From cf4c55bb5fc7f2b60bfc4219ca7c61eb1844d066 Mon Sep 17 00:00:00 2001
From: clc5q <clc5q@git.zephyr-software.com>
Date: Fri, 6 May 2016 19:40:19 +0000
Subject: [PATCH] Annotation diffs from previous DEADREGS fix for indirect
 calls.

Former-commit-id: 18b332a41eea526807e38bd1eeb0d69236b231dd
---
 .../commit/save-dansguardian.psexe.infoannot  | 10 +++---
 ...save-ffmpeg.psexe.infoannot.REMOVED.git-id |  2 +-
 .../save-gnome-system-monitor.psexe.infoannot |  2 +-
 tests/commit/save-nginx.psexe.infoannot       |  4 +--
 tests/commit/save-openssl.psexe.infoannot     |  2 +-
 ...ed-save-busybox.psexe.annot.REMOVED.git-id |  2 +-
 .../trimmed-sorted-save-bzip2.psexe.annot     | 14 +++-----
 ...ve-dansguardian.psexe.annot.REMOVED.git-id |  2 +-
 .../trimmed-sorted-save-destripe.psexe.annot  | 14 +++-----
 ...ted-save-ffmpeg.psexe.annot.REMOVED.git-id |  2 +-
 ...ave-firefox-bin.psexe.annot.REMOVED.git-id |  2 +-
 ...rted-save-gedit.psexe.annot.REMOVED.git-id |  2 +-
 ...orted-save-gimp.psexe.annot.REMOVED.git-id |  2 +-
 ...nome-calculator.psexe.annot.REMOVED.git-id |  2 +-
 ...orted-save-gnome-character-map.psexe.annot | 14 +++-----
 ...rted-save-gnome-control-center.psexe.annot | 14 +++-----
 ...d-sorted-save-gnome-dictionary.psexe.annot | 14 +++-----
 ...ve-gnome-file-share-properties.psexe.annot | 14 +++-----
 ...-sorted-save-gnome-font-viewer.psexe.annot | 14 +++-----
 ...trimmed-sorted-save-gnome-help.psexe.annot | 14 +++-----
 ...ed-sorted-save-gnome-keyring-3.psexe.annot | 16 +++------
 ...-keyring-daemon.psexe.annot.REMOVED.git-id |  2 +-
 ...mmed-sorted-save-gnome-keyring.psexe.annot | 16 +++------
 ...e-gnome-nettool.psexe.annot.REMOVED.git-id |  2 +-
 ...trimmed-sorted-save-gnome-open.psexe.annot | 14 +++-----
 ...ed-save-gnome-power-statistics.psexe.annot | 16 +++------
 ...save-gnome-screensaver-command.psexe.annot | 14 +++-----
 ...ome-screensaver.psexe.annot.REMOVED.git-id |  2 +-
 ...d-sorted-save-gnome-screenshot.psexe.annot | 14 +++-----
 ...ome-search-tool.psexe.annot.REMOVED.git-id |  2 +-
 ...-save-gnome-session-properties.psexe.annot | 14 +++-----
 ...sorted-save-gnome-session-quit.psexe.annot | 14 +++-----
 ...e-gnome-session.psexe.annot.REMOVED.git-id |  2 +-
 ...ted-save-gnome-settings-daemon.psexe.annot | 14 +++-----
 ...sorted-save-gnome-sound-applet.psexe.annot | 14 +++-----
 ...rted-save-gnome-sound-recorder.psexe.annot | 14 +++-----
 ...d-sorted-save-gnome-system-log.psexe.annot | 14 +++-----
 ...-system-monitor.psexe.annot.REMOVED.git-id |  2 +-
 ...-gnome-terminal.psexe.annot.REMOVED.git-id |  2 +-
 ...ome-text-editor.psexe.annot.REMOVED.git-id |  2 +-
 ...rted-save-gnome-thumbnail-font.psexe.annot | 14 +++-----
 ...orted-save-grep.psexe.annot.REMOVED.git-id |  2 +-
 ...rted-save-httpd.psexe.annot.REMOVED.git-id |  2 +-
 ...orted-save-less.psexe.annot.REMOVED.git-id |  2 +-
 ...d-save-ls-64bit.psexe.annot.REMOVED.git-id |  2 +-
 ...ted-save-lt-svn.psexe.annot.REMOVED.git-id |  2 +-
 .../trimmed-sorted-save-malloc.psexe.annot    | 20 ++++-------
 ...rted-save-nginx.psexe.annot.REMOVED.git-id |  2 +-
 ...ed-save-openssl.psexe.annot.REMOVED.git-id |  2 +-
 ...d-save-synaptic.psexe.annot.REMOVED.git-id |  2 +-
 .../commit/trimmed-sorted-save-toy.exe.annot  | 35 +++++++++----------
 .../trimmed-sorted-save-xcalc.psexe.annot     | 14 +++-----
 ...rted-save-xedit.psexe.annot.REMOVED.git-id |  2 +-
 .../trimmed-sorted-save-xeyes.psexe.annot     | 14 +++-----
 .../trimmed-sorted-save-bzip2.psexe.annot     | 14 +++-----
 .../trimmed-sorted-save-malloc.psexe.annot    | 20 ++++-------
 56 files changed, 163 insertions(+), 322 deletions(-)

diff --git a/tests/commit/save-dansguardian.psexe.infoannot b/tests/commit/save-dansguardian.psexe.infoannot
index 7d623d5d..edcb3393 100644
--- a/tests/commit/save-dansguardian.psexe.infoannot
+++ b/tests/commit/save-dansguardian.psexe.infoannot
@@ -708,9 +708,9 @@
             41051b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+-24 ZZ lea     rdi, [rax-18h] 
             4105c7      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [checkme+8]; this 
             41068b      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+24 ZZ IDIOM 18 MEMORYSINK lea     rdi, [checkme+18h]; this 
-            4106f3      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 418h 
+            4106f3      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 418h       ; this 
             410721      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [checkme+8]; this 
-            410743      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 468h 
+            410743      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 468h       ; this 
             410ab0  29844 FUNC RETURNTYPE RAX 1
             410ab0  29844 FUNC INARGS    6  ARG0 8 ARG1 4 ARG2 4 ARG3 1 ARG4 1 ARG5 1 
             410ab0  29844 FUNC PROBLEM _ZN17ConnectionHandler16handleConnectionER6SocketR6String CALLUNRESOLVED 
@@ -823,8 +823,8 @@
             41462d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+-24 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax-18h] 
             414802      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+-24 ZZ lea     rdi, [rax-18h] 
             414854      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+-24 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax-18h] 
-            41489e      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 328h 
-            4148db      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 378h 
+            41489e      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 328h       ; this 
+            4148db      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 378h       ; this 
             4149ca      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+-24 ZZ lea     rdi, [rax-18h] 
             414a0f      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+-24 ZZ lea     rdi, [rax-18h] 
             414a6a      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+-24 ZZ lea     rdi, [rax-18h] 
@@ -2724,7 +2724,7 @@
             458830    425 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 4 ARG4 4 ARG5 4 
             4589e0   1677 FUNC RETURNTYPE RAX 4
             4589e0   1677 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 4 ARG4 4 ARG5 4 
-            458c5d      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RAX ZZ IDIOM 19 sub     rax, [rsp+98h+__first._M_current] 
+            458c5d      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RAX ZZ IDIOM 19 sub     rax, [rsp+98h+var_88._M_current] 
             459070     27 FUNC RETURNTYPE RAX 0
             459070     27 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             459077      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     __out, [rax-18h] 
diff --git a/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id b/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
index 4838a0bc..9352790a 100644
--- a/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
+++ b/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
@@ -1 +1 @@
-2de7c80c6fc3f2dc222e01d0c9c4acfdf9cf6ab1
\ No newline at end of file
+73dced3eecab7370f5dcac8d9529acaa0e8bbed8
\ No newline at end of file
diff --git a/tests/commit/save-gnome-system-monitor.psexe.infoannot b/tests/commit/save-gnome-system-monitor.psexe.infoannot
index af49d7c4..4466bf00 100644
--- a/tests/commit/save-gnome-system-monitor.psexe.infoannot
+++ b/tests/commit/save-gnome-system-monitor.psexe.infoannot
@@ -1413,7 +1413,7 @@
             417410     63 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
             417aa0    112 FUNC RETURNTYPE RAX 0
             417aa0    112 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            417aec      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+632 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdi+278h] 
+            417aec      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+632 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdi+278h] ; this 
             417b10     96 FUNC RETURNTYPE RAX 16
             417b10     96 FUNC INARGS    6  ARG0 96 ARG1 96 ARG2 96 ARG3 96 ARG4 4 ARG5 4 
             417b90     21 FUNC RETURNTYPE RAX 16
diff --git a/tests/commit/save-nginx.psexe.infoannot b/tests/commit/save-nginx.psexe.infoannot
index 912cf0cd..9392d50c 100644
--- a/tests/commit/save-nginx.psexe.infoannot
+++ b/tests/commit/save-nginx.psexe.infoannot
@@ -11615,7 +11615,7 @@
             4fc273      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R13 ZZ mov     rdx, r13        ; n 
             4fc2cd      4 INSTR CHECK OVERFLOW SIGNED 64  R13 ZZ add     r13d, 1 
             4fc6d0    346 FUNC RETURNTYPE RAX 1
-            4fc6d0    346 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 4 ARG5 0 
+            4fc6d0    346 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 4 ARG5 0 
             4fc6d0    346 FUNC PROBLEM CONF_modules_unload CALLUNRESOLVED 
             4fc791      3 INSTR CHECK UNDERFLOW SIGNED 32  RBX ZZ sub     ebx, 1 
             4fc808      3 INSTR CHECK UNDERFLOW SIGNED 32  RBX ZZ sub     ebx, 1 
@@ -13420,7 +13420,7 @@
             53b1b0    468 FUNC RETURNTYPE RAX 4
             53b1b0    468 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 4 ARG5 1 
             53b390    997 FUNC RETURNTYPE RAX 1
-            53b390    997 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
+            53b390    997 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             53b390    997 FUNC PROBLEM RSA_eay_public_decrypt CALLUNRESOLVED 
             53b5ca      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+120 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+78h] 
             53b780   1083 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-openssl.psexe.infoannot b/tests/commit/save-openssl.psexe.infoannot
index dfcb41e2..fae36c36 100644
--- a/tests/commit/save-openssl.psexe.infoannot
+++ b/tests/commit/save-openssl.psexe.infoannot
@@ -4889,7 +4889,7 @@
             4c9390    468 FUNC RETURNTYPE RAX 4
             4c9390    468 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 4 ARG5 1 
             4c9570    997 FUNC RETURNTYPE RAX 1
-            4c9570    997 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
+            4c9570    997 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             4c9570    997 FUNC PROBLEM RSA_eay_public_decrypt CALLUNRESOLVED 
             4c97aa      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+120 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+78h] 
             4c9960   1083 FUNC RETURNTYPE RAX 1
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 54361dcc..69f23570 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 @@
-cfee388eaff041d7632c9b5e78388341695c16d2
\ No newline at end of file
+df1afed65c62fd2bf5b8b4d35d66b2288b3460fb
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-bzip2.psexe.annot b/tests/commit/trimmed-sorted-save-bzip2.psexe.annot
index de398a85..80d0e29d 100644
--- a/tests/commit/trimmed-sorted-save-bzip2.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-bzip2.psexe.annot
@@ -1911,18 +1911,16 @@
             401e49      7 INSTR BELONGTO 401e40 
             401e50     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401E9D 
             401e50      2 INSTR BELONGTO 401e40 
-            401e52     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_606E30 
             401e52      5 INSTR BELONGTO 401e40 
             401e52      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_606E30 
             401e57      7 INSTR BELONGTO 401e40 
             401e57      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_607200 
-            401e5e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_606E28 
             401e5e      7 INSTR BELONGTO 401e40 
             401e5e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_606E28 
-            401e65     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            401e65     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             401e65      4 INSTR BELONGTO 401e40 
             401e65      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            401e69     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            401e69     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             401e69      4 INSTR BELONGTO 401e40 
             401e69      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             401e6d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -7136,7 +7134,6 @@
             404545      5 INSTR BELONGTO 404540 
             404545      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             404545      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            40454a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:606E14h 
             40454a      7 INSTR BELONGTO 404540 
             40454a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:606E14h 
             404551      7 INSTR BELONGTO 404540 
@@ -7157,14 +7154,13 @@
             40456c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             40456c     56 DATAREF STACK 300 esp + 0 PARENT LocalFrame LOCALFRAME
             40456c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            404570     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             404570      3 INSTR BELONGTO 404540 
             404570      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             404573      3 INSTR BELONGTO 404540 
             404573      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             404576      3 INSTR BELONGTO 404540 
             404576      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            404579     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            404579     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             404579      4 INSTR BELONGTO 404540 
             404579      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             40457d      3 INSTR BELONGTO 404540 
@@ -7247,13 +7243,11 @@
             4045f0      4 INSTR BELONGTO 4045e0 
             4045f4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40460F 
             4045f4      2 INSTR BELONGTO 4045e0 
-            4045f6     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_606E18 
             4045f6      5 INSTR BELONGTO 4045e0 
             4045f6      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_606E18 
             4045fb      5 INSTR BELONGTO 4045e0 
-            404600     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            404600     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             404600      4 INSTR BELONGTO 4045e0 
-            404600      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             404604     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_606E18 
             404604      2 INSTR BELONGTO 4045e0 
             404606     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
diff --git a/tests/commit/trimmed-sorted-save-dansguardian.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-dansguardian.psexe.annot.REMOVED.git-id
index 9f5ba24d..55ee9991 100644
--- a/tests/commit/trimmed-sorted-save-dansguardian.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-dansguardian.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-5ffb72818324017cfba215972002031ef895ffc4
\ No newline at end of file
+d42e61feca5f5e502e3b33f95132f9045bd44c6a
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-destripe.psexe.annot b/tests/commit/trimmed-sorted-save-destripe.psexe.annot
index 8df18262..c5d14eeb 100644
--- a/tests/commit/trimmed-sorted-save-destripe.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-destripe.psexe.annot
@@ -607,18 +607,16 @@
             401c19      7 INSTR BELONGTO 401c10 
             401c20     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401C6D 
             401c20      2 INSTR BELONGTO 401c10 
-            401c22     -1 INSTR LOCAL MetadataUnused mov     ebx, offset __DTOR_END__ 
             401c22      5 INSTR BELONGTO 401c10 
             401c22      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset __DTOR_END__ 
             401c27      7 INSTR BELONGTO 401c10 
             401c27      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:dtor_idx_6533 
-            401c2e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset __DTOR_LIST__ 
             401c2e      7 INSTR BELONGTO 401c10 
             401c2e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset __DTOR_LIST__ 
-            401c35     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            401c35     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             401c35      4 INSTR BELONGTO 401c10 
             401c35      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            401c39     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            401c39     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             401c39      4 INSTR BELONGTO 401c10 
             401c39      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             401c3d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -3164,7 +3162,6 @@
             402b85      5 INSTR BELONGTO 402b80 
             402b85      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             402b85      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            402b8a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:603D94h 
             402b8a      7 INSTR BELONGTO 402b80 
             402b8a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:603D94h 
             402b91      7 INSTR BELONGTO 402b80 
@@ -3185,14 +3182,13 @@
             402bac      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             402bac     56 DATAREF STACK 151 esp + 0 PARENT LocalFrame LOCALFRAME
             402bac      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            402bb0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             402bb0      3 INSTR BELONGTO 402b80 
             402bb0      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             402bb3      3 INSTR BELONGTO 402b80 
             402bb3      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             402bb6      3 INSTR BELONGTO 402b80 
             402bb6      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            402bb9     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            402bb9     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             402bb9      4 INSTR BELONGTO 402b80 
             402bb9      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             402bbd      3 INSTR BELONGTO 402b80 
@@ -3275,13 +3271,11 @@
             402c30      4 INSTR BELONGTO 402c20 
             402c34     -1 INSTR LOCAL NoMetaUpdate jz      short loc_402C4F 
             402c34      2 INSTR BELONGTO 402c20 
-            402c36     -1 INSTR LOCAL MetadataUnused mov     ebx, offset __CTOR_LIST__ 
             402c36      5 INSTR BELONGTO 402c20 
             402c36      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset __CTOR_LIST__ 
             402c3b      5 INSTR BELONGTO 402c20 
-            402c40     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            402c40     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             402c40      4 INSTR BELONGTO 402c20 
-            402c40      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             402c44     -1 INSTR LOCAL NoMetaUpdate call    rax ; __CTOR_LIST__ 
             402c44      2 INSTR BELONGTO 402c20 
             402c46     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
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 10ca5b76..72a5fcec 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 @@
-1f54497a60c08dcb00764d2467b779568ba06a24
\ No newline at end of file
+54ecdd5a300c47c4aa3c8c26c6ec89b1341f4a75
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-firefox-bin.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-firefox-bin.psexe.annot.REMOVED.git-id
index 759d19f6..355cc1b3 100644
--- a/tests/commit/trimmed-sorted-save-firefox-bin.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-firefox-bin.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-993656eeb27ef2d4c58424e9b76c69fcef8e5a34
\ No newline at end of file
+c6b8fd559734f7727779c2b14ba5b41f0d607e10
\ 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 618f206e..b464e488 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 @@
-f6f2f9ec50933cc5c901af056b06371239e897fe
\ No newline at end of file
+72f44fc82fdb2dee7d87547b9a1d51dd7ddbc952
\ 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 60bf24ae..2e45eb94 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 @@
-55bdf4e1051f382b657e02945c0a899feaca8c47
\ No newline at end of file
+cd0de97b1efdf96eb9efd8aebecd429bbbad4dc1
\ 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 3abecc54..b9c654bd 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 @@
-79075a39792bd92d106a2e16e87755c8f0fadddb
\ No newline at end of file
+4d1156ace5b3c8569947a703d47a876568e0c35f
\ 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 250f4dfa..2e56ff63 100644
--- a/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
@@ -2828,18 +2828,16 @@
             406f79      7 INSTR BELONGTO 406f70 
             406f80     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_406FCD 
             406f80      2 INSTR BELONGTO 406f70 
-            406f82     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_60ED80 
             406f82      5 INSTR BELONGTO 406f70 
             406f82      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_60ED80 
             406f87      7 INSTR BELONGTO 406f70 
             406f87      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_60F948 
-            406f8e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_60ED78 
             406f8e      7 INSTR BELONGTO 406f70 
             406f8e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_60ED78 
-            406f95     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            406f95     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             406f95      4 INSTR BELONGTO 406f70 
             406f95      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            406f99     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            406f99     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             406f99      4 INSTR BELONGTO 406f70 
             406f99      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             406f9d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -11691,7 +11689,6 @@
             40bbc5      5 INSTR BELONGTO 40bbc0 
             40bbc5      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             40bbc5      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            40bbca     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:60ED64h 
             40bbca      7 INSTR BELONGTO 40bbc0 
             40bbca      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:60ED64h 
             40bbd1      7 INSTR BELONGTO 40bbc0 
@@ -11712,14 +11709,13 @@
             40bbec      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             40bbec     56 DATAREF STACK 718 esp + 0 PARENT LocalFrame LOCALFRAME
             40bbec      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            40bbf0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             40bbf0      3 INSTR BELONGTO 40bbc0 
             40bbf0      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             40bbf3      3 INSTR BELONGTO 40bbc0 
             40bbf3      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             40bbf6      3 INSTR BELONGTO 40bbc0 
             40bbf6      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            40bbf9     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            40bbf9     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             40bbf9      4 INSTR BELONGTO 40bbc0 
             40bbf9      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             40bbfd      3 INSTR BELONGTO 40bbc0 
@@ -11802,13 +11798,11 @@
             40bc70      4 INSTR BELONGTO 40bc60 
             40bc74     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40BC8F 
             40bc74      2 INSTR BELONGTO 40bc60 
-            40bc76     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_60ED68 
             40bc76      5 INSTR BELONGTO 40bc60 
             40bc76      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_60ED68 
             40bc7b      5 INSTR BELONGTO 40bc60 
-            40bc80     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            40bc80     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             40bc80      4 INSTR BELONGTO 40bc60 
-            40bc80      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             40bc84     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_60ED68 
             40bc84      2 INSTR BELONGTO 40bc60 
             40bc86     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
diff --git a/tests/commit/trimmed-sorted-save-gnome-control-center.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-control-center.psexe.annot
index 6b31bcc7..a8051049 100644
--- a/tests/commit/trimmed-sorted-save-gnome-control-center.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-control-center.psexe.annot
@@ -2577,20 +2577,18 @@
               7831     -1 INSTR LOCAL NoMetaUpdate call    ___cxa_finalize 
               7831      5 INSTR BELONGTO 7810 
               7831      5 INSTR DEADREGS  EFLAGS ZZ call    ___cxa_finalize 
-              7836     -1 INSTR LOCAL MetadataUnused lea     rbx, qword_210238 
               7836      7 INSTR BELONGTO 7810 
               7836      7 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ lea     rbx, qword_210238 
               783d      7 INSTR BELONGTO 7810 
               783d      7 INSTR DEADREGS  EFLAGS RAX R12 ZZ lea     r12, qword_210230 
               7844      7 INSTR BELONGTO 7810 
               7844      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_211020 
-              784b     -1 INSTR LOCAL MetadataUnused sub     rbx, r12 
               784b      3 INSTR BELONGTO 7810 
               784b      3 INSTR DEADREGS  EFLAGS ZZ sub     rbx, r12 
-              784e     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+              784e     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
               784e      4 INSTR BELONGTO 7810 
               784e      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-              7852     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+              7852     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
               7852      4 INSTR BELONGTO 7810 
               7852      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
               7856     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -11672,7 +11670,6 @@
               d3d5      5 INSTR BELONGTO d3d0 
               d3d5      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
               d3d5      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-              d3da     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:21021Ch 
               d3da      7 INSTR BELONGTO d3d0 
               d3da      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:21021Ch 
               d3e1      7 INSTR BELONGTO d3d0 
@@ -11693,14 +11690,13 @@
               d3fc      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
               d3fc     56 DATAREF STACK 651 esp + 0 PARENT LocalFrame LOCALFRAME
               d3fc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-              d400     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
               d400      3 INSTR BELONGTO d3d0 
               d400      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
               d403      3 INSTR BELONGTO d3d0 
               d403      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
               d406      3 INSTR BELONGTO d3d0 
               d406      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-              d409     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+              d409     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
               d409      4 INSTR BELONGTO d3d0 
               d409      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
               d40d      3 INSTR BELONGTO d3d0 
@@ -11783,13 +11779,11 @@
               d480      4 INSTR BELONGTO d470 
               d484     -1 INSTR LOCAL NoMetaUpdate jz      short loc_D49F 
               d484      2 INSTR BELONGTO d470 
-              d486     -1 INSTR LOCAL MetadataUnused lea     rbx, qword_210220 
               d486      7 INSTR BELONGTO d470 
               d486      7 INSTR DEADREGS  EFLAGS RBX ZZ lea     rbx, qword_210220 
               d48d      3 INSTR BELONGTO d470 
-              d490     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+              d490     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
               d490      4 INSTR BELONGTO d470 
-              d490      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
               d494     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_210220 
               d494      2 INSTR BELONGTO d470 
               d496     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
diff --git a/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
index 0c6c94fd..82462d36 100644
--- a/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
@@ -3662,18 +3662,16 @@
             409089      7 INSTR BELONGTO 409080 
             409090     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4090DD 
             409090      2 INSTR BELONGTO 409080 
-            409092     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_616D90 
             409092      5 INSTR BELONGTO 409080 
             409092      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_616D90 
             409097      7 INSTR BELONGTO 409080 
             409097      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_617E08 
-            40909e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_616D88 
             40909e      7 INSTR BELONGTO 409080 
             40909e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_616D88 
-            4090a5     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            4090a5     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             4090a5      4 INSTR BELONGTO 409080 
             4090a5      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            4090a9     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            4090a9     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             4090a9      4 INSTR BELONGTO 409080 
             4090a9      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             4090ad     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -18690,7 +18688,6 @@
             412615      5 INSTR BELONGTO 412610 
             412615      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             412615      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            41261a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:616D74h 
             41261a      7 INSTR BELONGTO 412610 
             41261a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:616D74h 
             412621      7 INSTR BELONGTO 412610 
@@ -18711,14 +18708,13 @@
             41263c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             41263c     56 DATAREF STACK 1264 esp + 0 PARENT LocalFrame LOCALFRAME
             41263c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            412640     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             412640      3 INSTR BELONGTO 412610 
             412640      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             412643      3 INSTR BELONGTO 412610 
             412643      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             412646      3 INSTR BELONGTO 412610 
             412646      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            412649     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            412649     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             412649      4 INSTR BELONGTO 412610 
             412649      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             41264d      3 INSTR BELONGTO 412610 
@@ -18801,13 +18797,11 @@
             4126c0      4 INSTR BELONGTO 4126b0 
             4126c4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4126DF 
             4126c4      2 INSTR BELONGTO 4126b0 
-            4126c6     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_616D78 
             4126c6      5 INSTR BELONGTO 4126b0 
             4126c6      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_616D78 
             4126cb      5 INSTR BELONGTO 4126b0 
-            4126d0     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            4126d0     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             4126d0      4 INSTR BELONGTO 4126b0 
-            4126d0      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             4126d4     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_616D78 
             4126d4      2 INSTR BELONGTO 4126b0 
             4126d6     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
diff --git a/tests/commit/trimmed-sorted-save-gnome-file-share-properties.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-file-share-properties.psexe.annot
index ec2c25ae..a438a6d0 100644
--- a/tests/commit/trimmed-sorted-save-gnome-file-share-properties.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-file-share-properties.psexe.annot
@@ -880,18 +880,16 @@
             402069      7 INSTR BELONGTO 402060 
             402070     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4020BD 
             402070      2 INSTR BELONGTO 402060 
-            402072     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_604DE0 
             402072      5 INSTR BELONGTO 402060 
             402072      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_604DE0 
             402077      7 INSTR BELONGTO 402060 
             402077      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_605290 
-            40207e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_604DD8 
             40207e      7 INSTR BELONGTO 402060 
             40207e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_604DD8 
-            402085     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            402085     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             402085      4 INSTR BELONGTO 402060 
             402085      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            402089     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            402089     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             402089      4 INSTR BELONGTO 402060 
             402089      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             40208d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -2869,7 +2867,6 @@
             403605      5 INSTR BELONGTO 403600 
             403605      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             403605      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            40360a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:604DC4h 
             40360a      7 INSTR BELONGTO 403600 
             40360a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:604DC4h 
             403611      7 INSTR BELONGTO 403600 
@@ -2890,14 +2887,13 @@
             40362c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             40362c     56 DATAREF STACK 219 esp + 0 PARENT LocalFrame LOCALFRAME
             40362c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            403630     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             403630      3 INSTR BELONGTO 403600 
             403630      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             403633      3 INSTR BELONGTO 403600 
             403633      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             403636      3 INSTR BELONGTO 403600 
             403636      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            403639     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            403639     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             403639      4 INSTR BELONGTO 403600 
             403639      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             40363d      3 INSTR BELONGTO 403600 
@@ -2980,13 +2976,11 @@
             4036b0      4 INSTR BELONGTO 4036a0 
             4036b4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4036CF 
             4036b4      2 INSTR BELONGTO 4036a0 
-            4036b6     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_604DC8 
             4036b6      5 INSTR BELONGTO 4036a0 
             4036b6      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_604DC8 
             4036bb      5 INSTR BELONGTO 4036a0 
-            4036c0     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            4036c0     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             4036c0      4 INSTR BELONGTO 4036a0 
-            4036c0      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             4036c4     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_604DC8 
             4036c4      2 INSTR BELONGTO 4036a0 
             4036c6     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
diff --git a/tests/commit/trimmed-sorted-save-gnome-font-viewer.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-font-viewer.psexe.annot
index 8ab39cb5..ad25e616 100644
--- a/tests/commit/trimmed-sorted-save-gnome-font-viewer.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-font-viewer.psexe.annot
@@ -2470,18 +2470,16 @@
             4036f9      7 INSTR BELONGTO 4036f0 
             403700     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40374D 
             403700      2 INSTR BELONGTO 4036f0 
-            403702     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_604DB0 
             403702      5 INSTR BELONGTO 4036f0 
             403702      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_604DB0 
             403707      7 INSTR BELONGTO 4036f0 
             403707      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_6053D8 
-            40370e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_604DA8 
             40370e      7 INSTR BELONGTO 4036f0 
             40370e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_604DA8 
-            403715     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            403715     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             403715      4 INSTR BELONGTO 4036f0 
             403715      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            403719     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            403719     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             403719      4 INSTR BELONGTO 4036f0 
             403719      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             40371d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -3888,7 +3886,6 @@
             4044d5      5 INSTR BELONGTO 4044d0 
             4044d5      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             4044d5      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            4044da     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:604D94h 
             4044da      7 INSTR BELONGTO 4044d0 
             4044da      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:604D94h 
             4044e1      7 INSTR BELONGTO 4044d0 
@@ -3909,14 +3906,13 @@
             4044fc      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             4044fc     56 DATAREF STACK 198 esp + 0 PARENT LocalFrame LOCALFRAME
             4044fc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            404500     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             404500      3 INSTR BELONGTO 4044d0 
             404500      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             404503      3 INSTR BELONGTO 4044d0 
             404503      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             404506      3 INSTR BELONGTO 4044d0 
             404506      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            404509     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            404509     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             404509      4 INSTR BELONGTO 4044d0 
             404509      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             40450d      3 INSTR BELONGTO 4044d0 
@@ -3999,13 +3995,11 @@
             404580      4 INSTR BELONGTO 404570 
             404584     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40459F 
             404584      2 INSTR BELONGTO 404570 
-            404586     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_604D98 
             404586      5 INSTR BELONGTO 404570 
             404586      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_604D98 
             40458b      5 INSTR BELONGTO 404570 
-            404590     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            404590     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             404590      4 INSTR BELONGTO 404570 
-            404590      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             404594     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_604D98 
             404594      2 INSTR BELONGTO 404570 
             404596     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
diff --git a/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot
index a0d672d6..c83f4417 100644
--- a/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot
@@ -1938,18 +1938,16 @@
             405059      7 INSTR BELONGTO 405050 
             405060     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4050AD 
             405060      2 INSTR BELONGTO 405050 
-            405062     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_60BDB0 
             405062      5 INSTR BELONGTO 405050 
             405062      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_60BDB0 
             405067      7 INSTR BELONGTO 405050 
             405067      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_60C6E0 
-            40506e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_60BDA8 
             40506e      7 INSTR BELONGTO 405050 
             40506e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_60BDA8 
-            405075     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            405075     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             405075      4 INSTR BELONGTO 405050 
             405075      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            405079     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            405079     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             405079      4 INSTR BELONGTO 405050 
             405079      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             40507d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -8750,7 +8748,6 @@
             409355      5 INSTR BELONGTO 409350 
             409355      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             409355      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            40935a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:60BD94h 
             40935a      7 INSTR BELONGTO 409350 
             40935a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:60BD94h 
             409361      7 INSTR BELONGTO 409350 
@@ -8771,14 +8768,13 @@
             40937c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             40937c     56 DATAREF STACK 540 esp + 0 PARENT LocalFrame LOCALFRAME
             40937c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            409380     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             409380      3 INSTR BELONGTO 409350 
             409380      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             409383      3 INSTR BELONGTO 409350 
             409383      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             409386      3 INSTR BELONGTO 409350 
             409386      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            409389     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            409389     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             409389      4 INSTR BELONGTO 409350 
             409389      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             40938d      3 INSTR BELONGTO 409350 
@@ -8861,13 +8857,11 @@
             409400      4 INSTR BELONGTO 4093f0 
             409404     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40941F 
             409404      2 INSTR BELONGTO 4093f0 
-            409406     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_60BD98 
             409406      5 INSTR BELONGTO 4093f0 
             409406      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_60BD98 
             40940b      5 INSTR BELONGTO 4093f0 
-            409410     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            409410     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             409410      4 INSTR BELONGTO 4093f0 
-            409410      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             409414     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_60BD98 
             409414      2 INSTR BELONGTO 4093f0 
             409416     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
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 17d1db56..150256a5 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot
@@ -577,7 +577,7 @@
             401456      4 INSTR BELONGTO 401380 
             401456      4 INSTR DEADREGS  EFLAGS RDI ZZ lea     edi, [r13-1] 
             40145a      5 INSTR BELONGTO 401380 
-            40145a      5 INSTR DEADREGS  EFLAGS R13 ZZ mov     [r12+8], rax 
+            40145a      5 INSTR DEADREGS  EFLAGS ZZ mov     [r12+8], rax 
             40145f     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [rbx+8] 
             40145f      3 INSTR BELONGTO 401380 
             401462     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 0FFFFFFFFh 
@@ -665,18 +665,16 @@
             4014b9      7 INSTR BELONGTO 4014b0 
             4014c0     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40150D 
             4014c0      2 INSTR BELONGTO 4014b0 
-            4014c2     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_602DD0 
             4014c2      5 INSTR BELONGTO 4014b0 
             4014c2      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_602DD0 
             4014c7      7 INSTR BELONGTO 4014b0 
             4014c7      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_603288 
-            4014ce     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_602DC8 
             4014ce      7 INSTR BELONGTO 4014b0 
             4014ce      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_602DC8 
-            4014d5     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            4014d5     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             4014d5      4 INSTR BELONGTO 4014b0 
             4014d5      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            4014d9     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            4014d9     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             4014d9      4 INSTR BELONGTO 4014b0 
             4014d9      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             4014dd     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -2065,7 +2063,6 @@
             401f15      5 INSTR BELONGTO 401f10 
             401f15      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             401f15      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            401f1a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:602DB4h 
             401f1a      7 INSTR BELONGTO 401f10 
             401f1a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:602DB4h 
             401f21      7 INSTR BELONGTO 401f10 
@@ -2086,14 +2083,13 @@
             401f3c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             401f3c     56 DATAREF STACK 153 esp + 0 PARENT LocalFrame LOCALFRAME
             401f3c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            401f40     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             401f40      3 INSTR BELONGTO 401f10 
             401f40      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             401f43      3 INSTR BELONGTO 401f10 
             401f43      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             401f46      3 INSTR BELONGTO 401f10 
             401f46      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            401f49     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            401f49     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             401f49      4 INSTR BELONGTO 401f10 
             401f49      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             401f4d      3 INSTR BELONGTO 401f10 
@@ -2176,13 +2172,11 @@
             401fc0      4 INSTR BELONGTO 401fb0 
             401fc4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401FDF 
             401fc4      2 INSTR BELONGTO 401fb0 
-            401fc6     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_602DB8 
             401fc6      5 INSTR BELONGTO 401fb0 
             401fc6      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_602DB8 
             401fcb      5 INSTR BELONGTO 401fb0 
-            401fd0     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            401fd0     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             401fd0      4 INSTR BELONGTO 401fb0 
-            401fd0      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             401fd4     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_602DB8 
             401fd4      2 INSTR BELONGTO 401fb0 
             401fd6     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
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 1e34caca..1ff3289c 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 @@
-f71b694d4ddc742ed0e6105f64c3fc7666f25858
\ No newline at end of file
+482c2040ba3e1aa54ab45f70f70e113b9756887e
\ 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 17d1db56..150256a5 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot
@@ -577,7 +577,7 @@
             401456      4 INSTR BELONGTO 401380 
             401456      4 INSTR DEADREGS  EFLAGS RDI ZZ lea     edi, [r13-1] 
             40145a      5 INSTR BELONGTO 401380 
-            40145a      5 INSTR DEADREGS  EFLAGS R13 ZZ mov     [r12+8], rax 
+            40145a      5 INSTR DEADREGS  EFLAGS ZZ mov     [r12+8], rax 
             40145f     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [rbx+8] 
             40145f      3 INSTR BELONGTO 401380 
             401462     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 0FFFFFFFFh 
@@ -665,18 +665,16 @@
             4014b9      7 INSTR BELONGTO 4014b0 
             4014c0     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40150D 
             4014c0      2 INSTR BELONGTO 4014b0 
-            4014c2     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_602DD0 
             4014c2      5 INSTR BELONGTO 4014b0 
             4014c2      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_602DD0 
             4014c7      7 INSTR BELONGTO 4014b0 
             4014c7      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_603288 
-            4014ce     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_602DC8 
             4014ce      7 INSTR BELONGTO 4014b0 
             4014ce      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_602DC8 
-            4014d5     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            4014d5     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             4014d5      4 INSTR BELONGTO 4014b0 
             4014d5      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            4014d9     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            4014d9     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             4014d9      4 INSTR BELONGTO 4014b0 
             4014d9      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             4014dd     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -2065,7 +2063,6 @@
             401f15      5 INSTR BELONGTO 401f10 
             401f15      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             401f15      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            401f1a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:602DB4h 
             401f1a      7 INSTR BELONGTO 401f10 
             401f1a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:602DB4h 
             401f21      7 INSTR BELONGTO 401f10 
@@ -2086,14 +2083,13 @@
             401f3c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             401f3c     56 DATAREF STACK 153 esp + 0 PARENT LocalFrame LOCALFRAME
             401f3c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            401f40     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             401f40      3 INSTR BELONGTO 401f10 
             401f40      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             401f43      3 INSTR BELONGTO 401f10 
             401f43      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             401f46      3 INSTR BELONGTO 401f10 
             401f46      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            401f49     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            401f49     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             401f49      4 INSTR BELONGTO 401f10 
             401f49      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             401f4d      3 INSTR BELONGTO 401f10 
@@ -2176,13 +2172,11 @@
             401fc0      4 INSTR BELONGTO 401fb0 
             401fc4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401FDF 
             401fc4      2 INSTR BELONGTO 401fb0 
-            401fc6     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_602DB8 
             401fc6      5 INSTR BELONGTO 401fb0 
             401fc6      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_602DB8 
             401fcb      5 INSTR BELONGTO 401fb0 
-            401fd0     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            401fd0     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             401fd0      4 INSTR BELONGTO 401fb0 
-            401fd0      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             401fd4     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_602DB8 
             401fd4      2 INSTR BELONGTO 401fb0 
             401fd6     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
diff --git a/tests/commit/trimmed-sorted-save-gnome-nettool.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gnome-nettool.psexe.annot.REMOVED.git-id
index d0a731fd..18ea375c 100644
--- a/tests/commit/trimmed-sorted-save-gnome-nettool.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gnome-nettool.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-043d747afe0bb4f7f70fbfb73d05f70cc2c95a0f
\ No newline at end of file
+56d6bd5f1dadea59e94245639e60e046b156fc07
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-open.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-open.psexe.annot
index 2d61d9c9..4b8d5a7a 100644
--- a/tests/commit/trimmed-sorted-save-gnome-open.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-open.psexe.annot
@@ -425,18 +425,16 @@
             400c79      7 INSTR BELONGTO 400c70 
             400c80     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_400CCD 
             400c80      2 INSTR BELONGTO 400c70 
-            400c82     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_601DF0 
             400c82      5 INSTR BELONGTO 400c70 
             400c82      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_601DF0 
             400c87      7 INSTR BELONGTO 400c70 
             400c87      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_602090 
-            400c8e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_601DE8 
             400c8e      7 INSTR BELONGTO 400c70 
             400c8e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_601DE8 
-            400c95     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            400c95     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             400c95      4 INSTR BELONGTO 400c70 
             400c95      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            400c99     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            400c99     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             400c99      4 INSTR BELONGTO 400c70 
             400c99      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             400c9d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -499,7 +497,6 @@
             400d15      5 INSTR BELONGTO 400d10 
             400d15      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             400d15      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            400d1a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:601DD4h 
             400d1a      7 INSTR BELONGTO 400d10 
             400d1a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:601DD4h 
             400d21      7 INSTR BELONGTO 400d10 
@@ -520,14 +517,13 @@
             400d3c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             400d3c     56 DATAREF STACK 42 esp + 0 PARENT LocalFrame LOCALFRAME
             400d3c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            400d40     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             400d40      3 INSTR BELONGTO 400d10 
             400d40      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             400d43      3 INSTR BELONGTO 400d10 
             400d43      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             400d46      3 INSTR BELONGTO 400d10 
             400d46      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            400d49     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            400d49     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             400d49      4 INSTR BELONGTO 400d10 
             400d49      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             400d4d      3 INSTR BELONGTO 400d10 
@@ -610,13 +606,11 @@
             400dc0      4 INSTR BELONGTO 400db0 
             400dc4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_400DDF 
             400dc4      2 INSTR BELONGTO 400db0 
-            400dc6     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_601DD8 
             400dc6      5 INSTR BELONGTO 400db0 
             400dc6      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_601DD8 
             400dcb      5 INSTR BELONGTO 400db0 
-            400dd0     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            400dd0     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             400dd0      4 INSTR BELONGTO 400db0 
-            400dd0      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             400dd4     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_601DD8 
             400dd4      2 INSTR BELONGTO 400db0 
             400dd6     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
diff --git a/tests/commit/trimmed-sorted-save-gnome-power-statistics.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-power-statistics.psexe.annot
index 28207947..709ff24b 100644
--- a/tests/commit/trimmed-sorted-save-gnome-power-statistics.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-power-statistics.psexe.annot
@@ -2153,18 +2153,16 @@
             404b39      7 INSTR BELONGTO 404b30 
             404b40     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_404B8D 
             404b40      2 INSTR BELONGTO 404b30 
-            404b42     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_60ED70 
             404b42      5 INSTR BELONGTO 404b30 
             404b42      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_60ED70 
             404b47      7 INSTR BELONGTO 404b30 
             404b47      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_60F6B0 
-            404b4e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_60ED68 
             404b4e      7 INSTR BELONGTO 404b30 
             404b4e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_60ED68 
-            404b55     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            404b55     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             404b55      4 INSTR BELONGTO 404b30 
             404b55      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            404b59     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            404b59     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             404b59      4 INSTR BELONGTO 404b30 
             404b59      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             404b5d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -8145,9 +8143,9 @@
             407af3      5 INSTR BELONGTO 407a80 
             407af3      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, [rsp+18h+var_10] 
             407af3      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+18h+var_10]
-            407af8     -1 INSTR LOCAL MetadataUnused mov     rbp, [rsp+18h+var_8] 
             407af8      5 INSTR BELONGTO 407a80 
             407af8      5 INSTR DEADREGS  EFLAGS ZZ mov     rbp, [rsp+18h+var_8] 
+            407af8      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+18h+var_8]
             407afd     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             407afd      4 INSTR BELONGTO 407a80 
             407b01     -1 INSTR LOCAL NoMetaUpdate jmp     loc_407990 
@@ -12932,7 +12930,6 @@
             40bc15      5 INSTR BELONGTO 40bc10 
             40bc15      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             40bc15      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            40bc1a     -1 INSTR LOCAL MetadataUnused lea     rbp, off_60ED50 
             40bc1a      7 INSTR BELONGTO 40bc10 
             40bc1a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, off_60ED50 
             40bc21      7 INSTR BELONGTO 40bc10 
@@ -12953,14 +12950,13 @@
             40bc3c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             40bc3c     56 DATAREF STACK 716 esp + 0 PARENT LocalFrame LOCALFRAME
             40bc3c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            40bc40     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             40bc40      3 INSTR BELONGTO 40bc10 
             40bc40      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             40bc43      3 INSTR BELONGTO 40bc10 
             40bc43      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             40bc46      3 INSTR BELONGTO 40bc10 
             40bc46      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            40bc49     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            40bc49     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             40bc49      4 INSTR BELONGTO 40bc10 
             40bc49      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             40bc4d      3 INSTR BELONGTO 40bc10 
@@ -13043,13 +13039,11 @@
             40bcc0      4 INSTR BELONGTO 40bcb0 
             40bcc4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40BCDF 
             40bcc4      2 INSTR BELONGTO 40bcb0 
-            40bcc6     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_60ED58 
             40bcc6      5 INSTR BELONGTO 40bcb0 
             40bcc6      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_60ED58 
             40bccb      5 INSTR BELONGTO 40bcb0 
-            40bcd0     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            40bcd0     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             40bcd0      4 INSTR BELONGTO 40bcb0 
-            40bcd0      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             40bcd4     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_60ED58 
             40bcd4      2 INSTR BELONGTO 40bcb0 
             40bcd6     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
diff --git a/tests/commit/trimmed-sorted-save-gnome-screensaver-command.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-screensaver-command.psexe.annot
index 69c06b71..850fff22 100644
--- a/tests/commit/trimmed-sorted-save-gnome-screensaver-command.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-screensaver-command.psexe.annot
@@ -712,18 +712,16 @@
             4011a9      7 INSTR BELONGTO 4011a0 
             4011b0     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4011FD 
             4011b0      2 INSTR BELONGTO 4011a0 
-            4011b2     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_602E10 
             4011b2      5 INSTR BELONGTO 4011a0 
             4011b2      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_602E10 
             4011b7      7 INSTR BELONGTO 4011a0 
             4011b7      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_6032C8 
-            4011be     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_602E08 
             4011be      7 INSTR BELONGTO 4011a0 
             4011be      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_602E08 
-            4011c5     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            4011c5     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             4011c5      4 INSTR BELONGTO 4011a0 
             4011c5      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            4011c9     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            4011c9     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             4011c9      4 INSTR BELONGTO 4011a0 
             4011c9      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             4011cd     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -1713,7 +1711,6 @@
             401855      5 INSTR BELONGTO 401850 
             401855      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             401855      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            40185a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:602DF4h 
             40185a      7 INSTR BELONGTO 401850 
             40185a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:602DF4h 
             401861      7 INSTR BELONGTO 401850 
@@ -1734,14 +1731,13 @@
             40187c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             40187c     56 DATAREF STACK 173 esp + 0 PARENT LocalFrame LOCALFRAME
             40187c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            401880     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             401880      3 INSTR BELONGTO 401850 
             401880      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             401883      3 INSTR BELONGTO 401850 
             401883      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             401886      3 INSTR BELONGTO 401850 
             401886      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            401889     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            401889     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             401889      4 INSTR BELONGTO 401850 
             401889      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             40188d      3 INSTR BELONGTO 401850 
@@ -1824,13 +1820,11 @@
             401900      4 INSTR BELONGTO 4018f0 
             401904     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40191F 
             401904      2 INSTR BELONGTO 4018f0 
-            401906     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_602DF8 
             401906      5 INSTR BELONGTO 4018f0 
             401906      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_602DF8 
             40190b      5 INSTR BELONGTO 4018f0 
-            401910     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            401910     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             401910      4 INSTR BELONGTO 4018f0 
-            401910      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             401914     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_602DF8 
             401914      2 INSTR BELONGTO 4018f0 
             401916     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
diff --git a/tests/commit/trimmed-sorted-save-gnome-screensaver.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gnome-screensaver.psexe.annot.REMOVED.git-id
index 14d30542..86c8f45b 100644
--- a/tests/commit/trimmed-sorted-save-gnome-screensaver.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gnome-screensaver.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-51a6a126bbc0310da0f890973893db5c3cf24aee
\ No newline at end of file
+1fbb31245d29bc637bca1befcce6d41b5d0631fe
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-screenshot.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-screenshot.psexe.annot
index 88510946..74b8d270 100644
--- a/tests/commit/trimmed-sorted-save-gnome-screenshot.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-screenshot.psexe.annot
@@ -2679,18 +2679,16 @@
             407639      7 INSTR BELONGTO 407630 
             407640     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40768D 
             407640      2 INSTR BELONGTO 407630 
-            407642     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_60ED70 
             407642      5 INSTR BELONGTO 407630 
             407642      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_60ED70 
             407647      7 INSTR BELONGTO 407630 
             407647      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_60FA68 
-            40764e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_60ED68 
             40764e      7 INSTR BELONGTO 407630 
             40764e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_60ED68 
-            407655     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            407655     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             407655      4 INSTR BELONGTO 407630 
             407655      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            407659     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            407659     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             407659      4 INSTR BELONGTO 407630 
             407659      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             40765d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -14033,7 +14031,6 @@
             40ce75      5 INSTR BELONGTO 40ce70 
             40ce75      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             40ce75      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            40ce7a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:60ED54h 
             40ce7a      7 INSTR BELONGTO 40ce70 
             40ce7a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:60ED54h 
             40ce81      7 INSTR BELONGTO 40ce70 
@@ -14054,14 +14051,13 @@
             40ce9c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             40ce9c     56 DATAREF STACK 605 esp + 0 PARENT LocalFrame LOCALFRAME
             40ce9c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            40cea0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             40cea0      3 INSTR BELONGTO 40ce70 
             40cea0      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             40cea3      3 INSTR BELONGTO 40ce70 
             40cea3      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             40cea6      3 INSTR BELONGTO 40ce70 
             40cea6      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            40cea9     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            40cea9     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             40cea9      4 INSTR BELONGTO 40ce70 
             40cea9      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             40cead      3 INSTR BELONGTO 40ce70 
@@ -14144,13 +14140,11 @@
             40cf20      4 INSTR BELONGTO 40cf10 
             40cf24     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40CF3F 
             40cf24      2 INSTR BELONGTO 40cf10 
-            40cf26     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_60ED58 
             40cf26      5 INSTR BELONGTO 40cf10 
             40cf26      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_60ED58 
             40cf2b      5 INSTR BELONGTO 40cf10 
-            40cf30     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            40cf30     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             40cf30      4 INSTR BELONGTO 40cf10 
-            40cf30      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             40cf34     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_60ED58 
             40cf34      2 INSTR BELONGTO 40cf10 
             40cf36     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
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 fb60de6f..02990bcd 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 @@
-e6600e9eeed3da75004e4371bd2ca1c1f85796ee
\ No newline at end of file
+b708cefcfd2bb31efea7b25a472da6facc8a3cb7
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-session-properties.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-session-properties.psexe.annot
index d82e1eec..b7bc9f9f 100644
--- a/tests/commit/trimmed-sorted-save-gnome-session-properties.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-session-properties.psexe.annot
@@ -2153,18 +2153,16 @@
             405559      7 INSTR BELONGTO 405550 
             405560     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4055AD 
             405560      2 INSTR BELONGTO 405550 
-            405562     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_60EDC0 
             405562      5 INSTR BELONGTO 405550 
             405562      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_60EDC0 
             405567      7 INSTR BELONGTO 405550 
             405567      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_60F7D0 
-            40556e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_60EDB8 
             40556e      7 INSTR BELONGTO 405550 
             40556e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_60EDB8 
-            405575     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            405575     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             405575      4 INSTR BELONGTO 405550 
             405575      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            405579     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            405579     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             405579      4 INSTR BELONGTO 405550 
             405579      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             40557d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -14194,7 +14192,6 @@
             40b795      5 INSTR BELONGTO 40b790 
             40b795      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             40b795      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            40b79a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:60EDA4h 
             40b79a      7 INSTR BELONGTO 40b790 
             40b79a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:60EDA4h 
             40b7a1      7 INSTR BELONGTO 40b790 
@@ -14215,14 +14212,13 @@
             40b7bc      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             40b7bc     56 DATAREF STACK 606 esp + 0 PARENT LocalFrame LOCALFRAME
             40b7bc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            40b7c0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             40b7c0      3 INSTR BELONGTO 40b790 
             40b7c0      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             40b7c3      3 INSTR BELONGTO 40b790 
             40b7c3      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             40b7c6      3 INSTR BELONGTO 40b790 
             40b7c6      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            40b7c9     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            40b7c9     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             40b7c9      4 INSTR BELONGTO 40b790 
             40b7c9      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             40b7cd      3 INSTR BELONGTO 40b790 
@@ -14305,13 +14301,11 @@
             40b840      4 INSTR BELONGTO 40b830 
             40b844     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40B85F 
             40b844      2 INSTR BELONGTO 40b830 
-            40b846     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_60EDA8 
             40b846      5 INSTR BELONGTO 40b830 
             40b846      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_60EDA8 
             40b84b      5 INSTR BELONGTO 40b830 
-            40b850     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            40b850     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             40b850      4 INSTR BELONGTO 40b830 
-            40b850      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             40b854     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_60EDA8 
             40b854      2 INSTR BELONGTO 40b830 
             40b856     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
diff --git a/tests/commit/trimmed-sorted-save-gnome-session-quit.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-session-quit.psexe.annot
index 6f74b466..497ace0b 100644
--- a/tests/commit/trimmed-sorted-save-gnome-session-quit.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-session-quit.psexe.annot
@@ -526,18 +526,16 @@
             400b19      7 INSTR BELONGTO 400b10 
             400b20     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_400B6D 
             400b20      2 INSTR BELONGTO 400b10 
-            400b22     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_601DF0 
             400b22      5 INSTR BELONGTO 400b10 
             400b22      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_601DF0 
             400b27      7 INSTR BELONGTO 400b10 
             400b27      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_602198 
-            400b2e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_601DE8 
             400b2e      7 INSTR BELONGTO 400b10 
             400b2e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_601DE8 
-            400b35     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            400b35     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             400b35      4 INSTR BELONGTO 400b10 
             400b35      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            400b39     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            400b39     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             400b39      4 INSTR BELONGTO 400b10 
             400b39      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             400b3d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -845,7 +843,6 @@
             400d15      5 INSTR BELONGTO 400d10 
             400d15      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             400d15      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            400d1a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:601DD4h 
             400d1a      7 INSTR BELONGTO 400d10 
             400d1a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:601DD4h 
             400d21      7 INSTR BELONGTO 400d10 
@@ -866,14 +863,13 @@
             400d3c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             400d3c     56 DATAREF STACK 92 esp + 0 PARENT LocalFrame LOCALFRAME
             400d3c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            400d40     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             400d40      3 INSTR BELONGTO 400d10 
             400d40      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             400d43      3 INSTR BELONGTO 400d10 
             400d43      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             400d46      3 INSTR BELONGTO 400d10 
             400d46      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            400d49     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            400d49     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             400d49      4 INSTR BELONGTO 400d10 
             400d49      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             400d4d      3 INSTR BELONGTO 400d10 
@@ -956,13 +952,11 @@
             400dc0      4 INSTR BELONGTO 400db0 
             400dc4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_400DDF 
             400dc4      2 INSTR BELONGTO 400db0 
-            400dc6     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_601DD8 
             400dc6      5 INSTR BELONGTO 400db0 
             400dc6      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_601DD8 
             400dcb      5 INSTR BELONGTO 400db0 
-            400dd0     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            400dd0     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             400dd0      4 INSTR BELONGTO 400db0 
-            400dd0      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             400dd4     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_601DD8 
             400dd4      2 INSTR BELONGTO 400db0 
             400dd6     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
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 a8345b17..3d9de434 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 @@
-05e0ca05278f03115a08ac2ba7ccfc0d267dcd0d
\ No newline at end of file
+e55feb11e96021801bbe20834e9c9b14b66a6f54
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-settings-daemon.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-settings-daemon.psexe.annot
index 8982d0a0..c2c732ed 100644
--- a/tests/commit/trimmed-sorted-save-gnome-settings-daemon.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-settings-daemon.psexe.annot
@@ -1708,18 +1708,16 @@
             4039a9      7 INSTR BELONGTO 4039a0 
             4039b0     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4039FD 
             4039b0      2 INSTR BELONGTO 4039a0 
-            4039b2     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_607DB0 
             4039b2      5 INSTR BELONGTO 4039a0 
             4039b2      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_607DB0 
             4039b7      7 INSTR BELONGTO 4039a0 
             4039b7      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_608478 
-            4039be     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_607DA8 
             4039be      7 INSTR BELONGTO 4039a0 
             4039be      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_607DA8 
-            4039c5     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            4039c5     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             4039c5      4 INSTR BELONGTO 4039a0 
             4039c5      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            4039c9     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            4039c9     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             4039c9      4 INSTR BELONGTO 4039a0 
             4039c9      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             4039cd     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -6914,7 +6912,6 @@
             405d55      5 INSTR BELONGTO 405d50 
             405d55      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             405d55      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            405d5a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:607D94h 
             405d5a      7 INSTR BELONGTO 405d50 
             405d5a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:607D94h 
             405d61      7 INSTR BELONGTO 405d50 
@@ -6935,14 +6932,13 @@
             405d7c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             405d7c     56 DATAREF STACK 424 esp + 0 PARENT LocalFrame LOCALFRAME
             405d7c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            405d80     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             405d80      3 INSTR BELONGTO 405d50 
             405d80      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             405d83      3 INSTR BELONGTO 405d50 
             405d83      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             405d86      3 INSTR BELONGTO 405d50 
             405d86      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            405d89     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            405d89     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             405d89      4 INSTR BELONGTO 405d50 
             405d89      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             405d8d      3 INSTR BELONGTO 405d50 
@@ -7025,13 +7021,11 @@
             405e00      4 INSTR BELONGTO 405df0 
             405e04     -1 INSTR LOCAL NoMetaUpdate jz      short loc_405E1F 
             405e04      2 INSTR BELONGTO 405df0 
-            405e06     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_607D98 
             405e06      5 INSTR BELONGTO 405df0 
             405e06      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_607D98 
             405e0b      5 INSTR BELONGTO 405df0 
-            405e10     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            405e10     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             405e10      4 INSTR BELONGTO 405df0 
-            405e10      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             405e14     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_607D98 
             405e14      2 INSTR BELONGTO 405df0 
             405e16     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
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 7b6b8161..3c74f68c 100644
--- a/tests/commit/trimmed-sorted-save-gnome-sound-applet.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-sound-applet.psexe.annot
@@ -7125,7 +7125,6 @@
              14995      5 INSTR BELONGTO 14990 
              14995      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
              14995      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-             1499a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:21C414h 
              1499a      7 INSTR BELONGTO 14990 
              1499a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:21C414h 
              149a1      7 INSTR BELONGTO 14990 
@@ -7146,14 +7145,13 @@
              149bc      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
              149bc     56 DATAREF STACK 1198 esp + 0 PARENT LocalFrame LOCALFRAME
              149bc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-             149c0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
              149c0      3 INSTR BELONGTO 14990 
              149c0      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
              149c3      3 INSTR BELONGTO 14990 
              149c3      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
              149c6      3 INSTR BELONGTO 14990 
              149c6      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-             149c9     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+             149c9     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
              149c9      4 INSTR BELONGTO 14990 
              149c9      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
              149cd      3 INSTR BELONGTO 14990 
@@ -7236,13 +7234,11 @@
              14a40      4 INSTR BELONGTO 14a30 
              14a44     -1 INSTR LOCAL NoMetaUpdate jz      short loc_14A5F 
              14a44      2 INSTR BELONGTO 14a30 
-             14a46     -1 INSTR LOCAL MetadataUnused lea     rbx, qword_21C418 
              14a46      7 INSTR BELONGTO 14a30 
              14a46      7 INSTR DEADREGS  EFLAGS RBX ZZ lea     rbx, qword_21C418 
              14a4d      3 INSTR BELONGTO 14a30 
-             14a50     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+             14a50     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
              14a50      4 INSTR BELONGTO 14a30 
-             14a50      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
              14a54     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_21C418 
              14a54      2 INSTR BELONGTO 14a30 
              14a56     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
@@ -9297,20 +9293,18 @@
               6da1     -1 INSTR LOCAL NoMetaUpdate call    ___cxa_finalize 
               6da1      5 INSTR BELONGTO 6d80 
               6da1      5 INSTR DEADREGS  EFLAGS ZZ call    ___cxa_finalize 
-              6da6     -1 INSTR LOCAL MetadataUnused lea     rbx, qword_21C430 
               6da6      7 INSTR BELONGTO 6d80 
               6da6      7 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ lea     rbx, qword_21C430 
               6dad      7 INSTR BELONGTO 6d80 
               6dad      7 INSTR DEADREGS  EFLAGS RAX R12 ZZ lea     r12, qword_21C428 
               6db4      7 INSTR BELONGTO 6d80 
               6db4      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_21D148 
-              6dbb     -1 INSTR LOCAL MetadataUnused sub     rbx, r12 
               6dbb      3 INSTR BELONGTO 6d80 
               6dbb      3 INSTR DEADREGS  EFLAGS ZZ sub     rbx, r12 
-              6dbe     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+              6dbe     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
               6dbe      4 INSTR BELONGTO 6d80 
               6dbe      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-              6dc2     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+              6dc2     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
               6dc2      4 INSTR BELONGTO 6d80 
               6dc2      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
               6dc6     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
diff --git a/tests/commit/trimmed-sorted-save-gnome-sound-recorder.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-sound-recorder.psexe.annot
index 161c51cc..0f7343a1 100644
--- a/tests/commit/trimmed-sorted-save-gnome-sound-recorder.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-sound-recorder.psexe.annot
@@ -2834,18 +2834,16 @@
             4068a9      7 INSTR BELONGTO 4068a0 
             4068b0     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4068FD 
             4068b0      2 INSTR BELONGTO 4068a0 
-            4068b2     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_60FD60 
             4068b2      5 INSTR BELONGTO 4068a0 
             4068b2      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_60FD60 
             4068b7      7 INSTR BELONGTO 4068a0 
             4068b7      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_6108F8 
-            4068be     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_60FD58 
             4068be      7 INSTR BELONGTO 4068a0 
             4068be      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_60FD58 
-            4068c5     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            4068c5     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             4068c5      4 INSTR BELONGTO 4068a0 
             4068c5      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            4068c9     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            4068c9     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             4068c9      4 INSTR BELONGTO 4068a0 
             4068c9      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             4068cd     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -15613,7 +15611,6 @@
             40cf95      5 INSTR BELONGTO 40cf90 
             40cf95      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             40cf95      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            40cf9a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:60FD44h 
             40cf9a      7 INSTR BELONGTO 40cf90 
             40cf9a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:60FD44h 
             40cfa1      7 INSTR BELONGTO 40cf90 
@@ -15634,14 +15631,13 @@
             40cfbc      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             40cfbc     56 DATAREF STACK 841 esp + 0 PARENT LocalFrame LOCALFRAME
             40cfbc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            40cfc0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             40cfc0      3 INSTR BELONGTO 40cf90 
             40cfc0      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             40cfc3      3 INSTR BELONGTO 40cf90 
             40cfc3      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             40cfc6      3 INSTR BELONGTO 40cf90 
             40cfc6      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            40cfc9     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            40cfc9     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             40cfc9      4 INSTR BELONGTO 40cf90 
             40cfc9      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             40cfcd      3 INSTR BELONGTO 40cf90 
@@ -15724,13 +15720,11 @@
             40d040      4 INSTR BELONGTO 40d030 
             40d044     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40D05F 
             40d044      2 INSTR BELONGTO 40d030 
-            40d046     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_60FD48 
             40d046      5 INSTR BELONGTO 40d030 
             40d046      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_60FD48 
             40d04b      5 INSTR BELONGTO 40d030 
-            40d050     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            40d050     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             40d050      4 INSTR BELONGTO 40d030 
-            40d050      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             40d054     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_60FD48 
             40d054      2 INSTR BELONGTO 40d030 
             40d056     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
diff --git a/tests/commit/trimmed-sorted-save-gnome-system-log.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-system-log.psexe.annot
index 7a8d30f0..71ac6226 100644
--- a/tests/commit/trimmed-sorted-save-gnome-system-log.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-system-log.psexe.annot
@@ -4152,18 +4152,16 @@
             409e19      7 INSTR BELONGTO 409e10 
             409e20     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_409E6D 
             409e20      2 INSTR BELONGTO 409e10 
-            409e22     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_618DA0 
             409e22      5 INSTR BELONGTO 409e10 
             409e22      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_618DA0 
             409e27      7 INSTR BELONGTO 409e10 
             409e27      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_61A290 
-            409e2e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_618D98 
             409e2e      7 INSTR BELONGTO 409e10 
             409e2e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_618D98 
-            409e35     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            409e35     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             409e35      4 INSTR BELONGTO 409e10 
             409e35      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            409e39     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            409e39     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             409e39      4 INSTR BELONGTO 409e10 
             409e39      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             409e3d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -21334,7 +21332,6 @@
             413fb5      5 INSTR BELONGTO 413fb0 
             413fb5      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             413fb5      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            413fba     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:618D84h 
             413fba      7 INSTR BELONGTO 413fb0 
             413fba      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:618D84h 
             413fc1      7 INSTR BELONGTO 413fb0 
@@ -21355,14 +21352,13 @@
             413fdc      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             413fdc     56 DATAREF STACK 1233 esp + 0 PARENT LocalFrame LOCALFRAME
             413fdc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            413fe0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             413fe0      3 INSTR BELONGTO 413fb0 
             413fe0      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             413fe3      3 INSTR BELONGTO 413fb0 
             413fe3      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             413fe6      3 INSTR BELONGTO 413fb0 
             413fe6      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            413fe9     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            413fe9     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             413fe9      4 INSTR BELONGTO 413fb0 
             413fe9      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             413fed      3 INSTR BELONGTO 413fb0 
@@ -21445,13 +21441,11 @@
             414060      4 INSTR BELONGTO 414050 
             414064     -1 INSTR LOCAL NoMetaUpdate jz      short loc_41407F 
             414064      2 INSTR BELONGTO 414050 
-            414066     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_618D88 
             414066      5 INSTR BELONGTO 414050 
             414066      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_618D88 
             41406b      5 INSTR BELONGTO 414050 
-            414070     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            414070     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             414070      4 INSTR BELONGTO 414050 
-            414070      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             414074     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_618D88 
             414074      2 INSTR BELONGTO 414050 
             414076     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
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 998c3178..daaa6f53 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 @@
-1677f56aa2893835ac4bfefe1ddadcd5541356dd
\ No newline at end of file
+7dce3183ee631435d2c59df04f47163e638d1e33
\ 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 4d6fee47..03ea35b2 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 @@
-de300ec76cf8149b5ebf6b55daaa7ac04e0a022e
\ No newline at end of file
+7da4c7f1a8116f5bc77701fe9e46cbb786f75bbc
\ 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 618f206e..b464e488 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 @@
-f6f2f9ec50933cc5c901af056b06371239e897fe
\ No newline at end of file
+72f44fc82fdb2dee7d87547b9a1d51dd7ddbc952
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-thumbnail-font.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-thumbnail-font.psexe.annot
index d73694f9..c49cd619 100644
--- a/tests/commit/trimmed-sorted-save-gnome-thumbnail-font.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-thumbnail-font.psexe.annot
@@ -2154,18 +2154,16 @@
             4020f9      7 INSTR BELONGTO 4020f0 
             402100     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40214D 
             402100      2 INSTR BELONGTO 4020f0 
-            402102     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_603DE0 
             402102      5 INSTR BELONGTO 4020f0 
             402102      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_603DE0 
             402107      7 INSTR BELONGTO 4020f0 
             402107      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_6041F8 
-            40210e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_603DD8 
             40210e      7 INSTR BELONGTO 4020f0 
             40210e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_603DD8 
-            402115     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            402115     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             402115      4 INSTR BELONGTO 4020f0 
             402115      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            402119     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            402119     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             402119      4 INSTR BELONGTO 4020f0 
             402119      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             40211d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -3141,7 +3139,6 @@
             402845      5 INSTR BELONGTO 402840 
             402845      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             402845      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            40284a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:603DC4h 
             40284a      7 INSTR BELONGTO 402840 
             40284a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:603DC4h 
             402851      7 INSTR BELONGTO 402840 
@@ -3162,14 +3159,13 @@
             40286c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             40286c     56 DATAREF STACK 410 esp + 0 PARENT LocalFrame LOCALFRAME
             40286c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            402870     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             402870      3 INSTR BELONGTO 402840 
             402870      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             402873      3 INSTR BELONGTO 402840 
             402873      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             402876      3 INSTR BELONGTO 402840 
             402876      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            402879     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            402879     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             402879      4 INSTR BELONGTO 402840 
             402879      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             40287d      3 INSTR BELONGTO 402840 
@@ -3252,13 +3248,11 @@
             4028f0      4 INSTR BELONGTO 4028e0 
             4028f4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40290F 
             4028f4      2 INSTR BELONGTO 4028e0 
-            4028f6     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_603DC8 
             4028f6      5 INSTR BELONGTO 4028e0 
             4028f6      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_603DC8 
             4028fb      5 INSTR BELONGTO 4028e0 
-            402900     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            402900     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             402900      4 INSTR BELONGTO 4028e0 
-            402900      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             402904     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_603DC8 
             402904      2 INSTR BELONGTO 4028e0 
             402906     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
diff --git a/tests/commit/trimmed-sorted-save-grep.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-grep.psexe.annot.REMOVED.git-id
index 771b0650..2f5fefe8 100644
--- a/tests/commit/trimmed-sorted-save-grep.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-grep.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-4e5dc12f32888b18c1005943f330c10797045690
\ No newline at end of file
+d19dd66fde77911c5b6885ced5a874293886b435
\ 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 15d97bbd..362b9946 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 @@
-1320b391fd55c7b86d17fe9a78e5fb78afe092be
\ No newline at end of file
+196ae6f45ab8a78cdc762e2bd55ca58b2ec88bcc
\ 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 a9fd2c7e..903951e0 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 @@
-a1296df5400508a88b59497762f926a27ff2ab44
\ No newline at end of file
+2c4d82df3e62005af24e60731a79d12ffa12ea4e
\ 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 d1717db6..14b8ec5a 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 @@
-b3af248d40c316b259d3c3165d44a9cfdf09742f
\ No newline at end of file
+23a6fcaa850418d87156359c6e74b080cd1eaf70
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-lt-svn.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-lt-svn.psexe.annot.REMOVED.git-id
index c68cc2b6..b1c91833 100644
--- a/tests/commit/trimmed-sorted-save-lt-svn.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-lt-svn.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-02485e0f539b5662858330457efd096c361e2b5d
\ No newline at end of file
+e4f814bae622cdf38e93ba6239f6455b1fb79619
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-malloc.psexe.annot b/tests/commit/trimmed-sorted-save-malloc.psexe.annot
index 0c0607a8..8a4c11e9 100644
--- a/tests/commit/trimmed-sorted-save-malloc.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-malloc.psexe.annot
@@ -48,7 +48,7 @@
            8048434     -3 INSTR LOCAL NoWarn push    ebx             ; _init 
            8048434     46 FUNC GLOBAL .init_proc FUNC_UNSAFE NOFP RET            8048461 
            8048435      3 INSTR BELONGTO 8048434 
-           8048435      3 INSTR DEADREGS  EFLAGS EBX ZZ sub     esp, 8 
+           8048435      3 INSTR DEADREGS  EFLAGS ZZ sub     esp, 8 
            8048435      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
            8048435      4 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
            8048435      8 DATAREF STACK 44 esp + 0 PARENT LocalFrame LOCALFRAME
@@ -214,16 +214,14 @@
            804856e      2 INSTR BELONGTO 8048560 
            8048570      5 INSTR BELONGTO 8048560 
            8048570      5 INSTR DEADREGS  EFLAGS EAX EBX ZZ mov     eax, ds:dtor_idx_6161 
-           8048575     -1 INSTR LOCAL MetadataUnused mov     ebx, offset __DTOR_END__ 
            8048575      5 INSTR BELONGTO 8048560 
            8048575      5 INSTR DEADREGS  EFLAGS EBX ZZ mov     ebx, offset __DTOR_END__ 
-           804857a     -1 INSTR LOCAL MetadataUnused sub     ebx, offset __DTOR_LIST__ 
            804857a      6 INSTR BELONGTO 8048560 
            804857a      6 INSTR DEADREGS  EFLAGS ZZ sub     ebx, offset __DTOR_LIST__ 
-           8048580     -1 INSTR LOCAL MetadataUnused sar     ebx, 2 
+           8048580     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM sar     ebx, 2 
            8048580      3 INSTR BELONGTO 8048560 
            8048580      3 INSTR DEADREGS  EFLAGS ZZ sar     ebx, 2 
-           8048583     -1 INSTR LOCAL MetadataUnused sub     ebx, 1 
+           8048583     -1 INSTR LOCAL MetadataRedundant sub     ebx, 1 
            8048583      3 INSTR BELONGTO 8048560 
            8048583      3 INSTR DEADREGS  EFLAGS ZZ sub     ebx, 1 
            8048586     -1 INSTR LOCAL NoMetaUpdate cmp     eax, ebx 
@@ -652,7 +650,6 @@
            8048802      4 INSTR BELONGTO 80487f0 
            8048802      4 INSTR DEADREGS  EFLAGS ESI EDI ZZ mov     ebp, [esp+2Ch+arg_0] 
            8048802      4 PTRIMMEDESP STACK 48 displ mov     ebp, [esp+2Ch+arg_0]
-           8048806     -1 INSTR LOCAL MetadataUnused lea     edi, (__CTOR_LIST__ - 8049FF4h)[ebx] 
            8048806      6 INSTR BELONGTO 80487f0 
            8048806      6 INSTR DEADREGS  EFLAGS ESI EDI ZZ lea     edi, (__CTOR_LIST__ - 8049FF4h)[ebx] 
            804880c     -1 INSTR LOCAL NoMetaUpdate call    _init_proc 
@@ -660,10 +657,9 @@
            804880c      5 INSTR DEADREGS  EFLAGS ESI ZZ call    _init_proc 
            8048811      6 INSTR BELONGTO 80487f0 
            8048811      6 INSTR DEADREGS  EFLAGS EAX ESI ZZ lea     eax, (__CTOR_LIST__ - 8049FF4h)[ebx] 
-           8048817     -1 INSTR LOCAL MetadataUnused sub     edi, eax 
            8048817      2 INSTR BELONGTO 80487f0 
-           8048817      2 INSTR DEADREGS  EFLAGS ESI ZZ sub     edi, eax 
-           8048819     -1 INSTR LOCAL MetadataUnused sar     edi, 2 
+           8048817     -2 INSTR LOCAL n EDI ZZ  NumericDEFs sub     edi, eax 
+           8048819     -1 INSTR LOCAL MetadataRedundant sar     edi, 2 
            8048819      3 INSTR BELONGTO 80487f0 
            8048819      3 INSTR DEADREGS  EFLAGS ESI ZZ sar     edi, 2 
            804881c     -1 INSTR LOCAL NoMetaUpdate test    edi, edi 
@@ -752,14 +748,12 @@
            804887c      3 INSTR BELONGTO 8048870 
            804887f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_8048894 
            804887f      2 INSTR BELONGTO 8048870 
-           8048881     -1 INSTR LOCAL MetadataUnused mov     ebx, offset __CTOR_LIST__ 
            8048881      5 INSTR BELONGTO 8048870 
            8048881      5 INSTR DEADREGS  EFLAGS EBX ZZ mov     ebx, offset __CTOR_LIST__ 
            8048886     -1 INSTR LOCAL NoMetaUpdate xchg    ax, ax 
            8048886      2 INSTR BELONGTO 8048870 
-           8048888     -1 INSTR LOCAL MetadataUnused sub     ebx, 4 
+           8048888     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     ebx, 4 
            8048888      3 INSTR BELONGTO 8048870 
-           8048888      3 INSTR DEADREGS  EFLAGS ZZ sub     ebx, 4 
            804888b     -1 INSTR LOCAL NoMetaUpdate call    eax ; __CTOR_LIST__ 
            804888b      2 INSTR BELONGTO 8048870 
            804888d      2 INSTR BELONGTO 8048870 
@@ -785,7 +779,7 @@
            804889c     26 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET            80488b5 
            804889c     -3 INSTR LOCAL NoWarn push    ebx             ; _fini 
            804889d      3 INSTR BELONGTO 804889c 
-           804889d      3 INSTR DEADREGS  EFLAGS EBX ZZ sub     esp, 8 
+           804889d      3 INSTR DEADREGS  EFLAGS ZZ sub     esp, 8 
            804889d      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
            804889d      4 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
            804889d      8 DATAREF STACK 57 esp + 0 PARENT LocalFrame LOCALFRAME
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 dc717df9..29c08336 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 @@
-b5c9094776207f48a902b252ab0a86502cc901da
\ No newline at end of file
+110c7ec5a2cb2f0fc6ad1dde63913b066fbb495b
\ 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 84081581..53ea4424 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 @@
-b96548e803fb63644e2c7ac0b699dcdc5ad50216
\ No newline at end of file
+266ca6077d86883b7f2dad29b376871223c2c670
\ 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 156f3793..84e79899 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 @@
-1d3520c2fecd95fe84fb5b32a09efb964a374402
\ No newline at end of file
+2a840dc83d30b23e59afacf95c9aadca6ce72226
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-toy.exe.annot b/tests/commit/trimmed-sorted-save-toy.exe.annot
index 5673017b..9fc19473 100644
--- a/tests/commit/trimmed-sorted-save-toy.exe.annot
+++ b/tests/commit/trimmed-sorted-save-toy.exe.annot
@@ -136,7 +136,7 @@
            8048337      1 INSTR DEADREGS  EFLAGS ZZ push    ebx 
            8048337     -3 INSTR LOCAL NoWarn push    ebx 
            8048338      3 INSTR BELONGTO 8048334 
-           8048338      3 INSTR DEADREGS  EFLAGS EBX ZZ sub     esp, 4 
+           8048338      3 INSTR DEADREGS  EFLAGS ZZ sub     esp, 4 
            8048338      4 DATAREF STACK 27 esp + 0 PARENT LocalFrame LOCALFRAME
            8048338      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
            8048338      8 MEMORYHOLE STACK esp + 4 CalleeSavedRegs 
@@ -444,46 +444,45 @@
            8048492      6 INSTR BELONGTO 8048470 
            8048492      6 INSTR DEADREGS  EFLAGS EAX EDX ESI EDI ZZ lea     eax, (__CTOR_LIST__ - 8049640h)[ebx] 
            8048498      3 INSTR BELONGTO 8048470 
-           8048498      3 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ sub     [ebp+var_10], eax 
+           8048498      3 INSTR DEADREGS  EFLAGS EDX ESI EDI ZZ sub     [ebp+var_10], eax 
            8048498      3 PTRIMMEDEBP STACK -16 displ sub     [ebp+var_10], eax
            804849b      4 INSTR BELONGTO 8048470 
-           804849b      4 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ sar     [ebp+var_10], 2 
+           804849b      4 INSTR DEADREGS  EFLAGS EDX ESI EDI ZZ sar     [ebp+var_10], 2 
            804849b      4 PTRIMMEDEBP STACK -16 displ sar     [ebp+var_10], 2
            804849f     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, [ebp+var_10] 
            804849f      3 INSTR BELONGTO 8048470 
-           804849f      3 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ mov     edx, [ebp+var_10] 
+           804849f      3 INSTR DEADREGS  EFLAGS EDX ESI EDI ZZ mov     edx, [ebp+var_10] 
            804849f      3 PTRIMMEDEBP STACK -16 displ mov     edx, [ebp+var_10]
            80484a2     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
            80484a2      2 INSTR BELONGTO 8048470 
            80484a4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_80484D1 
            80484a4      2 INSTR BELONGTO 8048470 
-           80484a6     -1 INSTR LOCAL MetadataUnused xor     edi, edi 
            80484a6      2 INSTR BELONGTO 8048470 
-           80484a6      2 INSTR DEADREGS  EFLAGS EBX ESI EDI ZZ xor     edi, edi 
+           80484a6      2 INSTR DEADREGS  EFLAGS ESI EDI ZZ xor     edi, edi 
+           80484a6     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
            80484a8      2 INSTR BELONGTO 8048470 
-           80484a8      2 INSTR DEADREGS  EFLAGS EBX ESI ZZ mov     esi, eax 
+           80484a8      2 INSTR DEADREGS  EFLAGS ESI ZZ mov     esi, eax 
            80484aa     -1 INSTR LOCAL NoMetaUpdate lea     esi, [esi+0] 
            80484aa      6 INSTR BELONGTO 8048470 
            80484b0      3 INSTR BELONGTO 8048470 
-           80484b0      3 INSTR DEADREGS  EFLAGS EAX EBX ZZ mov     eax, [ebp+arg_8] 
+           80484b0      3 INSTR DEADREGS  EFLAGS EAX ZZ mov     eax, [ebp+arg_8] 
            80484b0      3 PTRIMMEDEBP STACK 16 displ mov     eax, [ebp+arg_8]
-           80484b3     -1 INSTR LOCAL MetadataUnused add     edi, 1 
+           80484b3     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     edi, 1 
            80484b3      3 INSTR BELONGTO 8048470 
-           80484b3      3 INSTR DEADREGS  EFLAGS EBX ZZ add     edi, 1 
            80484b6      4 INSTR BELONGTO 8048470 
-           80484b6      4 INSTR DEADREGS  EFLAGS EBX ZZ mov     [esp+8], eax 
+           80484b6      4 INSTR DEADREGS  EFLAGS ZZ mov     [esp+8], eax 
            80484b6      4 PTRIMMEDESP STACK 8 displ mov     [esp+8], eax
            80484ba      3 INSTR BELONGTO 8048470 
-           80484ba      3 INSTR DEADREGS  EFLAGS EAX EBX ZZ mov     eax, [ebp+arg_4] 
+           80484ba      3 INSTR DEADREGS  EFLAGS EAX ZZ mov     eax, [ebp+arg_4] 
            80484ba      3 PTRIMMEDEBP STACK 12 displ mov     eax, [ebp+arg_4]
            80484bd      4 INSTR BELONGTO 8048470 
-           80484bd      4 INSTR DEADREGS  EFLAGS EBX ZZ mov     [esp+4], eax 
+           80484bd      4 INSTR DEADREGS  EFLAGS ZZ mov     [esp+4], eax 
            80484bd      4 PTRIMMEDESP STACK 4 displ mov     [esp+4], eax
            80484c1      3 INSTR BELONGTO 8048470 
-           80484c1      3 INSTR DEADREGS  EFLAGS EAX EBX ZZ mov     eax, [ebp+arg_0] 
+           80484c1      3 INSTR DEADREGS  EFLAGS EAX ZZ mov     eax, [ebp+arg_0] 
            80484c1      3 PTRIMMEDEBP STACK 8 displ mov     eax, [ebp+arg_0]
            80484c4      3 INSTR BELONGTO 8048470 
-           80484c4      3 INSTR DEADREGS  EFLAGS EBX ZZ mov     [esp], eax 
+           80484c4      3 INSTR DEADREGS  EFLAGS ZZ mov     [esp], eax 
            80484c4      3 PTRIMMEDESP STACK 0 displ mov     [esp], eax
            80484c7     -1 INSTR LOCAL NoMetaUpdate call    dword ptr [esi] 
            80484c7      2 INSTR BELONGTO 8048470 
@@ -528,7 +527,6 @@
            80484e3      1 INSTR BELONGTO 80484e0 
            80484e3      1 INSTR DEADREGS  EFLAGS EAX ZZ push    ebx 
            80484e3     -3 INSTR LOCAL NoWarn push    ebx 
-           80484e4     -1 INSTR LOCAL MetadataUnused mov     ebx, offset __CTOR_LIST__ 
            80484e4      5 INSTR BELONGTO 80484e0 
            80484e4      5 INSTR DEADREGS  EFLAGS EAX EBX ZZ mov     ebx, offset __CTOR_LIST__ 
            80484e9      3 INSTR BELONGTO 80484e0 
@@ -543,9 +541,8 @@
            80484f1      3 INSTR BELONGTO 80484e0 
            80484f4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_8048502 
            80484f4      2 INSTR BELONGTO 80484e0 
-           80484f6     -1 INSTR LOCAL MetadataUnused sub     ebx, 4 
+           80484f6     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     ebx, 4 
            80484f6      3 INSTR BELONGTO 80484e0 
-           80484f6      3 INSTR DEADREGS  EFLAGS ZZ sub     ebx, 4 
            80484f9     -1 INSTR LOCAL NoMetaUpdate call    eax ; __CTOR_LIST__ 
            80484f9      2 INSTR BELONGTO 80484e0 
            80484fb      2 INSTR BELONGTO 80484e0 
@@ -576,7 +573,7 @@
            804850b      1 INSTR DEADREGS  EFLAGS ZZ push    ebx 
            804850b     -3 INSTR LOCAL NoWarn push    ebx 
            804850c      3 INSTR BELONGTO 8048508 
-           804850c      3 INSTR DEADREGS  EFLAGS EBX ZZ sub     esp, 4 
+           804850c      3 INSTR DEADREGS  EFLAGS ZZ sub     esp, 4 
            804850c      4 DATAREF STACK 36 esp + 0 PARENT LocalFrame LOCALFRAME
            804850c      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
            804850c      8 MEMORYHOLE STACK esp + 4 CalleeSavedRegs 
diff --git a/tests/commit/trimmed-sorted-save-xcalc.psexe.annot b/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
index 4322eeaf..b685ceea 100644
--- a/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
@@ -1551,18 +1551,16 @@
             401d39      7 INSTR BELONGTO 401d30 
             401d40     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401D8D 
             401d40      2 INSTR BELONGTO 401d30 
-            401d42     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_606E00 
             401d42      5 INSTR BELONGTO 401d30 
             401d42      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_606E00 
             401d47      7 INSTR BELONGTO 401d30 
             401d47      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_6085F0 
-            401d4e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_606DF8 
             401d4e      7 INSTR BELONGTO 401d30 
             401d4e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_606DF8 
-            401d55     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            401d55     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             401d55      4 INSTR BELONGTO 401d30 
             401d55      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            401d59     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            401d59     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             401d59      4 INSTR BELONGTO 401d30 
             401d59      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             401d5d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -7403,7 +7401,6 @@
             404dd5      5 INSTR BELONGTO 404dd0 
             404dd5      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             404dd5      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            404dda     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:606DE4h 
             404dda      7 INSTR BELONGTO 404dd0 
             404dda      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:606DE4h 
             404de1      7 INSTR BELONGTO 404dd0 
@@ -7424,14 +7421,13 @@
             404dfc      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             404dfc     56 DATAREF STACK 555 esp + 0 PARENT LocalFrame LOCALFRAME
             404dfc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            404e00     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             404e00      3 INSTR BELONGTO 404dd0 
             404e00      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             404e03      3 INSTR BELONGTO 404dd0 
             404e03      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             404e06      3 INSTR BELONGTO 404dd0 
             404e06      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            404e09     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            404e09     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             404e09      4 INSTR BELONGTO 404dd0 
             404e09      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             404e0d      3 INSTR BELONGTO 404dd0 
@@ -7514,13 +7510,11 @@
             404e80      4 INSTR BELONGTO 404e70 
             404e84     -1 INSTR LOCAL NoMetaUpdate jz      short loc_404E9F 
             404e84      2 INSTR BELONGTO 404e70 
-            404e86     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_606DE8 
             404e86      5 INSTR BELONGTO 404e70 
             404e86      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_606DE8 
             404e8b      5 INSTR BELONGTO 404e70 
-            404e90     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            404e90     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             404e90      4 INSTR BELONGTO 404e70 
-            404e90      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             404e94     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_606DE8 
             404e94      2 INSTR BELONGTO 404e70 
             404e96     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
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 1a514e2f..fa60a8c9 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 @@
-df9a05652edfcc8d5d699fd6c042e4feeaa21329
\ No newline at end of file
+66c3e2b8c7335480ed24ecb5ff1c8747dc4c8826
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-xeyes.psexe.annot b/tests/commit/trimmed-sorted-save-xeyes.psexe.annot
index 7ccf8280..b25ea5f4 100644
--- a/tests/commit/trimmed-sorted-save-xeyes.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-xeyes.psexe.annot
@@ -902,18 +902,16 @@
             401929      7 INSTR BELONGTO 401920 
             401930     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40197D 
             401930      2 INSTR BELONGTO 401920 
-            401932     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_603DE0 
             401932      5 INSTR BELONGTO 401920 
             401932      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_603DE0 
             401937      7 INSTR BELONGTO 401920 
             401937      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_6056F0 
-            40193e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_603DD8 
             40193e      7 INSTR BELONGTO 401920 
             40193e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_603DD8 
-            401945     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            401945     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             401945      4 INSTR BELONGTO 401920 
             401945      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            401949     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            401949     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             401949      4 INSTR BELONGTO 401920 
             401949      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             40194d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -3429,7 +3427,6 @@
             403075      5 INSTR BELONGTO 403070 
             403075      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             403075      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            40307a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:603DC4h 
             40307a      7 INSTR BELONGTO 403070 
             40307a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:603DC4h 
             403081      7 INSTR BELONGTO 403070 
@@ -3450,14 +3447,13 @@
             40309c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             40309c     56 DATAREF STACK 224 esp + 0 PARENT LocalFrame LOCALFRAME
             40309c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            4030a0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             4030a0      3 INSTR BELONGTO 403070 
             4030a0      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             4030a3      3 INSTR BELONGTO 403070 
             4030a3      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             4030a6      3 INSTR BELONGTO 403070 
             4030a6      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            4030a9     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            4030a9     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             4030a9      4 INSTR BELONGTO 403070 
             4030a9      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             4030ad      3 INSTR BELONGTO 403070 
@@ -3540,13 +3536,11 @@
             403120      4 INSTR BELONGTO 403110 
             403124     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40313F 
             403124      2 INSTR BELONGTO 403110 
-            403126     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_603DC8 
             403126      5 INSTR BELONGTO 403110 
             403126      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_603DC8 
             40312b      5 INSTR BELONGTO 403110 
-            403130     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            403130     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             403130      4 INSTR BELONGTO 403110 
-            403130      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             403134     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_603DC8 
             403134      2 INSTR BELONGTO 403110 
             403136     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
diff --git a/tests/quick/trimmed-sorted-save-bzip2.psexe.annot b/tests/quick/trimmed-sorted-save-bzip2.psexe.annot
index de398a85..80d0e29d 100644
--- a/tests/quick/trimmed-sorted-save-bzip2.psexe.annot
+++ b/tests/quick/trimmed-sorted-save-bzip2.psexe.annot
@@ -1911,18 +1911,16 @@
             401e49      7 INSTR BELONGTO 401e40 
             401e50     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401E9D 
             401e50      2 INSTR BELONGTO 401e40 
-            401e52     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_606E30 
             401e52      5 INSTR BELONGTO 401e40 
             401e52      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     ebx, offset qword_606E30 
             401e57      7 INSTR BELONGTO 401e40 
             401e57      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_607200 
-            401e5e     -1 INSTR LOCAL MetadataUnused sub     rbx, offset qword_606E28 
             401e5e      7 INSTR BELONGTO 401e40 
             401e5e      7 INSTR DEADREGS  EFLAGS ZZ sub     rbx, offset qword_606E28 
-            401e65     -1 INSTR LOCAL MetadataUnused sar     rbx, 3 
+            401e65     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM sar     rbx, 3 
             401e65      4 INSTR BELONGTO 401e40 
             401e65      4 INSTR DEADREGS  EFLAGS ZZ sar     rbx, 3 
-            401e69     -1 INSTR LOCAL MetadataUnused sub     rbx, 1 
+            401e69     -1 INSTR LOCAL MetadataRedundant sub     rbx, 1 
             401e69      4 INSTR BELONGTO 401e40 
             401e69      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 1 
             401e6d     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rbx 
@@ -7136,7 +7134,6 @@
             404545      5 INSTR BELONGTO 404540 
             404545      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+var_20], r12 
             404545      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], r12
-            40454a     -1 INSTR LOCAL MetadataUnused lea     rbp, cs:606E14h 
             40454a      7 INSTR BELONGTO 404540 
             40454a      7 INSTR DEADREGS  EFLAGS R12 ZZ lea     rbp, cs:606E14h 
             404551      7 INSTR BELONGTO 404540 
@@ -7157,14 +7154,13 @@
             40456c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
             40456c     56 DATAREF STACK 300 esp + 0 PARENT LocalFrame LOCALFRAME
             40456c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
-            404570     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             404570      3 INSTR BELONGTO 404540 
             404570      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rbp, r12 
             404573      3 INSTR BELONGTO 404540 
             404573      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     r13d, edi 
             404576      3 INSTR BELONGTO 404540 
             404576      3 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     r14, rsi 
-            404579     -1 INSTR LOCAL MetadataUnused sar     rbp, 3 
+            404579     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     rbp, 3 
             404579      4 INSTR BELONGTO 404540 
             404579      4 INSTR DEADREGS  EFLAGS RBX R15 ZZ sar     rbp, 3 
             40457d      3 INSTR BELONGTO 404540 
@@ -7247,13 +7243,11 @@
             4045f0      4 INSTR BELONGTO 4045e0 
             4045f4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40460F 
             4045f4      2 INSTR BELONGTO 4045e0 
-            4045f6     -1 INSTR LOCAL MetadataUnused mov     ebx, offset qword_606E18 
             4045f6      5 INSTR BELONGTO 4045e0 
             4045f6      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, offset qword_606E18 
             4045fb      5 INSTR BELONGTO 4045e0 
-            404600     -1 INSTR LOCAL MetadataUnused sub     rbx, 8 
+            404600     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 8 
             404600      4 INSTR BELONGTO 4045e0 
-            404600      4 INSTR DEADREGS  EFLAGS ZZ sub     rbx, 8 
             404604     -1 INSTR LOCAL NoMetaUpdate call    rax ; qword_606E18 
             404604      2 INSTR BELONGTO 4045e0 
             404606     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, [rbx] 
diff --git a/tests/quick/trimmed-sorted-save-malloc.psexe.annot b/tests/quick/trimmed-sorted-save-malloc.psexe.annot
index 0c0607a8..8a4c11e9 100644
--- a/tests/quick/trimmed-sorted-save-malloc.psexe.annot
+++ b/tests/quick/trimmed-sorted-save-malloc.psexe.annot
@@ -48,7 +48,7 @@
            8048434     -3 INSTR LOCAL NoWarn push    ebx             ; _init 
            8048434     46 FUNC GLOBAL .init_proc FUNC_UNSAFE NOFP RET            8048461 
            8048435      3 INSTR BELONGTO 8048434 
-           8048435      3 INSTR DEADREGS  EFLAGS EBX ZZ sub     esp, 8 
+           8048435      3 INSTR DEADREGS  EFLAGS ZZ sub     esp, 8 
            8048435      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
            8048435      4 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
            8048435      8 DATAREF STACK 44 esp + 0 PARENT LocalFrame LOCALFRAME
@@ -214,16 +214,14 @@
            804856e      2 INSTR BELONGTO 8048560 
            8048570      5 INSTR BELONGTO 8048560 
            8048570      5 INSTR DEADREGS  EFLAGS EAX EBX ZZ mov     eax, ds:dtor_idx_6161 
-           8048575     -1 INSTR LOCAL MetadataUnused mov     ebx, offset __DTOR_END__ 
            8048575      5 INSTR BELONGTO 8048560 
            8048575      5 INSTR DEADREGS  EFLAGS EBX ZZ mov     ebx, offset __DTOR_END__ 
-           804857a     -1 INSTR LOCAL MetadataUnused sub     ebx, offset __DTOR_LIST__ 
            804857a      6 INSTR BELONGTO 8048560 
            804857a      6 INSTR DEADREGS  EFLAGS ZZ sub     ebx, offset __DTOR_LIST__ 
-           8048580     -1 INSTR LOCAL MetadataUnused sar     ebx, 2 
+           8048580     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM sar     ebx, 2 
            8048580      3 INSTR BELONGTO 8048560 
            8048580      3 INSTR DEADREGS  EFLAGS ZZ sar     ebx, 2 
-           8048583     -1 INSTR LOCAL MetadataUnused sub     ebx, 1 
+           8048583     -1 INSTR LOCAL MetadataRedundant sub     ebx, 1 
            8048583      3 INSTR BELONGTO 8048560 
            8048583      3 INSTR DEADREGS  EFLAGS ZZ sub     ebx, 1 
            8048586     -1 INSTR LOCAL NoMetaUpdate cmp     eax, ebx 
@@ -652,7 +650,6 @@
            8048802      4 INSTR BELONGTO 80487f0 
            8048802      4 INSTR DEADREGS  EFLAGS ESI EDI ZZ mov     ebp, [esp+2Ch+arg_0] 
            8048802      4 PTRIMMEDESP STACK 48 displ mov     ebp, [esp+2Ch+arg_0]
-           8048806     -1 INSTR LOCAL MetadataUnused lea     edi, (__CTOR_LIST__ - 8049FF4h)[ebx] 
            8048806      6 INSTR BELONGTO 80487f0 
            8048806      6 INSTR DEADREGS  EFLAGS ESI EDI ZZ lea     edi, (__CTOR_LIST__ - 8049FF4h)[ebx] 
            804880c     -1 INSTR LOCAL NoMetaUpdate call    _init_proc 
@@ -660,10 +657,9 @@
            804880c      5 INSTR DEADREGS  EFLAGS ESI ZZ call    _init_proc 
            8048811      6 INSTR BELONGTO 80487f0 
            8048811      6 INSTR DEADREGS  EFLAGS EAX ESI ZZ lea     eax, (__CTOR_LIST__ - 8049FF4h)[ebx] 
-           8048817     -1 INSTR LOCAL MetadataUnused sub     edi, eax 
            8048817      2 INSTR BELONGTO 80487f0 
-           8048817      2 INSTR DEADREGS  EFLAGS ESI ZZ sub     edi, eax 
-           8048819     -1 INSTR LOCAL MetadataUnused sar     edi, 2 
+           8048817     -2 INSTR LOCAL n EDI ZZ  NumericDEFs sub     edi, eax 
+           8048819     -1 INSTR LOCAL MetadataRedundant sar     edi, 2 
            8048819      3 INSTR BELONGTO 80487f0 
            8048819      3 INSTR DEADREGS  EFLAGS ESI ZZ sar     edi, 2 
            804881c     -1 INSTR LOCAL NoMetaUpdate test    edi, edi 
@@ -752,14 +748,12 @@
            804887c      3 INSTR BELONGTO 8048870 
            804887f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_8048894 
            804887f      2 INSTR BELONGTO 8048870 
-           8048881     -1 INSTR LOCAL MetadataUnused mov     ebx, offset __CTOR_LIST__ 
            8048881      5 INSTR BELONGTO 8048870 
            8048881      5 INSTR DEADREGS  EFLAGS EBX ZZ mov     ebx, offset __CTOR_LIST__ 
            8048886     -1 INSTR LOCAL NoMetaUpdate xchg    ax, ax 
            8048886      2 INSTR BELONGTO 8048870 
-           8048888     -1 INSTR LOCAL MetadataUnused sub     ebx, 4 
+           8048888     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     ebx, 4 
            8048888      3 INSTR BELONGTO 8048870 
-           8048888      3 INSTR DEADREGS  EFLAGS ZZ sub     ebx, 4 
            804888b     -1 INSTR LOCAL NoMetaUpdate call    eax ; __CTOR_LIST__ 
            804888b      2 INSTR BELONGTO 8048870 
            804888d      2 INSTR BELONGTO 8048870 
@@ -785,7 +779,7 @@
            804889c     26 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET            80488b5 
            804889c     -3 INSTR LOCAL NoWarn push    ebx             ; _fini 
            804889d      3 INSTR BELONGTO 804889c 
-           804889d      3 INSTR DEADREGS  EFLAGS EBX ZZ sub     esp, 8 
+           804889d      3 INSTR DEADREGS  EFLAGS ZZ sub     esp, 8 
            804889d      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
            804889d      4 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
            804889d      8 DATAREF STACK 57 esp + 0 PARENT LocalFrame LOCALFRAME
-- 
GitLab