From 2a5ad9297a7bae132f85d72e264fe60168325230 Mon Sep 17 00:00:00 2001
From: clc5q <clc5q@git.zephyr-software.com>
Date: Mon, 7 Sep 2015 23:49:08 +0000
Subject: [PATCH] Canonicalize 32-bit regs to 64-bit on 64-bit binaries.

Former-commit-id: aec64f4807158c0f9b48f5e566bb31b6b0fee661
---
 src/base/SMPDataFlowAnalysis.cpp              |    5 +
 src/drivers/idapro/SMPStaticAnalyzer.cpp      |    2 +-
 tests/commit/save-busybox.psexe.infoannot     |  800 ++++----
 tests/commit/save-bzip2.psexe.infoannot       |    2 +-
 ...save-ffmpeg.psexe.infoannot.REMOVED.git-id |    2 +-
 tests/commit/save-firefox-bin.psexe.infoannot |   86 +-
 tests/commit/save-gedit.psexe.infoannot       |   12 +-
 .../save-gimp.psexe.infoannot.REMOVED.git-id  |    2 +-
 .../save-gnome-calculator.psexe.infoannot     |   26 +-
 .../save-gnome-character-map.psexe.infoannot  |    2 +-
 .../save-gnome-control-center.psexe.infoannot |    2 +-
 tests/commit/save-gnome-help.psexe.infoannot  |    6 +-
 .../save-gnome-keyring-daemon.psexe.infoannot |   61 +-
 .../commit/save-gnome-nettool.psexe.infoannot |    4 +-
 .../save-gnome-screenshot.psexe.infoannot     |   24 +-
 .../save-gnome-search-tool.psexe.infoannot    |   10 +-
 .../commit/save-gnome-session.psexe.infoannot |   10 +-
 .../save-gnome-sound-recorder.psexe.infoannot |    4 +-
 .../save-gnome-system-log.psexe.infoannot     |    4 +-
 .../save-gnome-system-monitor.psexe.infoannot |   20 +-
 .../save-gnome-terminal.psexe.infoannot       |   16 +-
 .../save-gnome-text-editor.psexe.infoannot    |   12 +-
 .../save-gnome-thumbnail-font.psexe.infoannot |    4 +-
 tests/commit/save-grep.psexe.infoannot        |   40 +-
 tests/commit/save-httpd.psexe.infoannot       |   92 +-
 tests/commit/save-less.psexe.infoannot        |   30 +-
 tests/commit/save-ls-64bit.psexe.infoannot    |   10 +-
 tests/commit/save-lt-svn.psexe.infoannot      |    8 +-
 tests/commit/save-nginx.psexe.infoannot       |  463 +++--
 tests/commit/save-openssl.psexe.infoannot     |  522 +++---
 tests/commit/save-synaptic.psexe.infoannot    |   36 +-
 tests/commit/save-xedit.psexe.infoannot       |  182 +-
 ...ed-save-busybox.psexe.annot.REMOVED.git-id |    2 +-
 .../trimmed-sorted-save-bzip2.psexe.annot     |  452 ++---
 .../trimmed-sorted-save-destripe.psexe.annot  |  132 +-
 ...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 |  726 ++++----
 ...rted-save-gnome-control-center.psexe.annot |  698 +++----
 ...d-sorted-save-gnome-dictionary.psexe.annot | 1380 +++++++-------
 ...ve-gnome-file-share-properties.psexe.annot |  270 +--
 ...-sorted-save-gnome-font-viewer.psexe.annot |  288 +--
 ...trimmed-sorted-save-gnome-help.psexe.annot |  608 +++---
 ...ed-sorted-save-gnome-keyring-3.psexe.annot |  130 +-
 ...-keyring-daemon.psexe.annot.REMOVED.git-id |    2 +-
 ...mmed-sorted-save-gnome-keyring.psexe.annot |  130 +-
 ...e-gnome-nettool.psexe.annot.REMOVED.git-id |    2 +-
 ...trimmed-sorted-save-gnome-open.psexe.annot |   28 +-
 ...ed-save-gnome-power-statistics.psexe.annot | 1322 +++++++-------
 ...save-gnome-screensaver-command.psexe.annot |  162 +-
 ...ome-screensaver.psexe.annot.REMOVED.git-id |    2 +-
 ...d-sorted-save-gnome-screenshot.psexe.annot | 1022 +++++------
 ...ome-search-tool.psexe.annot.REMOVED.git-id |    2 +-
 ...-save-gnome-session-properties.psexe.annot | 1054 +++++------
 ...sorted-save-gnome-session-quit.psexe.annot |   80 +-
 ...e-gnome-session.psexe.annot.REMOVED.git-id |    2 +-
 ...ted-save-gnome-settings-daemon.psexe.annot |  676 +++----
 ...sorted-save-gnome-sound-applet.psexe.annot | 1622 ++++++++---------
 ...rted-save-gnome-sound-recorder.psexe.annot | 1436 +++++++--------
 ...d-sorted-save-gnome-system-log.psexe.annot | 1554 ++++++++--------
 ...-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 |  180 +-
 ...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 +-
 ...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 +-
 .../trimmed-sorted-save-xcalc.psexe.annot     |  402 ++--
 ...rted-save-xedit.psexe.annot.REMOVED.git-id |    2 +-
 .../trimmed-sorted-save-xeyes.psexe.annot     |  154 +-
 tests/quick/save-bzip2.psexe.infoannot        |    2 +-
 .../trimmed-sorted-save-bzip2.psexe.annot     |  452 ++---
 80 files changed, 8752 insertions(+), 8753 deletions(-)

diff --git a/src/base/SMPDataFlowAnalysis.cpp b/src/base/SMPDataFlowAnalysis.cpp
index d28af7b4..cfc7dc75 100644
--- a/src/base/SMPDataFlowAnalysis.cpp
+++ b/src/base/SMPDataFlowAnalysis.cpp
@@ -431,6 +431,11 @@ void CanonicalizeOpnd(STARSOpndTypePtr &TempOp) {
 		if (4 > GetOpDataSize(TempOp)) {
 			TempOp->SetReg(MDCanonicalizeSubReg(TempOp->GetReg()));
 		}
+		// Convert 32-bit regs to 64-bit on 64-bit binaries.
+		uint16_t CanonicalByteWidth = global_STARS_program->GetSTARS_ISA_Bytewidth();
+		if (TempOp->GetByteWidth() < CanonicalByteWidth) {
+			TempOp->SetByteWidth(CanonicalByteWidth);
+		}
 	}
 }
 #endif
diff --git a/src/drivers/idapro/SMPStaticAnalyzer.cpp b/src/drivers/idapro/SMPStaticAnalyzer.cpp
index 6e3bf2ff..a8c55b1c 100644
--- a/src/drivers/idapro/SMPStaticAnalyzer.cpp
+++ b/src/drivers/idapro/SMPStaticAnalyzer.cpp
@@ -62,7 +62,7 @@
 
 using namespace std;
 
-#define SMP_DEBUG_DELAY 1   // for setting an early breakpoint
+#define SMP_DEBUG_DELAY 0   // for setting an early breakpoint
 
 // Set to 1 for debugging output
 #define SMP_DEBUG 1
diff --git a/tests/commit/save-busybox.psexe.infoannot b/tests/commit/save-busybox.psexe.infoannot
index d4e90d0f..597376d5 100644
--- a/tests/commit/save-busybox.psexe.infoannot
+++ b/tests/commit/save-busybox.psexe.infoannot
@@ -787,7 +787,7 @@
             407a12      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R14 ZZ lea     ebp, [rbx+r14] 
             407a1b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+RBP ZZ lea     esi, [rax+rbp+3] 
             407a1b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+RBP+3 ZZ lea     esi, [rax+rbp+3] 
-            407a28      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ SINKMALLOC add     esi, r15d 
+            407a28      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ SINKMALLOC add     esi, r15d 
             407a56      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+RBX ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+rbx]  ; dest 
             407aa7      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+RDI ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdx+rdi]  ; dest 
             407ab3      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+48h+ptr]; dest 
@@ -933,7 +933,7 @@
             4087e0      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+1 ZZ lea     edi, [rbx+1] 
             408800     60 FUNC RETURNTYPE RAX 4
             408800     60 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
-            408821      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, ebx 
+            408821      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 sub     esi, ebx 
             40883c     18 FUNC RETURNTYPE RAX 4
             40883c     18 FUNC INARGS    6  ARG0 0 ARG1 96 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             40884e     36 FUNC RETURNTYPE RAX 4
@@ -1056,7 +1056,7 @@
             40ae5d    534 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40b03b      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RSI*2 ZZ IDIOM 32 lea     esi, [rax+rsi*2] 
             40b03b      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+RSI*2 ZZ IDIOM 32 lea     esi, [rax+rsi*2] 
-            40b03e      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, edx 
+            40b03e      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, edx 
             40b073    545 FUNC RETURNTYPE RAX 1
             40b073    545 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40b294     19 FUNC RETURNTYPE RAX 1
@@ -1087,7 +1087,7 @@
             40bef2     69 FUNC INARGS    3  ARG0 4 ARG1 0 ARG2 0 
             40bf37    194 FUNC RETURNTYPE RAX 1
             40bf37    194 FUNC INARGS    6  ARG0 16 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
-            40bf71      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, ebx 
+            40bf71      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, ebx 
             40bff9     45 FUNC RETURNTYPE RAX 1
             40bff9     45 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40c026      9 FUNC RETURNTYPE RAX 96
@@ -1163,9 +1163,9 @@
             40d8ad      6 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBX+128 ZZ lea     esi, [rbx+80h] 
             40d958      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+56 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+38h] 
             40d95c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+52 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+34h] 
-            40da22      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, [rbp+10h] 
+            40da22      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, [rbp+10h] 
             40db53      3 INSTR CHECK UNDERFLOW SIGNED 64  RDX ZZ sub     rdx, rax        ; nbytes 
-            40dc69      2 INSTR CHECK OVERFLOW SIGNED 32  EAX ZZ inc     eax 
+            40dc69      2 INSTR CHECK OVERFLOW SIGNED 32  RAX ZZ inc     eax 
             40dcb5    151 FUNC RETURNTYPE RAX 1
             40dcb5    151 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40dd4c    310 FUNC RETURNTYPE RAX 8
@@ -1185,7 +1185,7 @@
             40e629   1616 FUNC RETURNTYPE RAX 0
             40e629   1616 FUNC INARGS    2  ARG0 0 ARG1 0 
             40e724      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R14+1 ZZ lea     edi, [r14+1] 
-            40e730      2 INSTR CHECK UNDERFLOW SIGNED 32  EDI ZZ sub     edi, edx        ; seconds 
+            40e730      2 INSTR CHECK UNDERFLOW SIGNED 32  RDI ZZ sub     edi, edx        ; seconds 
             40ec79    125 FUNC RETURNTYPE RAX 0
             40ec79    125 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40ece8      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ IDIOM 14 mov     edi, eax        ; status 
@@ -1206,8 +1206,8 @@
             40f531    241 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40f68b    433 FUNC RETURNTYPE RAX 1
             40f68b    433 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40f6e8      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 8 DL ZZ IDIOM 5 movzx   esi, dl         ; c 
-            40f739      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1002h 
+            40f6e8      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDX 8 DL ZZ IDIOM 5 movzx   esi, dl         ; c 
+            40f739      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1002h 
             40f74b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+-1 ZZ lea     r9d, [rax-1] 
             40f74f      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+RAX ZZ lea     ecx, [rax+rax] 
             40f761      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+R13 ZZ IDIOM 32 lea     edx, [rbp+r13+0] 
@@ -1222,11 +1222,11 @@
             40fa6c    144 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 1 ARG5 1 
             40fafc    525 FUNC RETURNTYPE RAX 0
             40fafc    525 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40fb54      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 8 DL ZZ IDIOM 5 movzx   edx, dl 
-            40fb57      4 INSTR CHECK TRUNCATION UNSIGNED 32 ESI 8 SIL ZZ IDIOM 5 movzx   esi, sil 
-            40fb5b      4 INSTR CHECK TRUNCATION UNSIGNED 32 EDI 8 DIL ZZ IDIOM 5 movzx   edi, dil 
-            40fcbd      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 32 EAX ZZ IDIOM 14 mov     r9d, eax 
-            40fcc0      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 32 EAX ZZ IDIOM 14 mov     r8d, eax 
+            40fb54      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDX 8 DL ZZ IDIOM 5 movzx   edx, dl 
+            40fb57      4 INSTR CHECK TRUNCATION UNSIGNED 32 RSI 8 SIL ZZ IDIOM 5 movzx   esi, sil 
+            40fb5b      4 INSTR CHECK TRUNCATION UNSIGNED 32 RDI 8 DIL ZZ IDIOM 5 movzx   edi, dil 
+            40fcbd      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ IDIOM 14 mov     r9d, eax 
+            40fcc0      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ IDIOM 14 mov     r8d, eax 
             40fcd6      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15+RAX ZZ lea     edx, [r15+rax] 
             40fcdf      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+RDI ZZ lea     ecx, [r12+rdi] 
             40fd09   1344 FUNC RETURNTYPE RAX 1
@@ -1234,9 +1234,9 @@
             40fd31      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+40 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rax+28h] 
             40fe25      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+48 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+30h] 
             40fe3c      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+208 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+0D0h] 
-            40ff53      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [rbp+54h] 
+            40ff53      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [rbp+54h] 
             40ff5b      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 imul    esi, [rbp+34h]  ; len 
-            40ff6f      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [rbp+60h] 
+            40ff6f      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [rbp+60h] 
             40ffbe      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDX ZZ IDIOM 33 imul    edx, [rbp+44h] 
             410249     42 FUNC RETURNTYPE RAX 1
             410249     42 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1267,20 +1267,20 @@
             4104d5     30 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4104f3   4350 FUNC RETURNTYPE RAX 0
             4104f3   4350 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 1 ARG4 4 ARG5 4 
-            410578      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 16 AX ZZ IDIOM 5 movzx   esi, ax 
-            41074f      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 16 BX ZZ IDIOM 5 movzx   esi, bx 
+            410578      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 16 AX ZZ IDIOM 5 movzx   esi, ax 
+            41074f      3 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 16 BX ZZ IDIOM 5 movzx   esi, bx 
             4109e6      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R12 ZZ inc     r12d 
             410a8e      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R12 ZZ inc     r12d 
-            410e37      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ inc     esi 
-            410f60      3 INSTR CHECK TRUNCATION UNSIGNED 16 EDX 8 DL ZZ IDIOM 5 movzx   esi, dl 
-            410f9a      3 INSTR CHECK TRUNCATION UNSIGNED 16 EAX 8 AL ZZ IDIOM 5 movzx   edx, al 
-            410f9d      3 INSTR CHECK TRUNCATION UNSIGNED 16 EAX 8 AH ZZ IDIOM 5 movzx   esi, ah 
-            411065      3 INSTR CHECK TRUNCATION UNSIGNED 16 EDX 8 DH ZZ IDIOM 5 movzx   esi, dh 
-            411082      3 INSTR CHECK TRUNCATION UNSIGNED 16 EAX 8 AH ZZ IDIOM 5 movzx   esi, ah 
-            4110a2      3 INSTR CHECK TRUNCATION UNSIGNED 16 EAX 8 AH ZZ IDIOM 5 movzx   esi, ah 
-            4110cf      3 INSTR CHECK TRUNCATION UNSIGNED 16 EAX 8 AH ZZ IDIOM 5 movzx   esi, ah 
+            410e37      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ inc     esi 
+            410f60      3 INSTR CHECK TRUNCATION UNSIGNED 16 RDX 8 DL ZZ IDIOM 5 movzx   esi, dl 
+            410f9a      3 INSTR CHECK TRUNCATION UNSIGNED 16 RAX 8 AL ZZ IDIOM 5 movzx   edx, al 
+            410f9d      3 INSTR CHECK TRUNCATION UNSIGNED 16 RAX 8 AH ZZ IDIOM 5 movzx   esi, ah 
+            411065      3 INSTR CHECK TRUNCATION UNSIGNED 16 RDX 8 DH ZZ IDIOM 5 movzx   esi, dh 
+            411082      3 INSTR CHECK TRUNCATION UNSIGNED 16 RAX 8 AH ZZ IDIOM 5 movzx   esi, ah 
+            4110a2      3 INSTR CHECK TRUNCATION UNSIGNED 16 RAX 8 AH ZZ IDIOM 5 movzx   esi, ah 
+            4110cf      3 INSTR CHECK TRUNCATION UNSIGNED 16 RAX 8 AH ZZ IDIOM 5 movzx   esi, ah 
             4111ca      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R12 ZZ inc     r12d 
-            4111f6      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 16 BX ZZ IDIOM 5 movzx   esi, bx 
+            4111f6      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 16 BX ZZ IDIOM 5 movzx   esi, bx 
             41142b      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R12 ZZ inc     r12d 
             4115f1     83 FUNC RETURNTYPE RAX 1
             4115f1     83 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 1 ARG3 16 ARG4 0 ARG5 0 
@@ -1289,20 +1289,20 @@
             411646      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+20 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rdi+14h] 
             41164a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+46 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdi+2Eh] 
             41164e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+54 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rdi+36h] 
-            411953      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 8 DL ZZ IDIOM 5 movzx   esi, dl 
+            411953      3 INSTR CHECK TRUNCATION UNSIGNED 64 RDX 8 DL ZZ IDIOM 5 movzx   esi, dl 
             411a1a     14 FUNC RETURNTYPE RAX 0
             411a1a     14 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             411a28     96 FUNC RETURNTYPE RAX 1
             411a28     96 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             411a88    457 FUNC RETURNTYPE RAX 0
             411a88    457 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
-            411ba6      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EBX ZZ sub     ebx, r13d 
+            411ba6      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RBX ZZ sub     ebx, r13d 
             411bec      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 imul    rdx, rax, 3D090000h 
             411c0c      3 INSTR CHECK TRUNCATION UNSIGNED 64 RCX 32 ECX ZZ mov     r8d, ecx 
             411c51   4860 FUNC RETURNTYPE RAX 1
             411c51   4860 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4120e8      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edi, eax 
-            4128af      6 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, 0F0h 
+            4128af      6 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, 0F0h 
             412e00      5 INSTR MEMSET STACKOFFSET_ESP 1280 SIZE 516 ZZ call    _memset 
             412f1a      4 INSTR CHECK OVERFLOW UNSIGNED 64  RBP ZZ IDIOM 18 MEMORYSINK add     rbp, 8 
             412f4d    314 FUNC RETURNTYPE RAX 0
@@ -1329,10 +1329,10 @@
             4135b6     25 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 4 ARG3 96 
             4135cf    217 FUNC RETURNTYPE RAX 1
             4135cf    217 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            413620      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ inc     edx 
-            413622      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ECX ZZ inc     ecx 
-            413624      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, esi 
-            413626      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ inc     esi 
+            413620      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ inc     edx 
+            413622      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RCX ZZ inc     ecx 
+            413624      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, esi 
+            413626      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ inc     esi 
             4136a8     37 FUNC RETURNTYPE RAX 1
             4136a8     37 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             4136cd     16 FUNC RETURNTYPE RAX 1
@@ -1367,14 +1367,14 @@
             413f83     75 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
             413fce    188 FUNC RETURNTYPE RAX 96
             413fce    188 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
-            414044      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ inc     esi 
+            414044      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ inc     esi 
             41408a    192 FUNC RETURNTYPE RAX 0
             41408a    192 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4140ac      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK sub     rdi, 4          ; ptr 
             41414a    104 FUNC RETURNTYPE RAX 16
             41414a    104 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             414167      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RCX+RAX ZZ lea     edx, [rcx+rax] 
-            414187      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ dec     edx 
+            414187      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ dec     edx 
             4141b2     67 FUNC RETURNTYPE RAX 0
             4141b2     67 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             4141f5    124 FUNC RETURNTYPE RAX 96
@@ -1393,8 +1393,8 @@
             41432f    308 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             414366      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+400 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+190h] ; termios_p 
             4143d0      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RAX+1 ZZ lea     esi, [rax+1] 
-            4143d3      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 2 
-            4143fb      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, r12d 
+            4143d3      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 2 
+            4143fb      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, r12d 
             41441a      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+460 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+1CCh] 
             414463    163 FUNC RETURNTYPE RAX 4
             414463    163 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
@@ -1412,15 +1412,15 @@
             414713   2611 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             414819      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+400 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+190h] 
             41482e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+36 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rbp+24h] 
-            4148ba      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ inc     edi 
-            414914      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ inc     edi 
+            4148ba      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ inc     edi 
+            414914      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ inc     edi 
             414fbe      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RDX 32 EDX ZZ mov     edi, edx        ; c 
             415146   1145 FUNC RETURNTYPE RAX 1
             415146   1145 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             415477      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+14 ZZ lea     rdi, [rax+0Eh] 
-            4154c4      7 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, [rsp+198h+var_54] 
+            4154c4      7 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, [rsp+198h+var_54] 
             4154d2      8 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 imul    esi, [rsp+198h+var_50] 
-            4154da      7 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, [rsp+198h+var_48] 
+            4154da      7 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, [rsp+198h+var_48] 
             4155bf    421 FUNC RETURNTYPE RAX 1
             4155bf    421 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             415675      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+4] 
@@ -1448,16 +1448,16 @@
             4162ac    145 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             41633d    967 FUNC RETURNTYPE RAX 1
             41633d    967 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            416432      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, esi 
-            416535      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, r12d 
-            4165da      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, ebx 
+            416432      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, esi 
+            416535      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, r12d 
+            4165da      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, ebx 
             416704     45 FUNC RETURNTYPE RAX 1
             416704     45 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             416731    128 FUNC RETURNTYPE RAX 1
             416731    128 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4167b1     97 FUNC RETURNTYPE RAX 1
             4167b1     97 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4167e9      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   esi, al 
+            4167e9      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 8 AL ZZ IDIOM 5 movzx   esi, al 
             416812      1 FUNC RETURNTYPE RAX 0
             416812      1 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             416813     53 FUNC RETURNTYPE RAX 1
@@ -1476,7 +1476,7 @@
             416d43     31 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             416d62   1254 FUNC RETURNTYPE RAX 1
             416d62   1254 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            417142      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 16 AX ZZ IDIOM 5 movzx   esi, ax 
+            417142      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 16 AX ZZ IDIOM 5 movzx   esi, ax 
             417248    417 FUNC RETURNTYPE RAX 0
             417248    417 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4172ce      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RBX+1 ZZ lea     edi, [rbx+1] 
@@ -1524,14 +1524,14 @@
             418342     99 FUNC RETURNTYPE RAX 1
             418342     99 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             418361      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ IDIOM 30 mov     esi, eax 
-            418366      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, ebx 
+            418366      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 sub     esi, ebx 
             4183a5    137 FUNC RETURNTYPE RAX 4
             4183a5    137 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4183dd      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 RBP ZZ mov     rdx, rbp        ; n 
             4183f9      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R12 ZZ mov     rdx, r12        ; n 
             41842e     39 FUNC RETURNTYPE RAX 4
             41842e     39 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
-            41843d      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ inc     edi 
+            41843d      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ inc     edi 
             418455     78 FUNC RETURNTYPE RAX 4
             418455     78 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             418477      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+127 ZZ lea     esi, [rdx+7Fh] 
@@ -1572,8 +1572,8 @@
             41a10a     20 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 96 ARG3 1 
             41a11e   1252 FUNC RETURNTYPE RAX 1
             41a11e   1252 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            41a3a0      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 89A1h 
-            41a418      6 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, 89A2h 
+            41a3a0      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 89A1h 
+            41a418      6 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, 89A2h 
             41a536      5 INSTR MEMSET STACKOFFSET_ESP 144 SIZE 128 ZZ call    _memset 
             41a602     52 FUNC RETURNTYPE RAX 4
             41a602     52 FUNC INARGS    2  ARG0 4 ARG1 0 
@@ -1581,15 +1581,15 @@
             41a636   1365 FUNC INARGS    2  ARG0 0 ARG1 0 
             41a78c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+33 ZZ lea     rdi, [rax+21h] 
             41a7a9      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+30 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+1Eh]  ; dest 
-            41a7db      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AH ZZ IDIOM 5 movzx   ecx, ah 
-            41a7e2      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   edx, al 
+            41a7db      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 8 AH ZZ IDIOM 5 movzx   ecx, ah 
+            41a7e2      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 8 AL ZZ IDIOM 5 movzx   edx, al 
             41a839      4 INSTR CHECK TRUNCATION UNSIGNED 64 R13 16 R13 ZZ IDIOM 5 movzx   esi, r13w 
-            41a87b      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 4 
+            41a87b      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 4 
             41a8dc      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, 4 
             41a910      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX+-12 ZZ lea     eax, [rax-0Ch] 
             41a91c      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RDX 32 EDX ZZ mov     esi, edx 
             41a9f7      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+29 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+1Dh]  ; s1 
-            41ab79      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EAX ZZ IDIOM 19 add     eax, edx 
+            41ab79      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RAX ZZ IDIOM 19 add     eax, edx 
             41ab8b    773 FUNC RETURNTYPE RAX 1
             41ab8b    773 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41acea      5 INSTR MEMSET STACKOFFSET_ESP 16 SIZE 6 ZZ call    _memset 
@@ -1634,13 +1634,13 @@
             41b3ec    364 FUNC RETURNTYPE RAX 1
             41b3ec    364 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             41b431      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+7 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+7]    ; template 
-            41b468      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 441h 
+            41b468      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 441h 
             41b558   2460 FUNC RETURNTYPE RAX 1
             41b558   2460 FUNC INARGS    2  ARG0 0 ARG1 4 
-            41bafc      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ECX ZZ inc     ecx 
-            41bafe      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 76Ch 
+            41bafc      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RCX ZZ inc     ecx 
+            41bafe      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 76Ch 
             41bb6d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+4] 
-            41bb97      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   ecx, bl 
+            41bb97      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BL ZZ IDIOM 5 movzx   ecx, bl 
             41bd14      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+1] 
             41bd48      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+1] 
             41bd76      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+4] 
@@ -1674,7 +1674,7 @@
             41c7f0      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, r13        ; n 
             41c8b5      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+1]    ; s 
             41c8de      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+1]    ; s1 
-            41c911      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, r13d 
+            41c911      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, r13d 
             41c954     55 FUNC RETURNTYPE RAX 0
             41c954     55 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             41c98b    603 FUNC RETURNTYPE RAX 0
@@ -1714,8 +1714,8 @@
             41dac0      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 19 add     rdi, 18h 
             41db30      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+RDX ZZ IDIOM 19 lea     rdi, [rax+rdx+19h] 
             41db30      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+RDX+25 ZZ IDIOM 19 lea     rdi, [rax+rdx+19h] 
-            41db4f      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ IDIOM 19 sub     ecx, r15d 
-            41db57      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ IDIOM 19 dec     ecx 
+            41db4f      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ IDIOM 19 sub     ecx, r15d 
+            41db57      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ IDIOM 19 dec     ecx 
             41db97      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+10h]  ; s 
             41dc2b      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 19 add     rdi, 18h 
             41dc8a     15 FUNC RETURNTYPE RAX 0
@@ -1813,14 +1813,14 @@
             41fac6    117 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41fb3b    243 FUNC RETURNTYPE RAX 1
             41fb3b    243 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            41fba4      2 INSTR CHECK OVERFLOW SIGNED 32  EBP ZZ inc     ebp 
+            41fba4      2 INSTR CHECK OVERFLOW SIGNED 32  RBP ZZ inc     ebp 
             41fc2e     40 FUNC RETURNTYPE RAX 4
             41fc2e     40 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41fc56    130 FUNC RETURNTYPE RAX 1
             41fc56    130 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41fcd8    249 FUNC RETURNTYPE RAX 0
             41fcd8    249 FUNC INARGS    6  ARG0 16 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            41fda7      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   esi, bl 
+            41fda7      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BL ZZ IDIOM 5 movzx   esi, bl 
             41fdd1   1210 FUNC RETURNTYPE RAX 1
             41fdd1   1210 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41fdfd      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+32 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rax+20h] 
@@ -1894,7 +1894,7 @@
             421541     94 FUNC INARGS    6  ARG0 16 ARG1 16 ARG2 16 ARG3 1 ARG4 0 ARG5 0 
             42159f    333 FUNC RETURNTYPE RAX 4
             42159f    333 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
-            4215ea      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 7 
+            4215ea      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 7 
             4216ec    141 FUNC RETURNTYPE RAX 1
             4216ec    141 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             421779    111 FUNC RETURNTYPE RAX 1
@@ -1962,7 +1962,7 @@
             4227df      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+1] 
             422971      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+6 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+6] 
             422a63      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+4] 
-            422a6a      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 16 BX ZZ IDIOM 5 movzx   esi, bx 
+            422a6a      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 16 BX ZZ IDIOM 5 movzx   esi, bx 
             422a80      3 INSTR CHECK SIGNEDNESS SIGNED 16 DX ZZ IDIOM 20 movzx   edx, dx 
             422abb      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rax+4]    ; s2 
             422abf      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+4]    ; s1 
@@ -1971,7 +1971,7 @@
             422bd8   2093 FUNC PROBLEM sub_422BD8 CALLUNRESOLVED 
             422d1d      5 INSTR MEMSET STACKOFFSET_ESP 192 SIZE 152 ZZ call    _memset 
             422e65      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 GLOBALMEMSINK add     rsi, 0E0h       ; src 
-            422e84      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ inc     edi             ; nfds 
+            422e84      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ inc     edi             ; nfds 
             422fcd      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 4          ; addr 
             4232d8      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 10h        ; groups 
             4232fb      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 GLOBALMEMSINK add     rsi, 8          ; rlimits 
@@ -2030,7 +2030,7 @@
             423eaa      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+104 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+68h] 
             423ec7      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+120 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+78h] 
             423f4c      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+8 ZZ IDIOM 18 STACKMEMSINK lea     rdx, [r12+8]    ; buf 
-            4242bb      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 16 AX ZZ IDIOM 5 movzx   esi, ax 
+            4242bb      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 16 AX ZZ IDIOM 5 movzx   esi, ax 
             42432e    162 FUNC RETURNTYPE RAX 1
             42432e    162 FUNC INARGS    6  ARG0 96 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4243d0     34 FUNC RETURNTYPE RAX 1
@@ -2075,9 +2075,9 @@
             424f3c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+28 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+1Ch]  ; s 
             424ff7   1019 FUNC RETURNTYPE RAX 0
             424ff7   1019 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4250d8      2 INSTR CHECK UNDERFLOW SIGNED 32  EDI ZZ sub     edi, eax 
-            4250da      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, ebx 
-            425335      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ inc     edi             ; nfds 
+            4250d8      2 INSTR CHECK UNDERFLOW SIGNED 32  RDI ZZ sub     edi, eax 
+            4250da      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, ebx 
+            425335      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ inc     edi             ; nfds 
             4253f2     76 FUNC RETURNTYPE RAX 4
             4253f2     76 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42543e    206 FUNC RETURNTYPE RAX 1
@@ -2143,7 +2143,7 @@
             4262a5     53 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
             4262da    102 FUNC RETURNTYPE RAX 0
             4262da    102 FUNC INARGS    6  ARG0 0 ARG1 96 ARG2 0 ARG3 0 ARG4 4 ARG5 1 
-            4262f3      3 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 ECX 32 ECX ZZ mov     r9d, ecx        ; addr_len 
+            4262f3      3 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RCX 32 ECX ZZ mov     r9d, ecx        ; addr_len 
             426340    332 FUNC RETURNTYPE RAX 0
             426340    332 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42648c     54 FUNC RETURNTYPE RAX 1
@@ -2173,16 +2173,16 @@
             426dbb    982 FUNC RETURNTYPE RAX 4
             426dbb    982 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             426edc      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R14 ZZ mov     esi, r14d       ; nmemb 
-            426f06      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, edx 
-            426f39      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ IDIOM 15 add     esi, ecx 
+            426f06      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, edx 
+            426f39      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ IDIOM 15 add     esi, ecx 
             426f83      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R9+R9 ZZ lea     eax, [r9+r9] 
             427191    985 FUNC RETURNTYPE RAX 4
             427191    985 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            42742e      4 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   r9d, al 
+            42742e      4 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 8 AL ZZ IDIOM 5 movzx   r9d, al 
             42756a    979 FUNC RETURNTYPE RAX 0
             42756a    979 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42758d      5 INSTR MEMSET STACKOFFSET_ESP 32 SIZE 136 ZZ call    _memset 
-            427663      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 16 BX ZZ IDIOM 5 movzx   esi, bx 
+            427663      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 16 BX ZZ IDIOM 5 movzx   esi, bx 
             42767e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rax+4] 
             4276fa      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+296 ZZ IDIOM 18 MEMORYSINK lea     r8, [r12+128h] 
             42770c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rax+4] 
@@ -2193,10 +2193,10 @@
             427a4d     60 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             427a89    260 FUNC RETURNTYPE RAX 1
             427a89    260 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 1 ARG4 1 ARG5 0 
-            427b35      2 INSTR CHECK TRUNCATION UNSIGNED 32 EDI 32 EDI ZZ IDIOM 14 mov     ecx, edi 
+            427b35      2 INSTR CHECK TRUNCATION UNSIGNED 64 RDI 32 EDI ZZ IDIOM 14 mov     ecx, edi 
             427b8d     87 FUNC RETURNTYPE RAX 0
             427b8d     87 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            427bc8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 8 
+            427bc8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 8 
             427be4    325 FUNC RETURNTYPE RAX 0
             427be4    325 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             427c9f      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, qword ptr cs:termios_p.c_cc+13h 
@@ -2205,22 +2205,22 @@
             42850b      7 FUNC RETURNTYPE RAX 0
             42850b      7 FUNC INARGS    4  ARG0 0 ARG1 4 ARG2 0 ARG3 0 
             42850b      7 FUNC PROBLEM sub_42850B CHUNKS 
-            427e44      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 16 DX ZZ IDIOM 5 movzx   edx, dx 
+            427e44      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDX 16 DX ZZ IDIOM 5 movzx   edx, dx 
             427ea3      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+4 ZZ lea     rdi, [rax+4] 
-            427ed3      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 88h 
+            427ed3      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 88h 
             427efb      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 0Ch 
             427f35      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rax+4] 
             427f76      5 INSTR MEMSET STACKOFFSET_ESP 176 SIZE 32 ZZ call    _memset 
-            428245      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 0Ch 
+            428245      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 0Ch 
             428286      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rax+4]    ; optval 
             4282b5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rax+4] 
-            428412      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, r13d 
+            428412      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ sub     ecx, r13d 
             428512    697 FUNC RETURNTYPE RAX 1
             428512    697 FUNC INARGS    2  ARG0 0 ARG1 4 
-            4287a8      2 INSTR CHECK OVERFLOW UNSIGNED 32  ECX ZZ inc     ecx 
-            4287aa      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, r15d 
-            4287ad      4 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, [rsp+88h+var_64] 
-            4287b1      4 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, [rsp+88h+var_60] 
+            4287a8      2 INSTR CHECK OVERFLOW UNSIGNED 32  RCX ZZ inc     ecx 
+            4287aa      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ sub     ecx, r15d 
+            4287ad      4 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ sub     ecx, [rsp+88h+var_64] 
+            4287b1      4 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ sub     ecx, [rsp+88h+var_60] 
             4287cb     43 FUNC RETURNTYPE RAX 0
             4287cb     43 FUNC INARGS    2  ARG0 4 ARG1 0 
             4287f6    108 FUNC RETURNTYPE RAX 1
@@ -2289,10 +2289,10 @@
             42a3b2   1716 FUNC RETURNTYPE RAX 0
             42a3b2   1716 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42a5bb      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, rsi        ; n 
-            42a855      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BH ZZ IDIOM 5 movzx   edi, bh 
-            42a85d      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   edi, bl 
+            42a855      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BH ZZ IDIOM 5 movzx   edi, bh 
+            42a85d      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BL ZZ IDIOM 5 movzx   edi, bl 
             42a868      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 8 AH ZZ IDIOM 5 movzx   edi, ah 
-            42a870      4 INSTR CHECK TRUNCATION UNSIGNED 32 EBP 8 BPL ZZ IDIOM 5 movzx   edi, bpl 
+            42a870      4 INSTR CHECK TRUNCATION UNSIGNED 32 RBP 8 BPL ZZ IDIOM 5 movzx   edi, bpl 
             42aa66    553 FUNC RETURNTYPE RAX 4
             42aa66    553 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             42aba1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+4] 
@@ -2300,22 +2300,22 @@
             42ac8f    151 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42ad26   1847 FUNC RETURNTYPE RAX 1
             42ad26   1847 FUNC INARGS    2  ARG0 0 ARG1 0 
-            42aff9      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ inc     edi             ; nfds 
+            42aff9      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ inc     edi             ; nfds 
             42b14e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rax, [rbx+8] 
             42b1b8      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 32 EBX ZZ IDIOM 30 mov     edx, ebx 
-            42b1bd      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ IDIOM 19 sub     edx, r12d 
+            42b1bd      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ IDIOM 19 sub     edx, r12d 
             42b281      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R13 ZZ mov     rdx, r13        ; n 
-            42b352      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            42b352      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             42b354      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+RCX ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+rcx+30h]; buf 
             42b354      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+RCX+48 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+rcx+30h]; buf 
-            42b3d1      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            42b3d1      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             42b3d3      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+RCX ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+rcx+818h]; buf 
             42b3d3      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+RCX+2072 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+rcx+818h]; buf 
             42b45d     86 FUNC RETURNTYPE RAX 0
             42b45d     86 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42b4b3    127 FUNC RETURNTYPE RAX 4
             42b4b3    127 FUNC INARGS    6  ARG0 16 ARG1 4 ARG2 64 ARG3 0 ARG4 0 ARG5 0 
-            42b4db      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EBX ZZ inc     ebx 
+            42b4db      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RBX ZZ inc     ebx 
             42b532     70 FUNC RETURNTYPE RAX 1
             42b532     70 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             42b578     26 FUNC RETURNTYPE RAX 0
@@ -2333,7 +2333,7 @@
             42bd1c      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ IDIOM 18 MEMORYSINK add     rcx, 4 
             42bd46    652 FUNC RETURNTYPE RAX 1
             42bd46    652 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            42bd6d      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 4 
+            42bd6d      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 4 
             42be01      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+4 ZZ IDIOM 18 MEMORYSINK lea     r9, [r14+4] 
             42be05      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+4 ZZ IDIOM 18 MEMORYSINK lea     r8, [r15+4] 
             42bfd2    324 FUNC RETURNTYPE RAX 1
@@ -2344,23 +2344,23 @@
             42c95a   1487 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42cb9d      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 8          ; cp 
             42cbc0      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 0Ch        ; cp 
-            42cbfb      2 INSTR CHECK TRUNCATION SIGNED 32 EBP 32 EBP ZZ mov     esi, ebp 
+            42cbfb      2 INSTR CHECK TRUNCATION SIGNED 64 RBP 32 EBP ZZ mov     esi, ebp 
             42d08d     10 FUNC RETURNTYPE RAX 0
             42d08d     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             42d097      7 FUNC RETURNTYPE RAX 1
             42d097      7 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42d097      7 FUNC PROBLEM sub_42D097 CHUNKS 
-            42c3b4      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 16 DX ZZ IDIOM 5 movzx   edx, dx 
+            42c3b4      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDX 16 DX ZZ IDIOM 5 movzx   edx, dx 
             42c505      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+24 ZZ IDIOM 18 MEMORYSINK lea     rcx, [r15+18h]  ; optval 
-            42c5eb      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBP 16 BP ZZ IDIOM 5 movzx   edx, bp 
+            42c5eb      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBP 16 BP ZZ IDIOM 5 movzx   edx, bp 
             42c5ff      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rax+4]    ; optval 
             42c626      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+4] 
             42c658      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 4 
             42c6c7      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 4 
             42c6d8      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rax+4] 
             42c6f0      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 4 
-            42c770      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 4 
-            42c8ef      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, [r15+24h] 
+            42c770      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 4 
+            42c8ef      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, [r15+24h] 
             42c8f7      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 4 
             42c91c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rax+4] 
             42c929      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edx, eax 
@@ -2427,7 +2427,7 @@
             42e4f0    152 FUNC RETURNTYPE RAX 1
             42e4f0    152 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             42e537      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+8] 
-            42e572      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   ecx, al 
+            42e572      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 8 AL ZZ IDIOM 5 movzx   ecx, al 
             42e572      3 INSTR CHECK SIGNEDNESS SIGNED 8 AL ZZ IDIOM 20 movzx   ecx, al 
             42e588   1424 FUNC RETURNTYPE RAX 1
             42e588   1424 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -2475,13 +2475,13 @@
             42f3bf      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+4 ZZ lea     rsi, [rax+4] 
             42f430      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+4 ZZ lea     rsi, [r12+4] 
             42f4cd      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+4] 
-            42f4e1      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 29 sub     esi, 4 
+            42f4e1      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 29 sub     esi, 4 
             42f536      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 4 
-            42f53a      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 29 sub     esi, 4 
+            42f53a      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 29 sub     esi, 4 
             42f567   1320 FUNC RETURNTYPE RAX 0
             42f567   1320 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42f5d1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+24 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+18h] 
-            42f5e5      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, 18h 
+            42f5e5      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ sub     ecx, 18h 
             42f6eb      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 4 
             42f82a      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+4 ZZ lea     rsi, [rax+4] 
             42f867      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 4          ; s2 
@@ -2516,7 +2516,7 @@
             430df1     64 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             430e31   1858 FUNC RETURNTYPE RAX 1
             430e31   1858 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            430e5f      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 16 CX ZZ IDIOM 5 movzx   ecx, cx 
+            430e5f      3 INSTR CHECK TRUNCATION UNSIGNED 32 RCX 16 CX ZZ IDIOM 5 movzx   ecx, cx 
             430fe7      5 INSTR MEMSET STACKOFFSET_ESP 272 SIZE 128 ZZ call    _memset 
             430ff2      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+12 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+0Ch] 
             431379      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RCX+4 ZZ lea     rsi, [rcx+4] 
@@ -2540,7 +2540,7 @@
             432793      5 INSTR MEMSET STACKOFFSET_ESP 256 SIZE 128 ZZ call    _memset 
             432798      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+28 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+1Ch] 
             43294c      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+4 ZZ lea     rsi, [rax+4] 
-            4329be      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 16 BX ZZ IDIOM 5 movzx   edi, bx 
+            4329be      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 16 BX ZZ IDIOM 5 movzx   edi, bx 
             4329ef      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+4 ZZ lea     rsi, [rax+4] 
             432a5f     90 FUNC RETURNTYPE RAX 0
             432a5f     90 FUNC INARGS    6  ARG0 8 ARG1 8 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
@@ -2561,7 +2561,7 @@
             4333f6    986 FUNC RETURNTYPE RAX 1
             4333f6    986 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             43359e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+1]    ; s 
-            43368f      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 16 DX ZZ IDIOM 5 movzx   eax, dx 
+            43368f      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDX 16 DX ZZ IDIOM 5 movzx   eax, dx 
             4337d0     66 FUNC RETURNTYPE RAX 0
             4337d0     66 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             433812     64 FUNC RETURNTYPE RAX 0
@@ -2602,7 +2602,7 @@
             43408d    307 FUNC RETURNTYPE RAX 0
             43408d    307 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4340c8      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+32 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+20h] 
-            4340d4      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, 20h 
+            4340d4      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ sub     ecx, 20h 
             4341a5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+32 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdx+20h]  ; dest 
             4341a9      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 4          ; src 
             4341c0     92 FUNC RETURNTYPE RAX 4
@@ -2659,7 +2659,7 @@
             43490b    281 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4349a8      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+4 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+4]    ; buf 
             4349e0      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RCX+-48 ZZ lea     eax, [rcx-30h] 
-            4349ed      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, eax 
+            4349ed      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, eax 
             434a24     63 FUNC RETURNTYPE RAX 0
             434a24     63 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             434a63     64 FUNC RETURNTYPE RAX 1
@@ -2676,7 +2676,7 @@
             434cb2      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX+R12+2 ZZ lea     edi, [rax+r12+2] 
             434ce6    112 FUNC RETURNTYPE RAX 0
             434ce6    112 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
-            434ce7      4 INSTR CHECK TRUNCATION UNSIGNED 32 ESI 8 SIL ZZ IDIOM 5 movzx   esi, sil 
+            434ce7      4 INSTR CHECK TRUNCATION UNSIGNED 32 RSI 8 SIL ZZ IDIOM 5 movzx   esi, sil 
             434d56    251 FUNC RETURNTYPE RAX 1
             434d56    251 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             434d6e      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+240 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+0F0h] 
@@ -2708,7 +2708,7 @@
             43563e      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBX+RBP ZZ IDIOM 32 lea     eax, [rbx+rbp] 
             43567a    926 FUNC RETURNTYPE RAX 0
             43567a    926 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4356ed      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EBX ZZ inc     ebx 
+            4356ed      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RBX ZZ inc     ebx 
             435742      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+20 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r14+14h] 
             435770      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+108 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r14+6Ch] 
             43579c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+44 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r14+2Ch] 
@@ -2723,15 +2723,15 @@
             435c61   2737 FUNC RETURNTYPE RAX 1
             435c61   2737 FUNC INARGS    2  ARG0 0 ARG1 0 
             435fd5      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edi, eax        ; seed 
-            436028      2 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, ebp 
+            436028      2 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, ebp 
             436052      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBX+1 ZZ lea     edi, [rbx+1]    ; nfds 
             436427      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+28 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+1Ch]  ; s1 
-            436485      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 3 
+            436485      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 3 
             436712     54 FUNC RETURNTYPE RAX 0
             436712     54 FUNC INARGS    6  ARG0 8 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             436748     96 FUNC RETURNTYPE RAX 0
             436748     96 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
-            43674d      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 8 DL ZZ IDIOM 5 movzx   esi, dl 
+            43674d      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDX 8 DL ZZ IDIOM 5 movzx   esi, dl 
             4367a8    111 FUNC RETURNTYPE RAX 4
             4367a8    111 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4367e8      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+44 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+2Ch]  ; dest 
@@ -2759,13 +2759,13 @@
             4370f9   1052 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             437189      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RBP*8 ZZ lea     rdi, ds:0[rbp*8] 
             4371d6      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RBP*4 ZZ lea     rdi, ds:0[rbp*4] 
-            4372b3      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ inc     edi             ; nfds 
+            4372b3      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ inc     edi             ; nfds 
             437345      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+12 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rbx+0Ch] 
             4373fe      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+24 ZZ IDIOM 18 STACKMEMSINK lea     rdx, [rbx+18h] 
             437515    475 FUNC RETURNTYPE RAX 4
             437515    475 FUNC INARGS    6  ARG0 96 ARG1 1 ARG2 4 ARG3 8 ARG4 0 ARG5 0 
             43753c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+2 ZZ lea     rdi, [rax+2] 
-            43756b      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ IDIOM 19 dec     eax 
+            43756b      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ IDIOM 19 dec     eax 
             4376f0    307 FUNC RETURNTYPE RAX 4
             4376f0    307 FUNC INARGS    5  ARG0 4 ARG1 1 ARG2 4 ARG3 0 ARG4 0 
             437732      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RSI+2 ZZ lea     edx, [rsi+2] 
@@ -2815,13 +2815,13 @@
             4380db    324 FUNC RETURNTYPE RAX 1
             4380db    324 FUNC INARGS    6  ARG0 8 ARG1 0 ARG2 1 ARG3 0 ARG4 1 ARG5 0 
             4381b4      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R15+240 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [r15+0F0h] 
-            4381cd      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, eax 
-            4381d1      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, ecx        ; n 
+            4381cd      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, eax 
+            4381d1      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, ecx        ; n 
             43821f    479 FUNC RETURNTYPE RAX 0
             43821f    479 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 0 ARG4 1 ARG5 4 
             4382f9      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+268 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [r13+10Ch] 
-            438316      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
-            438370      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 16  EDX ZZ sub     dx, bx 
+            438316      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
+            438370      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 16  RDX ZZ sub     dx, bx 
             4383fe    140 FUNC RETURNTYPE RAX 1
             4383fe    140 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             43848a     97 FUNC RETURNTYPE RAX 0
@@ -2867,7 +2867,7 @@
             438c01     96 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             438c61    453 FUNC RETURNTYPE RAX 0
             438c61    453 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
-            438cf8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 2 
+            438cf8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 2 
             438da1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+2 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdx+2] 
             438dc8      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+3 ZZ lea     esi, [rax+3] 
             438e26     43 FUNC RETURNTYPE RAX 1
@@ -2882,7 +2882,7 @@
             439001     94 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             43905f    559 FUNC RETURNTYPE RAX 1
             43905f    559 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4390ef      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EAX ZZ dec     eax 
+            4390ef      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RAX ZZ dec     eax 
             4391f1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+1] 
             43928e     59 FUNC RETURNTYPE RAX 4
             43928e     59 FUNC INARGS    3  ARG0 4 ARG1 0 ARG2 0 
@@ -2895,7 +2895,7 @@
             439695      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RBX+1 ZZ lea     rdx, [rbx+1]    ; n 
             4396ca   1240 FUNC RETURNTYPE RAX 1
             4396ca   1240 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            43981e      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   edx, al 
+            43981e      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 8 AL ZZ IDIOM 5 movzx   edx, al 
             439a4a      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RBX+1 ZZ lea     edx, [rbx+1]    ; n 
             439a9e      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RBX+1 ZZ lea     edx, [rbx+1]    ; n 
             439ba2     23 FUNC RETURNTYPE RAX 1
@@ -2975,9 +2975,9 @@
             43b4fc    534 FUNC INARGS    6  ARG0 16 ARG1 4 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             43b582      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+3 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+3]    ; nptr 
             43b60a      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 32 EBX ZZ IDIOM 30 mov     edx, ebx 
-            43b610      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ IDIOM 19 sub     edx, r13d 
+            43b610      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ IDIOM 19 sub     edx, r13d 
             43b627      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, 14h 
-            43b62b      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ inc     edx 
+            43b62b      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ inc     edx 
             43b62d      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, [rcx] 
             43b633      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, 4 
             43b712    717 FUNC RETURNTYPE RAX 4
@@ -2986,7 +2986,7 @@
             43b76b      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+4]    ; s1 
             43b76f      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 4          ; s2 
             43b7c2      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+4] 
-            43b7d7      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, r13d 
+            43b7d7      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, r13d 
             43b8a7      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+R15 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+r15+4]; s2 
             43b8a7      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+R15+4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+r15+4]; s2 
             43b8cd      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+R12 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r15+r12-10h]; s2 
@@ -3041,7 +3041,7 @@
             43c38f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+RSI ZZ IDIOM 18 MEMORYSINK lea     rsi, [r14+rsi] 
             43c3d5      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+144 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+90h] 
             43c3f2      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+168 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+0A8h] 
-            43c415      2 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ dec     eax 
+            43c415      2 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ dec     eax 
             43c450     30 FUNC RETURNTYPE RAX 4
             43c450     30 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             43c46e     24 FUNC RETURNTYPE RAX 4
@@ -3114,7 +3114,7 @@
             43d015    487 FUNC RETURNTYPE RAX 4
             43d015    487 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             43d037      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+112 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+70h] 
-            43d0b3      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, 30h 
+            43d0b3      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, 30h 
             43d155      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+48 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+30h] 
             43d1fc     95 FUNC RETURNTYPE RAX 4
             43d1fc     95 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -3156,11 +3156,11 @@
             43db81    165 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             43dc26    517 FUNC RETURNTYPE RAX 0
             43dc26    517 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
-            43dcce      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, 30h 
+            43dcce      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, 30h 
             43dddd      2 INSTR CHECK TRUNCATION SIGNED 64 RBX 32 EBX ZZ mov     esi, ebx 
             43de2b    498 FUNC RETURNTYPE RAX 1
             43de2b    498 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            43defb      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, ebp 
+            43defb      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, ebp 
             43df1d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+1] 
             43df42      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+1] 
             43e01d    367 FUNC RETURNTYPE RAX 0
@@ -3187,13 +3187,13 @@
             43eb74    639 FUNC RETURNTYPE RAX 1
             43eb74    639 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             43eb74    639 FUNC PROBLEM sub_43EB74 CALLUNRESOLVED 
-            43ec83      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, cs:termios_p.c_lflag 
-            43ec9b      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ inc     edi 
+            43ec83      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, cs:termios_p.c_lflag 
+            43ec9b      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ inc     edi 
             43ecc6      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R12 ZZ inc     r12d 
             43ed63      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R13 ZZ inc     r13d 
-            43ed89      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 16 DX ZZ IDIOM 5 movzx   edx, dx 
-            43ed96      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ inc     edx 
-            43ed9a      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, ecx 
+            43ed89      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDX 16 DX ZZ IDIOM 5 movzx   edx, dx 
+            43ed96      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ inc     edx 
+            43ed9a      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, ecx 
             43edf3     28 FUNC RETURNTYPE RAX 4
             43edf3     28 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             43ee0f     83 FUNC RETURNTYPE RAX 4
@@ -3213,7 +3213,7 @@
             43f181      6 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+256 ZZ lea     esi, [rax+100h] 
             43f26f      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+1 ZZ lea     edx, [r13+1] 
             43f279      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R9 ZZ add     r9d, [rsp+68h+var_64] 
-            43f27e      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ inc     esi 
+            43f27e      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ inc     esi 
             43f2a4    108 FUNC RETURNTYPE RAX 4
             43f2a4    108 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             43f310    374 FUNC RETURNTYPE RAX 1
@@ -3267,21 +3267,21 @@
             4400fe      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R8+RAX ZZ IDIOM 15 lea     rdx, [r8+rax] 
             44014b   1662 FUNC RETURNTYPE RAX 96
             44014b   1662 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4403a6      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, [rbx+30h] 
-            4403b5      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, [rbx+28h] 
-            4403d1      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, [rbx+20h] 
-            4403ed      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, [rbx+18h] 
-            440409      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, [rbx+8] 
-            440425      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, [rbx+10h] 
-            44043e      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, [rbx] 
+            4403a6      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, [rbx+30h] 
+            4403b5      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, [rbx+28h] 
+            4403d1      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, [rbx+20h] 
+            4403ed      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, [rbx+18h] 
+            440409      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, [rbx+8] 
+            440425      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, [rbx+10h] 
+            44043e      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, [rbx] 
             440698      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, rax 
             4406ae      4 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 imul    edi, [rbp+10h] 
-            4406bf      4 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, [rsp+208h+var_200] 
+            4406bf      4 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, [rsp+208h+var_200] 
             44070e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+48 ZZ IDIOM 32 lea     edx, [r15+30h] 
-            44072e      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, 30h 
+            44072e      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, 30h 
             440740      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+32 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+20h] 
             440767      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+36 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rbp+24h] 
-            44076b      2 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, edi 
+            44076b      2 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, edi 
             44076f      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, 6C95C4h    ; s 
             4407c9     20 FUNC RETURNTYPE RAX 0
             4407c9     20 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
@@ -3355,13 +3355,13 @@
             441d49    105 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             441db2    405 FUNC RETURNTYPE RAX 0
             441db2    405 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            441de0      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AH ZZ IDIOM 5 movzx   edi, ah 
+            441de0      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 8 AH ZZ IDIOM 5 movzx   edi, ah 
             441f15      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 8 
             441f47    409 FUNC RETURNTYPE RAX 1
             441f47    409 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4420e0   1872 FUNC RETURNTYPE RAX 0
             4420e0   1872 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4425d5      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 2 
+            4425d5      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 2 
             442830     32 FUNC RETURNTYPE RAX 0
             442830     32 FUNC INARGS    6  ARG0 16 ARG1 16 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             442850     33 FUNC RETURNTYPE RAX 1
@@ -3370,7 +3370,7 @@
             442871    113 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4428e2    529 FUNC RETURNTYPE RAX 1
             4428e2    529 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4429cb      2 INSTR CHECK OVERFLOW SIGNED 32  EBX ZZ SINKMALLOC inc     ebx 
+            4429cb      2 INSTR CHECK OVERFLOW SIGNED 32  RBX ZZ SINKMALLOC inc     ebx 
             4429d1      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+1 ZZ lea     esi, [rbx+1] 
             442af3    727 FUNC RETURNTYPE RAX 1
             442af3    727 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -3388,8 +3388,8 @@
             442e68    225 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             442f49    388 FUNC RETURNTYPE RAX 1
             442f49    388 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            442ffa      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, ebx 
-            443028      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, ebx 
+            442ffa      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, ebx 
+            443028      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, ebx 
             4430cd    124 FUNC RETURNTYPE RAX 1
             4430cd    124 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             443149     29 FUNC RETURNTYPE RAX 0
@@ -3545,12 +3545,12 @@
             445a1f    250 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             445b19    102 FUNC RETURNTYPE RAX 0
             445b19    102 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            445b44      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ inc     edx 
+            445b44      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ inc     edx 
             445b7f    121 FUNC RETURNTYPE RAX 0
             445b7f    121 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             445bf8     55 FUNC RETURNTYPE RAX 1
             445bf8     55 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
-            445c16      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ inc     edx 
+            445c16      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ inc     edx 
             445c2f    160 FUNC RETURNTYPE RAX 0
             445c2f    160 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             445ccf    108 FUNC RETURNTYPE RAX 0
@@ -3573,8 +3573,8 @@
             445f42    147 FUNC INARGS    6  ARG0 96 ARG1 96 ARG2 96 ARG3 96 ARG4 16 ARG5 4 
             445fd5     79 FUNC RETURNTYPE RAX 0
             445fd5     79 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 96 ARG3 1 
-            446018      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, r9d 
-            44601d      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 dec     esi 
+            446018      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 sub     esi, r9d 
+            44601d      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 dec     esi 
             446024     68 FUNC RETURNTYPE RAX 1
             446024     68 FUNC INARGS    6  ARG0 96 ARG1 96 ARG2 4 ARG3 16 ARG4 16 ARG5 4 
             446068    220 FUNC RETURNTYPE RAX 0
@@ -3742,7 +3742,7 @@
             448b6a     63 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             448ba9    794 FUNC RETURNTYPE RAX 1
             448ba9    794 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
-            448cad      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ dec     esi 
+            448cad      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ dec     esi 
             448ec3    157 FUNC RETURNTYPE RAX 4
             448ec3    157 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 1 
             448f60    117 FUNC RETURNTYPE RAX 4
@@ -3818,14 +3818,14 @@
             44a177    182 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
             44a1af      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RSI ZZ sub     rsi, rax 
             44a1f9      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 32 EBX ZZ IDIOM 30 mov     ecx, ebx 
-            44a20f      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ IDIOM 18 MEMORYSINK sub     ecx, r8d 
+            44a20f      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ IDIOM 18 MEMORYSINK sub     ecx, r8d 
             44a22d    204 FUNC RETURNTYPE RAX 1
             44a22d    204 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44a2f9     92 FUNC RETURNTYPE RAX 1
             44a2f9     92 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44a355    192 FUNC RETURNTYPE RAX 96
             44a355    192 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            44a3c1      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ inc     edx 
+            44a3c1      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ inc     edx 
             44a415      5 FUNC RETURNTYPE RAX 0
             44a415      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             44a41a    270 FUNC RETURNTYPE RAX 96
@@ -3856,7 +3856,7 @@
             44b115    195 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
             44b1d8    939 FUNC RETURNTYPE RAX 0
             44b1d8    939 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            44b33e      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ dec     esi 
+            44b33e      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ dec     esi 
             44b42e      3 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, rbx 
             44b519      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R12 ZZ inc     r12d 
             44b583    512 FUNC RETURNTYPE RAX 0
@@ -3866,15 +3866,15 @@
             44b6ad      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+57 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+39h] 
             44b83f   1415 FUNC RETURNTYPE RAX 1
             44b83f   1415 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
-            44b98c      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, [rbx+10h] 
+            44b98c      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, [rbx+10h] 
             44b9be      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+RBX ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+rbx+0]; s 
             44baba      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+1] 
             44bb72      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDI ZZ sub     rdi, rdx 
-            44bcd6      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDI ZZ sub     edi, dword ptr [rsp+128h+var_100] 
-            44bcda      2 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 32 EAX ZZ IDIOM 30 mov     esi, eax 
-            44bcdc      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 18 MEMORYSINK sub     esi, ecx 
+            44bcd6      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDI ZZ sub     edi, dword ptr [rsp+128h+var_100] 
+            44bcda      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ IDIOM 30 mov     esi, eax 
+            44bcdc      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 18 MEMORYSINK sub     esi, ecx 
             44bd3d      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 32 EBX ZZ IDIOM 30 mov     edx, ebx 
-            44bd3f      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ IDIOM 18 MEMORYSINK sub     edx, ebp 
+            44bd3f      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ IDIOM 18 MEMORYSINK sub     edx, ebp 
             44bd5c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+2 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+2] 
             44bd67      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+2 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+2] 
             44bd82      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+RBP ZZ lea     esi, [rax+rbp] 
@@ -3891,7 +3891,7 @@
             44d0f3    150 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44d189    330 FUNC RETURNTYPE RAX 1
             44d189    330 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            44d228      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ inc     edx 
+            44d228      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ inc     edx 
             44d2d3    165 FUNC RETURNTYPE RAX 1
             44d2d3    165 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             44d378     31 FUNC RETURNTYPE RAX 1
@@ -3903,11 +3903,11 @@
             44d572      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+-4 ZZ lea     eax, [rbx-4] 
             44d5e6     78 FUNC RETURNTYPE RAX 0
             44d5e6     78 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
-            44d5f1      4 INSTR CHECK TRUNCATION SIGNED 32 EDI 8 DIL ZZ IDIOM 26 movsx   edi, dil 
+            44d5f1      4 INSTR CHECK TRUNCATION SIGNED 32 RDI 8 DIL ZZ IDIOM 26 movsx   edi, dil 
             44d5f1      4 INSTR CHECK SIGNEDNESS UNSIGNED 8 DIL ZZ IDIOM 20 movsx   edi, dil 
             44d634    198 FUNC RETURNTYPE RAX 1
             44d634    198 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            44d67a      4 INSTR CHECK TRUNCATION UNSIGNED 32 EDI 8 DIL ZZ IDIOM 5 movzx   edi, dil 
+            44d67a      4 INSTR CHECK TRUNCATION UNSIGNED 32 RDI 8 DIL ZZ IDIOM 5 movzx   edi, dil 
             44d6fa    930 FUNC RETURNTYPE RAX 96
             44d6fa    930 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             44d938      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ lea     rdi, [rax+1] 
@@ -3945,24 +3945,24 @@
             44ef96    178 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44f048    178 FUNC RETURNTYPE RAX 0
             44f048    178 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            44f08c      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ inc     edx 
+            44f08c      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ inc     edx 
             44f0fa    322 FUNC RETURNTYPE RAX 0
             44f0fa    322 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44f23c    253 FUNC RETURNTYPE RAX 0
             44f23c    253 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            44f2e6      2 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ dec     eax 
+            44f2e6      2 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ dec     eax 
             44f339   1408 FUNC RETURNTYPE RAX 4
             44f339   1408 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 1 ARG3 1 ARG4 1 ARG5 1 
             44f339   1408 FUNC PROBLEM sub_44F339 CALLUNRESOLVED 
-            44f5bc      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, 0Dh 
+            44f5bc      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, 0Dh 
             44f6bf      3 INSTR CHECK OVERFLOW UNSIGNED 64  R12 ZZ IDIOM 18 MEMORYSINK inc     r12 
             44f7d3      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBP+1 ZZ lea     edx, [rbp+1] 
             44f7ea      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, rax        ; src 
             44f8b9    659 FUNC RETURNTYPE RAX 4
             44f8b9    659 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            44f97e      6 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ IDIOM 27 add     esi, 102h 
+            44f97e      6 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ IDIOM 27 add     esi, 102h 
             44f992      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+-4 ZZ lea     eax, [r14-4] 
-            44fadb      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, [rax+10h] 
+            44fadb      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, [rax+10h] 
             44fb03      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDX+124 ZZ lea     eax, [rdx+7Ch] 
             44fb4c    232 FUNC RETURNTYPE RAX 0
             44fb4c    232 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -3983,7 +3983,7 @@
             4503aa     24 FUNC INARGS    2  ARG0 4 ARG1 0 
             4503c2     77 FUNC RETURNTYPE RAX 4
             4503c2     77 FUNC INARGS    2  ARG0 4 ARG1 0 
-            4503de      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ dec     ecx 
+            4503de      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ dec     ecx 
             45040f     66 FUNC RETURNTYPE RAX 4
             45040f     66 FUNC INARGS    2  ARG0 4 ARG1 0 
             450451      3 FUNC RETURNTYPE RAX 1
@@ -4065,14 +4065,14 @@
             450fd1     53 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             451006    106 FUNC RETURNTYPE RAX 0
             451006    106 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            451021      2 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 32 EAX ZZ IDIOM 30 mov     esi, eax 
-            451029      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, ebp 
+            451021      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ IDIOM 30 mov     esi, eax 
+            451029      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 sub     esi, ebp 
             451070     51 FUNC RETURNTYPE RAX 0
             451070     51 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             45108b      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 140h       ; act 
             4510a3    425 FUNC RETURNTYPE RAX 1
             4510a3    425 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            451127      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EBP ZZ inc     ebp 
+            451127      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RBP ZZ inc     ebp 
             45124c    154 FUNC RETURNTYPE RAX 4
             45124c    154 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4512e6     61 FUNC RETURNTYPE RAX 0
@@ -4085,22 +4085,22 @@
             45143e     23 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             451455    148 FUNC RETURNTYPE RAX 1
             451455    148 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4514be      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r13d 
+            4514be      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r13d 
             4514c1      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 8          ; dest 
             4514c8      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RSI*8 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rdi+rsi*8]; src 
             4514c8      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDI+RSI*8 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rdi+rsi*8]; src 
             4514e9    149 FUNC RETURNTYPE RAX 0
             4514e9    149 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            45151c      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 0FFFFFF80h 
-            451522      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ inc     esi 
+            45151c      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 0FFFFFF80h 
+            451522      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ inc     esi 
             451538      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RSI*8 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rax+rsi*8]; src 
             451538      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+RSI*8 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rax+rsi*8]; src 
             45153f      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RSI+128 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rsi+80h]  ; dest 
             45157e     55 FUNC RETURNTYPE RAX 4
             45157e     55 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            45158e      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, esi 
-            45159e      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, edx 
-            4515a6      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ inc     esi 
+            45158e      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, esi 
+            45159e      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, edx 
+            4515a6      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ inc     esi 
             4515b5     98 FUNC RETURNTYPE RAX 1
             4515b5     98 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             451617    100 FUNC RETURNTYPE RAX 1
@@ -4120,7 +4120,7 @@
             451952    788 FUNC RETURNTYPE RAX 1
             451952    788 FUNC INARGS    6  ARG0 8 ARG1 4 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             451952    788 FUNC PROBLEM sub_451952 CALLUNRESOLVED 
-            451b6b      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   edx, bl 
+            451b6b      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BL ZZ IDIOM 5 movzx   edx, bl 
             451c66    159 FUNC RETURNTYPE RAX 4
             451c66    159 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             451caa      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBX+1 ZZ lea     esi, [rbx+1] 
@@ -4137,7 +4137,7 @@
             451e32      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBX 32 EBX ZZ mov     esi, ebx 
             451e46    107 FUNC RETURNTYPE RAX 0
             451e46    107 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            451e7b      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ inc     esi 
+            451e7b      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ inc     esi 
             451e80      4 INSTR CHECK OVERFLOW SIGNED 64 RSI ZZ imul    rsi, 30h 
             451eb1     35 FUNC RETURNTYPE RAX 0
             451eb1     35 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
@@ -4171,7 +4171,7 @@
             452608      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R12 ZZ IDIOM 18 MEMORYSINK add     r12, rax 
             452698    309 FUNC RETURNTYPE RAX 1
             452698    309 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            452777      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ neg     edi             ; pid 
+            452777      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ neg     edi             ; pid 
             4527cd    769 FUNC RETURNTYPE RAX 1
             4527cd    769 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             452ace   2881 FUNC RETURNTYPE RAX 96
@@ -4205,29 +4205,29 @@
             453d13      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+R14 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+r14+0]; s1 
             453e04    176 FUNC RETURNTYPE RAX 96
             453e04    176 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            453e32      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 18 MEMORYSINK sub     esi, ebx        ; n 
+            453e32      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 18 MEMORYSINK sub     esi, ebx        ; n 
             453eb4     54 FUNC RETURNTYPE RAX 1
             453eb4     54 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             453eea    162 FUNC RETURNTYPE RAX 1
             453eea    162 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            453f47      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, ebx 
-            453f4b      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 inc     esi 
+            453f47      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 sub     esi, ebx 
+            453f4b      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 inc     esi 
             453f52      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+1]    ; s 
-            453f7e      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ dec     esi 
+            453f7e      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ dec     esi 
             453f8c    107 FUNC RETURNTYPE RAX 4
             453f8c    107 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            453fb4      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, ebx        ; n 
+            453fb4      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 sub     esi, ebx        ; n 
             453ff7    249 FUNC RETURNTYPE RAX 0
             453ff7    249 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             453ff7    249 FUNC PROBLEM sub_453FF7 CALLUNRESOLVED 
             4540f0   1644 FUNC RETURNTYPE RAX 1
             4540f0   1644 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
             4540f0   1644 FUNC PROBLEM sub_4540F0 CALLUNRESOLVED 
-            4544f2      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, ebx 
+            4544f2      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, ebx 
             45475c   1015 FUNC RETURNTYPE RAX 1
             45475c   1015 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             454873      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBX+-3 ZZ lea     eax, [rbx-3] 
-            454a04      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ dec     eax 
+            454a04      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ dec     eax 
             454b53    154 FUNC RETURNTYPE RAX 96
             454b53    154 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             454b53    154 FUNC PROBLEM sub_454B53 CALLUNRESOLVED 
@@ -4240,7 +4240,7 @@
             454cf7   1329 FUNC RETURNTYPE RAX 0
             454cf7   1329 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
             454cf7   1329 FUNC PROBLEM sub_454CF7 CALLUNRESOLVED 
-            454d80      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ IDIOM 19 sub     edx, ebx 
+            454d80      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ IDIOM 19 sub     edx, ebx 
             454eb4      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R12 ZZ inc     r12d 
             454fed      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+4] 
             4550d8      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+1] 
@@ -4252,8 +4252,8 @@
             455322     54 FUNC INARGS    6  ARG0 8 ARG1 0 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             455358    254 FUNC RETURNTYPE RAX 1
             455358    254 FUNC INARGS    6  ARG0 0 ARG1 96 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
-            455418      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ neg     edi             ; pid 
-            455430      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ neg     edi             ; pid 
+            455418      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ neg     edi             ; pid 
+            455430      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ neg     edi             ; pid 
             455456    330 FUNC RETURNTYPE RAX 1
             455456    330 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             455539      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     edi, eax        ; pid 
@@ -4261,8 +4261,8 @@
             4555a0    228 FUNC INARGS    1  ARG0 0 
             455776     91 FUNC RETURNTYPE RAX 0
             455776     91 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
-            4557c7      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   edi, bl 
-            4557ca      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ neg     edi             ; signo 
+            4557c7      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BL ZZ IDIOM 5 movzx   edi, bl 
+            4557ca      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ neg     edi             ; signo 
             4557d1     51 FUNC RETURNTYPE RAX 0
             4557d1     51 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             455804    149 FUNC RETURNTYPE RAX 4
@@ -4279,7 +4279,7 @@
             455bf2    120 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
             455c6a   1666 FUNC RETURNTYPE RAX 4
             455c6a   1666 FUNC INARGS    6  ARG0 8 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            455d08      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 8 DL ZZ IDIOM 5 movzx   esi, dl         ; c 
+            455d08      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDX 8 DL ZZ IDIOM 5 movzx   esi, dl         ; c 
             45603d      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RSI+R14 ZZ lea     rsi, [rsi+r14+1] 
             45603d      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RSI+R14+1 ZZ lea     rsi, [rsi+r14+1] 
             456042      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 19 add     rsi, rbx 
@@ -4298,7 +4298,7 @@
             456394   1165 FUNC RETURNTYPE RAX 0
             456394   1165 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4563bf      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 148h       ; set 
-            4565af      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   esi, al 
+            4565af      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 8 AL ZZ IDIOM 5 movzx   esi, al 
             4565af      3 INSTR CHECK SIGNEDNESS SIGNED 8 AL ZZ IDIOM 20 movzx   esi, al 
             456821    266 FUNC RETURNTYPE RAX 4
             456821    266 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
@@ -4327,12 +4327,12 @@
             4572fb   1167 FUNC RETURNTYPE RAX 96
             4572fb   1167 FUNC INARGS    6  ARG0 2 ARG1 4 ARG2 96 ARG3 1 ARG4 0 ARG5 4 
             4572fb   1167 FUNC PROBLEM sub_4572FB CALLUNRESOLVED 
-            4574fd      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 101h 
-            45751e      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax        ; timeout 
+            4574fd      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 101h 
+            45751e      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax        ; timeout 
             45778a    570 FUNC RETURNTYPE RAX 1
             45778a    570 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             457864      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 GLOBALMEMSINK add     rsi, 6C9478h    ; bufp 
-            45786b      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r12d       ; len 
+            45786b      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r12d       ; len 
             4579c4     61 FUNC RETURNTYPE RAX 0
             4579c4     61 FUNC INARGS    6  ARG0 16 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             457a01    490 FUNC RETURNTYPE RAX 0
@@ -4372,7 +4372,7 @@
             458a72      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RBP+1 ZZ lea     rdx, [rbp+1]    ; n 
             458a81      4 INSTR CHECK OVERFLOW UNSIGNED 64  R8 ZZ IDIOM 18 MEMORYSINK add     r8, 4           ; addr 
             458b08      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+1] 
-            458b83      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ IDIOM 19 sub     edx, eax 
+            458b83      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ IDIOM 19 sub     edx, eax 
             458c22    217 FUNC RETURNTYPE RAX 4
             458c22    217 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             458cfb   1364 FUNC RETURNTYPE RAX 1
@@ -4407,7 +4407,7 @@
             459a50      4 INSTR CHECK OVERFLOW UNSIGNED 64  R8 ZZ IDIOM 18 STACKMEMSINK add     r8, 6Ch 
             459c50    618 FUNC RETURNTYPE RAX 1
             459c50    618 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            459d71      2 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 32 EBX ZZ mov     esi, ebx 
+            459d71      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 32 EBX ZZ mov     esi, ebx 
             459e55      2 INSTR CHECK TRUNCATION SIGNED 64 RBX 32 EBX ZZ mov     ecx, ebx 
             459eba     49 FUNC RETURNTYPE RAX 16
             459eba     49 FUNC INARGS    4  ARG0 1 ARG1 0 ARG2 0 ARG3 0 
@@ -4433,9 +4433,9 @@
             459f6c    197 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 1 ARG3 0 
             45a031    142 FUNC RETURNTYPE RAX 4
             45a031    142 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 1 ARG4 1 ARG5 0 
-            45a07d      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, eax 
-            45a08d      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, ebp 
-            45a08f      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ inc     esi 
+            45a07d      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, eax 
+            45a08d      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, ebp 
+            45a08f      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ inc     esi 
             45a0bf     36 FUNC RETURNTYPE RAX 1
             45a0bf     36 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             45a0e3     60 FUNC RETURNTYPE RAX 1
@@ -4475,7 +4475,7 @@
             45a82e     13 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             45a83b    435 FUNC RETURNTYPE RAX 1
             45a83b    435 FUNC INARGS    6  ARG0 1 ARG1 8 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
-            45a96e      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, [r13+58h] 
+            45a96e      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, [r13+58h] 
             45a9ee   1716 FUNC RETURNTYPE RAX 1
             45a9ee   1716 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             45ae00      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RCX+1 ZZ lea     esi, [rcx+1] 
@@ -4503,8 +4503,8 @@
             45b4c4      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBP+1 ZZ lea     esi, [rbp+1] 
             45b502   1252 FUNC RETURNTYPE RAX 4
             45b502   1252 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            45b5a5      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ inc     esi 
-            45b946      2 INSTR CHECK UNDERFLOW SIGNED 32  EDI ZZ dec     edi 
+            45b5a5      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ inc     esi 
+            45b946      2 INSTR CHECK UNDERFLOW SIGNED 32  RDI ZZ dec     edi 
             45b9e6    123 FUNC RETURNTYPE RAX 0
             45b9e6    123 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             45ba61    929 FUNC RETURNTYPE RAX 96
@@ -4512,14 +4512,14 @@
             45bbc7      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RBX+1 ZZ IDIOM 32 lea     edx, [rbx+1] 
             45bc09      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+1 ZZ lea     edx, [r13+1] 
             45bc89      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RCX+1 ZZ lea     esi, [rcx+1] 
-            45bd91      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ inc     edx 
+            45bd91      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ inc     edx 
             45be02    751 FUNC RETURNTYPE RAX 96
             45be02    751 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             45be4a      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R14+1 ZZ lea     esi, [r14+1] 
             45bfbe      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, 178h 
             45bfe0      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+RDX ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+rdx-4]; s1 
             45bfe0      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+RDX+-4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+rdx-4]; s1 
-            45c016      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, eax 
+            45c016      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ sub     ecx, eax 
             45c0f1    399 FUNC RETURNTYPE RAX 1
             45c0f1    399 FUNC INARGS    6  ARG0 8 ARG1 1 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
             45c113      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 60h        ; env 
@@ -4534,12 +4534,12 @@
             45c470      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+24 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+18h] 
             45c474      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+68 ZZ IDIOM 18 MEMORYSINK lea     r9, [rbp+44h] 
             45c478      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+64 ZZ IDIOM 18 MEMORYSINK lea     r8, [rbp+40h] 
-            45c66a      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EAX ZZ IDIOM 31 sub     eax, 61h 
+            45c66a      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RAX ZZ IDIOM 31 sub     eax, 61h 
             45c6c2      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX+1 ZZ lea     esi, [rdx+1] 
             45c8c9      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+1 ZZ lea     esi, [r13+1] 
-            45c97b      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   edi, bl 
+            45c97b      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BL ZZ IDIOM 5 movzx   edi, bl 
             45c988      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+1 ZZ lea     esi, [r13+1] 
-            45ca04      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EAX ZZ IDIOM 31 sub     eax, 61h 
+            45ca04      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RAX ZZ IDIOM 31 sub     eax, 61h 
             45ca6e      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBX+1 ZZ lea     esi, [rbx+1] 
             45ca94      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+RBX ZZ lea     edx, [r12+rbx-1] 
             45ca94      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+RBX+-1 ZZ lea     edx, [r12+rbx-1] 
@@ -4553,10 +4553,10 @@
             45cc52      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+RBP ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdx+rbp+9C0h] 
             45cc52      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+RBP+2496 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdx+rbp+9C0h] 
             45cd29      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15+RAX ZZ lea     esi, [r15+rax] 
-            45cd30      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, r14d 
+            45cd30      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, r14d 
             45cd47      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R14+RAX ZZ lea     esi, [r14+rax] 
-            45cd4e      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, r15d 
-            45cdf0      2 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, edx 
+            45cd4e      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, r15d 
+            45cdf0      2 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, edx 
             45cfb2     88 FUNC RETURNTYPE RAX 1
             45cfb2     88 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             45d00a    292 FUNC RETURNTYPE RAX 1
@@ -4576,7 +4576,7 @@
             45d2b6    233 FUNC RETURNTYPE RAX 0
             45d2b6    233 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             45d2e0      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+5540 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+15A4h] 
-            45d32f      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 23 sub     esi, eax 
+            45d32f      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 23 sub     esi, eax 
             45d33c      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+5540 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r12+15A4h] 
             45d370      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+RBX ZZ lea     esi, [r13+rbx+0] 
             45d39f    278 FUNC RETURNTYPE RAX 0
@@ -4641,7 +4641,7 @@
             45f7be     46 FUNC INARGS    6  ARG0 8 ARG1 1 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             45f7ec    476 FUNC RETURNTYPE RAX 1
             45f7ec    476 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            45f870      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, eax 
+            45f870      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, eax 
             45f9c8    794 FUNC RETURNTYPE RAX 0
             45f9c8    794 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             45fa92      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     edi, eax        ; semid 
@@ -4659,10 +4659,10 @@
             4607e0   1164 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             460937      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+56 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+38h]  ; timer 
             4609cb      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+48 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+30h]  ; timer 
-            460a78      2 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 32 EBX ZZ mov     esi, ebx        ; semnum 
-            460a8f      2 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 32 EBX ZZ mov     esi, ebx        ; semnum 
-            460aa3      2 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 32 EBX ZZ mov     esi, ebx        ; semnum 
-            460abf      2 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 32 EBX ZZ mov     esi, ebx        ; semnum 
+            460a78      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 32 EBX ZZ mov     esi, ebx        ; semnum 
+            460a8f      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 32 EBX ZZ mov     esi, ebx        ; semnum 
+            460aa3      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 32 EBX ZZ mov     esi, ebx        ; semnum 
+            460abf      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 32 EBX ZZ mov     esi, ebx        ; semnum 
             460ba5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+48 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+30h]  ; timer 
             460c6c    320 FUNC RETURNTYPE RAX 1
             460c6c    320 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -4686,14 +4686,14 @@
             461284   2433 FUNC RETURNTYPE RAX 0
             461284   2433 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             461527      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBP 32 EBP ZZ IDIOM 30 mov     esi, ebp 
-            461530      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, ebx 
+            461530      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 sub     esi, ebx 
             46153f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+1 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+1] 
             461543      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+16 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+10h] 
             4615df      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+1] 
             4615e3      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBP 32 EBP ZZ IDIOM 30 mov     esi, ebp 
-            4615e9      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, edi 
-            461686      2 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 32 EAX ZZ IDIOM 30 mov     esi, eax 
-            46168e      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, ebp 
+            4615e9      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 sub     esi, edi 
+            461686      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ IDIOM 30 mov     esi, eax 
+            46168e      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 sub     esi, ebp 
             461785      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+10h]  ; preg 
             4617e0      5 INSTR MEMSET STACKOFFSET_ESP 32 SIZE 80 ZZ call    _memset 
             461816      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+56 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+38h]  ; preg 
@@ -4708,7 +4708,7 @@
             461c5e     59 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             461c99   1417 FUNC RETURNTYPE RAX 1
             461c99   1417 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            46210f      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EBP ZZ inc     ebp 
+            46210f      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RBP ZZ inc     ebp 
             4621ae      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+1 ZZ lea     edi, [rax+1] 
             462222     22 FUNC RETURNTYPE RAX 1
             462222     22 FUNC INARGS    2  ARG0 1 ARG1 1 
@@ -4722,32 +4722,32 @@
             46230b   2442 FUNC INARGS    2  ARG0 0 ARG1 4 
             462629      5 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 imul    edi, [rsp+158h+var_130] 
             462649      5 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 imul    edi, [rsp+158h+var_130] 
-            462667      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDI ZZ dec     edi 
+            462667      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDI ZZ dec     edi 
             46280d      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+104 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+68h]  ; buf 
             462876      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+236 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+0ECh] ; buf 
             4628a2      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+120 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+78h] 
-            4628aa      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, 14h 
-            46298e      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, eax 
+            4628aa      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, 14h 
+            46298e      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ sub     ecx, eax 
             4629a1      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rsp+158h+var_150] 
-            4629b8      4 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, [rsp+158h+var_FC] 
-            4629cb      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, eax 
+            4629b8      4 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ sub     ecx, [rsp+158h+var_FC] 
+            4629cb      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, eax 
             462a58      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+RBX ZZ lea     rdi, [rax+rbx] 
             462a77      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RAX ZZ lea     rdi, [rbx+rax] 
-            462aba      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [r12+rcx+8] 
+            462aba      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, [r12+rcx+8] 
             462abf      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rsp+158h+var_150] 
             462b1d      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rsp+158h+var_150] 
             462b2b      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, rax 
             462b7e      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rsp+158h+var_150] 
             462b86      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, rax 
-            462bae      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rdx+8] 
+            462bae      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, [rdx+8] 
             462bb4      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDI+RAX ZZ lea     edi, [rdi+rax+1] 
             462bb4      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDI+RAX+1 ZZ lea     edi, [rdi+rax+1] 
             462bb8      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rsp+158h+var_150] 
-            462c16      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ inc     edi 
-            462c18      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rsp+158h+var_11C] 
+            462c16      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ inc     edi 
+            462c18      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, [rsp+158h+var_11C] 
             462c1c      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rsp+158h+var_150] 
             462c2c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+32 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+20h]  ; dest 
-            462c69      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rbx+8] 
+            462c69      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, [rbx+8] 
             462c6c      6 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rsp+158h+var_150] 
             462c95     26 FUNC RETURNTYPE RAX 1
             462c95     26 FUNC INARGS    2  ARG0 4 ARG1 1 
@@ -4757,10 +4757,10 @@
             462cc6     25 FUNC INARGS    2  ARG0 4 ARG1 1 
             462cdf    110 FUNC RETURNTYPE RAX 1
             462cdf    110 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            462d0c      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 23 sub     esi, eax 
+            462d0c      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 23 sub     esi, eax 
             462d4d    184 FUNC RETURNTYPE RAX 1
             462d4d    184 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            462dbc      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 23 sub     esi, eax 
+            462dbc      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 23 sub     esi, eax 
             462e05     53 FUNC RETURNTYPE RAX 1
             462e05     53 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             462e3a     87 FUNC RETURNTYPE RAX 1
@@ -4774,14 +4774,14 @@
             463117      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+86 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+56h]  ; dest 
             46314e      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+2 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+2]    ; dest 
             463169      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+2 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+2]    ; dest 
-            4632d6      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 23 sub     esi, eax 
+            4632d6      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 23 sub     esi, eax 
             46331e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+RCX ZZ IDIOM 32 lea     esi, [rdx+rcx-1] 
             46331e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+RCX+-1 ZZ IDIOM 32 lea     esi, [rdx+rcx-1] 
             46345c      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+3668 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+0E54h]; buf 
             463496      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+RBX ZZ IDIOM 32 lea     edx, [r12+rbx] 
-            4634cf      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 23 sub     esi, edx 
-            463541      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ inc     esi 
-            463543      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, eax 
+            4634cf      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 23 sub     esi, edx 
+            463541      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ inc     esi 
+            463543      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, eax 
             46366a      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+22104 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rbp+5658h] 
             4636bd      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+24152 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+5E58h]; s 
             4636e1      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+22104 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+5658h] 
@@ -4790,8 +4790,8 @@
             4638a0      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+21076 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+5254h]; s 
             4638bf      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+20052 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+4E54h] 
             46393a      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+20052 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+4E54h] 
-            46397b      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ inc     esi 
-            46397d      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, eax 
+            46397b      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ inc     esi 
+            46397d      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, eax 
             4639b7      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+2132 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+854h] 
             4639f4      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+1108 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+454h] 
             463ab4   1364 FUNC RETURNTYPE RAX 1
@@ -4808,7 +4808,7 @@
             4642ec      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     esi, eax 
             464305      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+-65 ZZ lea     edx, [rax-41h] 
             464308      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+32 ZZ lea     ecx, [rax+20h] 
-            464322      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   ebp, bl 
+            464322      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BL ZZ IDIOM 5 movzx   ebp, bl 
             464460     42 FUNC RETURNTYPE RAX 0
             464460     42 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46448a    103 FUNC RETURNTYPE RAX 0
@@ -4850,7 +4850,7 @@
             4659a6    382 FUNC RETURNTYPE RAX 0
             4659a6    382 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             465a27      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+R15 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+r15+0]; s 
-            465a2c      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, r15d       ; n 
+            465a2c      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, r15d       ; n 
             465a7c      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13*4 ZZ lea     rdi, ds:0[r13*4] 
             465b24     89 FUNC RETURNTYPE RAX 1
             465b24     89 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -4915,7 +4915,7 @@
             466f75      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+3 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+3]    ; s1 
             466f9c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+100 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+64h] 
             466ff2      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+2 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+2] 
-            466fff      2 INSTR CHECK OVERFLOW UNSIGNED 32  ECX ZZ add     ecx, ecx 
+            466fff      2 INSTR CHECK OVERFLOW UNSIGNED 32  RCX ZZ add     ecx, ecx 
             46700f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+6 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+6] 
             467029      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R14 ZZ inc     r14d 
             467048     85 FUNC RETURNTYPE RAX 0
@@ -4940,7 +4940,7 @@
             467459      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RAX ZZ inc     rax 
             4674d3    757 FUNC RETURNTYPE RAX 0
             4674d3    757 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            467545      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 16 CX ZZ IDIOM 5 movzx   ecx, cx 
+            467545      3 INSTR CHECK TRUNCATION UNSIGNED 32 RCX 16 CX ZZ IDIOM 5 movzx   ecx, cx 
             467563      3 INSTR CHECK OVERFLOW UNSIGNED 32 ECX ZZ IDIOM 33 imul    ecx, edx 
             467575      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+1024 ZZ lea     rsi, [r14+400h] 
             46759a      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+37 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+25h] 
@@ -4949,7 +4949,7 @@
             4675ed      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+288 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+120h] 
             467653      4 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 imul    esi, r12d 
             467657      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+RSI ZZ lea     rsi, [r14+rsi] 
-            46774e      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, edi 
+            46774e      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, edi 
             467756      4 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 imul    esi, r12d 
             46775a      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, r14 
             467790      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 16h 
@@ -4987,7 +4987,7 @@
             467be1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+72 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+48h] 
             467c29      4 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 imul    esi, r12d, 3 
             467c2d      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, rax 
-            467c6e      2 INSTR CHECK OVERFLOW UNSIGNED 32  EBX ZZ add     ebx, edx 
+            467c6e      2 INSTR CHECK OVERFLOW UNSIGNED 32  RBX ZZ add     ebx, edx 
             467c8a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+RSI ZZ IDIOM 32 lea     rsi, [rax+rsi] 
             467cab    105 FUNC RETURNTYPE RAX 0
             467cab    105 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -5077,7 +5077,7 @@
             468564    111 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4685d3     12 FUNC RETURNTYPE RAX 0
             4685d3     12 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            47204e      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [rbx+40h] 
+            47204e      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [rbx+40h] 
             472051      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+RSI ZZ IDIOM 18 MEMORYSINK lea     rsi, [rdi+rsi]  ; src 
             4721d0      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDX+1 ZZ IDIOM 18 MEMORYSINK lea     eax, [rdx+1] 
             4685df     37 FUNC RETURNTYPE RAX 1
@@ -5100,12 +5100,12 @@
             4689c7   1627 FUNC RETURNTYPE RAX 0
             4689c7   1627 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             468bdc      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RSI+-1 ZZ lea     ebx, [rsi-1] 
-            468c4f      2 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ dec     esi 
-            468e93      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, r15d 
-            468ea6      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
-            468eb7      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, ebx 
-            468ebe      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, r12d 
-            468ed3      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            468c4f      2 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ dec     esi 
+            468e93      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, r15d 
+            468ea6      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
+            468eb7      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, ebx 
+            468ebe      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, r12d 
+            468ed3      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             469022    533 FUNC RETURNTYPE RAX 1
             469022    533 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 4 ARG4 0 ARG5 4 
             469126      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDI+1 ZZ IDIOM 18 MEMORYSINK lea     esi, [rdi+1] 
@@ -5125,15 +5125,15 @@
             469389     59 FUNC INARGS    3  ARG0 4 ARG1 0 ARG2 1 
             4693c4     87 FUNC RETURNTYPE RAX 0
             4693c4     87 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
-            4693f3      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BH ZZ IDIOM 5 movzx   edx, bh 
+            4693f3      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BH ZZ IDIOM 5 movzx   edx, bh 
             46941b     45 FUNC RETURNTYPE RAX 0
             46941b     45 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            469428      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BH ZZ IDIOM 5 movzx   edx, bh 
+            469428      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BH ZZ IDIOM 5 movzx   edx, bh 
             469448    450 FUNC RETURNTYPE RAX 0
             469448    450 FUNC INARGS    1  ARG0 4 
             46960a   2264 FUNC RETURNTYPE RAX 1
             46960a   2264 FUNC INARGS    1  ARG0 4 
-            469657      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ inc     esi 
+            469657      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ inc     esi 
             4699a3      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R11+R11 ZZ lea     edi, [r11+r11] 
             469a34      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R11+R11 ZZ lea     edi, [r11+r11] 
             469d38      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R12 ZZ add     r12d, 10h 
@@ -5144,11 +5144,11 @@
             46a074      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+R10 ZZ lea     edx, [r12+r10] 
             46a078      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15+-1 ZZ lea     eax, [r15-1] 
             46a0ab      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R11+RCX ZZ lea     esi, [r11+rcx] 
-            46a0c0      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, [rax] 
-            46a28f      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, r14d 
-            46a2a0      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
-            46a2b9      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, r12d 
-            46a2cf      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            46a0c0      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, [rax] 
+            46a28f      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, r14d 
+            46a2a0      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
+            46a2b9      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, r12d 
+            46a2cf      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             46a3d0   1177 FUNC RETURNTYPE RAX 96
             46a3d0   1177 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 4 ARG5 0 
             46a83e      3 INSTR CHECK OVERFLOW SIGNED 64  R11 ZZ inc     r11 
@@ -5158,7 +5158,7 @@
             46a8b2      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RDX+RCX ZZ lea     rcx, [rdx+rcx] 
             46a90c    259 FUNC RETURNTYPE RAX 1
             46a90c    259 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            46a970      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 425A6830h 
+            46a970      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 425A6830h 
             46aa0f    380 FUNC RETURNTYPE RAX 1
             46aa0f    380 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46ab8b    543 FUNC RETURNTYPE RAX 1
@@ -5179,7 +5179,7 @@
             46b292      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+16 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+10h] 
             46b2f5     23 FUNC RETURNTYPE RAX 0
             46b2f5     23 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
-            46b2f9      2 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ dec     esi 
+            46b2f9      2 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ dec     esi 
             46b30c    147 FUNC RETURNTYPE RAX 1
             46b30c    147 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             46b39f    159 FUNC RETURNTYPE RAX 1
@@ -5210,29 +5210,29 @@
             46bd5c     84 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46bdb0    114 FUNC RETURNTYPE RAX 1
             46bdb0    114 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            46bdea      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDI 16 DI ZZ IDIOM 5 movzx   edi, di 
+            46bdea      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDI 16 DI ZZ IDIOM 5 movzx   edi, di 
             46be22    341 FUNC RETURNTYPE RAX 0
             46be22    341 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46bf77    393 FUNC RETURNTYPE RAX 1
             46bf77    393 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            46bfe9      2 INSTR CHECK UNDERFLOW SIGNED 32  EBX ZZ dec     ebx 
+            46bfe9      2 INSTR CHECK UNDERFLOW SIGNED 32  RBX ZZ dec     ebx 
             46c100    625 FUNC RETURNTYPE RAX 1
             46c100    625 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 1 ARG4 4 ARG5 1 
             46c131      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+5120 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+1400h] 
             46c14b      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+5160 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+1428h] 
             46c17f      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+5200 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+1450h] 
             46c210      4 INSTR CHECK TRUNCATION UNSIGNED 64 R13 16 R13 ZZ IDIOM 5 movzx   edi, r13w 
-            46c219      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 16 BX ZZ IDIOM 5 movzx   edi, bx 
-            46c262      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 2 
+            46c219      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 16 BX ZZ IDIOM 5 movzx   edi, bx 
+            46c262      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 2 
             46c26a      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+4844 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+12ECh] 
             46c271      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+3692 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+0E6Ch] 
-            46c293      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 4 
+            46c293      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 4 
             46c2ba      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+-257 ZZ lea     edi, [r13-101h] 
             46c2d3      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+-3 ZZ lea     edi, [r12-3] 
             46c30b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+-1 ZZ lea     esi, [r13-1] 
             46c371     22 FUNC RETURNTYPE RAX 0
             46c371     22 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            46c374      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDI 16 DI ZZ IDIOM 5 movzx   edi, di 
+            46c374      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDI 16 DI ZZ IDIOM 5 movzx   edi, di 
             46c387   1955 FUNC RETURNTYPE RAX 1
             46c387   1955 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46c4bf      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBX 32 EBX ZZ mov     edi, ebx 
@@ -5242,10 +5242,10 @@
             46c670      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBX 32 EBX ZZ mov     edi, ebx 
             46c69e      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 10000h     ; s 
             46c974      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+-3 ZZ lea     esi, [rax-3] 
-            46ca12      2 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, eax 
-            46ca40      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ IDIOM 18 MEMORYSINK dec     edx 
-            46ca61      2 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, eax 
-            46caf3      2 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, eax 
+            46ca12      2 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, eax 
+            46ca40      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ IDIOM 18 MEMORYSINK dec     edx 
+            46ca61      2 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, eax 
+            46caf3      2 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, eax 
             46cb2a     19 FUNC RETURNTYPE RAX 0
             46cb2a     19 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 64 ARG3 0 
             46cb3d     41 FUNC RETURNTYPE RAX 0
@@ -5292,23 +5292,23 @@
             46d063     38 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
             46d089   1526 FUNC RETURNTYPE RAX 1
             46d089   1526 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
-            46d236      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ IDIOM 19 sub     edx, ebp 
+            46d236      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ IDIOM 19 sub     edx, ebp 
             46d281      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+-1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13-1] 
-            46d297      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ IDIOM 19 sub     edx, ebp 
+            46d297      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ IDIOM 19 sub     edx, ebp 
             46d2bb      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK inc     rdi             ; dest 
             46d38f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+-1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rcx-1] 
-            46d393      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ IDIOM 19 sub     edx, ebp 
+            46d393      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ IDIOM 19 sub     edx, ebp 
             46d4aa      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+-3 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13-3] 
-            46d4b4      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ IDIOM 19 sub     edx, ebp 
+            46d4b4      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ IDIOM 19 sub     edx, ebp 
             46d515      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+-2 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13-2] 
-            46d52b      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ IDIOM 19 sub     edx, ebp 
+            46d52b      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ IDIOM 19 sub     edx, ebp 
             46d54f      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK inc     rdi             ; dest 
             46d67f    496 FUNC RETURNTYPE RAX 1
             46d67f    496 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             46d86f    910 FUNC RETURNTYPE RAX 1
             46d86f    910 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46d988      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+42 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rbp+2Ah] 
-            46db91      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   edi, al 
+            46db91      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 8 AL ZZ IDIOM 5 movzx   edi, al 
             46db9d      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBP 32 EBP ZZ mov     esi, ebp 
             46dbfd      8 FUNC RETURNTYPE RAX 0
             46dbfd      8 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 0 
@@ -5321,9 +5321,9 @@
             46dd10    125 FUNC PROBLEM sub_46DD10 CALLUNRESOLVED 
             46dd8d   1467 FUNC RETURNTYPE RAX 1
             46dd8d   1467 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            46ddb1      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, 63h 
+            46ddb1      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, 63h 
             46df3a      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     esi, eax 
-            46df44      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ neg     esi 
+            46df44      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ neg     esi 
             46e348     95 FUNC RETURNTYPE RAX 0
             46e348     95 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46e3a7    127 FUNC RETURNTYPE RAX 1
@@ -5351,7 +5351,7 @@
             46ec1c      5 INSTR MEMSET STACKOFFSET_ESP 16 SIZE 512 ZZ call    _memset 
             46ec2f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+100 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rbx+64h] 
             46ec3f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+124 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rbx+7Ch] 
-            46ec6f      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, r14d 
+            46ec6f      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, r14d 
             46f207     53 FUNC RETURNTYPE RAX 1
             46f207     53 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
             46f23c     46 FUNC RETURNTYPE RAX 0
@@ -5359,9 +5359,9 @@
             46f26a   2411 FUNC RETURNTYPE RAX 1
             46f26a   2411 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46f337      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+5 ZZ lea     rdi, [rax+5] 
-            46f5f9      3 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, 4 
-            46f6b1      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ inc     edi 
-            46fb31      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   esi, al 
+            46f5f9      3 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, 4 
+            46f6b1      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ inc     edi 
+            46fb31      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 8 AL ZZ IDIOM 5 movzx   esi, al 
             46fb31      3 INSTR CHECK SIGNEDNESS SIGNED 8 AL ZZ IDIOM 20 movzx   esi, al 
             46fbb0      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     ecx, eax 
             46ff96     27 FUNC RETURNTYPE RAX 0
@@ -5385,7 +5385,7 @@
             470312      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 118h 
             470322      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 50h        ; env 
             470350      6 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 imul    edi, edx, 186A0h 
-            47035a      6 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, 6105C200h 
+            47035a      6 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, 6105C200h 
             4703cd   2018 FUNC RETURNTYPE RAX 1
             4703cd   2018 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4704c3      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+1304 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+518h] 
@@ -5393,7 +5393,7 @@
             470baf    404 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             470c39      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+2 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r12+2] 
             470c93      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+1 ZZ lea     eax, [rbx+1] 
-            470cd5      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EBX ZZ sub     ebx, ebp 
+            470cd5      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RBX ZZ sub     ebx, ebp 
             470d43     52 FUNC RETURNTYPE RAX 1
             470d43     52 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 1 ARG3 96 
             470d77     19 FUNC RETURNTYPE RAX 0
@@ -5407,9 +5407,9 @@
             470dcf   1216 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 96 ARG4 96 ARG5 4 
             470e2d      5 INSTR MEMSET STACKOFFSET_ESP 1536 SIZE 68 ZZ call    _memset 
             47101d      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+RAX ZZ lea     ecx, [rax+rax] 
-            471051      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 EBX 8 BL ZZ mov     cl, bl 
+            471051      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 RBX 8 BL ZZ mov     cl, bl 
             471053      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBX+RBP ZZ lea     edx, [rbx+rbp] 
-            47106d      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ inc     edi 
+            47106d      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ inc     edi 
             47128f     29 FUNC RETURNTYPE RAX 0
             47128f     29 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 96 ARG3 96 ARG4 0 ARG5 8 
             4712ac    183 FUNC RETURNTYPE RAX 1
@@ -5417,31 +5417,31 @@
             4712f0      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 4          ; buf 
             471363    704 FUNC RETURNTYPE RAX 1
             471363    704 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            47145d      2 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 14 mov     cl, bl 
-            47147e      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ IDIOM 15 add     edx, eax 
+            47145d      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 8 BL ZZ IDIOM 14 mov     cl, bl 
+            47147e      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ IDIOM 15 add     edx, eax 
             471623     34 FUNC RETURNTYPE RAX 0
             471623     34 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             471645   2213 FUNC RETURNTYPE RAX 1
             471645   2213 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             4716cc      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 0A0h       ; env 
-            4717ef      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 16 AX ZZ IDIOM 5 movzx   ebp, ax 
+            4717ef      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 16 AX ZZ IDIOM 5 movzx   ebp, ax 
             471903      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+96 ZZ IDIOM 18 MEMORYSINK lea     r9, [rbx+60h] 
             471951      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+104 ZZ IDIOM 18 MEMORYSINK lea     r9, [rax+68h] 
             4719b9      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+257 ZZ lea     r15d, [rax+101h] 
             471aa0      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, 60h 
-            471b38      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 16 AX ZZ IDIOM 5 movzx   edx, ax 
+            471b38      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 16 AX ZZ IDIOM 5 movzx   edx, ax 
             471cbd      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI*4 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rbx+rdi*4] 
             471cbd      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RDI*4 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rbx+rdi*4] 
             471ce0      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+104 ZZ IDIOM 18 MEMORYSINK lea     r9, [rax+68h] 
             471d54      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, 8Ch 
-            471d72      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ inc     edx 
+            471d72      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ inc     edx 
             471eea    125 FUNC RETURNTYPE RAX 1
             471eea    125 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             471f67    138 FUNC RETURNTYPE RAX 1
             471f67    138 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             471f94      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 RBX ZZ mov     rdx, rbx        ; n 
             471f97      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+RSI ZZ IDIOM 18 MEMORYSINK lea     rsi, [rdi+rsi]  ; src 
-            471fac      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, r12d 
+            471fac      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, r12d 
             472228    102 FUNC RETURNTYPE RAX 0
             472228    102 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47228e    102 FUNC RETURNTYPE RAX 1
@@ -5485,11 +5485,11 @@
             473712    128 FUNC INARGS    2  ARG0 4 ARG1 4 
             473792   1568 FUNC RETURNTYPE RAX 1
             473792   1568 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            47399a      2 INSTR CHECK OVERFLOW UNSIGNED 32  EAX ZZ add     eax, ecx 
-            473b07      6 INSTR CHECK OVERFLOW UNSIGNED 32  EAX ZZ add     eax, [rbx+6F0Ch] 
+            47399a      2 INSTR CHECK OVERFLOW UNSIGNED 32  RAX ZZ add     eax, ecx 
+            473b07      6 INSTR CHECK OVERFLOW UNSIGNED 32  RAX ZZ add     eax, [rbx+6F0Ch] 
             473b2d      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, [rbx+18h]  ; src 
             473bb3      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RCX ZZ sub     rcx, [rbp+8] 
-            473c42      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, edx 
+            473c42      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, edx 
             4746bb     31 FUNC RETURNTYPE RAX 1
             4746bb     31 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4746da     71 FUNC RETURNTYPE RAX 1
@@ -5500,7 +5500,7 @@
             4747a3     47 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4747d2    385 FUNC RETURNTYPE RAX 0
             4747d2    385 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
-            474903      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ inc     edi 
+            474903      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ inc     edi 
             474953    634 FUNC RETURNTYPE RAX 1
             474953    634 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             474953    634 FUNC PROBLEM sub_474953 CALLUNRESOLVED 
@@ -5512,7 +5512,7 @@
             474c3b    121 FUNC RETURNTYPE RAX 4
             474c3b    121 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             474c93      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 32 EBX ZZ IDIOM 30 mov     esi, ebx 
-            474c9d      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, ebp 
+            474c9d      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 sub     esi, ebp 
             474cb4   1809 FUNC RETURNTYPE RAX 1
             474cb4   1809 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             474cb4   1809 FUNC PROBLEM sub_474CB4 CALLUNRESOLVED 
@@ -5642,7 +5642,7 @@
             477680    145 FUNC RETURNTYPE RAX 4
             477680    145 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             477691      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDX ZZ IDIOM 33 imul    edx, cs:dword_6CB4D0, 7 
-            477698      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 15h        ; n 
+            477698      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 15h        ; n 
             477711     37 FUNC RETURNTYPE RAX 4
             477711     37 FUNC INARGS    6  ARG0 8 ARG1 1 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             477736    354 FUNC RETURNTYPE RAX 1
@@ -5653,28 +5653,28 @@
             47795b      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 imul    esi, cs:dword_6CB4D0, 7 
             47797a      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0A1h 
             477ac7      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 imul    esi, cs:dword_6CB4D0, 7 
-            477ae3      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 14h 
-            477ae6      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, eax 
+            477ae3      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 14h 
+            477ae6      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, eax 
             477afc      4 INSTR CHECK OVERFLOW UNSIGNED 64  R12 ZZ IDIOM 18 STACKMEMSINK add     r12, 1Ch 
             477b43      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 ESI ZZ IDIOM 33 imul    esi, cs:dword_6CB4D0, 0F8h 
-            477b51      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 40h 
+            477b51      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 40h 
             477c4c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+R14 ZZ lea     esi, [r12+r14] 
             477c50      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+2 ZZ lea     edi, [r13+2] 
             477c56      4 INSTR CHECK OVERFLOW UNSIGNED 64 RSI ZZ IDIOM 33 imul    rsi, 2Ah 
             477c5a      4 INSTR CHECK OVERFLOW UNSIGNED 32 EDI ZZ IDIOM 33 imul    edi, r12d 
             477c61      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, rax 
             477c68      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+RDI ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rdx+rdi] 
-            477c80      6 INSTR CHECK UNDERFLOW UNSIGNED 32  EAX ZZ sub     eax, cs:dword_6CB4D0 
-            477c8e      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EBP ZZ add     ebp, 7 
+            477c80      6 INSTR CHECK UNDERFLOW UNSIGNED 32  RAX ZZ sub     eax, cs:dword_6CB4D0 
+            477c8e      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RBP ZZ add     ebp, 7 
             477cba    103 FUNC RETURNTYPE RAX 1
             477cba    103 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             477d21     36 FUNC RETURNTYPE RAX 0
             477d21     36 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             477d45    318 FUNC RETURNTYPE RAX 0
             477d45    318 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            477e33      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   esi, bl 
-            477e3d      3 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, 40h 
-            477e47      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   edi, bl         ; c 
+            477e33      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BL ZZ IDIOM 5 movzx   esi, bl 
+            477e3d      3 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, 40h 
+            477e47      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BL ZZ IDIOM 5 movzx   edi, bl         ; c 
             477e83     64 FUNC RETURNTYPE RAX 0
             477e83     64 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             477ec3    218 FUNC RETURNTYPE RAX 0
@@ -5699,7 +5699,7 @@
             478644      5 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 0 
             478649   1018 FUNC RETURNTYPE RAX 0
             478649   1018 FUNC INARGS    2  ARG0 0 ARG1 4 
-            47881e      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ inc     edi 
+            47881e      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ inc     edi 
             478a43     17 FUNC RETURNTYPE RAX 0
             478a43     17 FUNC INARGS    4  ARG0 1 ARG1 0 ARG2 0 ARG3 0 
             478a54    933 FUNC RETURNTYPE RAX 1
@@ -5719,7 +5719,7 @@
             47931d      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 imul    rsi, rax        ; offset 
             47950e    816 FUNC RETURNTYPE RAX 1
             47950e    816 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            47979e      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, eax 
+            47979e      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, eax 
             4797da      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDI ZZ sub     rdi, [rsp+0E8h+var_C0] 
             47983e     34 FUNC RETURNTYPE RAX 0
             47983e     34 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -5898,14 +5898,14 @@
             47d9f1    384 FUNC RETURNTYPE RAX 1
             47d9f1    384 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             47d9f1    384 FUNC PROBLEM sub_47D9F1 CALLUNRESOLVED 
-            47da9c      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 9 sub     esi, 30h 
+            47da9c      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 9 sub     esi, 30h 
             47dae3      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RSI ZZ sub     rsi, r12 
-            47daef      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ inc     esi 
+            47daef      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ inc     esi 
             47dafb      3 INSTR CHECK OVERFLOW UNSIGNED 32 ESI ZZ IDIOM 33 imul    esi, eax 
             47db71   2254 FUNC RETURNTYPE RAX 1
             47db71   2254 FUNC INARGS    2  ARG0 0 ARG1 4 
             47db71   2254 FUNC PROBLEM sub_47DB71 CALLUNRESOLVED 
-            47e279      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, edi 
+            47e279      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, edi 
             47e2c7      3 INSTR CHECK UNDERFLOW SIGNED 64  RDI ZZ sub     rdi, r13 
             47e386      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDI+RCX ZZ lea     rsi, [rdi+rcx-1] 
             47e386      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDI+RCX+-1 ZZ lea     rsi, [rdi+rcx-1] 
@@ -5922,10 +5922,10 @@
             47e538    528 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 4 ARG5 0 
             47e748    874 FUNC RETURNTYPE RAX 1
             47e748    874 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            47e869      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   edi, al         ; c 
+            47e869      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 8 AL ZZ IDIOM 5 movzx   edi, al         ; c 
             47e950      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+1 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rdi+1] 
             47e99b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+4 ZZ lea     edi, [r13+4] 
-            47ea2a      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   edi, al         ; c 
+            47ea2a      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 8 AL ZZ IDIOM 5 movzx   edi, al         ; c 
             47eab2     18 FUNC RETURNTYPE RAX 0
             47eab2     18 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47eac4     57 FUNC RETURNTYPE RAX 4
@@ -5953,9 +5953,9 @@
             47f26b     34 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47f28d    556 FUNC RETURNTYPE RAX 4
             47f28d    556 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            47f33f      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, 9 
+            47f33f      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, 9 
             47f3fc      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RDI ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rdi] 
-            47f400      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, r8d 
+            47f400      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, r8d 
             47f4b9    696 FUNC RETURNTYPE RAX 1
             47f4b9    696 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47f771    898 FUNC RETURNTYPE RAX 1
@@ -6049,8 +6049,8 @@
             481c67      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDX ZZ sub     rdx, r12        ; nbytes 
             481e48    379 FUNC RETURNTYPE RAX 0
             481e48    379 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            481eb7      2 INSTR CHECK UNDERFLOW SIGNED 32  EDI ZZ sub     edi, ebp 
-            481eb9      3 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, r12d 
+            481eb7      2 INSTR CHECK UNDERFLOW SIGNED 32  RDI ZZ sub     edi, ebp 
+            481eb9      3 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, r12d 
             481fc3     72 FUNC RETURNTYPE RAX 1
             481fc3     72 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             48200b     67 FUNC RETURNTYPE RAX 0
@@ -6078,7 +6078,7 @@
             482aad      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R15+1 ZZ lea     r14d, [r15+1] 
             482caf    646 FUNC RETURNTYPE RAX 1
             482caf    646 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            482d74      4 INSTR CHECK TRUNCATION UNSIGNED 32 EBP 8 BPL ZZ IDIOM 5 movzx   esi, bpl        ; c 
+            482d74      4 INSTR CHECK TRUNCATION UNSIGNED 32 RBP 8 BPL ZZ IDIOM 5 movzx   esi, bpl        ; c 
             482f35      3 FUNC RETURNTYPE RAX 1
             482f35      3 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             482f38     89 FUNC RETURNTYPE RAX 0
@@ -6099,8 +6099,8 @@
             483332    369 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4834a3    271 FUNC RETURNTYPE RAX 1
             4834a3    271 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4834f9      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ IDIOM 19 sub     eax, ebx 
-            483555      3 INSTR CHECK UNDERFLOW SIGNED 32  EDI ZZ sub     edi, 4 
+            4834f9      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ IDIOM 19 sub     eax, ebx 
+            483555      3 INSTR CHECK UNDERFLOW SIGNED 32  RDI ZZ sub     edi, 4 
             483572      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, rbx        ; n 
             4835b2    379 FUNC RETURNTYPE RAX 0
             4835b2    379 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -6135,7 +6135,7 @@
             483d93    116 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             483e07    349 FUNC RETURNTYPE RAX 1
             483e07    349 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            483f42      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   edx, al 
+            483f42      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 8 AL ZZ IDIOM 5 movzx   edx, al 
             483f42      3 INSTR CHECK SIGNEDNESS SIGNED 8 AL ZZ IDIOM 20 movzx   edx, al 
             483f64     31 FUNC RETURNTYPE RAX 1
             483f64     31 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -6194,9 +6194,9 @@
             485379   1943 FUNC RETURNTYPE RAX 0
             485379   1943 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             485560      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RBX*8 ZZ lea     rdi, ds:0[rbx*8] 
-            485646      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, ebp 
+            485646      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 sub     esi, ebp 
             485673      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+2 ZZ lea     esi, [r13+2] 
-            4859e1      4 INSTR CHECK TRUNCATION UNSIGNED 32 EDI 8 DIL ZZ IDIOM 5 movzx   edi, dil 
+            4859e1      4 INSTR CHECK TRUNCATION UNSIGNED 32 RDI 8 DIL ZZ IDIOM 5 movzx   edi, dil 
             485b1b    170 FUNC RETURNTYPE RAX 0
             485b1b    170 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             485bc5    167 FUNC RETURNTYPE RAX 1
@@ -6306,12 +6306,12 @@
             486d62     38 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             486d88    799 FUNC RETURNTYPE RAX 1
             486d88    799 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
-            486ec7      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r15d 
-            486efb      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, eax 
+            486ec7      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r15d 
+            486efb      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, eax 
             486f52      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+1 ZZ lea     edx, [rbx+1] 
             486f7b      7 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+RAX ZZ lea     esi, [rbx+rax+80h] 
             486f7b      7 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+RAX+128 ZZ lea     esi, [rbx+rax+80h] 
-            486f9a      4 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ IDIOM 21 add     edx, [rsp+88h+var_3C] 
+            486f9a      4 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ IDIOM 21 add     edx, [rsp+88h+var_3C] 
             486fa8      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+RSI ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+rsi]  ; buf 
             487024      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+RSI ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+rsi] 
             4870a7     17 FUNC RETURNTYPE RAX 4
@@ -6335,7 +6335,7 @@
             4879ad    676 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             487c51    351 FUNC RETURNTYPE RAX 0
             487c51    351 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            487d04      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ inc     edx 
+            487d04      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ inc     edx 
             487db0    148 FUNC RETURNTYPE RAX 4
             487db0    148 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             487e44    229 FUNC RETURNTYPE RAX 4
@@ -6348,7 +6348,7 @@
             488187      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 21h 
             4881be      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+28h]  ; src 
             488217      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 8 
-            488680      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ inc     edi 
+            488680      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ inc     edi 
             488eb1   1094 FUNC RETURNTYPE RAX 0
             488eb1   1094 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             489079      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+1] 
@@ -6358,7 +6358,7 @@
             4892f7    534 FUNC RETURNTYPE RAX 4
             4892f7    534 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
             489423      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R15+RDI ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+rdi]  ; s 
-            489456      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, eax 
+            489456      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, eax 
             48945d      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+R12 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+r12]  ; s 
             48947f      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R15+R12 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+r12] 
             4894e8      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R14+1 ZZ lea     esi, [r14+1] 
@@ -6371,7 +6371,7 @@
             4895c8    638 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 1 ARG3 1 ARG4 1 ARG5 1 
             489661      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBX+RAX ZZ lea     esi, [rbx+rax] 
             489719      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBX+RAX ZZ lea     esi, [rbx+rax] 
-            48971c      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, ebp 
+            48971c      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, ebp 
             4897be      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBP+RAX ZZ lea     esi, [rbp+rax+0] 
             4897d3      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+RDI ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+rdi]  ; dest 
             489846   1687 FUNC RETURNTYPE RAX 4
@@ -6395,23 +6395,23 @@
             48a316   2029 FUNC RETURNTYPE RAX 4
             48a316   2029 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
             48a3e4      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, 30h 
-            48a463      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 2 
-            48a528      4 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, [rsp+0F8h+var_AC] 
+            48a463      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 2 
+            48a528      4 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, [rsp+0F8h+var_AC] 
             48a585      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 10h        ; base 
-            48a6a1      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 2 
-            48a6c7      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ inc     edi 
-            48a73c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 2 
+            48a6a1      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 2 
+            48a6c7      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ inc     edi 
+            48a73c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 2 
             48a8a0      4 INSTR CHECK OVERFLOW SIGNED 64 RAX ZZ imul    rax, 0Ch 
             48a90f      4 INSTR CHECK OVERFLOW SIGNED 64 RSI ZZ imul    rsi, 0Ch 
             48aa5b      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 10h 
             48ab03    213 FUNC RETURNTYPE RAX 1
             48ab03    213 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 1 ARG5 0 
-            48ab95      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EBP ZZ inc     ebp 
+            48ab95      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RBP ZZ inc     ebp 
             48abd8   1371 FUNC RETURNTYPE RAX 1
             48abd8   1371 FUNC INARGS    6  ARG0 8 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            48ae2c      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, [rcx+0Ch] 
+            48ae2c      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, [rcx+0Ch] 
             48aeb4      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RAX+1 ZZ lea     edx, [rax+1] 
-            48b02f      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ dec     ecx 
+            48b02f      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ dec     ecx 
             48b0f3      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RDI ZZ IDIOM 15 lea     rdi, [rbx+rdi] 
             48b133   1517 FUNC RETURNTYPE RAX 1
             48b133   1517 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -6419,7 +6419,7 @@
             48b4a8      7 INSTR CHECK OVERFLOW UNSIGNED 64 RDX ZZ IDIOM 33 imul    rdx, rbx, 90h 
             48b4c1      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+RBP ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdx+rbp+20h]; stat_buf 
             48b4c1      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+RBP+32 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdx+rbp+20h]; stat_buf 
-            48b50b      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r14d 
+            48b50b      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r14d 
             48b516      7 INSTR CHECK OVERFLOW SIGNED 64 RDX ZZ imul    rdx, 90h 
             48b51d      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+RBP ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdx+rbp+20h]; stat_buf 
             48b51d      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+RBP+32 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdx+rbp+20h]; stat_buf 
@@ -6443,29 +6443,29 @@
             48b99f    545 FUNC RETURNTYPE RAX 1
             48b99f    545 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             48ba4d      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 RBX ZZ mov     rdx, rbx        ; n 
-            48bafc      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [r12+8] 
+            48bafc      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [r12+8] 
             48bbc0     87 FUNC RETURNTYPE RAX 96
             48bbc0     87 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             48bc17    136 FUNC RETURNTYPE RAX 64
             48bc17    136 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
-            48bc5e      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EBX ZZ IDIOM 19 sub     ebx, eax 
+            48bc5e      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RBX ZZ IDIOM 19 sub     ebx, eax 
             48bc9f    182 FUNC RETURNTYPE RAX 0
             48bc9f    182 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             48bd55    405 FUNC RETURNTYPE RAX 1
             48bd55    405 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
-            48be48      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EAX ZZ IDIOM 31 sub     eax, 30h 
+            48be48      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RAX ZZ IDIOM 31 sub     eax, 30h 
             48beea    219 FUNC RETURNTYPE RAX 1
             48beea    219 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             48bfc5   2699 FUNC RETURNTYPE RAX 1
             48bfc5   2699 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             48c359      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+-97 ZZ lea     eax, [rdx-61h] 
-            48c492      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ inc     esi 
+            48c492      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ inc     esi 
             48c525      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+1]    ; s 
             48c71e      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RDI+RAX ZZ lea     rdi, [rdi+rax+18h] 
             48c71e      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RDI+RAX+24 ZZ lea     rdi, [rdi+rax+18h] 
             48c903      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+20 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+14h]  ; buf 
-            48c9bd      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDI ZZ dec     edi 
-            48ca07      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ inc     edi 
+            48c9bd      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDI ZZ dec     edi 
+            48ca07      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ inc     edi 
             48ca50     40 FUNC RETURNTYPE RAX 0
             48ca50     40 FUNC INARGS    6  ARG0 4 ARG1 2 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             48ca50     40 FUNC PROBLEM sub_48CA50 CALLUNRESOLVED 
@@ -6502,9 +6502,9 @@
             48d6a6    129 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             48d727    142 FUNC RETURNTYPE RAX 0
             48d727    142 FUNC INARGS    2  ARG0 4 ARG1 4 
-            48d790      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ IDIOM 19 sub     esi, ecx 
-            48d795      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, eax 
-            48d797      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, ebp 
+            48d790      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ IDIOM 19 sub     esi, ecx 
+            48d795      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, eax 
+            48d797      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, ebp 
             48d7b5   1261 FUNC RETURNTYPE RAX 4
             48d7b5   1261 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             48d8ac      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rax+8] 
@@ -6577,18 +6577,18 @@
             48eeb4     98 FUNC RETURNTYPE RAX 4
             48eeb4     98 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             48eecf      4 INSTR CHECK OVERFLOW SIGNED 32 EDI ZZ imul    edi, r12d 
-            48eed3      3 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, 8 
+            48eed3      3 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, 8 
             48ef16     49 FUNC RETURNTYPE RAX 0
             48ef16     49 FUNC INARGS    6  ARG0 8 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             48ef47    155 FUNC RETURNTYPE RAX 4
             48ef47    155 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             48ef94      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     edx, eax 
-            48ef99      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, esi 
+            48ef99      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, esi 
             48efe2    114 FUNC RETURNTYPE RAX 4
             48efe2    114 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             48f054    198 FUNC RETURNTYPE RAX 0
             48f054    198 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            48f08f      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, eax 
+            48f08f      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, eax 
             48f094      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+RCX ZZ lea     esi, [rdx+rcx+2800h] 
             48f094      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+RCX+10240 ZZ lea     esi, [rdx+rcx+2800h] 
             48f0e8      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+R12 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+r12+0]; dest 
@@ -6659,8 +6659,8 @@
             48fb08    358 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             48fc6e    334 FUNC RETURNTYPE RAX 4
             48fc6e    334 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            48fd03      2 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 32 EAX ZZ IDIOM 30 mov     esi, eax 
-            48fd0b      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, r12d 
+            48fd03      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ IDIOM 30 mov     esi, eax 
+            48fd0b      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 sub     esi, r12d 
             48fd70      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDI ZZ dec     rdi 
             48fdbc     47 FUNC RETURNTYPE RAX 1
             48fdbc     47 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
@@ -6688,12 +6688,12 @@
             48fed1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+60 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+3Ch] 
             48ff98      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+RSI ZZ IDIOM 18 MEMORYSINK lea     rsi, [r13+rsi+0]; src 
             48ffe5      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+RDI ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+rdi+0]; s 
-            48ffea      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, ecx        ; n 
+            48ffea      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, ecx        ; n 
             48ffff      5 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, [rsp+58h+s]; n 
             4900e2      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+RSI ZZ IDIOM 18 MEMORYSINK lea     rsi, [r13+rsi+0] 
             49015c     35 FUNC RETURNTYPE RAX 1
             49015c     35 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
-            49016c      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDI ZZ dec     edi 
+            49016c      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDI ZZ dec     edi 
             49017f     65 FUNC RETURNTYPE RAX 1
             49017f     65 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             490196      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 3E0h 
@@ -6703,7 +6703,7 @@
             490254     85 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4902a9    199 FUNC RETURNTYPE RAX 4
             4902a9    199 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
-            490316      2 INSTR CHECK UNDERFLOW SIGNED 32  EBX ZZ dec     ebx 
+            490316      2 INSTR CHECK UNDERFLOW SIGNED 32  RBX ZZ dec     ebx 
             490370    505 FUNC RETURNTYPE RAX 0
             490370    505 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             4903de      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RSI ZZ dec     rsi 
@@ -6712,7 +6712,7 @@
             490569     69 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4905ae    410 FUNC RETURNTYPE RAX 4
             4905ae    410 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            490683      4 INSTR CHECK TRUNCATION UNSIGNED 32 EBP 8 BPL ZZ IDIOM 5 movzx   esi, bpl 
+            490683      4 INSTR CHECK TRUNCATION UNSIGNED 32 RBP 8 BPL ZZ IDIOM 5 movzx   esi, bpl 
             490748    170 FUNC RETURNTYPE RAX 1
             490748    170 FUNC INARGS    6  ARG0 8 ARG1 1 ARG2 8 ARG3 4 ARG4 0 ARG5 0 
             490766      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+10240 ZZ lea     edi, [r12+2800h] 
@@ -6754,16 +6754,16 @@
             491426      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 RBX ZZ mov     rdx, rbx        ; n 
             4914fc   4808 FUNC RETURNTYPE RAX 4
             4914fc   4808 FUNC INARGS    6  ARG0 96 ARG1 4 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
-            49164d      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, [rbp+44h] 
+            49164d      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, [rbp+44h] 
             491aaa      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+1208 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+4B8h] 
             491bad      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ inc     rsi 
             491bf3      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ inc     rsi 
             491d0b      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 8 AL ZZ IDIOM 5 movzx   edx, al 
             492149      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDX ZZ dec     rdx 
-            492205      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ inc     esi 
+            492205      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ inc     esi 
             492294      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 8 AL ZZ IDIOM 5 movzx   edx, al 
-            49248f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, [rbp+44h] 
-            492600      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ dec     esi 
+            49248f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, [rbp+44h] 
+            492600      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ dec     esi 
             4927c4    526 FUNC RETURNTYPE RAX 1
             4927c4    526 FUNC INARGS    6  ARG0 8 ARG1 8 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             4929d2    877 FUNC RETURNTYPE RAX 96
@@ -6780,11 +6780,11 @@
             492fea     17 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             492ffb    150 FUNC RETURNTYPE RAX 4
             492ffb    150 FUNC INARGS    6  ARG0 1 ARG1 2 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
-            49301a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 2 
+            49301a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 2 
             493091   1734 FUNC RETURNTYPE RAX 4
             493091   1734 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
-            493192      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ inc     esi 
-            49319b      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 2 
+            493192      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ inc     esi 
+            49319b      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 2 
             4933bc      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 8 
             493449      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+16 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+10h] 
             49350e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+20 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+14h] 
@@ -6840,7 +6840,7 @@
             494683    872 FUNC PROBLEM sub_494683 CALLUNRESOLVED 
             4947a5      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15+1 ZZ lea     edi, [r15+1] 
             4947e3      6 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RAX+-384 ZZ lea     edx, [rax-180h] 
-            494826      6 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, 0FFh 
+            494826      6 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, 0FFh 
             4949eb    120 FUNC RETURNTYPE RAX 4
             4949eb    120 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             494a63    296 FUNC RETURNTYPE RAX 4
@@ -6872,7 +6872,7 @@
             49575c      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBX+1 ZZ lea     edx, [rbx+1]    ; n 
             495784    401 FUNC RETURNTYPE RAX 0
             495784    401 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            4958bb      4 INSTR CHECK TRUNCATION UNSIGNED 32 EDI 8 DIL ZZ IDIOM 5 movzx   edi, dil 
+            4958bb      4 INSTR CHECK TRUNCATION UNSIGNED 32 RDI 8 DIL ZZ IDIOM 5 movzx   edi, dil 
             495915    292 FUNC RETURNTYPE RAX 0
             495915    292 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
             495a39    110 FUNC RETURNTYPE RAX 1
@@ -6974,7 +6974,7 @@
             497134      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+1] 
             49716c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+1] 
             4971b1      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 32 EBX ZZ IDIOM 30 mov     esi, ebx 
-            4971b3      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, edi 
+            4971b3      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 sub     esi, edi 
             497207    257 FUNC RETURNTYPE RAX 0
             497207    257 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             497308   1144 FUNC RETURNTYPE RAX 96
@@ -7137,13 +7137,13 @@
             49a5a5     24 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             49a5bd    623 FUNC RETURNTYPE RAX 1
             49a5bd    623 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            49a5f3      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ inc     edx 
+            49a5f3      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ inc     edx 
             49a5f5      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBX 32 EBX ZZ mov     esi, ebx 
             49a62f      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+1 ZZ lea     edx, [r12+1] 
             49a6aa      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDI+RDX ZZ IDIOM 32 lea     edx, [rdi+rdx+1] 
             49a6aa      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDI+RDX+1 ZZ IDIOM 32 lea     edx, [rdi+rdx+1] 
-            49a733      2 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ inc     edx 
-            49a800      2 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ inc     edx 
+            49a733      2 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ inc     edx 
+            49a800      2 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ inc     edx 
             49a82c     59 FUNC RETURNTYPE RAX 0
             49a82c     59 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             49a867     53 FUNC RETURNTYPE RAX 0
@@ -7157,10 +7157,10 @@
             49aa2f    829 FUNC RETURNTYPE RAX 1
             49aa2f    829 FUNC INARGS    6  ARG0 16 ARG1 0 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             49abbd      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 RBP ZZ mov     rdx, rbp        ; n 
-            49ad14      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ inc     esi 
+            49ad14      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ inc     esi 
             49ad6c     56 FUNC RETURNTYPE RAX 1
             49ad6c     56 FUNC INARGS    6  ARG0 96 ARG1 0 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
-            49ad81      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ dec     edx 
+            49ad81      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ dec     edx 
             49ada4    143 FUNC RETURNTYPE RAX 1
             49ada4    143 FUNC INARGS    6  ARG0 8 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             49ae0c      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBP+-1 ZZ lea     edx, [rbp-1] 
@@ -7172,11 +7172,11 @@
             49ae50      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+RAX+2 ZZ lea     rdi, [rax+rax+2] 
             49ae94    841 FUNC RETURNTYPE RAX 1
             49ae94    841 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            49aff6      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, r12d 
+            49aff6      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 19 sub     esi, r12d 
             49b0ed      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+2 ZZ lea     esi, [rax+2] 
             49b1dd    158 FUNC RETURNTYPE RAX 96
             49b1dd    158 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            49b230      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, eax 
+            49b230      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ sub     ecx, eax 
             49b242      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     esi, [rax+1] 
             49b27b     10 FUNC RETURNTYPE RAX 96
             49b27b     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 4 ARG3 96 
@@ -7207,26 +7207,26 @@
             49b4ea     49 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             49b51b   1022 FUNC RETURNTYPE RAX 4
             49b51b   1022 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            49b5f3      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, eax 
+            49b5f3      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, eax 
             49b7cb      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, r14 
             49b8d0      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     esi, eax 
-            49b8da      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, ebx 
+            49b8da      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, ebx 
             49b919     99 FUNC RETURNTYPE RAX 0
             49b919     99 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            49b95b      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, eax 
+            49b95b      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, eax 
             49b97c   2739 FUNC RETURNTYPE RAX 1
             49b97c   2739 FUNC INARGS    6  ARG0 96 ARG1 16 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
-            49bcff      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, eax 
+            49bcff      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, eax 
             49bd01      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RSI*4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rdi+rsi*4]; src 
             49bd01      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+RSI*4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rdi+rsi*4]; src 
-            49bd08      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ inc     edx 
+            49bd08      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ inc     edx 
             49bd32      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+-1 ZZ lea     edx, [rax-1] 
             49bd57      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+-1 ZZ lea     edx, [rax-1] 
-            49bed4      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, [rbp+24h] 
-            49bf35      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, [rbp+24h] 
+            49bed4      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, [rbp+24h] 
+            49bf35      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, [rbp+24h] 
             49c112      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, [rbp+30h]  ; src 
             49c11a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RSI+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rsi+4]    ; dest 
-            49c15c      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ dec     esi 
+            49c15c      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ dec     esi 
             49c42f     44 FUNC RETURNTYPE RAX 1
             49c42f     44 FUNC INARGS    6  ARG0 96 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             49c45b     34 FUNC RETURNTYPE RAX 0
@@ -7312,7 +7312,7 @@
             49d6f4    143 FUNC RETURNTYPE RAX 1
             49d6f4    143 FUNC INARGS    1  ARG0 4 
             49d741      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+RAX ZZ lea     eax, [rdx+rax] 
-            49d74b      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ inc     esi 
+            49d74b      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ inc     esi 
             49d783     59 FUNC RETURNTYPE RAX 4
             49d783     59 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             49d7be     52 FUNC RETURNTYPE RAX 1
@@ -7324,7 +7324,7 @@
             49d834    306 FUNC RETURNTYPE RAX 1
             49d834    306 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 4 ARG4 0 ARG5 0 
             49d858      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+-1 ZZ lea     edx, [r13-1] 
-            49d885      2 INSTR CHECK UNDERFLOW SIGNED 32  EBX ZZ dec     ebx 
+            49d885      2 INSTR CHECK UNDERFLOW SIGNED 32  RBX ZZ dec     ebx 
             49d908      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+RBX ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+rbx+0]; dest 
             49d966     53 FUNC RETURNTYPE RAX 0
             49d966     53 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -7389,7 +7389,7 @@
             49ef83      5 INSTR MEMSET STACKOFFSET_ESP 96 SIZE 544 ZZ call    _memset 
             49efc8   1179 FUNC RETURNTYPE RAX 4
             49efc8   1179 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 4 ARG3 4 
-            49f233      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EAX ZZ inc     eax 
+            49f233      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RAX ZZ inc     eax 
             49f364      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 32 EBX ZZ mov     ecx, ebx 
             49f41c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+2 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+2] 
             49f42d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+6 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+6] 
@@ -7522,7 +7522,7 @@
             4a0fbe      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 8 ARG3 96 
             4a0fc3    105 FUNC RETURNTYPE RAX 4
             4a0fc3    105 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 0 
-            4a0fd5      2 INSTR CHECK OVERFLOW SIGNED 32  EAX ZZ add     eax, eax 
+            4a0fd5      2 INSTR CHECK OVERFLOW SIGNED 32  RAX ZZ add     eax, eax 
             4a102c     87 FUNC RETURNTYPE RAX 1
             4a102c     87 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4a1083     37 FUNC RETURNTYPE RAX 1
@@ -7658,15 +7658,15 @@
             4a2529     10 FUNC RETURNTYPE RAX 4
             4a2529     10 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4a2529     10 FUNC PROBLEM sub_4A2529 CHUNKS CALLUNRESOLVED 
-            4a24eb      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 4 
+            4a24eb      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 4 
             4a2533     10 FUNC RETURNTYPE RAX 4
             4a2533     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             4a253d    629 FUNC RETURNTYPE RAX 4
             4a253d    629 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4a25ca      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1 ZZ IDIOM 18 MEMORYSINK lea     edx, [rbx+1] 
-            4a25d0      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ IDIOM 18 MEMORYSINK sub     edx, r12d 
+            4a25d0      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ IDIOM 18 MEMORYSINK sub     edx, r12d 
             4a25ff      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+1] 
-            4a275a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 4 
+            4a275a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 4 
             4a2778      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+4] 
             4a27b2     12 FUNC RETURNTYPE RAX 0
             4a27be     12 FUNC RETURNTYPE RAX 0
@@ -7756,7 +7756,7 @@
             4a3486      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+80 ZZ lea     rdx, [rax+50h] 
             4a34a2    273 FUNC RETURNTYPE RAX 1
             4a34a2    273 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
-            4a34dd      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ IDIOM 18 MEMORYSINK sub     edx, ebx 
+            4a34dd      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ IDIOM 18 MEMORYSINK sub     edx, ebx 
             4a35b3     33 FUNC RETURNTYPE RAX 1
             4a35b3     33 FUNC INARGS    6  ARG0 8 ARG1 1 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             4a35d4    124 FUNC RETURNTYPE RAX 4
diff --git a/tests/commit/save-bzip2.psexe.infoannot b/tests/commit/save-bzip2.psexe.infoannot
index a1a8f0d9..8318aaca 100644
--- a/tests/commit/save-bzip2.psexe.infoannot
+++ b/tests/commit/save-bzip2.psexe.infoannot
@@ -122,7 +122,7 @@
             402090     61 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4020d0    432 FUNC RETURNTYPE RAX 0
             4020d0    432 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4021b3      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            4021b3      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             402280     45 FUNC RETURNTYPE RAX 0
             402280     45 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4022b0     40 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id b/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
index 05a9deeb..7df35219 100644
--- a/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
+++ b/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
@@ -1 +1 @@
-0bacb4250e6dc0c9fa5be461a383fbfea8222492
\ No newline at end of file
+0ea988185f899c1e9980219b3e85f123b8eecbde
\ No newline at end of file
diff --git a/tests/commit/save-firefox-bin.psexe.infoannot b/tests/commit/save-firefox-bin.psexe.infoannot
index cdb13dc7..e53fdc32 100644
--- a/tests/commit/save-firefox-bin.psexe.infoannot
+++ b/tests/commit/save-firefox-bin.psexe.infoannot
@@ -158,10 +158,10 @@
             403ea0    586 FUNC RETURNTYPE RAX 96
             403ea0    586 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             404035      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RBP ZZ IDIOM 31 sub     rbp, 4 
-            404061      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, ebp 
+            404061      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, ebp 
             4040f0    362 FUNC RETURNTYPE RAX 96
             4040f0    362 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4041f2      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
+            4041f2      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
             404260    233 FUNC RETURNTYPE RAX 1
             404260    233 FUNC INARGS    2  ARG0 4 ARG1 4 
             404350    702 FUNC RETURNTYPE RAX 1
@@ -171,13 +171,13 @@
             404750    663 FUNC RETURNTYPE RAX 0
             404750    663 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4048cd      3 INSTR CHECK OVERFLOW SIGNED 64  R12 ZZ add     r12d, r13d 
-            4048d0      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, r15d 
+            4048d0      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, r15d 
             4048ef      4 INSTR CHECK UNDERFLOW UNSIGNED 64  R9 ZZ IDIOM 31 sub     r9, 4 
             404904      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+1 ZZ lea     ecx, [r13+1] 
             404972      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+R15 ZZ lea     edi, [r13+r15+0] 
             4049f0    102 FUNC RETURNTYPE RAX 16
             4049f0    102 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 4 ARG3 4 ARG4 96 ARG5 1 
-            4049f0      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 3Fh 
+            4049f0      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 3Fh 
             404a60    110 FUNC RETURNTYPE RAX 1
             404a60    110 FUNC INARGS    2  ARG0 4 ARG1 4 
             404ad0    143 FUNC RETURNTYPE RAX 16
@@ -194,21 +194,21 @@
             404cfa      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [r9]       ; dest 
             404d51      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R11 ZZ add     r11d, 1 
             404d76      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R14 ZZ add     r14d, 1 
-            404dc4      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
+            404dc4      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
             404de0    466 FUNC RETURNTYPE RAX 96
             404de0    466 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 4 ARG3 1 ARG4 4 ARG5 4 
             404fc0    239 FUNC RETURNTYPE RAX 1
             404fc0    239 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4050b0   3107 FUNC RETURNTYPE RAX 1
             4050b0   3107 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 4 ARG3 1 ARG4 4 ARG5 0 
-            4051a2      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ IDIOM 1 sub     ecx, r13d 
-            4051c5      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, eax 
-            4051c7      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDI ZZ sub     edi, eax 
-            4058d4      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 15 sub     esi, r13d 
-            4058e0      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDI ZZ IDIOM 15 sub     edi, r13d 
+            4051a2      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ IDIOM 1 sub     ecx, r13d 
+            4051c5      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, eax 
+            4051c7      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDI ZZ sub     edi, eax 
+            4058d4      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 15 sub     esi, r13d 
+            4058e0      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDI ZZ IDIOM 15 sub     edi, r13d 
             4059b1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+R15 ZZ lea     rdx, [rdi+r15] 
-            405b19      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 15 sub     esi, eax 
-            405b20      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDI ZZ IDIOM 15 sub     edi, eax 
+            405b19      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 15 sub     esi, eax 
+            405b20      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDI ZZ IDIOM 15 sub     edi, eax 
             405ce0     86 FUNC RETURNTYPE RAX 32
             405ce0     86 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             405ce8      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RSI+1 ZZ lea     rdi, [rsi+1] 
@@ -421,8 +421,8 @@
             40a1e6     21 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40a1fc    407 FUNC RETURNTYPE RAX 4
             40a1fc    407 FUNC INARGS    3  ARG0 4 ARG1 4 ARG2 4 
-            40a220      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ inc     edx 
-            40a2da      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ inc     edx 
+            40a220      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ inc     edx 
+            40a2da      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ inc     edx 
             40a394     52 FUNC RETURNTYPE RAX 8
             40a394     52 FUNC INARGS    6  ARG0 8 ARG1 1 ARG2 16 ARG3 96 ARG4 1 ARG5 1 
             40a3c8     56 FUNC RETURNTYPE RAX 8
@@ -445,7 +445,7 @@
             40a89e     52 FUNC INARGS    6  ARG0 8 ARG1 1 ARG2 1 ARG3 96 ARG4 1 ARG5 1 
             40a8d2    168 FUNC RETURNTYPE RAX 0
             40a8d2    168 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40a901      2 INSTR CHECK OVERFLOW SIGNED 32  EAX ZZ inc     eax 
+            40a901      2 INSTR CHECK OVERFLOW SIGNED 32  RAX ZZ inc     eax 
             40a97a    757 FUNC RETURNTYPE RAX 0
             40a97a    757 FUNC INARGS    2  ARG0 0 ARG1 4 
             40aa94      4 INSTR CHECK UNDERFLOW SIGNED 64  R11 ZZ sub     r11d, 30h       ; jumptable 000000000040A9D9 case 4 
@@ -454,7 +454,7 @@
             40ac70    103 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40acd8    217 FUNC RETURNTYPE RAX 8
             40acd8    217 FUNC INARGS    6  ARG0 8 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40ad07      2 INSTR CHECK OVERFLOW SIGNED 32  EAX ZZ inc     eax 
+            40ad07      2 INSTR CHECK OVERFLOW SIGNED 32  RAX ZZ inc     eax 
             40adb2    112 FUNC RETURNTYPE RAX 8
             40adb2    112 FUNC INARGS    6  ARG0 8 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             40ae22    113 FUNC RETURNTYPE RAX 1
@@ -471,7 +471,7 @@
             40afd4     95 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40b034    214 FUNC RETURNTYPE RAX 8
             40b034    214 FUNC INARGS    6  ARG0 8 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40b063      2 INSTR CHECK OVERFLOW SIGNED 32  EAX ZZ inc     eax 
+            40b063      2 INSTR CHECK OVERFLOW SIGNED 32  RAX ZZ inc     eax 
             40b10a    300 FUNC RETURNTYPE RAX 8
             40b10a    300 FUNC INARGS    6  ARG0 8 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             40b221      4 INSTR CHECK OVERFLOW UNSIGNED 64  RCX ZZ adc     rcx, 0 
@@ -502,8 +502,8 @@
             40cb9e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+116 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+74h] 
             40cbf6    218 FUNC RETURNTYPE RAX 4
             40cbf6    218 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40cc10      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, r12d 
-            40cc1a      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ inc     edx             ; unsigned int 
+            40cc10      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, r12d 
+            40cc1a      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ inc     edx             ; unsigned int 
             40cc24      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+116 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+74h] 
             40ccd0     10 FUNC RETURNTYPE RAX 0
             40ccd0     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
@@ -516,14 +516,14 @@
             40cdc0     13 FUNC INARGS    4  ARG0 4 ARG1 1 ARG2 4 ARG3 1 
             40cdd0   2385 FUNC RETURNTYPE RAX 1
             40cdd0   2385 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 4 ARG3 1 ARG4 4 ARG5 0 
-            40cef9      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 34h 
-            40cf9d      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ neg     esi 
+            40cef9      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 34h 
+            40cf9d      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ neg     esi 
             40d0a9      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RSI+1 ZZ lea     edi, [rsi+1] 
-            40d191      3 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, r14d 
+            40d191      3 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, r14d 
             40d2de      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R14+1 ZZ lea     r9d, [r14+1] 
-            40d3a3      2 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ neg     edx 
-            40d3e2      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ neg     esi 
-            40d49a      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ neg     esi 
+            40d3a3      2 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ neg     edx 
+            40d3e2      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ neg     esi 
+            40d49a      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ neg     esi 
             40d6a0      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX+1 ZZ lea     ecx, [rdx+1] 
             40d724     57 FUNC RETURNTYPE RAX 1
             40d724     57 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -533,7 +533,7 @@
             40d7b0    109 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 0 
             40d81e    232 FUNC RETURNTYPE RAX 96
             40d81e    232 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40d8d1      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ inc     edi 
+            40d8d1      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ inc     edi 
             40da70     53 FUNC RETURNTYPE RAX 0
             40da70     53 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             40daa6    345 FUNC RETURNTYPE RAX 0
@@ -542,19 +542,19 @@
             40dd40    131 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             40de16    146 FUNC RETURNTYPE RAX 4
             40de16    146 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40de35      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, ebp 
+            40de35      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, ebp 
             40dea8    211 FUNC RETURNTYPE RAX 4
             40dea8    211 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
-            40dece      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, edx 
-            40ded5      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ inc     edi 
-            40ded7      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDI ZZ sub     edi, edx 
+            40dece      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, edx 
+            40ded5      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ inc     edi 
+            40ded7      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDI ZZ sub     edi, edx 
             40df7c    119 FUNC RETURNTYPE RAX 4
             40df7c    119 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40e000     97 FUNC RETURNTYPE RAX 4
             40e000     97 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             40e070     63 FUNC RETURNTYPE RAX 96
             40e070     63 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40e08c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
+            40e08c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
             40e0b0    362 FUNC RETURNTYPE RAX 96
             40e0b0    362 FUNC INARGS    5  ARG0 4 ARG1 1 ARG2 1 ARG3 0 ARG4 0 
             40e11f      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RAX+2 ZZ lea     edi, [rax+2] 
@@ -578,16 +578,16 @@
             40e575      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+-1 ZZ IDIOM 32 lea     rdx, [rcx-1] 
             40e596    256 FUNC RETURNTYPE RAX 4
             40e596    256 FUNC INARGS    5  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 4 
-            40e5c7      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ dec     edx 
+            40e5c7      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ dec     edx 
             40e5c9      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK inc     rsi 
-            40e67f      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r8d 
+            40e67f      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r8d 
             40e685      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, r9 
             40e6a0    370 FUNC RETURNTYPE RAX 1
             40e6a0    370 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
-            40e7f8      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, 1 
+            40e7f8      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ sub     ecx, 1 
             40e812    342 FUNC RETURNTYPE RAX 1
             40e812    342 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            40e951      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ dec     ecx 
+            40e951      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ dec     ecx 
             40e968    277 FUNC RETURNTYPE RAX 1
             40e968    277 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             40ea7e   2750 FUNC RETURNTYPE RAX 1
@@ -612,8 +612,8 @@
             40fb98      3 INSTR CHECK OVERFLOW SIGNED 64  R9 ZZ inc     r9 
             40fbf8    180 FUNC RETURNTYPE RAX 1
             40fbf8    180 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 1 ARG4 1 ARG5 0 
-            40fc66      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ neg     esi 
-            40fc87      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ neg     esi 
+            40fc66      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ neg     esi 
+            40fc87      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ neg     esi 
             40fcac    146 FUNC RETURNTYPE RAX 0
             40fcac    146 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 4 ARG4 4 ARG5 4 
             40fd3e     96 FUNC RETURNTYPE RAX 0
@@ -702,14 +702,14 @@
             414435      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RAX ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+20h] 
             414435      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RAX+32 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+20h] 
             414583      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+63 ZZ IDIOM 15 lea     rcx, [rdx+3Fh] 
-            414660      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ IDIOM 1 sub     ecx, [rax+r12*4+34h] 
+            414660      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ IDIOM 1 sub     ecx, [rax+r12*4+34h] 
             4146b3      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+80 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+50h] 
             41478c      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDI ZZ sub     rdi, 0FFFFFFFFFFFFFF80h 
             414850    665 FUNC RETURNTYPE RAX 0
             414850    665 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             414850    665 FUNC PROBLEM sub_414850 CALLUNRESOLVED 
             41490f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+63 ZZ IDIOM 15 lea     rcx, [rdx+3Fh] 
-            4149eb      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ IDIOM 1 sub     ecx, [rax+rbp*4+34h] 
+            4149eb      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ IDIOM 1 sub     ecx, [rax+rbp*4+34h] 
             414af0    382 FUNC RETURNTYPE RAX 0
             414af0    382 FUNC INARGS    4  ARG0 1 ARG1 0 ARG2 0 ARG3 0 
             414af0    382 FUNC PROBLEM sub_414AF0 CALLUNRESOLVED 
@@ -719,12 +719,12 @@
             414c70   2890 FUNC PROBLEM sub_414C70 CALLUNRESOLVED 
             4151dd      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, 0FFFFFh 
             4152aa      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+63 ZZ IDIOM 15 lea     rcx, [rdx+3Fh] 
-            41538b      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ IDIOM 1 sub     ecx, [rax+r12*4+34h] 
+            41538b      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ IDIOM 1 sub     ecx, [rax+r12*4+34h] 
             4157c0    873 FUNC RETURNTYPE RAX 0
             4157c0    873 FUNC INARGS    1  ARG0 1 
             4157c0    873 FUNC PROBLEM sub_4157C0 CALLUNRESOLVED 
             4158d1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+63 ZZ IDIOM 15 lea     rcx, [rdx+3Fh] 
-            4159b1      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ IDIOM 1 sub     ecx, [r11+rbp*4+34h] 
+            4159b1      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ IDIOM 1 sub     ecx, [r11+rbp*4+34h] 
             415b30    429 FUNC RETURNTYPE RAX 4
             415b30    429 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             415bc9      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 50h 
@@ -744,9 +744,9 @@
             415fd5      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDI+RDI ZZ lea     rdx, [rdi+rdi-100000h] 
             415fd5      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDI+RDI+-1048576 ZZ lea     rdx, [rdi+rdi-100000h] 
             416156      4 INSTR CHECK OVERFLOW UNSIGNED 64  RCX ZZ IDIOM 15 add     rcx, 3Fh 
-            41622a      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ IDIOM 1 sub     ecx, [rax+rbx*4+34h] 
+            41622a      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ IDIOM 1 sub     ecx, [rax+rbx*4+34h] 
             4162f6      4 INSTR CHECK OVERFLOW UNSIGNED 64  RCX ZZ IDIOM 15 add     rcx, 3Fh 
-            4163ca      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ IDIOM 1 sub     ecx, [rax+rbx*4+34h] 
+            4163ca      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ IDIOM 1 sub     ecx, [rax+rbx*4+34h] 
             416910    741 FUNC RETURNTYPE RAX 4
             416910    741 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             416b21      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+8] 
diff --git a/tests/commit/save-gedit.psexe.infoannot b/tests/commit/save-gedit.psexe.infoannot
index 72044215..84c70c20 100644
--- a/tests/commit/save-gedit.psexe.infoannot
+++ b/tests/commit/save-gedit.psexe.infoannot
@@ -3372,8 +3372,8 @@
             446a30     10 FUNC RETURNTYPE RAX 96
             446a30     10 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             446a30     10 FUNC PROBLEM gedit_utils_str_middle_truncate CHUNKS 
-            445d5b      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, r14d 
-            445e30      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, r14d 
+            445d5b      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, r14d 
+            445e30      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, r14d 
             446a40      7 FUNC RETURNTYPE RAX 1
             446a40      7 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
             446a50    333 FUNC RETURNTYPE RAX 1
@@ -3391,7 +3391,7 @@
             447070    459 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             447240    241 FUNC RETURNTYPE RAX 1
             447240    241 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4472b0      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, 21h 
+            4472b0      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, 21h 
             447340    144 FUNC RETURNTYPE RAX 1
             447340    144 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4473d0    128 FUNC RETURNTYPE RAX 1
@@ -3659,7 +3659,7 @@
             453040    131 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             453120    689 FUNC RETURNTYPE RAX 96
             453120    689 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            4531c6      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, r15d 
+            4531c6      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, r15d 
             453c70    426 FUNC RETURNTYPE RAX 4
             453c70    426 FUNC INARGS    6  ARG0 96 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             453e20     68 FUNC RETURNTYPE RAX 4
@@ -4574,7 +4574,7 @@
             475280   1317 FUNC RETURNTYPE RAX 0
             475280   1317 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
             47535a      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+1 ZZ lea     rcx, [rax+1] 
-            47552a      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 EAX 8 AL ZZ IDIOM 14 movsx   ecx, al 
+            47552a      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RAX 8 AL ZZ IDIOM 14 movsx   ecx, al 
             47552a      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 AL ZZ IDIOM 20 movsx   ecx, al 
             4757b0     48 FUNC RETURNTYPE RAX 0
             4757b0     48 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -4787,7 +4787,7 @@
             47ac40    153 FUNC RETURNTYPE RAX 0
             47ac40    153 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47ac40    153 FUNC PROBLEM gedit_history_entry_prepend_text CHUNKS 
-            47aad6      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDI ZZ sub     edi, 2 
+            47aad6      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDI ZZ sub     edi, 2 
             47ace0    145 FUNC RETURNTYPE RAX 0
             47ace0    145 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47ad80     97 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id b/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id
index fb5b1b3a..519ab871 100644
--- a/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id
+++ b/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id
@@ -1 +1 @@
-ad46a5e66b693c1a3d55fae6577c15ca04441094
\ No newline at end of file
+5a7b28f89c0bb71f1cd7cfe799fb8e66de97122f
\ No newline at end of file
diff --git a/tests/commit/save-gnome-calculator.psexe.infoannot b/tests/commit/save-gnome-calculator.psexe.infoannot
index aa3acdd8..431e670a 100644
--- a/tests/commit/save-gnome-calculator.psexe.infoannot
+++ b/tests/commit/save-gnome-calculator.psexe.infoannot
@@ -839,7 +839,7 @@
             40f080    167 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             40f130    614 FUNC RETURNTYPE RAX 4
             40f130    614 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40f246      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ IDIOM 1 sub     ecx, r13d 
+            40f246      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ IDIOM 1 sub     ecx, r13d 
             40f3a0      8 FUNC RETURNTYPE RAX 0
             40f3a0      8 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             40f3b0    159 FUNC RETURNTYPE RAX 0
@@ -1064,8 +1064,8 @@
             415ad0    533 FUNC RETURNTYPE RAX 0
             415ad0    533 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             415bc6      3 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, r13 
-            415c51      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [rsp+68h+var_40] 
-            415c58      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, 1 
+            415c51      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [rsp+68h+var_40] 
+            415c58      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, 1 
             415f60    103 FUNC RETURNTYPE RAX 1
             415f60    103 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             416400     56 FUNC RETURNTYPE RAX 1
@@ -1124,7 +1124,7 @@
             417aa0    147 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             417b40    219 FUNC RETURNTYPE RAX 1
             417b40    219 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            417bd9      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ IDIOM 1 sub     ecx, ebp 
+            417bd9      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ IDIOM 1 sub     ecx, ebp 
             417c20    120 FUNC RETURNTYPE RAX 0
             417c20    120 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             417ca0      5 FUNC RETURNTYPE RAX 0
@@ -1300,10 +1300,10 @@
             41c770    188 FUNC INARGS    6  ARG0 8 ARG1 1 ARG2 1 ARG3 8 ARG4 0 ARG5 0 
             41c830   1265 FUNC RETURNTYPE RAX 1
             41c830   1265 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
-            41c96e      7 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, [rsi+rax+18Ch] 
-            41c9d6      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 1 
-            41caf0      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, 1 
-            41cbd3      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
+            41c96e      7 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, [rsi+rax+18Ch] 
+            41c9d6      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 1 
+            41caf0      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, 1 
+            41cbd3      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 1 
             41cd30    100 FUNC RETURNTYPE RAX 1
             41cd30    100 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             41cea0     13 FUNC RETURNTYPE RAX 96
@@ -1459,7 +1459,7 @@
             420bde      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, 1 
             420cd0    306 FUNC RETURNTYPE RAX 1
             420cd0    306 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            420cd1      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1 
+            420cd1      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1 
             420cda      4 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, 1Eh 
             420e10     51 FUNC RETURNTYPE RAX 0
             420e10     51 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1507,10 +1507,10 @@
             4226f2      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R8+RSI ZZ IDIOM 18 MEMORYSINK lea     r10, [r8+rsi+1] 
             4226f2      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R8+RSI+1 ZZ IDIOM 18 MEMORYSINK lea     r10, [r8+rsi+1] 
             42272e      4 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rax+8] 
-            42288f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ECX ZZ IDIOM 21 add     ecx, [rdx+18h] 
+            42288f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RCX ZZ IDIOM 21 add     ecx, [rdx+18h] 
             422a04      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rdx+8]    ; ptr 
             422ab9      3 INSTR CHECK OVERFLOW SIGNED 64  RDX ZZ add     rdx, rax 
-            422afe      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EAX ZZ SINKMALLOC add     eax, edi 
+            422afe      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RAX ZZ SINKMALLOC add     eax, edi 
             422ca0    170 FUNC RETURNTYPE RAX 1
             422ca0    170 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             422d50    106 FUNC RETURNTYPE RAX 96
@@ -1633,7 +1633,7 @@
             42482c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+3 ZZ lea     rdi, [rax+3]    ; size 
             424850   1199 FUNC RETURNTYPE RAX 4
             424850   1199 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 1 ARG3 1 ARG4 4 ARG5 4 
-            424c40      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebx 
+            424c40      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebx 
             424d00    578 FUNC RETURNTYPE RAX 0
             424d00    578 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
             424d6e      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 1 
@@ -1725,7 +1725,7 @@
             4265c0    453 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 1 ARG4 1 ARG5 0 
             426790    350 FUNC RETURNTYPE RAX 1
             426790    350 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 1 ARG4 1 ARG5 0 
-            426845      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, esi 
+            426845      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, esi 
             4268f0     85 FUNC RETURNTYPE RAX 1
             4268f0     85 FUNC INARGS    6  ARG0 8 ARG1 8 ARG2 1 ARG3 1 ARG4 1 ARG5 0 
             426950     88 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-gnome-character-map.psexe.infoannot b/tests/commit/save-gnome-character-map.psexe.infoannot
index ae501abb..32557e24 100644
--- a/tests/commit/save-gnome-character-map.psexe.infoannot
+++ b/tests/commit/save-gnome-character-map.psexe.infoannot
@@ -675,7 +675,7 @@
             40abb0    102 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40ad10     47 FUNC RETURNTYPE RAX 0
             40ad10     47 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40ad31      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 9 
+            40ad31      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 9 
             40ae90     98 FUNC RETURNTYPE RAX 0
             40ae90     98 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40b0e0    127 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-control-center.psexe.infoannot b/tests/commit/save-gnome-control-center.psexe.infoannot
index 036c2b5e..7a5e0468 100644
--- a/tests/commit/save-gnome-control-center.psexe.infoannot
+++ b/tests/commit/save-gnome-control-center.psexe.infoannot
@@ -599,7 +599,7 @@
               7da0    967 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 4 
               8170    775 FUNC RETURNTYPE RAX 1
               8170    775 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-              8350      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, edx 
+              8350      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, edx 
               8480     32 FUNC RETURNTYPE RAX 1
               8480     32 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
               84a0    165 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-gnome-help.psexe.infoannot b/tests/commit/save-gnome-help.psexe.infoannot
index 4c6e02b8..e679547c 100644
--- a/tests/commit/save-gnome-help.psexe.infoannot
+++ b/tests/commit/save-gnome-help.psexe.infoannot
@@ -451,7 +451,7 @@
             405810    252 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             405ac0    144 FUNC RETURNTYPE RAX 0
             405ac0    144 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            405b28      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, r12d 
+            405b28      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, r12d 
             405b50     54 FUNC RETURNTYPE RAX 0
             405b50     54 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             405b90     26 FUNC RETURNTYPE RAX 0
@@ -497,8 +497,8 @@
             406e00     30 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             406e20    167 FUNC RETURNTYPE RAX 0
             406e20    167 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            406e74      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ECX ZZ add     ecx, ecx 
-            406e7f      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            406e74      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RCX ZZ add     ecx, ecx 
+            406e7f      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             406ed0    168 FUNC RETURNTYPE RAX 0
             406ed0    168 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             406f80    268 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-keyring-daemon.psexe.infoannot b/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
index a7f82482..eff7aa19 100644
--- a/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
+++ b/tests/commit/save-gnome-keyring-daemon.psexe.infoannot
@@ -1359,7 +1359,7 @@
             410030    128 FUNC RETURNTYPE RAX 0
             410030    128 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             410030    128 FUNC PROBLEM sub_410030 CALLUNRESOLVED 
-            41005e      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 EAX 32 EAX ZZ mov     ecx, eax 
+            41005e      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     ecx, eax 
             4100b0    325 FUNC RETURNTYPE RAX 1
             4100b0    325 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4100b0    325 FUNC PROBLEM sub_4100B0 CALLUNRESOLVED 
@@ -1561,9 +1561,9 @@
             418950    464 FUNC RETURNTYPE RAX 0
             418950    464 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4189ed      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+1 ZZ lea     rsi, [rax+1] 
-            418a3d      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 8 DL ZZ IDIOM 5 movzx   edx, dl 
+            418a3d      3 INSTR CHECK TRUNCATION UNSIGNED 64 RDX 8 DL ZZ IDIOM 5 movzx   edx, dl 
             418a3d      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 DL ZZ IDIOM 20 movzx   edx, dl 
-            418a50      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 EDX 8 DL ZZ IDIOM 14 movsx   edx, dl 
+            418a50      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RDX 8 DL ZZ IDIOM 14 movsx   edx, dl 
             418a50      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 DL ZZ IDIOM 20 movsx   edx, dl 
             418b20     54 FUNC RETURNTYPE RAX 0
             418b20     54 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1773,7 +1773,7 @@
             422490    842 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4225a5      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, [r12]      ; buf 
             4225a9      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, rbp        ; n 
-            422702      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, 4 
+            422702      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, 4 
             422705      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 4 
             4227e0    335 FUNC RETURNTYPE RAX 0
             4227e0    335 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1903,8 +1903,8 @@
             4274f0    250 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4275f0    900 FUNC RETURNTYPE RAX 1
             4275f0    900 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            427901      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, 4 
-            427904      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, r13d 
+            427901      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, 4 
+            427904      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, r13d 
             427980    668 FUNC RETURNTYPE RAX 1
             427980    668 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             427c20    154 FUNC RETURNTYPE RAX 1
@@ -1918,8 +1918,8 @@
             428260   1711 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             428699      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+R12 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r14+r12] 
             4287d9      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBP 32 EBP ZZ mov     esi, ebp 
-            4287df      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, 4 
-            4287e2      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, ebp 
+            4287df      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, 4 
+            4287e2      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, ebp 
             428910   1458 FUNC RETURNTYPE RAX 1
             428910   1458 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             428ed0    282 FUNC RETURNTYPE RAX 1
@@ -1953,7 +1953,7 @@
             429faa      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+RBP ZZ IDIOM 32 lea     rdi, [r12+rbp]  ; dest 
             42a030    158 FUNC RETURNTYPE RAX 1
             42a030    158 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            42a062      3 INSTR CHECK TRUNCATION UNSIGNED 32 ESI 16 SI ZZ IDIOM 5 movzx   esi, si 
+            42a062      3 INSTR CHECK TRUNCATION UNSIGNED 32 RSI 16 SI ZZ IDIOM 5 movzx   esi, si 
             42a0d0    114 FUNC RETURNTYPE RAX 0
             42a0d0    114 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             42a150   1056 FUNC RETURNTYPE RAX 0
@@ -2011,8 +2011,8 @@
             42cb40    301 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42cc70   2998 FUNC RETURNTYPE RAX 1
             42cc70   2998 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            42cfa5      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, 8 
-            42d4a0      2 INSTR CHECK TRUNCATION UNSIGNED 32 EBP 32 EBP ZZ mov     esi, ebp 
+            42cfa5      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, 8 
+            42d4a0      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBP 32 EBP ZZ mov     esi, ebp 
             42d5ac      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+-2 ZZ lea     rsi, [rax-2] 
             42d5b0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rcx+1] 
             42d753      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+RAX ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdx+rax-8] 
@@ -2222,7 +2222,7 @@
             435300     83 FUNC RETURNTYPE RAX 1
             435300     83 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             435317      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 2 
-            43532a      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBP 16 BP ZZ IDIOM 5 movzx   edx, bp 
+            43532a      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBP 16 BP ZZ IDIOM 5 movzx   edx, bp 
             435360    107 FUNC RETURNTYPE RAX 1
             435360    107 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             43537f      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, rsi 
@@ -2245,7 +2245,7 @@
             435570    168 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             435620    136 FUNC RETURNTYPE RAX 1
             435620    136 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            435660      2 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 32 EDX ZZ mov     esi, edx 
+            435660      2 INSTR CHECK TRUNCATION UNSIGNED 64 RDX 32 EDX ZZ mov     esi, edx 
             4356b0     85 FUNC RETURNTYPE RAX 1
             4356b0     85 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             435710    262 FUNC RETURNTYPE RAX 1
@@ -2827,7 +2827,7 @@
             450df0    375 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             450f70    429 FUNC RETURNTYPE RAX 1
             450f70    429 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            451004      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1 
+            451004      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1 
             451120    169 FUNC RETURNTYPE RAX 1
             451120    169 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4511d0    220 FUNC RETURNTYPE RAX 1
@@ -2971,7 +2971,7 @@
             4568a7      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, rbp 
             4569b0   3536 FUNC RETURNTYPE RAX 1
             4569b0   3536 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            456d52      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, 1 
+            456d52      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, 1 
             456d90      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+16 ZZ IDIOM 18 MEMORYSINK lea     rcx, [r13+10h] 
             456db5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+64 ZZ IDIOM 18 MEMORYSINK lea     rcx, [r13+40h] 
             456ecb      8 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, [rsp+178h+var_C8]; src 
@@ -3174,7 +3174,7 @@
             465197      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBX 32 EBX ZZ mov     ecx, ebx 
             4651c0    448 FUNC RETURNTYPE RAX 1
             4651c0    448 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            465204      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 8 
+            465204      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 8 
             465380    122 FUNC RETURNTYPE RAX 0
             465380    122 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             465400    330 FUNC RETURNTYPE RAX 1
@@ -3193,14 +3193,14 @@
             4664f0     25 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
             466510    789 FUNC RETURNTYPE RAX 1
             466510    789 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            4666e0      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, 8 
-            4666f5      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, 8          ; nbytes 
+            4666e0      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, 8 
+            4666f5      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, 8          ; nbytes 
             466830   1568 FUNC RETURNTYPE RAX 1
             466830   1568 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             466960      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, 8 
             4669d0      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R14 ZZ add     r14, 4 
             466b48      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rax+8] 
-            466ca0      6 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 3E8h 
+            466ca0      6 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 3E8h 
             466e50    185 FUNC RETURNTYPE RAX 1
             466e50    185 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             466f10    688 FUNC RETURNTYPE RAX 0
@@ -3679,7 +3679,6 @@
             47ffb0    256 FUNC PROBLEM sub_47FFB0 JUMPUNRESOLVED 
             4800b0    201 FUNC RETURNTYPE RAX 0
             4800b0    201 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
-            48012a      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 10h 
             480180    400 FUNC RETURNTYPE RAX 0
             480180    400 FUNC PROBLEM sub_480180 JUMPUNRESOLVED 
             480310    131 FUNC RETURNTYPE RAX 1
@@ -4090,7 +4089,7 @@
             48d230    186 FUNC PROBLEM gkm_marshal_VOID__OBJECT_ULONG JUMPUNRESOLVED 
             48d2f0    321 FUNC RETURNTYPE RAX 1
             48d2f0    321 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 4 ARG4 4 ARG5 0 
-            48d370      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EAX ZZ IDIOM 15 add     eax, r10d 
+            48d370      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RAX ZZ IDIOM 15 add     eax, r10d 
             48d440    352 FUNC RETURNTYPE RAX 1
             48d440    352 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             48d5a0    185 FUNC RETURNTYPE RAX 4
@@ -4108,7 +4107,7 @@
             48e024      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R11+-48 ZZ IDIOM 32 lea     ebp, [r11-30h] 
             48e1c0   1663 FUNC RETURNTYPE RAX 1
             48e1c0   1663 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
-            48e2ef      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 ESI 8 SIL ZZ IDIOM 14 movsx   esi, sil 
+            48e2ef      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RSI 8 SIL ZZ IDIOM 14 movsx   esi, sil 
             48e2ef      4 INSTR CHECK SIGNEDNESS UNSIGNED 8 SIL ZZ IDIOM 20 movsx   esi, sil 
             48e2f8      7 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RSI*4 ZZ lea     esi, [rsi+rsi*4-0F0h] 
             48e2f8      7 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RSI+RSI*4 ZZ lea     esi, [rsi+rsi*4-0F0h] 
@@ -4199,15 +4198,15 @@
             490860    416 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4908c1      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX*4 ZZ IDIOM 32 lea     edx, [rax+rax*4] 
             4908c1      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+RAX*4 ZZ IDIOM 32 lea     edx, [rax+rax*4] 
-            4908d1      3 INSTR CHECK TRUNCATION UNSIGNED 16 EAX 8 AL ZZ IDIOM 5 movzx   edx, al 
-            4908da      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, eax 
+            4908d1      3 INSTR CHECK TRUNCATION UNSIGNED 16 RAX 8 AL ZZ IDIOM 5 movzx   edx, al 
+            4908da      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ sub     ecx, eax 
             490a00     69 FUNC RETURNTYPE RAX 1
             490a00     69 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             490a50   1733 FUNC RETURNTYPE RAX 1
             490a50   1733 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             490cba      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+24 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+18h] 
             490cbe      4 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, [rbx+20h] 
-            490fcd      2 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, esi 
+            490fcd      2 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, esi 
             490fee      3 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, rcx 
             491120    149 FUNC RETURNTYPE RAX 1
             491120    149 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -4258,7 +4257,7 @@
             492990    407 FUNC RETURNTYPE RAX 0
             492990    407 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             492990    407 FUNC PROBLEM sub_492990 CALLUNRESOLVED 
-            492a69      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, 1 
+            492a69      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, 1 
             492a6c      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 1 
             492a70      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, [rbx+20h]  ; src 
             492c40    376 FUNC RETURNTYPE RAX 1
@@ -4275,12 +4274,12 @@
             4933f0     76 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             493440   1572 FUNC RETURNTYPE RAX 1
             493440   1572 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            49369e      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ECX ZZ add     ecx, edx 
+            49369e      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RCX ZZ add     ecx, edx 
             4936a0      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R8 ZZ add     r8d, eax 
             493a70    333 FUNC RETURNTYPE RAX 1
             493a70    333 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            493b05      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 16  ECX ZZ add     cx, 76Ch 
-            493b0a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 1 
+            493b05      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 16  RCX ZZ add     cx, 76Ch 
+            493b0a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 1 
             493bc0    324 FUNC RETURNTYPE RAX 1
             493bc0    324 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             493d10    727 FUNC RETURNTYPE RAX 1
@@ -4379,7 +4378,7 @@
             4984ca      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBP 32 EBP ZZ IDIOM 30 mov     edi, ebp 
             4984d1      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBP 32 EBP ZZ IDIOM 30 mov     edi, ebp 
             4984f2      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBP 32 EBP ZZ IDIOM 30 mov     edi, ebp 
-            49871a      4 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, [rsp+68h+var_60] 
+            49871a      4 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, [rsp+68h+var_60] 
             498729      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, rbp        ; src 
             498870    753 FUNC RETURNTYPE RAX 1
             498870    753 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 1 ARG4 0 ARG5 4 
@@ -4392,7 +4391,7 @@
             4992a0   1225 FUNC RETURNTYPE RAX 1
             4992a0   1225 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 0 ARG4 1 ARG5 0 
             49946f      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     edx, [rax+1] 
-            499566      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDI ZZ sub     edi, 1 
+            499566      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDI ZZ sub     edi, 1 
             499569      4 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, rbp 
             49956d      5 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+0B8h+var_60]; dest 
             499770   2065 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-gnome-nettool.psexe.infoannot b/tests/commit/save-gnome-nettool.psexe.infoannot
index 32f4f111..2a41bad5 100644
--- a/tests/commit/save-gnome-nettool.psexe.infoannot
+++ b/tests/commit/save-gnome-nettool.psexe.infoannot
@@ -696,8 +696,8 @@
             40bca0    167 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             40bd50   1372 FUNC RETURNTYPE RAX 1
             40bd50   1372 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40bfab      2 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, edx 
-            40c1a9      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            40bfab      2 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, edx 
+            40c1a9      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             40c1fc      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+1 ZZ lea     esi, [r13+1] 
             40c2b0     22 FUNC RETURNTYPE RAX 1
             40c2b0     22 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-gnome-screenshot.psexe.infoannot b/tests/commit/save-gnome-screenshot.psexe.infoannot
index e9dc07ae..423eed54 100644
--- a/tests/commit/save-gnome-screenshot.psexe.infoannot
+++ b/tests/commit/save-gnome-screenshot.psexe.infoannot
@@ -714,8 +714,8 @@
             4099d0    171 FUNC PROBLEM sub_4099D0 STACKANALYSIS 
             409bd0   1167 FUNC RETURNTYPE RAX 4
             409bd0   1167 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            409df1      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, r15d 
-            409dfa      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, r9d 
+            409df1      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, r15d 
+            409dfa      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, r9d 
             40a060      9 FUNC RETURNTYPE RAX 0
             40a060      9 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             40a070     64 FUNC RETURNTYPE RAX 0
@@ -750,29 +750,29 @@
             40b6f0    859 FUNC RETURNTYPE RAX 0
             40b6f0    859 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             40b73b      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RAX+RBX ZZ lea     edx, [rax+rbx] 
-            40b742      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, r14d 
+            40b742      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, r14d 
             40ba50    452 FUNC RETURNTYPE RAX 0
             40ba50    452 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40bb56      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
-            40bb5f      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            40bb56      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
+            40bb5f      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             40bbb4      4 INSTR CHECK OVERFLOW SIGNED 64  R14 ZZ add     r14d, 1 
             40bc20    282 FUNC RETURNTYPE RAX 0
             40bc20    282 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40bd40    298 FUNC RETURNTYPE RAX 0
             40bd40    298 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
-            40bdbf      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r15d 
+            40bdbf      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r15d 
             40be70    179 FUNC RETURNTYPE RAX 0
             40be70    179 FUNC INARGS    6  ARG0 16 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40bf30    118 FUNC RETURNTYPE RAX 0
             40bf30    118 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40bfb0   2677 FUNC RETURNTYPE RAX 0
             40bfb0   2677 FUNC INARGS    5  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 
-            40c85a      7 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, [rsp+198h+var_70] 
-            40c861      7 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, [rsp+198h+var_6C] 
-            40c9b5      7 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [rsp+198h+var_40] 
-            40c9c6      7 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, [rsp+198h+var_3C] 
-            40c9f8      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
-            40ca06      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, eax 
+            40c85a      7 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, [rsp+198h+var_70] 
+            40c861      7 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, [rsp+198h+var_6C] 
+            40c9b5      7 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [rsp+198h+var_40] 
+            40c9c6      7 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, [rsp+198h+var_3C] 
+            40c9f8      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
+            40ca06      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, eax 
             40ca30    569 FUNC RETURNTYPE RAX 0
             40ca30    569 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40cc70    371 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-gnome-search-tool.psexe.infoannot b/tests/commit/save-gnome-search-tool.psexe.infoannot
index cb943242..8abcb59d 100644
--- a/tests/commit/save-gnome-search-tool.psexe.infoannot
+++ b/tests/commit/save-gnome-search-tool.psexe.infoannot
@@ -1164,13 +1164,13 @@
             40e417      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+1 ZZ lea     rdx, [rax+1] 
             40e5a0    335 FUNC RETURNTYPE RAX 0
             40e5a0    335 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40e622      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 16  EDX ZZ add     dx, 76Ch 
-            40e62a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1 
+            40e622      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 16  RDX ZZ add     dx, 76Ch 
+            40e62a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1 
             40e6f0    448 FUNC RETURNTYPE RAX 0
             40e6f0    448 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40e8b0   1525 FUNC RETURNTYPE RAX 0
             40e8b0   1525 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40e9f8      3 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, 9 
+            40e9f8      3 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, 9 
             40e9fb      4 INSTR CHECK OVERFLOW SIGNED 64  R8 ZZ add     r8d, 9 
             40eeb0    526 FUNC RETURNTYPE RAX 0
             40eeb0    526 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
@@ -1293,7 +1293,7 @@
             419940    141 FUNC RETURNTYPE RAX 0
             419940    141 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             419940    141 FUNC PROBLEM sub_419940 CHUNKS 
-            41962e      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDI ZZ sub     edi, 2 
+            41962e      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDI ZZ sub     edi, 2 
             419ac0    129 FUNC RETURNTYPE RAX 4
             419ac0    129 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             419d60     97 FUNC RETURNTYPE RAX 1
@@ -1397,7 +1397,7 @@
             41ccf0   1317 FUNC RETURNTYPE RAX 0
             41ccf0   1317 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
             41cdca      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+1 ZZ lea     rcx, [rax+1] 
-            41cf9a      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 EAX 8 AL ZZ IDIOM 14 movsx   ecx, al 
+            41cf9a      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RAX 8 AL ZZ IDIOM 14 movsx   ecx, al 
             41cf9a      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 AL ZZ IDIOM 20 movsx   ecx, al 
             41d220     48 FUNC RETURNTYPE RAX 0
             41d220     48 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-gnome-session.psexe.infoannot b/tests/commit/save-gnome-session.psexe.infoannot
index 14b653e6..c7d362bc 100644
--- a/tests/commit/save-gnome-session.psexe.infoannot
+++ b/tests/commit/save-gnome-session.psexe.infoannot
@@ -1540,7 +1540,7 @@
             41e2b0    757 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41e5b0    682 FUNC RETURNTYPE RAX 1
             41e5b0    682 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
-            41e6a7      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, 1          ; jumptable 000000000041E65A cases 0-5,7 
+            41e6a7      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, 1          ; jumptable 000000000041E65A cases 0-5,7 
             41e950     43 FUNC RETURNTYPE RAX 0
             41e950     43 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41e980    586 FUNC RETURNTYPE RAX 96
@@ -1613,7 +1613,7 @@
             423030     29 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             423050    656 FUNC RETURNTYPE RAX 1
             423050    656 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
-            423248      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CH ZZ IDIOM 5 movzx   ecx, ch 
+            423248      3 INSTR CHECK TRUNCATION UNSIGNED 32 RCX 8 CH ZZ IDIOM 5 movzx   ecx, ch 
             4232e0    399 FUNC RETURNTYPE RAX 4
             4232e0    399 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 2 ARG3 8 ARG4 0 ARG5 0 
             4232e0    399 FUNC PROBLEM sub_4232E0 CALLUNRESOLVED 
@@ -1716,8 +1716,8 @@
             427190    555 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
             4273c0    233 FUNC RETURNTYPE RAX 0
             4273c0    233 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            427406      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ECX ZZ add     ecx, 1 
-            427424      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, r13d 
+            427406      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RCX ZZ add     ecx, 1 
+            427424      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, r13d 
             4274b0    336 FUNC RETURNTYPE RAX 0
             4274b0    336 FUNC INARGS    6  ARG0 16 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             427630    316 FUNC RETURNTYPE RAX 4
@@ -1731,7 +1731,7 @@
             427990   1317 FUNC RETURNTYPE RAX 0
             427990   1317 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             427a6a      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+1 ZZ lea     rcx, [rax+1] 
-            427c3a      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 EAX 8 AL ZZ IDIOM 14 movsx   ecx, al 
+            427c3a      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RAX 8 AL ZZ IDIOM 14 movsx   ecx, al 
             427c3a      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 AL ZZ IDIOM 20 movsx   ecx, al 
             427ec0     48 FUNC RETURNTYPE RAX 0
             427ec0     48 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-gnome-sound-recorder.psexe.infoannot b/tests/commit/save-gnome-sound-recorder.psexe.infoannot
index 129a9617..c04a2584 100644
--- a/tests/commit/save-gnome-sound-recorder.psexe.infoannot
+++ b/tests/commit/save-gnome-sound-recorder.psexe.infoannot
@@ -633,8 +633,8 @@
             407d40   2712 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4087e0    684 FUNC RETURNTYPE RAX 4
             4087e0    684 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            408a57      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
-            408a7f      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
+            408a57      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 1 
+            408a7f      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 1 
             408a90    233 FUNC RETURNTYPE RAX 0
             408a90    233 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             409070     86 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-system-log.psexe.infoannot b/tests/commit/save-gnome-system-log.psexe.infoannot
index 5cb7bc35..17b44874 100644
--- a/tests/commit/save-gnome-system-log.psexe.infoannot
+++ b/tests/commit/save-gnome-system-log.psexe.infoannot
@@ -907,7 +907,7 @@
             40b4b0     11 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 0 
             40b4c0    205 FUNC RETURNTYPE RAX 0
             40b4c0    205 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            40b516      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1 
+            40b516      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1 
             40b527      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RSI ZZ sub     rsi, rbx 
             40b590     34 FUNC RETURNTYPE RAX 0
             40b590     34 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -917,7 +917,7 @@
             40b620     61 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40b660    955 FUNC RETURNTYPE RAX 1
             40b660    955 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40b8e9      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 16  ESI ZZ add     si, word ptr [rsp+88h+var_54] 
+            40b8e9      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 16  RSI ZZ add     si, word ptr [rsp+88h+var_54] 
             40ba20    162 FUNC RETURNTYPE RAX 0
             40ba20    162 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             40bad0    440 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-gnome-system-monitor.psexe.infoannot b/tests/commit/save-gnome-system-monitor.psexe.infoannot
index 929a5c03..66c621d2 100644
--- a/tests/commit/save-gnome-system-monitor.psexe.infoannot
+++ b/tests/commit/save-gnome-system-monitor.psexe.infoannot
@@ -1446,7 +1446,7 @@
             4188b0    135 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             418950     34 FUNC RETURNTYPE RAX 8
             418950     34 FUNC INARGS    6  ARG0 8 ARG1 8 ARG2 8 ARG3 1 ARG4 0 ARG5 0 
-            41895a      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   edx, cl         ; bool 
+            41895a      3 INSTR CHECK TRUNCATION UNSIGNED 32 RCX 8 CL ZZ IDIOM 5 movzx   edx, cl         ; bool 
             418980    115 FUNC RETURNTYPE RAX 0
             418980    115 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             418a50    117 FUNC RETURNTYPE RAX 0
@@ -1532,7 +1532,7 @@
             41b150     35 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             41b180    550 FUNC RETURNTYPE RAX 1
             41b180    550 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
-            41b275      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EBP ZZ add     ebp, 1 
+            41b275      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RBP ZZ add     ebp, 1 
             41b3b0    278 FUNC RETURNTYPE RAX 0
             41b3b0    278 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41b4d0     34 FUNC RETURNTYPE RAX 0
@@ -1544,9 +1544,9 @@
             41b590   1770 FUNC RETURNTYPE RAX 0
             41b590   1770 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41b695      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+84 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rax+54h] 
-            41b7d7      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, eax 
+            41b7d7      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, eax 
             41b952      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RCX 32 ECX ZZ mov     esi, ecx 
-            41b957      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, eax        ; unsigned __int64 
+            41b957      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, eax        ; unsigned __int64 
             41bfc0     12 FUNC RETURNTYPE RAX 0
             41bfc0     12 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             41bfd0    111 FUNC RETURNTYPE RAX 0
@@ -1614,7 +1614,7 @@
             41e7c0     83 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41e820   2160 FUNC RETURNTYPE RAX 0
             41e820   2160 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            41ecd1      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 EBP 32 EBP ZZ mov     esi, ebp 
+            41ecd1      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBP 32 EBP ZZ mov     esi, ebp 
             41f090     94 FUNC RETURNTYPE RAX 0
             41f090     94 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             41f0f0    176 FUNC RETURNTYPE RAX 1
@@ -1813,7 +1813,7 @@
             4251a0    651 FUNC RETURNTYPE RAX 0
             4251a0    651 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42529e      4 INSTR CHECK OVERFLOW UNSIGNED 32 EDX ZZ IDIOM 33 imul    edx, r8d 
-            4252a2      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, edx 
+            4252a2      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ sub     ecx, edx 
             425430    153 FUNC RETURNTYPE RAX 0
             425430    153 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4254d0    140 FUNC RETURNTYPE RAX 0
@@ -1826,7 +1826,7 @@
             425630      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBP 32 EBP ZZ mov     edx, ebp 
             425680     99 FUNC RETURNTYPE RAX 1
             425680     99 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4256a1      2 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 ECX 32 ECX ZZ IDIOM 26 mov     edx, ecx 
+            4256a1      2 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RCX 32 ECX ZZ IDIOM 26 mov     edx, ecx 
             4256f0    145 FUNC RETURNTYPE RAX 0
             4256f0    145 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
             425790    255 FUNC RETURNTYPE RAX 4
@@ -1841,7 +1841,7 @@
             425c20     83 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             425c80    618 FUNC RETURNTYPE RAX 0
             425c80    618 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
-            425e45      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, 12h 
+            425e45      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, 12h 
             426000     29 FUNC RETURNTYPE RAX 0
             426000     29 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             426020     31 FUNC RETURNTYPE RAX 0
@@ -1997,8 +1997,8 @@
             42d07d      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RAX+1 ZZ lea     ecx, [rax+1] 
             42d095      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r12 
             42d0a1      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15+1 ZZ lea     rsi, [r15+1] 
-            42d0a8      2 INSTR CHECK OVERFLOW UNSIGNED 32  ECX ZZ add     ecx, eax 
-            42d0ad      3 INSTR CHECK OVERFLOW UNSIGNED 32  ECX ZZ add     ecx, 1 
+            42d0a8      2 INSTR CHECK OVERFLOW UNSIGNED 32  RCX ZZ add     ecx, eax 
+            42d0ad      3 INSTR CHECK OVERFLOW UNSIGNED 32  RCX ZZ add     ecx, 1 
             42d0b5      4 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rbp+0] 
             42d0bc      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r12 
             42d140    481 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-gnome-terminal.psexe.infoannot b/tests/commit/save-gnome-terminal.psexe.infoannot
index ae2804bc..42be668c 100644
--- a/tests/commit/save-gnome-terminal.psexe.infoannot
+++ b/tests/commit/save-gnome-terminal.psexe.infoannot
@@ -1701,7 +1701,7 @@
             4132a7      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 RBP ZZ mov     rdx, rbp        ; n 
             413320   1079 FUNC RETURNTYPE RAX 1
             413320   1079 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            41338c      3 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, 1 
+            41338c      3 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, 1 
             4134f2      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+26 ZZ IDIOM 32 lea     rdi, [rcx+1Ah] 
             413559      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+1 ZZ lea     rdx, [rax+1] 
             413758     42 FUNC RETURNTYPE RAX 0
@@ -1959,8 +1959,8 @@
             41e020    124 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41e0a0    801 FUNC RETURNTYPE RAX 4
             41e0a0    801 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 4 ARG3 1 ARG4 1 ARG5 1 
-            41e2f4      2 INSTR CHECK UNDERFLOW SIGNED 32  EDI ZZ sub     edi, ebp 
-            41e2fb      3 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, 1 
+            41e2f4      2 INSTR CHECK UNDERFLOW SIGNED 32  RDI ZZ sub     edi, ebp 
+            41e2fb      3 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, 1 
             41e3d0    265 FUNC RETURNTYPE RAX 0
             41e3d0    265 FUNC INARGS    6  ARG0 8 ARG1 16 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             41e4a4      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX*4 ZZ IDIOM 18 GLOBALMEMSINK lea     rsi, qword_43A960[rax*4] 
@@ -1979,7 +1979,7 @@
             41f6d0   1480 FUNC RETURNTYPE RAX 0
             41f6d0   1480 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41fb60      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32 EDI ZZ IDIOM 33 imul    edi, eax, 0Eh 
-            41fbbe      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EBX ZZ add     ebx, 1 
+            41fbbe      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RBX ZZ add     ebx, 1 
             41fbd3      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+1 ZZ lea     rdx, [rax+1] 
             41fca0     16 FUNC RETURNTYPE RAX 1
             41fca0     16 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -2115,7 +2115,7 @@
             4247ea      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     esi, eax 
             424806      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     esi, eax 
             424840      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     esi, eax 
-            424888      3 INSTR CHECK TRUNCATION UNSIGNED 32 ESI 16 SI ZZ IDIOM 5 movzx   esi, si 
+            424888      3 INSTR CHECK TRUNCATION UNSIGNED 32 RSI 16 SI ZZ IDIOM 5 movzx   esi, si 
             424888      3 INSTR CHECK SIGNEDNESS UNSIGNED 16 SI ZZ IDIOM 20 movzx   esi, si 
             424920      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     esi, eax 
             42495d      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     esi, eax 
@@ -2124,7 +2124,7 @@
             424a20      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     esi, eax 
             424a58      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     esi, eax 
             424a90      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     esi, eax 
-            424b14      3 INSTR CHECK TRUNCATION UNSIGNED 32 ESI 16 SI ZZ IDIOM 5 movzx   esi, si 
+            424b14      3 INSTR CHECK TRUNCATION UNSIGNED 32 RSI 16 SI ZZ IDIOM 5 movzx   esi, si 
             424b14      3 INSTR CHECK SIGNEDNESS UNSIGNED 16 SI ZZ IDIOM 20 movzx   esi, si 
             424b40    397 FUNC RETURNTYPE RAX 0
             424b40    397 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -2415,7 +2415,7 @@
             42f770      9 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             42f780    303 FUNC RETURNTYPE RAX 0
             42f780    303 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            42f82c      4 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, [rsp+68h+var_54] 
+            42f82c      4 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, [rsp+68h+var_54] 
             42f8b0    181 FUNC RETURNTYPE RAX 1
             42f8b0    181 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
             42f970    219 FUNC RETURNTYPE RAX 0
@@ -2478,7 +2478,7 @@
             4326e0   1279 FUNC RETURNTYPE RAX 0
             4326e0   1279 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
             4327b0      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+1 ZZ lea     rcx, [rax+1] 
-            43296c      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 EAX 8 AL ZZ IDIOM 14 movsx   ecx, al         ; jumptable 0000000000432A33 default case 
+            43296c      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RAX 8 AL ZZ IDIOM 14 movsx   ecx, al         ; jumptable 0000000000432A33 default case 
             43296c      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 AL ZZ IDIOM 20 movsx   ecx, al         ; jumptable 0000000000432A33 default case 
             432be0     48 FUNC RETURNTYPE RAX 0
             432be0     48 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-gnome-text-editor.psexe.infoannot b/tests/commit/save-gnome-text-editor.psexe.infoannot
index 72044215..84c70c20 100644
--- a/tests/commit/save-gnome-text-editor.psexe.infoannot
+++ b/tests/commit/save-gnome-text-editor.psexe.infoannot
@@ -3372,8 +3372,8 @@
             446a30     10 FUNC RETURNTYPE RAX 96
             446a30     10 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             446a30     10 FUNC PROBLEM gedit_utils_str_middle_truncate CHUNKS 
-            445d5b      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, r14d 
-            445e30      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, r14d 
+            445d5b      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, r14d 
+            445e30      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, r14d 
             446a40      7 FUNC RETURNTYPE RAX 1
             446a40      7 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
             446a50    333 FUNC RETURNTYPE RAX 1
@@ -3391,7 +3391,7 @@
             447070    459 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             447240    241 FUNC RETURNTYPE RAX 1
             447240    241 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4472b0      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, 21h 
+            4472b0      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, 21h 
             447340    144 FUNC RETURNTYPE RAX 1
             447340    144 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4473d0    128 FUNC RETURNTYPE RAX 1
@@ -3659,7 +3659,7 @@
             453040    131 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             453120    689 FUNC RETURNTYPE RAX 96
             453120    689 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            4531c6      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, r15d 
+            4531c6      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, r15d 
             453c70    426 FUNC RETURNTYPE RAX 4
             453c70    426 FUNC INARGS    6  ARG0 96 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             453e20     68 FUNC RETURNTYPE RAX 4
@@ -4574,7 +4574,7 @@
             475280   1317 FUNC RETURNTYPE RAX 0
             475280   1317 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
             47535a      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+1 ZZ lea     rcx, [rax+1] 
-            47552a      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 EAX 8 AL ZZ IDIOM 14 movsx   ecx, al 
+            47552a      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RAX 8 AL ZZ IDIOM 14 movsx   ecx, al 
             47552a      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 AL ZZ IDIOM 20 movsx   ecx, al 
             4757b0     48 FUNC RETURNTYPE RAX 0
             4757b0     48 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -4787,7 +4787,7 @@
             47ac40    153 FUNC RETURNTYPE RAX 0
             47ac40    153 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47ac40    153 FUNC PROBLEM gedit_history_entry_prepend_text CHUNKS 
-            47aad6      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDI ZZ sub     edi, 2 
+            47aad6      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDI ZZ sub     edi, 2 
             47ace0    145 FUNC RETURNTYPE RAX 0
             47ace0    145 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47ad80     97 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-gnome-thumbnail-font.psexe.infoannot b/tests/commit/save-gnome-thumbnail-font.psexe.infoannot
index aa8c152e..f678d77f 100644
--- a/tests/commit/save-gnome-thumbnail-font.psexe.infoannot
+++ b/tests/commit/save-gnome-thumbnail-font.psexe.infoannot
@@ -122,8 +122,8 @@
             4017c0   2281 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             401a29      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+-1 ZZ IDIOM 32 lea     rsi, [rcx-1] 
             401bf9      2 INSTR CHECK TRUNCATION SIGNED 64 RAX 32 EAX ZZ mov     ecx, eax 
-            401e4c      3 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, 4 
-            401e58      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, esi 
+            401e4c      3 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, 4 
+            401e58      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, esi 
             401e5a      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8d, edx 
             401edf      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, 3 
             401f02      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ IDIOM 18 MEMORYSINK add     rcx, 3 
diff --git a/tests/commit/save-grep.psexe.infoannot b/tests/commit/save-grep.psexe.infoannot
index 9fa218a3..33dc6706 100644
--- a/tests/commit/save-grep.psexe.infoannot
+++ b/tests/commit/save-grep.psexe.infoannot
@@ -275,7 +275,7 @@
             404129      4 INSTR CHECK UNDERFLOW UNSIGNED 64  R8 ZZ sub     r8d, 1          ; range 
             404147      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R13 ZZ IDIOM 18 MEMORYSINK add     r13, r14 
             404263      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, cs:qword_6266A0; buffer 
-            40426a      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, 1 
+            40426a      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, 1 
             404276      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, r13 
             404279      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RCX ZZ IDIOM 19 sub     rcx, r14        ; start 
             404280      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+64 ZZ IDIOM 18 MEMORYSINK lea     r8, [rdi+40h]   ; regs 
@@ -324,7 +324,7 @@
             405170    301 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4052a0    135 FUNC RETURNTYPE RAX 96
             4052a0    135 FUNC INARGS    5  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 
-            40531d      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   esi, bl         ; int 
+            40531d      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BL ZZ IDIOM 5 movzx   esi, bl         ; int 
             405330    630 FUNC RETURNTYPE RAX 1
             405330    630 FUNC INARGS    5  ARG0 96 ARG1 4 ARG2 4 ARG3 0 ARG4 0 
             405408      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RBX ZZ lea     rax, [rbx+rbx] 
@@ -334,7 +334,7 @@
             4055b0    838 FUNC RETURNTYPE RAX 96
             4055b0    838 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             405813      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, rdi        ; n 
-            40587a      3 INSTR CHECK TRUNCATION SIGNED 32 EBX 8 BL ZZ movsx   edi, bl 
+            40587a      3 INSTR CHECK TRUNCATION SIGNED 32 RBX 8 BL ZZ movsx   edi, bl 
             40587a      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 BL ZZ movsx   edi, bl 
             405900   1165 FUNC RETURNTYPE RAX 0
             405900   1165 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
@@ -365,12 +365,12 @@
             406973      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, rdi        ; n 
             406c18      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDI ZZ IDIOM 19 sub     rdi, rax 
             406c1b      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r15        ; ptr 
-            406fcb      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   esi, al         ; int 
+            406fcb      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 8 AL ZZ IDIOM 5 movzx   esi, al         ; int 
             406fe0    556 FUNC RETURNTYPE RAX 1
             406fe0    556 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40713b      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, rax 
             407163      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r12        ; dest 
-            407194      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, eax 
+            407194      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, eax 
             407210    764 FUNC RETURNTYPE RAX 0
             407210    764 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             407510   2392 FUNC RETURNTYPE RAX 4
@@ -387,8 +387,8 @@
             409cf0    343 FUNC INARGS    6  ARG0 96 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             409e50   1261 FUNC RETURNTYPE RAX 96
             409e50   1261 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 64 ARG3 0 ARG4 0 ARG5 0 
-            40a0fe      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ IDIOM 29 sub     esi, 1 
-            40a18f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1 
+            40a0fe      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ IDIOM 29 sub     esi, 1 
+            40a18f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1 
             40a340   1666 FUNC RETURNTYPE RAX 0
             40a340   1666 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40a9d0   1388 FUNC RETURNTYPE RAX 1
@@ -420,16 +420,16 @@
             40b910   1679 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             40bfa0    843 FUNC RETURNTYPE RAX 0
             40bfa0    843 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
-            40bfeb      5 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 10Ch 
-            40c02b      5 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 10Ch 
-            40c06b      5 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 10Ch 
-            40c0ab      5 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 10Ch 
-            40c0eb      5 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 10Ch 
-            40c12b      5 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 10Ch 
-            40c16c      6 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, 10Ch 
-            40c1ac      6 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, 10Ch 
-            40c1f3      5 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 10Ch 
-            40c1fd      3 INSTR CHECK UNDERFLOW SIGNED 32  EDI ZZ sub     edi, 1 
+            40bfeb      5 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 10Ch 
+            40c02b      5 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 10Ch 
+            40c06b      5 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 10Ch 
+            40c0ab      5 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 10Ch 
+            40c0eb      5 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 10Ch 
+            40c12b      5 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 10Ch 
+            40c16c      6 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, 10Ch 
+            40c1ac      6 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, 10Ch 
+            40c1f3      5 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 10Ch 
+            40c1fd      3 INSTR CHECK UNDERFLOW SIGNED 32  RDI ZZ sub     edi, 1 
             40c2f0    523 FUNC RETURNTYPE RAX 96
             40c2f0    523 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             40c35b      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ lea     rsi, [rax+1] 
@@ -443,8 +443,8 @@
             40c8e0    547 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             40cb10    734 FUNC RETURNTYPE RAX 1
             40cb10    734 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
-            40cc08      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, esi 
-            40cc29      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EBP ZZ add     ebp, 1 
+            40cc08      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, esi 
+            40cc29      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RBP ZZ add     ebp, 1 
             40cc9c      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX*4 ZZ lea     esi, ds:0FFFFFFFFFFFFFFFFh[rax*4] 
             40cc9c      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX*4+-1 ZZ lea     esi, ds:0FFFFFFFFFFFFFFFFh[rax*4] 
             40ccdb      7 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RCX*4 ZZ lea     esi, ds:0FFFFFFFFFFFFFFFFh[rcx*4] 
@@ -475,7 +475,7 @@
             40f07b      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+-48 ZZ IDIOM 32 lea     edx, [rax-30h] 
             40f1b0   1870 FUNC RETURNTYPE RAX 1
             40f1b0   1870 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40f516      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, esi 
+            40f516      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, esi 
             40f900     31 FUNC RETURNTYPE RAX 0
             40f900     31 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             40f920   2845 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-httpd.psexe.infoannot b/tests/commit/save-httpd.psexe.infoannot
index 323ebfd2..9315d164 100644
--- a/tests/commit/save-httpd.psexe.infoannot
+++ b/tests/commit/save-httpd.psexe.infoannot
@@ -1488,7 +1488,7 @@
             4281c5    326 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42830b    752 FUNC RETURNTYPE RAX 0
             42830b    752 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
-            4285cd      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ inc     edi             ; mode 
+            4285cd      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ inc     edi             ; mode 
             428600   2862 FUNC RETURNTYPE RAX 0
             428600   2862 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             428600   2862 FUNC PROBLEM main CALLUNRESOLVED 
@@ -1521,8 +1521,8 @@
             429dd0     45 FUNC RETURNTYPE RAX 0
             429e00    642 FUNC RETURNTYPE RAX 96
             429e00    642 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            429f24      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 16 CX ZZ IDIOM 5 movzx   ecx, cx 
-            429f63      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 16 CX ZZ IDIOM 5 movzx   ecx, cx 
+            429f24      3 INSTR CHECK TRUNCATION UNSIGNED 32 RCX 16 CX ZZ IDIOM 5 movzx   ecx, cx 
+            429f63      3 INSTR CHECK TRUNCATION UNSIGNED 32 RCX 16 CX ZZ IDIOM 5 movzx   ecx, cx 
             42a090     97 FUNC RETURNTYPE RAX 1
             42a090     97 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             42a100   1248 FUNC RETURNTYPE RAX 1
@@ -1552,8 +1552,8 @@
             42af00     30 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42af20    436 FUNC RETURNTYPE RAX 1
             42af20    436 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            42af9d      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   ecx, al 
-            42afb1      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   esi, cl 
+            42af9d      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 8 AL ZZ IDIOM 5 movzx   ecx, al 
+            42afb1      3 INSTR CHECK TRUNCATION UNSIGNED 64 RCX 8 CL ZZ IDIOM 5 movzx   esi, cl 
             42b0e0    183 FUNC RETURNTYPE RAX 64
             42b0e0    183 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
             42b16f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+2 ZZ IDIOM 19 lea     rdx, [rbp+2]    ; n 
@@ -1605,16 +1605,16 @@
             42c0c0      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             42c0d0    143 FUNC RETURNTYPE RAX 0
             42c0d0    143 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            42c0f1      3 INSTR CHECK TRUNCATION SIGNED 32 EDX 8 DL ZZ IDIOM 26 movsx   esi, dl         ; c 
+            42c0f1      3 INSTR CHECK TRUNCATION SIGNED 32 RDX 8 DL ZZ IDIOM 26 movsx   esi, dl         ; c 
             42c10d      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, rbx 
             42c160      8 FUNC RETURNTYPE RAX 0
             42c160      8 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 1 ARG3 0 
             42c170    352 FUNC RETURNTYPE RAX 4
             42c170    352 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             42c1e5      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBX 32 EBX ZZ IDIOM 30 mov     edx, ebx 
-            42c1ec      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ IDIOM 19 sub     edx, edi        ; len 
+            42c1ec      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ IDIOM 19 sub     edx, edi        ; len 
             42c28a      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, str 
-            42c290      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ IDIOM 19 sub     edx, 1          ; len 
+            42c290      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ IDIOM 19 sub     edx, 1          ; len 
             42c2d0      5 FUNC RETURNTYPE RAX 0
             42c2d0      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             42c2e0     19 FUNC RETURNTYPE RAX 0
@@ -1634,7 +1634,7 @@
             42c620    336 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
             42c770    514 FUNC RETURNTYPE RAX 4
             42c770    514 FUNC INARGS    6  ARG0 0 ARG1 8 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
-            42c7ac      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1 
+            42c7ac      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1 
             42c980     13 FUNC RETURNTYPE RAX 0
             42c980     13 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             42c990     16 FUNC RETURNTYPE RAX 0
@@ -1979,7 +1979,7 @@
             432237      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+RAX+-63 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r14+rax-3Fh] 
             43225e      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+216 ZZ IDIOM 18 MEMORYSINK lea     rdi, [ws+0D8h] 
             432292      7 INSTR CHECK OVERFLOW SIGNED 32 EDI ZZ imul    edi, cs:thread_limit_1 
-            43229d      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, edi 
+            43229d      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, edi 
             43231a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+120 ZZ IDIOM 18 MEMORYSINK lea     rdi, [ws+78h] 
             432360     33 FUNC RETURNTYPE RAX 1
             432360     33 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -2057,7 +2057,7 @@
             433100    457 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4332d0    190 FUNC RETURNTYPE RAX 0
             4332d0    190 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            433300      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1 
+            433300      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1 
             433390    295 FUNC RETURNTYPE RAX 4
             433390    295 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             433390    295 FUNC PROBLEM ap_make_content_type CALLUNRESOLVED 
@@ -2080,7 +2080,7 @@
             433910    140 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4339a0   2194 FUNC RETURNTYPE RAX 96
             4339a0   2194 FUNC INARGS    2  ARG0 4 ARG1 0 
-            4339e6      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 2 
+            4339e6      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 2 
             433a2c      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+RDX ZZ IDIOM 18 MEMORYSINK lea     rax, [last_len+rdx] 
             433a87      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+R12 ZZ IDIOM 18 MEMORYSINK lea     rdi, [last_field_0+last_len]; dest 
             433ace      4 INSTR CHECK OVERFLOW SIGNED 64  R15 ZZ add     r15d, 1 
@@ -2151,7 +2151,7 @@
             4354f0    274 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
             435610   4443 FUNC RETURNTYPE RAX 4
             435610   4443 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            43586b      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 2 
+            43586b      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 2 
             436770    216 FUNC RETURNTYPE RAX 4
             436770    216 FUNC INARGS    6  ARG0 2 ARG1 1 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             436850      8 FUNC RETURNTYPE RAX 0
@@ -2472,7 +2472,7 @@
             43ead0     28 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             43eaf0    243 FUNC RETURNTYPE RAX 96
             43eaf0    243 FUNC INARGS    1  ARG0 4 
-            43eb30      3 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, 1 
+            43eb30      3 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, 1 
             43eb58      4 INSTR CHECK OVERFLOW SIGNED 64  R8 ZZ add     r8d, 1 
             43ebf0     86 FUNC RETURNTYPE RAX 4
             43ebf0     86 FUNC INARGS    6  ARG0 0 ARG1 16 ARG2 2 ARG3 1 ARG4 0 ARG5 0 
@@ -2595,7 +2595,7 @@
             440ac4      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+RAX ZZ lea     rsi, [rdi+rax+2] 
             440ac4      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+RAX+2 ZZ lea     rsi, [rdi+rax+2] 
             440ae3      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ add     rdx, 1          ; n 
-            440bab      3 INSTR CHECK OVERFLOW SIGNED 32  EBP ZZ add     ebp, 1 
+            440bab      3 INSTR CHECK OVERFLOW SIGNED 32  RBP ZZ add     ebp, 1 
             440dde      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, [rbx+158h] 
             440dfc      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, rcx        ; s 
             440e28      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 19 lea     rdx, [path_info_len+1]; n 
@@ -2682,7 +2682,7 @@
             443b90    698 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 4 ARG4 4 ARG5 0 
             443b90    698 FUNC PROBLEM writev_nonblocking CALLUNRESOLVED 
             443c48      5 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, [rsp+98h+vec] 
-            443c59      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, r13d 
+            443c59      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, r13d 
             443ca4      5 INSTR CHECK OVERFLOW UNSIGNED 64  R12 ZZ IDIOM 15 add     r12, [rsp+98h+vec] 
             443e50    938 FUNC RETURNTYPE RAX 1
             443e50    938 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 4 ARG4 1 ARG5 0 
@@ -2765,19 +2765,19 @@
             445ee0    789 FUNC RETURNTYPE RAX 96
             445ee0    789 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4461a3      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R8 ZZ add     r8d, 1 
-            4461ad      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
-            4461b1      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 13h 
-            4461bc      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, eax 
+            4461ad      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
+            4461b1      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 13h 
+            4461bc      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, eax 
             446200    480 FUNC RETURNTYPE RAX 0
             446200    480 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4462a4      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
-            4462a8      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 13h 
-            4462af      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, eax 
-            4462cf      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 1 
+            4462a4      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
+            4462a8      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 13h 
+            4462af      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, eax 
+            4462cf      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 1 
             4463a3      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R8 ZZ add     r8d, 1 
-            4463ad      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
-            4463b1      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 13h 
-            4463bb      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, eax 
+            4463ad      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
+            4463b1      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 13h 
+            4463bb      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, eax 
             4463e0     69 FUNC RETURNTYPE RAX 1
             4463e0     69 FUNC INARGS    6  ARG0 16 ARG1 16 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             446430    135 FUNC RETURNTYPE RAX 1
@@ -3108,7 +3108,7 @@
             44d1d0     81 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44d230    221 FUNC RETURNTYPE RAX 1
             44d230    221 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            44d278      2 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 32 EAX ZZ IDIOM 14 mov     ecx, eax 
+            44d278      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ IDIOM 14 mov     ecx, eax 
             44d310    115 FUNC RETURNTYPE RAX 1
             44d310    115 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 0 
             44d390    155 FUNC RETURNTYPE RAX 0
@@ -3151,31 +3151,31 @@
             44da60   3428 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 4 
             44da60   3428 FUNC PROBLEM log_error_core CALLUNRESOLVED 
             44dd70      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R12 ZZ add     r12d, 1 
-            44dee0      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebp 
+            44dee0      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebp 
             44deed      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 STACKMEMSINK add     rdi, rcx        ; dest 
             44e016      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 STACKMEMSINK add     rdi, rbx 
             44e06a      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 STACKMEMSINK add     rdi, rbx        ; buf 
-            44e08b      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, ebx        ; int 
+            44e08b      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, ebx        ; int 
             44e08d      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ IDIOM 18 STACKMEMSINK add     rdx, rsi        ; char * 
             44e1a0      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax        ; errstr 
             44e23d      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 STACKMEMSINK add     rdx, rbx        ; char * 
-            44e269      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebx        ; buflen 
+            44e269      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebx        ; buflen 
             44e26b      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 STACKMEMSINK add     rdi, rsi        ; buf 
             44e2a2      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 STACKMEMSINK add     rdi, rbx        ; dest 
             44e2cf      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 STACKMEMSINK add     rdx, rbx        ; char * 
-            44e300      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebx        ; buflen 
+            44e300      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebx        ; buflen 
             44e302      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 STACKMEMSINK add     rdi, rcx        ; buf 
-            44e330      4 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, [rsp+4128h+errstr_start]; int 
+            44e330      4 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, [rsp+4128h+errstr_start]; int 
             44e345      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ IDIOM 18 STACKMEMSINK add     rdx, rsi        ; char * 
-            44e35d      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, ebx        ; int 
+            44e35d      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, ebx        ; int 
             44e375      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ IDIOM 18 STACKMEMSINK add     rdx, rax        ; char * 
-            44e396      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebx        ; buflen 
+            44e396      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebx        ; buflen 
             44e398      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 STACKMEMSINK add     rdi, rcx        ; buf 
-            44e3b2      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, ebx        ; int 
+            44e3b2      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, ebx        ; int 
             44e3b7      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ IDIOM 18 STACKMEMSINK add     rdx, rsi        ; char * 
-            44e3d3      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebx        ; buflen 
+            44e3d3      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebx        ; buflen 
             44e3da      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 STACKMEMSINK add     rdi, r12        ; buf 
-            44e3fb      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, r13d       ; int 
+            44e3fb      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, r13d       ; int 
             44e3fe      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ IDIOM 18 STACKMEMSINK add     rdx, rax        ; char * 
             44e6ac      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, 198h       ; id 
             44e73f      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+176 ZZ IDIOM 18 MEMORYSINK lea     rdx, [c_0+0B0h] ; id 
@@ -3233,11 +3233,11 @@
             44ffb9      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R13 ZZ mov     rdx, r13        ; n 
             450060    336 FUNC RETURNTYPE RAX 4
             450060    336 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            450090      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 2 
+            450090      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 2 
             4501b0   1713 FUNC RETURNTYPE RAX 4
             4501b0   1713 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4505b6      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+6 ZZ lea     rsi, [rax+6] 
-            4506e7      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 19h 
+            4506e7      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 19h 
             450870    206 FUNC RETURNTYPE RAX 1
             450870    206 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             450940    637 FUNC RETURNTYPE RAX 4
@@ -3324,7 +3324,7 @@
             453200     36 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             453230    822 FUNC RETURNTYPE RAX 96
             453230    822 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
-            4533f9      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 16 DX ZZ IDIOM 5 movzx   ecx, dx 
+            4533f9      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDX 16 DX ZZ IDIOM 5 movzx   ecx, dx 
             45347a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+8] 
             453570     96 FUNC RETURNTYPE RAX 96
             453570     96 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
@@ -3391,7 +3391,7 @@
             455250     50 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             455290    504 FUNC RETURNTYPE RAX 0
             455290    504 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4553cd      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 1 
+            4553cd      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 1 
             455490     22 FUNC RETURNTYPE RAX 1
             455490     22 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4554b0    448 FUNC RETURNTYPE RAX 1
@@ -3449,7 +3449,7 @@
             4569e0      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, str 
             456a90    428 FUNC RETURNTYPE RAX 1
             456a90    428 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
-            456b22      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r14d 
+            456b22      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r14d 
             456b6c      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+RDX ZZ lea     rsi, [rax+rdx+1] 
             456b6c      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+RDX+1 ZZ lea     rsi, [rax+rdx+1] 
             456b76      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R14 ZZ mov     rdx, startl     ; n 
@@ -3517,7 +3517,7 @@
             458b27      3 INSTR CHECK OVERFLOW UNSIGNED 64  RAX ZZ SINKMALLOC add     rax, rsi 
             458b83      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rax+8]    ; dest 
             458c33      3 INSTR CHECK OVERFLOW SIGNED 64  RDX ZZ add     rdx, rax 
-            458c8c      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EAX ZZ SINKMALLOC add     eax, esi 
+            458c8c      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RAX ZZ SINKMALLOC add     eax, esi 
             458e20    170 FUNC RETURNTYPE RAX 1
             458e20    170 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             458ed0    106 FUNC RETURNTYPE RAX 96
@@ -3646,7 +3646,7 @@
             45b6d0    105 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             45b740    109 FUNC RETURNTYPE RAX 1
             45b740    109 FUNC INARGS    4  ARG0 1 ARG1 0 ARG2 0 ARG3 0 
-            45b752      3 INSTR CHECK UNDERFLOW SIGNED 32  EDI ZZ sub     edi, 64h 
+            45b752      3 INSTR CHECK UNDERFLOW SIGNED 32  RDI ZZ sub     edi, 64h 
             45b7b0     16 FUNC RETURNTYPE RAX 0
             45b7b0     16 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
             45b7c0     45 FUNC RETURNTYPE RAX 1
@@ -3751,7 +3751,7 @@
             461170    321 FUNC INARGS    5  ARG0 4 ARG1 0 ARG2 1 ARG3 0 ARG4 0 
             4612c0    659 FUNC RETURNTYPE RAX 1
             4612c0    659 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            46130a      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, esi        ; read_policy 
+            46130a      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, esi        ; read_policy 
             461560    256 FUNC RETURNTYPE RAX 4
             461560    256 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             461660    863 FUNC RETURNTYPE RAX 0
@@ -3852,7 +3852,7 @@
             464f8b      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, rbx 
             465076      3 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     r8d, eax        ; status 
             4653b9      3 INSTR CHECK OVERFLOW SIGNED 32 ECX ZZ imul    ecx, ebx 
-            4653d4      2 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, ebp 
+            4653d4      2 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, ebp 
             465560      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+48 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r15+30h] 
             46566f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+48 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r15+30h] 
             465880    208 FUNC RETURNTYPE RAX 1
diff --git a/tests/commit/save-less.psexe.infoannot b/tests/commit/save-less.psexe.infoannot
index 34d80878..8a68a153 100644
--- a/tests/commit/save-less.psexe.infoannot
+++ b/tests/commit/save-less.psexe.infoannot
@@ -192,7 +192,7 @@
             402a30    352 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             402b90   1618 FUNC RETURNTYPE RAX 1
             402b90   1618 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 2 ARG3 0 ARG4 0 ARG5 0 
-            4030d8      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, 1          ; int 
+            4030d8      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, 1          ; int 
             4031f0    125 FUNC RETURNTYPE RAX 0
             4031f0    125 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             403270     22 FUNC RETURNTYPE RAX 1
@@ -243,7 +243,7 @@
             403980   1425 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             403dd9      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+RSI ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+rsi+2Ch]; buf 
             403dd9      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+RSI+44 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+rsi+2Ch]; buf 
-            403e2e      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, esi 
+            403e2e      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, esi 
             403e30      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+RSI ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+rsi+2Ch] 
             403e30      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+RSI+44 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+rsi+2Ch] 
             403f20     41 FUNC RETURNTYPE RAX 1
@@ -286,7 +286,7 @@
             404c40    114 FUNC INARGS    4  ARG0 1 ARG1 0 ARG2 0 ARG3 0 
             404cc0    180 FUNC RETURNTYPE RAX 1
             404cc0    180 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            404cda      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 EBX 8 BL ZZ IDIOM 14 movsx   edi, bl 
+            404cda      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RBX 8 BL ZZ IDIOM 14 movsx   edi, bl 
             404cda      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 BL ZZ IDIOM 20 movsx   edi, bl 
             404d80    347 FUNC RETURNTYPE RAX 1
             404d80    347 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
@@ -308,7 +308,7 @@
             405490     47 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             4054c0    395 FUNC RETURNTYPE RAX 16
             4054c0    395 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 1 ARG3 4 ARG4 4 ARG5 0 
-            405572      2 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 ESI 32 ESI ZZ IDIOM 26 mov     edi, esi 
+            405572      2 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RSI 32 ESI ZZ IDIOM 26 mov     edi, esi 
             405650    103 FUNC RETURNTYPE RAX 0
             405650    103 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 96 ARG3 8 ARG4 0 ARG5 0 
             4056c0    119 FUNC RETURNTYPE RAX 16
@@ -480,7 +480,7 @@
             40a6f0    182 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40a7b0     32 FUNC RETURNTYPE RAX 1
             40a7b0     32 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40a7ba      3 INSTR CHECK TRUNCATION SIGNED 32 EBX 8 BL ZZ movsx   esi, bl         ; c 
+            40a7ba      3 INSTR CHECK TRUNCATION SIGNED 32 RBX 8 BL ZZ movsx   esi, bl         ; c 
             40a7d0     33 FUNC RETURNTYPE RAX 0
             40a7d0     33 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 96 ARG3 1 ARG4 1 ARG5 4 
             40a800    262 FUNC RETURNTYPE RAX 4
@@ -534,12 +534,12 @@
             40b840     33 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             40b870    708 FUNC RETURNTYPE RAX 0
             40b870    708 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 1 ARG3 1 ARG4 1 ARG5 0 
-            40ba6c      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
+            40ba6c      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 1 
             40bb40    305 FUNC RETURNTYPE RAX 0
             40bb40    305 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 1 ARG3 1 ARG4 1 ARG5 0 
             40bc80    393 FUNC RETURNTYPE RAX 0
             40bc80    393 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
-            40bdcd      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
+            40bdcd      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 1 
             40be10    146 FUNC RETURNTYPE RAX 0
             40be10    146 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             40be75      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edi, eax 
@@ -593,7 +593,7 @@
             40c8d0    786 FUNC RETURNTYPE RAX 0
             40c8d0    786 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 96 ARG3 96 ARG4 1 ARG5 0 
             40c98a      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+-1 ZZ lea     edi, [r12-1] 
-            40c9e0      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ neg     edi 
+            40c9e0      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ neg     edi 
             40cbc0      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+1 ZZ lea     edi, [r13+1] 
             40cbf0    115 FUNC RETURNTYPE RAX 1
             40cbf0    115 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -605,7 +605,7 @@
             40cd60    210 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40ce40    146 FUNC RETURNTYPE RAX 0
             40ce40    146 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
-            40ce8f      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDI ZZ sub     edi, 1 
+            40ce8f      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDI ZZ sub     edi, 1 
             40cee0    254 FUNC RETURNTYPE RAX 1
             40cee0    254 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             40cf15      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 RBX ZZ mov     rdi, rbx        ; nmemb 
@@ -648,7 +648,7 @@
             40da2d      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 BL ZZ movsx   edi, bl 
             40db30      3 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, rax 
             40db33      3 INSTR CHECK OVERFLOW SIGNED 64  RDX ZZ add     rdx, rax 
-            40dba3      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, edx 
+            40dba3      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, edx 
             40dba5      3 INSTR CHECK OVERFLOW SIGNED 64  RDX ZZ add     rdx, rax 
             40de9f      7 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, cs:qword_624AD8 
             40def0   1249 FUNC RETURNTYPE RAX 1
@@ -659,13 +659,13 @@
             40e3e0     13 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 1 ARG3 96 
             40e3f0    701 FUNC RETURNTYPE RAX 1
             40e3f0    701 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40e451      4 INSTR CHECK TRUNCATION SIGNED 32 EBX 8 BL ZZ movsx   rdi, bl 
-            40e650      2 INSTR CHECK UNDERFLOW SIGNED 32  EDI ZZ sub     edi, eax 
+            40e451      4 INSTR CHECK TRUNCATION SIGNED 32 RBX 8 BL ZZ movsx   rdi, bl 
+            40e650      2 INSTR CHECK UNDERFLOW SIGNED 32  RDI ZZ sub     edi, eax 
             40e6b0     43 FUNC RETURNTYPE RAX 1
             40e6b0     43 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40e6e0    423 FUNC RETURNTYPE RAX 1
             40e6e0    423 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
-            40e7d8      2 INSTR CHECK UNDERFLOW SIGNED 32  EDI ZZ sub     edi, eax 
+            40e7d8      2 INSTR CHECK UNDERFLOW SIGNED 32  RDI ZZ sub     edi, eax 
             40e890     21 FUNC RETURNTYPE RAX 4
             40e890     21 FUNC INARGS    4  ARG0 1 ARG1 1 ARG2 0 ARG3 96 
             40e8b0     98 FUNC RETURNTYPE RAX 1
@@ -789,7 +789,7 @@
             411440    122 FUNC PROBLEM sub_411440 CALLUNRESOLVED 
             4114c0     70 FUNC RETURNTYPE RAX 4
             4114c0     70 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
-            4114f1      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, 20h 
+            4114f1      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, 20h 
             411510    408 FUNC RETURNTYPE RAX 1
             411510    408 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
             4116b0    285 FUNC RETURNTYPE RAX 1
@@ -877,7 +877,7 @@
             4129f0    142 FUNC PROBLEM sub_4129F0 CHUNKS 
             412e60      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX+-1 ZZ lea     rdi, [rax-1] 
             412eca      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+-1 ZZ lea     rdi, [rax-1] 
-            412ee7      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, 1 
+            412ee7      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, 1 
             412ef8      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX+1 ZZ lea     rdi, [rax+1] 
             4130e0     16 FUNC RETURNTYPE RAX 0
             4130e0     16 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
diff --git a/tests/commit/save-ls-64bit.psexe.infoannot b/tests/commit/save-ls-64bit.psexe.infoannot
index 61bc1af6..b8f84b40 100644
--- a/tests/commit/save-ls-64bit.psexe.infoannot
+++ b/tests/commit/save-ls-64bit.psexe.infoannot
@@ -291,7 +291,7 @@
             4059e0    246 FUNC INARGS    4  ARG0 1 ARG1 0 ARG2 1 ARG3 0 
             405ae0     64 FUNC RETURNTYPE RAX 1
             405ae0     64 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
-            405b16      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   esi, bl         ; int 
+            405b16      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BL ZZ IDIOM 5 movzx   esi, bl         ; int 
             405b20    372 FUNC RETURNTYPE RAX 0
             405b20    372 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             405ca0    116 FUNC RETURNTYPE RAX 0
@@ -464,7 +464,7 @@
             40a3d0    135 FUNC RETURNTYPE RAX 0
             40a3d0    135 FUNC INARGS    2  ARG0 4 ARG1 0 
             40a41b      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RSI+-48 ZZ lea     r9d, [rsi-30h] 
-            40a428      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, 41h 
+            40a428      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, 41h 
             40a790     61 FUNC RETURNTYPE RAX 1
             40a790     61 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 16 
             40a7d0     68 FUNC RETURNTYPE RAX 1
@@ -504,8 +504,8 @@
             40baa0   1940 FUNC RETURNTYPE RAX 4
             40baa0   1940 FUNC INARGS    6  ARG0 0 ARG1 8 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             40bb12      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+-1 ZZ lea     rdx, [rax-1] 
-            40be99      3 INSTR CHECK OVERFLOW SIGNED 32  EBP ZZ add     ebp, 1 
-            40bef4      3 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, 30h 
+            40be99      3 INSTR CHECK OVERFLOW SIGNED 32  RBP ZZ add     ebp, 1 
+            40bef4      3 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, 30h 
             40bef7      7 INSTR CHECK OVERFLOW UNSIGNED 64  R9 ZZ IDIOM 18 MEMORYSINK add     r9, 287h 
             40bf08      3 INSTR CHECK UNDERFLOW UNSIGNED 64  R9 ZZ IDIOM 18 MEMORYSINK sub     r9, r8 
             40bf88      3 INSTR CHECK UNDERFLOW UNSIGNED 64  R9 ZZ IDIOM 18 MEMORYSINK sub     r9, r8 
@@ -531,7 +531,7 @@
             40cb3a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RAX ZZ add     rax, r14 
             40cd10    496 FUNC RETURNTYPE RAX 1
             40cd10    496 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 96 ARG4 0 ARG5 4 
-            40cda5      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebp 
+            40cda5      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebp 
             40cdd3      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, rbx        ; n 
             40cf00     51 FUNC RETURNTYPE RAX 0
             40cf00     51 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 96 ARG4 1 ARG5 0 
diff --git a/tests/commit/save-lt-svn.psexe.infoannot b/tests/commit/save-lt-svn.psexe.infoannot
index 970d9b45..b726c940 100644
--- a/tests/commit/save-lt-svn.psexe.infoannot
+++ b/tests/commit/save-lt-svn.psexe.infoannot
@@ -607,7 +607,7 @@
             40b7e0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [b+8] 
             40b8f0   1068 FUNC RETURNTYPE RAX 96
             40b8f0   1068 FUNC INARGS    3  ARG0 0 ARG1 4 ARG2 0 
-            40b991      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, 1 
+            40b991      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, 1 
             40bbee      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 78h        ; baton 
             40bd20    398 FUNC RETURNTYPE RAX 96
             40bd20    398 FUNC INARGS    3  ARG0 0 ARG1 4 ARG2 0 
@@ -660,8 +660,8 @@
             40e1ab      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 0Ch 
             40e1be      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+24 ZZ lea     rdx, [rax+18h] 
             40e1c2      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+12 ZZ lea     rsi, [rax+0Ch] 
-            40e21c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, [rax+0Ch] 
-            40e265      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, [rax+0Ch] 
+            40e21c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, [rax+0Ch] 
+            40e265      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, [rax+0Ch] 
             40e303      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+24 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rdx+18h] 
             40e307      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDI+24 ZZ lea     rsi, [rdi+18h] 
             40e30b      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, 0Ch 
@@ -832,7 +832,7 @@
             41b764      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+412 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rbp+19Ch] 
             41bc7d      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+376 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rbp+178h] 
             41be38      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+48 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rbp+30h] 
-            41c4e7      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 1 
+            41c4e7      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 1 
             41c7e1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+72 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rdi+48h]  ; notify_baton_p 
             41c7e8      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 40h        ; notify_func_p 
             41cc17      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RDI ZZ IDIOM 11 CONST 4294967168 sub     rdi, 0FFFFFFFFFFFFFF80h 
diff --git a/tests/commit/save-nginx.psexe.infoannot b/tests/commit/save-nginx.psexe.infoannot
index 9732b271..7a570235 100644
--- a/tests/commit/save-nginx.psexe.infoannot
+++ b/tests/commit/save-nginx.psexe.infoannot
@@ -399,7 +399,7 @@
             4044a6   2698 FUNC RETURNTYPE RAX 1
             4044a6   2698 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40453a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+-63 ZZ IDIOM 32 lea     r8d, [rdx-3Fh] 
-            404790      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 8 DL ZZ IDIOM 5 movzx   edx, dl 
+            404790      3 INSTR CHECK TRUNCATION UNSIGNED 64 RDX 8 DL ZZ IDIOM 5 movzx   edx, dl 
             4048c3      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBP+1 ZZ lea     edi, [argc+1] 
             404c14      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RSI ZZ IDIOM 19 sub     rsi, rbp        ; n 
             404e4a      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+136 ZZ IDIOM 18 MEMORYSINK lea     rdi, [ccf+88h]  ; name 
@@ -510,7 +510,7 @@
             406b54      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, rdi        ; size 
             406bce      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+R12 ZZ lea     rdx, [size+size]; n 
             406bf6      3 INSTR CHECK OVERFLOW UNSIGNED 64  RCX ZZ IDIOM 15 add     rcx, names 
-            406c1c      3 INSTR CHECK OVERFLOW UNSIGNED 16  EAX ZZ IDIOM 28 add     ax, [rdx] 
+            406c1c      3 INSTR CHECK OVERFLOW UNSIGNED 16  RAX ZZ IDIOM 28 add     ax, [rdx] 
             406d23      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12*8 ZZ lea     rsi, ds:18h[size*8]; size 
             406d23      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12*8+24 ZZ lea     rsi, ds:18h[size*8]; size 
             406d5b      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12*8 ZZ lea     rsi, ds:0[size*8]; size 
@@ -595,9 +595,9 @@
             408cf9   2268 FUNC RETURNTYPE RAX 4
             408cf9   2268 FUNC INARGS    4  ARG0 4 ARG1 96 ARG2 4 ARG3 4 
             408e56      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RSI+-37 ZZ IDIOM 32 lea     eax, [rsi-25h] 
-            409438      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   ecx, cl         ; zero 
-            40956c      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   ecx, cl         ; zero 
-            4095ad      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   ecx, cl         ; zero 
+            409438      3 INSTR CHECK TRUNCATION UNSIGNED 32 RCX 8 CL ZZ IDIOM 5 movzx   ecx, cl         ; zero 
+            40956c      3 INSTR CHECK TRUNCATION UNSIGNED 32 RCX 8 CL ZZ IDIOM 5 movzx   ecx, cl         ; zero 
+            4095ad      3 INSTR CHECK TRUNCATION UNSIGNED 32 RCX 8 CL ZZ IDIOM 5 movzx   ecx, cl         ; zero 
             4095d5    138 FUNC RETURNTYPE RAX 4
             4095d5    138 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 16 ARG4 1 ARG5 0 
             40965f    141 FUNC RETURNTYPE RAX 4
@@ -664,8 +664,8 @@
             40a244      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RCX+-48 ZZ IDIOM 32 lea     r8d, [rcx-30h] 
             40a25b      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R8+-97 ZZ lea     r12d, [c-61h] 
             40a286      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RCX+-48 ZZ IDIOM 32 lea     r8d, [rcx-30h] 
-            40a2a5      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ IDIOM 31 sub     ecx, 56h 
-            40a356      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ IDIOM 31 sub     ecx, 7Dh 
+            40a2a5      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ IDIOM 31 sub     ecx, 56h 
+            40a356      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ IDIOM 31 sub     ecx, 7Dh 
             40a3c3    250 FUNC RETURNTYPE RAX 4
             40a3c3    250 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 1 
             40a4bd    142 FUNC RETURNTYPE RAX 4
@@ -831,8 +831,8 @@
             40ebee   1068 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40ed8a      3 INSTR CHECK OVERFLOW SIGNED 64  RDX ZZ add     rdx, rcx 
             40ed95      3 INSTR CHECK UNDERFLOW SIGNED 64  RDX ZZ sub     rdx, rcx 
-            40ee81      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, 1 
-            40ef75      3 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, 2Bh 
+            40ee81      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ sub     ecx, 1 
+            40ef75      3 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, 2Bh 
             40f01a     69 FUNC RETURNTYPE RAX 4
             40f01a     69 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 1 ARG4 1 ARG5 4 
             40f05f    173 FUNC RETURNTYPE RAX 0
@@ -1527,7 +1527,7 @@
             421856    717 FUNC RETURNTYPE RAX 1
             421856    717 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             421856    717 FUNC PROBLEM ngx_epoll_process_events CALLUNRESOLVED 
-            421881      2 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 ESI 32 ESI ZZ IDIOM 26 mov     ecx, esi        ; timeout 
+            421881      2 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RSI 32 ESI ZZ IDIOM 26 mov     ecx, esi        ; timeout 
             421b23    195 FUNC RETURNTYPE RAX 1
             421b23    195 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             421be6    154 FUNC RETURNTYPE RAX 1
@@ -1608,7 +1608,7 @@
             4238d2      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDX ZZ sub     rdx, rsi        ; size 
             423a15      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R15+R13 ZZ lea     rdx, [send+size] 
             423a2a      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R13 ZZ mov     rdx, size       ; n 
-            423ac2      2 INSTR CHECK TRUNCATION SIGNED 64 RAX 32 EAX ZZ cdqe 
+            423ac2      2 INSTR CHECK TRUNCATION SIGNED 64 RAX 32 RAX ZZ cdqe 
             423b62    582 FUNC RETURNTYPE RAX 1
             423b62    582 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             423da8     54 FUNC RETURNTYPE RAX 1
@@ -1686,8 +1686,8 @@
             425d8c     39 FUNC PROBLEM ngx_ssl_ocsp_process_body CALLUNRESOLVED 
             425db3    696 FUNC RETURNTYPE RAX 1
             425db3    696 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            425e45      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ IDIOM 31 sub     ecx, 31h        ; jumptable 0000000000425DE9 case 5 
-            425e75      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ IDIOM 31 sub     ecx, 30h        ; jumptable 0000000000425DE9 case 7 
+            425e45      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ IDIOM 31 sub     ecx, 31h        ; jumptable 0000000000425DE9 case 5 
+            425e75      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ IDIOM 31 sub     ecx, 30h        ; jumptable 0000000000425DE9 case 7 
             425eae      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RCX+-48 ZZ IDIOM 32 lea     r8d, [rcx-30h] 
             42606b    860 FUNC RETURNTYPE RAX 1
             42606b    860 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1722,7 +1722,7 @@
             426c6a   1542 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             426fc3      4 INSTR CHECK OVERFLOW SIGNED 64  RDX ZZ add     rdx, 2 
             426fda      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX*4 ZZ IDIOM 32 lea     rsi, ds:0[rdx*4]; size 
-            427030      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, [r12+30h] 
+            427030      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, [r12+30h] 
             42703a      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RSI+RAX ZZ lea     esi, [rsi+rax+1Ah] 
             42703a      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RSI+RAX+26 ZZ lea     esi, [rsi+rax+1Ah] 
             42703e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14*2 ZZ lea     esi, [rsi+r14*2] 
@@ -1963,7 +1963,7 @@
             42f10c    550 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             42f19e      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+464 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r+1D0h]   ; l 
             42f2a3      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, [rsp+48h+val.data] 
-            42f2b2      2 INSTR CHECK OVERFLOW UNSIGNED 32  ECX ZZ add     ecx, ecx 
+            42f2b2      2 INSTR CHECK OVERFLOW UNSIGNED 32  RCX ZZ add     ecx, ecx 
             42f332    500 FUNC RETURNTYPE RAX 4
             42f332    500 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             42f3d4      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RCX ZZ sub     reserved, alias 
@@ -2192,7 +2192,7 @@
             435af5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rev+28h]  ; node 
             435be0   2867 FUNC RETURNTYPE RAX 1
             435be0   2867 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 0 
-            436031      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ IDIOM 31 sub     edx, 21h 
+            436031      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ IDIOM 31 sub     edx, 21h 
             43646b      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+-49 ZZ IDIOM 32 lea     ecx, [rdx-31h]  ; jumptable 0000000000435C0B case 21 
             436498      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+-48 ZZ IDIOM 32 lea     ecx, [rdx-30h] 
             4364c1      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+-48 ZZ IDIOM 32 lea     ecx, [rdx-30h]  ; jumptable 0000000000435C0B case 23 
@@ -2207,7 +2207,7 @@
             437012      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+-48 ZZ IDIOM 32 lea     r11d, [ch_0-30h] 
             437031      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+-97 ZZ lea     ecx, [c-61h] 
             437053      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+-48 ZZ IDIOM 32 lea     ecx, [ch_0-30h] ; jumptable 0000000000436D70 case 5 
-            437061      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ IDIOM 15 add     edx, ecx 
+            437061      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ IDIOM 15 add     edx, ecx 
             437093      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+-97 ZZ lea     ecx, [c-61h] 
             4370a5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+RCX ZZ IDIOM 15 lea     edx, [c+rcx-57h] 
             4370a5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+RCX+-87 ZZ IDIOM 15 lea     edx, [c+rcx-57h] 
@@ -2232,8 +2232,8 @@
             437998    920 FUNC RETURNTYPE RAX 1
             437998    920 FUNC INARGS    3  ARG0 0 ARG1 4 ARG2 4 
             437a0c      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDI+-97 ZZ lea     ecx, [c-61h] 
-            437a90      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDI ZZ IDIOM 31 sub     edi, 9 
-            437aba      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDI ZZ IDIOM 31 sub     edi, 9 
+            437a90      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDI ZZ IDIOM 31 sub     edi, 9 
+            437aba      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDI ZZ IDIOM 31 sub     edi, 9 
             437d30     17 FUNC RETURNTYPE RAX 1
             437d30     17 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             437d41   2866 FUNC RETURNTYPE RAX 1
@@ -2563,9 +2563,9 @@
             43f02f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+16 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+10h]  ; src 
             43f066    184 FUNC RETURNTYPE RAX 4
             43f066    184 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            43f0bf      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            43f0bf      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             43f0c7      3 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, r8         ; src 
-            43f0ea      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            43f0ea      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             43f0f2      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, p          ; src 
             43f11e    139 FUNC RETURNTYPE RAX 4
             43f11e    139 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -2990,7 +2990,7 @@
             44a29a   2015 FUNC RETURNTYPE RAX 1
             44a29a   2015 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44a29a   2015 FUNC PROBLEM ngx_http_range_header_filter CALLUNRESOLVED 
-            44a493      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, 30h 
+            44a493      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, 30h 
             44a529      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDX+-48 ZZ IDIOM 32 lea     eax, [rdx-30h] 
             44a5ff      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+464 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r+1D0h]   ; l 
             44a623      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+464 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r+1D0h]   ; l 
@@ -3216,7 +3216,7 @@
             44ec06   2234 FUNC RETURNTYPE RAX 1
             44ec06   2234 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44ec06   2234 FUNC PROBLEM ngx_http_gzip_body_filter CALLUNRESOLVED 
-            44ee16      2 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ neg     ecx 
+            44ee16      2 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ neg     ecx 
             44ee1d      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+144 ZZ IDIOM 18 MEMORYSINK lea     rdi, [ctx+90h] 
             44eef0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     rdx, [ctx+10h]  ; busy 
             44eef4      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rsi, [ctx+8]    ; free 
@@ -3329,8 +3329,8 @@
             452f0b    859 FUNC RETURNTYPE RAX 1
             452f0b    859 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
             45313e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+-1 ZZ IDIOM 32 lea     rdx, [rcx-1]    ; n 
-            453155      2 INSTR CHECK OVERFLOW UNSIGNED 32  ECX ZZ add     ecx, eax 
-            453157      2 INSTR CHECK OVERFLOW UNSIGNED 32  ECX ZZ add     ecx, ecx 
+            453155      2 INSTR CHECK OVERFLOW UNSIGNED 32  RCX ZZ add     ecx, eax 
+            453157      2 INSTR CHECK OVERFLOW UNSIGNED 32  RCX ZZ add     ecx, ecx 
             453266    830 FUNC RETURNTYPE RAX 1
             453266    830 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             45335f      4 INSTR CHECK OVERFLOW UNSIGNED 64  RBX ZZ IDIOM 18 MEMORYSINK add     p, 1 
@@ -3436,7 +3436,7 @@
             455da8    163 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             455e4b    156 FUNC RETURNTYPE RAX 1
             455e4b    156 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
-            455e6a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 21h 
+            455e6a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 21h 
             455ee7    196 FUNC RETURNTYPE RAX 1
             455ee7    196 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             455f72      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+16 ZZ IDIOM 18 MEMORYSINK lea     rcx, [ctx+10h]  ; uid 
@@ -3468,13 +3468,12 @@
             456972      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+54 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+36h]  ; dst 
             4569ac      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [r_0+340h] 
             456a0c      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 36h        ; dest 
-            456b47      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, 30h        ; n 
             456b4b      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, 1          ; len 
             456b69      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, last_0     ; size 
             456c52      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX*4 ZZ lea     rdx, ds:0[rax*4] 
             456c69      5 INSTR CHECK OVERFLOW UNSIGNED 64 RDI ZZ IDIOM 33 imul    rdi, [rdx+8] 
             456c6e      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, [rbx+30h]  ; t 
-            456e42      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   ecx, cl 
+            456e42      3 INSTR CHECK TRUNCATION UNSIGNED 32 RCX 8 CL ZZ IDIOM 5 movzx   ecx, cl 
             456fa0     65 FUNC RETURNTYPE RAX 1
             456fa0     65 FUNC INARGS    4  ARG0 0 ARG1 4 ARG2 4 ARG3 0 
             456fe1     23 FUNC RETURNTYPE RAX 4
@@ -3678,7 +3677,7 @@
             45b6f0      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 15 sub     rdx, 20h        ; n 
             45b6f4      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1 ZZ IDIOM 15 lea     rdi, [rbx+1] 
             45b6fc      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 15 add     rdi, rcx        ; dest 
-            45b74f      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 8 DL ZZ IDIOM 5 movzx   esi, dl 
+            45b74f      3 INSTR CHECK TRUNCATION UNSIGNED 64 RDX 8 DL ZZ IDIOM 5 movzx   esi, dl 
             45b76a      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 8 AL ZZ IDIOM 5 movzx   edx, al 
             45b930      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+16 ZZ IDIOM 18 MEMORYSINK lea     rcx, [value+10h]; value 
             45ba13      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+16 ZZ IDIOM 18 MEMORYSINK lea     rcx, [value+10h]; value 
@@ -3998,10 +3997,10 @@
             464750    253 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46484d    496 FUNC RETURNTYPE RAX 1
             46484d    496 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 0 
-            4648a1      4 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   r8d, cl 
-            464906      4 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   r8d, cl 
-            464950      4 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   r8d, cl 
-            46499b      4 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   r8d, cl 
+            4648a1      4 INSTR CHECK TRUNCATION UNSIGNED 64 RCX 8 CL ZZ IDIOM 5 movzx   r8d, cl 
+            464906      4 INSTR CHECK TRUNCATION UNSIGNED 64 RCX 8 CL ZZ IDIOM 5 movzx   r8d, cl 
+            464950      4 INSTR CHECK TRUNCATION UNSIGNED 64 RCX 8 CL ZZ IDIOM 5 movzx   r8d, cl 
+            46499b      4 INSTR CHECK TRUNCATION UNSIGNED 64 RCX 8 CL ZZ IDIOM 5 movzx   r8d, cl 
             464a3d    908 FUNC RETURNTYPE RAX 1
             464a3d    908 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             464b4b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RSI+RCX ZZ lea     rax, [rsi+rcx] 
@@ -4047,7 +4046,7 @@
             465db7     87 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             465e0e    269 FUNC RETURNTYPE RAX 1
             465e0e    269 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            465e92      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, [flcf+178h] 
+            465e92      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, [flcf+178h] 
             465ed4      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [f+40h]    ; dest 
             465f1b     83 FUNC RETURNTYPE RAX 96
             465f1b     83 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
@@ -4347,10 +4346,10 @@
             46ea80   2239 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46ea80   2239 FUNC PROBLEM ssl23_get_client_hello CALLUNRESOLVED 
             46ec24      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBP+2 ZZ lea     esi, [rbp+2] 
-            46ec41      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, 2 
+            46ec41      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, 2 
             46ec44      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 2 
             46ece1      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13        ; src 
-            46ece4      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDI ZZ IDIOM 18 MEMORYSINK sub     edi, edx 
+            46ece4      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDI ZZ IDIOM 18 MEMORYSINK sub     edi, edx 
             46ecef      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, rax        ; dest 
             46f340    522 FUNC RETURNTYPE RAX 1
             46f340    522 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -4361,7 +4360,6 @@
             46f5b0   3786 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46f5b0   3786 FUNC PROBLEM ssl23_connect CALLUNRESOLVED 
             46f724      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+196 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdx+0C4h] 
-            46f808      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, 10h 
             46f881      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+196 ZZ lea     rdi, [rax+0C4h] 
             46f8ae      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R8 ZZ IDIOM 18 MEMORYSINK add     r8, [rsp+98h+var_70] 
             46f8b3      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+RDX ZZ IDIOM 18 MEMORYSINK lea     rsi, [rax+rdx+0C4h]; src 
@@ -4370,7 +4368,7 @@
             46f8dc      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R8+RCX ZZ IDIOM 18 MEMORYSINK lea     rdx, [r8+rcx] 
             46f8e0      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, rsi 
             46f8e3      2 INSTR CHECK TRUNCATION UNSIGNED 64 RDX 32 EDX ZZ mov     ecx, edx 
-            46fe27      6 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, 3E8h 
+            46fe27      6 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, 3E8h 
             46fe6e      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+200 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdx+0C8h] 
             46ff0c      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+196 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rcx+0C4h] 
             46ff32      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+46 ZZ IDIOM 18 MEMORYSINK lea     rcx, [r14+2Eh] 
@@ -4381,7 +4379,7 @@
             4700b7      2 INSTR CHECK TRUNCATION UNSIGNED 64 RDX 32 EDX ZZ IDIOM 14 mov     esi, edx 
             4700c6      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+5 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r14+5] 
             4700cd      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+-5 ZZ IDIOM 19 lea     edx, [rax-5] 
-            47019a      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, eax 
+            47019a      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, eax 
             4701a7      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 94h        ; dest 
             4701b0      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RSI+RAX ZZ IDIOM 18 MEMORYSINK lea     rsi, [rsi+rax+0C4h]; src 
             4701b0      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RSI+RAX+196 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rsi+rax+0C4h]; src 
@@ -4413,7 +4411,7 @@
             47085e      3 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, r13 
             470890     76 FUNC RETURNTYPE RAX 1
             470890     76 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4708b8      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, esi 
+            4708b8      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, esi 
             4708ba      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, r12 
             4708e0     45 FUNC RETURNTYPE RAX 16
             4708e0     45 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
@@ -4466,21 +4464,21 @@
             470fa0     63 FUNC INARGS    4  ARG0 0 ARG1 4 ARG2 0 ARG3 0 
             470fe0   2392 FUNC RETURNTYPE RAX 4
             470fe0   2392 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            471072      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, 3 
+            471072      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, 3 
             47110d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+2 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rcx+2] 
             471115      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+1 ZZ lea     edx, [rax+1] 
             471122      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+1 ZZ lea     ecx, [rax+1] 
             47112c      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R15 ZZ mov     rdx, r15        ; n 
             471139      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 3          ; dest 
-            4711d1      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 1 
+            4711d1      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 1 
             4711ec      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 3          ; dest 
-            471292      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 2 
+            471292      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 2 
             4712d2      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 2          ; dest 
             471397      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R14 ZZ mov     rdx, r14        ; n 
             4714e6      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 2 
             4715e3      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 2 
             47168a      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R14 ZZ mov     rdx, r14        ; n 
-            4716e1      2 INSTR CHECK TRUNCATION SIGNED 64 RAX 32 EAX ZZ cdqe 
+            4716e1      2 INSTR CHECK TRUNCATION SIGNED 64 RAX 32 RAX ZZ cdqe 
             471940   1391 FUNC RETURNTYPE RAX 4
             471940   1391 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             471940   1391 FUNC PROBLEM ssl_add_serverhello_tlsext CALLUNRESOLVED 
@@ -4489,10 +4487,10 @@
             471eb0   1490 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 8 ARG5 0 
             471eb0   1490 FUNC PROBLEM ssl_parse_serverhello_tlsext CALLUNRESOLVED 
             47201b      3 INSTR CHECK OVERFLOW UNSIGNED 64  R15 ZZ IDIOM 18 MEMORYSINK add     r15, r14 
-            4720b5      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 16 BX ZZ IDIOM 5 movzx   edx, bx 
-            4720ee      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EBX ZZ IDIOM 29 sub     ebx, 1 
+            4720b5      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 16 BX ZZ IDIOM 5 movzx   edx, bx 
+            4720ee      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RBX ZZ IDIOM 29 sub     ebx, 1 
             472159      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+5 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+5]    ; src 
-            47233d      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 16 BX ZZ IDIOM 5 movzx   edx, bx 
+            47233d      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 16 BX ZZ IDIOM 5 movzx   edx, bx 
             472490    356 FUNC RETURNTYPE RAX 1
             472490    356 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             472600    194 FUNC RETURNTYPE RAX 1
@@ -4509,7 +4507,7 @@
             472ac0    455 FUNC RETURNTYPE RAX 1
             472ac0    455 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 4 ARG5 0 
             472bb7      3 INSTR CHECK OVERFLOW UNSIGNED 64  RCX ZZ IDIOM 18 MEMORYSINK add     rcx, rsi 
-            472c1b      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 16 DX ZZ IDIOM 5 movzx   edx, dx 
+            472c1b      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDX 16 DX ZZ IDIOM 5 movzx   edx, dx 
             472c90    223 FUNC RETURNTYPE RAX 1
             472c90    223 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             472d70     52 FUNC RETURNTYPE RAX 1
@@ -4523,7 +4521,7 @@
             473010   2872 FUNC PROBLEM ssl_parse_clienthello_tlsext CALLUNRESOLVED 
             473183      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 R12 16 R12 ZZ IDIOM 5 movzx   eax, r12w 
             473183      4 INSTR CHECK SIGNEDNESS UNSIGNED 16 R12 ZZ IDIOM 20 movzx   eax, r12w 
-            4731a1      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, 3 
+            4731a1      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ sub     ecx, 3 
             4731af      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 R13 16 R13 ZZ IDIOM 5 movzx   r15d, r13w 
             4731af      4 INSTR CHECK SIGNEDNESS UNSIGNED 16 R13 ZZ IDIOM 20 movzx   r15d, r13w 
             473201      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15+1 ZZ IDIOM 32 lea     edi, [r15+1] 
@@ -4534,7 +4532,7 @@
             4735ee      4 INSTR CHECK TRUNCATION UNSIGNED 64 R12 16 R12 ZZ IDIOM 5 movzx   r13d, r12w 
             473687      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDI+-1 ZZ IDIOM 32 lea     eax, [rdi-1] 
             4736c3      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+5 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+5]    ; src 
-            473725      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EAX ZZ IDIOM 29 sub     eax, 2 
+            473725      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RAX ZZ IDIOM 29 sub     eax, 2 
             473790      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+6 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+6]    ; src 
             473886      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 R13 16 R13 ZZ IDIOM 5 movzx   edx, r13w 
             473886      4 INSTR CHECK SIGNEDNESS UNSIGNED 16 R13 ZZ IDIOM 20 movzx   edx, r13w 
@@ -4643,7 +4641,7 @@
             477650     97 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4776c0    280 FUNC RETURNTYPE RAX 1
             4776c0    280 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4777c2      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, ebx        ; n 
+            4777c2      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, ebx        ; n 
             4777e0     12 FUNC RETURNTYPE RAX 0
             4777e0     12 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             4777f0     12 FUNC RETURNTYPE RAX 0
@@ -5038,7 +5036,7 @@
             47ced0    445 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47cf33      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+RAX ZZ lea     rax, [r13+rax+2] 
             47cf33      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+RAX+2 ZZ lea     rax, [r13+rax+2] 
-            47cf60      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, 1 
+            47cf60      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, 1 
             47d090    469 FUNC RETURNTYPE RAX 1
             47d090    469 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             47d270    146 FUNC RETURNTYPE RAX 4
@@ -5389,7 +5387,7 @@
             486123      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RSI+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rsi+1]    ; s1 
             4861b0    227 FUNC RETURNTYPE RAX 1
             4861b0    227 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            4861f1      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, eax 
+            4861f1      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, eax 
             48620a      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 420h       ; src 
             48622b      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 461h       ; src 
             486232      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r12        ; dest 
@@ -5414,16 +5412,16 @@
             486752      6 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBP+-8304 ZZ lea     eax, [rbp-2070h] 
             4868b4      6 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBP+-8240 ZZ lea     eax, [rbp-2030h] 
             486903      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R14 ZZ add     r14, rax 
-            48691d      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, esi 
+            48691d      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ sub     ecx, esi 
             48691f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             486970      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R15 ZZ mov     edx, r15d       ; n 
-            486979      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, [rax+120h] 
+            486979      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, [rax+120h] 
             48697f      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 8          ; dest 
             486983      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r14        ; src 
             4869c7      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, r14 
             486a9a      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R15 ZZ mov     edx, r15d       ; n 
             486aa4      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 14h        ; dest 
-            486d56      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, esi 
+            486d56      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ sub     ecx, esi 
             486d58      3 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, r14 
             486dfa      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             486e3a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+1]    ; s1 
@@ -5433,17 +5431,17 @@
             486f24      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 48h        ; src 
             486f50      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 1          ; dest 
             486f54      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 94h        ; src 
-            486fb1      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            486fb1      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             486fb3      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
-            486ffc      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            486ffc      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             486ffe      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             48712e      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 0B8h 
-            4871f0      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            4871f0      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             4871f2      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             48728f      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, 0F0h 
-            487357      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            487357      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             487359      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
-            487522      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ IDIOM 31 sub     edx, 10h 
+            487522      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ IDIOM 31 sub     edx, 10h 
             48753e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+1] 
             487665      2 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RAX 32 EAX ZZ IDIOM 14 mov     edx, eax 
             48784f      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
@@ -5475,21 +5473,21 @@
             488bc1      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             488c01      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+1] 
             488c0b      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 94h 
-            488c60      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            488c60      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             488c62      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
-            488cc6      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            488cc6      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             488cc8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             488d71      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 0B8h       ; dest 
             488db0      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 1          ; dest 
             488db4      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 0B8h       ; src 
             488e28      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 48h        ; src 
-            488e70      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            488e70      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             488e72      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
-            488ed1      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            488ed1      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             488ed3      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
-            488fd0      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            488fd0      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             488fd2      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
-            489044      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            489044      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             489046      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             489112      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 0CCh 
             489159      2 INSTR CHECK TRUNCATION SIGNED 64 RAX 32 EAX ZZ mov     edx, eax 
@@ -5532,7 +5530,7 @@
             489fb0    205 FUNC RETURNTYPE RAX 1
             489fb0    205 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
             489fb0    205 FUNC PROBLEM ssl2_write_error CALLUNRESOLVED 
-            489ff2      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, ebp 
+            489ff2      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, ebp 
             489ffa      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax 
             48a080     37 FUNC RETURNTYPE RAX 0
             48a080     37 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 1 
@@ -5560,7 +5558,7 @@
             48a630    475 FUNC RETURNTYPE RAX 1
             48a630    475 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             48a6d4      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RBX+R15 ZZ lea     esi, [rbx+r15] 
-            48a6db      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebx 
+            48a6db      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebx 
             48a6e7      4 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rax+38h] 
             48a772      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15+RBX ZZ lea     edx, [r15+rbx]  ; n 
             48a7e3      2 INSTR CHECK SIGNEDNESS UNSIGNED 32 EBX ZZ mov     edx, ebx        ; n 
@@ -5632,7 +5630,7 @@
             48cd26      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0A4h 
             48cd5c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax 
             48cd70      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+2 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rbx+2] 
-            48cd8d      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, r14d 
+            48cd8d      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, r14d 
             48d2a0    673 FUNC RETURNTYPE RAX 1
             48d2a0    673 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             48d2ed      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+5 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+5] 
@@ -5680,13 +5678,13 @@
             48f3fc      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, [rsp+268h+dest] 
             48f42f      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, rbp 
             48f469      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+1 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rdx+1] 
-            48f49d      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, 4 
-            48f4b8      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, 0Ah 
+            48f49d      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, 4 
+            48f4b8      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, 0Ah 
             48f502      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+464 ZZ IDIOM 18 MEMORYSINK lea     rcx, [r14+1D0h] 
             48f523      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+448 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r14+1C0h] 
             48f580    231 FUNC RETURNTYPE RAX 1
             48f580    231 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            48f5aa      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 8 
+            48f5aa      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 8 
             48f621      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 8          ; dest 
             48f670    390 FUNC RETURNTYPE RAX 1
             48f670    390 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -5725,14 +5723,14 @@
             4919e0   4938 FUNC INARGS    1  ARG0 4 
             4919e0   4938 FUNC PROBLEM ssl3_get_key_exchange CALLUNRESOLVED 
             491bcd      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+2 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+2] 
-            491bfb      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, edi 
+            491bfb      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, edi 
             491bfd      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, rcx        ; s 
             491f3e      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0C4h 
             491f5b      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0A4h 
             491fd0      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0C4h 
             491fed      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0A4h 
             492020      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax 
-            49202c      4 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, [rsp+1D8h+var_168] 
+            49202c      4 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, [rsp+1D8h+var_168] 
             4921c2      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0C4h 
             4921df      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0A4h 
             492647      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+4 ZZ IDIOM 18 MEMORYSINK lea     r9, [r12+4] 
@@ -5867,7 +5865,7 @@
             498693      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0A4h 
             4986ac      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0C4h 
             4986ec      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 14h 
-            498736      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, dword ptr [rsp+118h+dest] 
+            498736      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, dword ptr [rsp+118h+dest] 
             498870     84 FUNC RETURNTYPE RAX 4
             498870     84 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4988d0    505 FUNC RETURNTYPE RAX 1
@@ -5916,9 +5914,9 @@
             499ab0     21 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
             499ad0    852 FUNC RETURNTYPE RAX 1
             499ad0    852 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            499b91      2 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, ebx 
+            499b91      2 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, ebx 
             499c09      5 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rsp+58h+var_48] 
-            499c11      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebx 
+            499c11      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebx 
             499c1a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r15 
             499d7f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r14        ; dest 
             499e30     78 FUNC RETURNTYPE RAX 1
@@ -5944,12 +5942,12 @@
             49a980   4438 FUNC RETURNTYPE RAX 1
             49a980   4438 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             49a980   4438 FUNC PROBLEM ssl3_read_bytes CALLUNRESOLVED 
-            49acef      6 INSTR CHECK OVERFLOW UNSIGNED 32  ECX ZZ add     ecx, [rbp+124h] 
+            49acef      6 INSTR CHECK OVERFLOW UNSIGNED 32  RCX ZZ add     ecx, [rbp+124h] 
             49ad1d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+1 ZZ lea     eax, [r14+1] 
-            49ae3d      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 EDX 16 DX ZZ IDIOM 14 movsx   r14d, dx 
+            49ae3d      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 RDX 16 DX ZZ IDIOM 14 movsx   r14d, dx 
             49ae3d      4 INSTR CHECK SIGNEDNESS UNSIGNED 16 DX ZZ IDIOM 20 movsx   r14d, dx 
             49ae68      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RAX ZZ sub     rax, 5 
-            49b1b5      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, 301h 
+            49b1b5      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, 301h 
             49b735      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, [rbp+130h] ; src 
             49b73c      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R12 ZZ mov     edx, r12d       ; n 
             49b911      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+1000 ZZ IDIOM 32 lea     edx, [r12+3E8h] 
@@ -5999,7 +5997,7 @@
             49c650   1038 FUNC RETURNTYPE RAX 1
             49c650   1038 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 4 
             49c650   1038 FUNC PROBLEM ssl3_get_message CALLUNRESOLVED 
-            49c771      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 4 
+            49c771      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 4 
             49c96b      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+4 ZZ lea     esi, [rcx+4] 
             49ca60    157 FUNC RETURNTYPE RAX 1
             49ca60    157 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -6047,7 +6045,7 @@
             49d875      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R15+-4 ZZ lea     r8d, [r15-4] 
             49d900      5 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, [rsp+3D8h+var_388] 
             49d929      5 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 STACKMEMSINK add     rdi, [rsp+3D8h+var_3D0]; dest 
-            49d936      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, ebx        ; n 
+            49d936      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, ebx        ; n 
             49de5f      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+-13 ZZ lea     edx, [r12-0Dh] 
             49e0f0    247 FUNC RETURNTYPE RAX 4
             49e0f0    247 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
@@ -6089,14 +6087,13 @@
             49f5a7      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 290h       ; src 
             49f610    717 FUNC RETURNTYPE RAX 1
             49f610    717 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
-            49f6b6      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, 1 
             49f6ba      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, [r12+8]    ; n 
             49f8b7      4 INSTR CHECK TRUNCATION UNSIGNED 64 R12 16 R12 ZZ IDIOM 5 movzx   ecx, r12w 
             49f8e0    181 FUNC RETURNTYPE RAX 1
             49f8e0    181 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
-            49f941      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, esi 
-            49f943      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, [rax+28h] 
-            49f946      3 INSTR CHECK TRUNCATION UNSIGNED 32 ESI 16 SI ZZ IDIOM 5 movzx   esi, si 
+            49f941      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, esi 
+            49f943      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, [rax+28h] 
+            49f946      3 INSTR CHECK TRUNCATION UNSIGNED 32 RSI 16 SI ZZ IDIOM 5 movzx   esi, si 
             49f9a0    133 FUNC RETURNTYPE RAX 4
             49f9a0    133 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             49fa30    102 FUNC RETURNTYPE RAX 0
@@ -6360,7 +6357,7 @@
             4a5797      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RSI ZZ sub     rsi, r12 
             4a57d4      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+2 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rcx+2] 
             4a57e1      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RCX ZZ IDIOM 18 MEMORYSINK sbb     rcx, 3 
-            4a57e5      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ IDIOM 19 sub     ecx, ebp 
+            4a57e5      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ IDIOM 19 sub     ecx, ebp 
             4a5804      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+RCX ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rbp+rcx+0] 
             4a5811      3 INSTR CHECK UNDERFLOW SIGNED 64  RDX ZZ sub     rdx, rcx 
             4a5898      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+56 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdi+38h]  ; timer 
@@ -6673,7 +6670,7 @@
             4b1f84      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+156 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+9Ch]  ; dest 
             4b1faa      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R14 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r14+9Ch]; s 
             4b1faa      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R14+156 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r14+9Ch]; s 
-            4b1fb4      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, r14d       ; n 
+            4b1fb4      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, r14d       ; n 
             4b20d4      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+8] 
             4b2122      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+152 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+98h] 
             4b2129      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+156 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+9Ch] 
@@ -6682,7 +6679,7 @@
             4b2337      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+156 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+9Ch]  ; dest 
             4b235d      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R14 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r14+9Ch]; s 
             4b235d      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R14+156 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r14+9Ch]; s 
-            4b2367      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, r14d       ; n 
+            4b2367      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, r14d       ; n 
             4b248c      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+8] 
             4b24a8      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+8] 
             4b24e9      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+152 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+98h] 
@@ -6844,15 +6841,15 @@
             4b4551      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+360 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+168h] 
             4b45e0    698 FUNC RETURNTYPE RAX 4
             4b45e0    698 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4b45f8      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, 2 
+            4b45f8      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, 2 
             4b48a0    559 FUNC RETURNTYPE RAX 4
             4b48a0    559 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 96 ARG4 1 ARG5 0 
             4b48b6      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX*2 ZZ lea     esi, [rax+rax*2] 
             4b48b6      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+RAX*2 ZZ lea     esi, [rax+rax*2] 
-            4b48da      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, edi 
-            4b48df      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, edi 
+            4b48da      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, edi 
+            4b48df      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, edi 
             4b48ea      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15+2 ZZ lea     ecx, [r15+2] 
-            4b48fc      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            4b48fc      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             4b48fe      7 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX*8 ZZ lea     edi, ds:8[rdx*8] 
             4b48fe      7 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX*8+8 ZZ lea     edi, ds:8[rdx*8] 
             4b4a1b      3 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ IDIOM 19 add     rsi, r15 
@@ -6889,14 +6886,14 @@
             4b5570     69 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4b55c0    201 FUNC RETURNTYPE RAX 1
             4b55c0    201 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4b5648      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1 
+            4b5648      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1 
             4b566c      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+1 ZZ lea     esi, [rax+1] 
             4b5690    276 FUNC RETURNTYPE RAX 1
             4b5690    276 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4b57b0    394 FUNC RETURNTYPE RAX 1
             4b57b0    394 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4b5851      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13*8 ZZ lea     rdx, ds:0[r13*8]; n 
-            4b5908      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 1 
+            4b5908      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 1 
             4b5940    450 FUNC RETURNTYPE RAX 1
             4b5940    450 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4b5b10    124 FUNC RETURNTYPE RAX 1
@@ -6910,7 +6907,7 @@
             4b5ea0      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBP+1 ZZ lea     esi, [rbp+1] 
             4b5ec0    153 FUNC RETURNTYPE RAX 1
             4b5ec0    153 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4b5f40      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1 
+            4b5f40      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1 
             4b5f60    257 FUNC RETURNTYPE RAX 1
             4b5f60    257 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 1 ARG3 0 
             4b6070    238 FUNC RETURNTYPE RAX 1
@@ -7114,7 +7111,7 @@
             4ba8b4      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+R12*2 ZZ lea     edi, [r12+r12*2] 
             4ba8c0      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+78h+var_68] 
             4ba8e8      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+78h+var_68] 
-            4ba92d      3 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, r12d 
+            4ba92d      3 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, r12d 
             4ba933      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+78h+var_68] 
             4baa66      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK sub     rsi, [rsp+78h+var_50] 
             4baab0     78 FUNC RETURNTYPE RAX 1
@@ -7225,12 +7222,12 @@
             4bc381      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+72 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdi+48h] 
             4bc38a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+80 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdi+50h] 
             4bc393      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+88 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdi+58h] 
-            4bc3a8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
-            4bc3ab      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rax+8] 
-            4bc3b2      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rax+8] 
-            4bc3b9      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rax+8] 
-            4bc3c0      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rax+8] 
-            4bc3c7      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rax+8] 
+            4bc3a8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
+            4bc3ab      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, [rax+8] 
+            4bc3b2      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, [rax+8] 
+            4bc3b9      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, [rax+8] 
+            4bc3c0      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, [rax+8] 
+            4bc3c7      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, [rax+8] 
             4bc3ca      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDI*8 ZZ lea     edi, ds:98h[rdi*8] 
             4bc3ca      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDI*8+152 ZZ lea     edi, ds:98h[rdi*8] 
             4bc650    710 FUNC RETURNTYPE RAX 1
@@ -7952,11 +7949,11 @@
             4c5704      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, 400h 
             4c57d0    814 FUNC RETURNTYPE RAX 1
             4c57d0    814 FUNC INARGS    6  ARG0 8 ARG1 96 ARG2 8 ARG3 4 ARG4 1 ARG5 0 
-            4c58d4      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r12d 
+            4c58d4      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r12d 
             4c5970      4 INSTR CHECK SIGNEDNESS UNSIGNED 64 R8 ZZ IDIOM 20 movsx   r8d, r8b 
             4c5b00   3833 FUNC RETURNTYPE RAX 0
             4c5b00   3833 FUNC INARGS    6  ARG0 8 ARG1 96 ARG2 4 ARG3 8 ARG4 8 ARG5 4 
-            4c5d41      4 INSTR CHECK TRUNCATION SIGNED 32 EDX 8 DL ZZ IDIOM 14 movsx   r8d, dl 
+            4c5d41      4 INSTR CHECK TRUNCATION SIGNED 32 RDX 8 DL ZZ IDIOM 14 movsx   r8d, dl 
             4c6241      4 INSTR CHECK SIGNEDNESS UNSIGNED 64 R8 ZZ IDIOM 20 movsx   r8d, r8b 
             4c6a00    260 FUNC RETURNTYPE RAX 1
             4c6a00    260 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 8 ARG3 96 ARG4 96 ARG5 96 
@@ -8213,7 +8210,7 @@
             4cc580    511 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             4cc580    511 FUNC PROBLEM EVP_EncryptUpdate.part.0 CALLUNRESOLVED 
             4cc655      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+56 ZZ IDIOM 18 MEMORYSINK lea     r8, [rbx+38h] 
-            4cc65f      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            4cc65f      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             4cc666      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R8+RAX ZZ IDIOM 18 MEMORYSINK lea     rdi, [r8+rax]   ; dest 
             4cc66e      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R9 ZZ mov     rdx, r9         ; n 
             4cc728      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rax+38h]; dest 
@@ -8515,7 +8512,7 @@
             4d0130    275 FUNC RETURNTYPE RAX 1
             4d0130    275 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4d0184      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+272 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+110h] 
-            4d01b8      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [rbx+104h] 
+            4d01b8      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [rbx+104h] 
             4d01be      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+40 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+28h]  ; dest 
             4d0201      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+272 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+110h] 
             4d0250    412 FUNC RETURNTYPE RAX 1
@@ -8524,21 +8521,21 @@
             4d03ac      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 38h        ; dest 
             4d03f0    698 FUNC RETURNTYPE RAX 1
             4d03f0    698 FUNC INARGS    5  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 
-            4d05a5      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [rbx+104h] 
+            4d05a5      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [rbx+104h] 
             4d05ab      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+28h] 
             4d0602      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+56 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+38h]  ; s2 
-            4d066c      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [rbx+104h] 
+            4d066c      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [rbx+104h] 
             4d0672      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+28h] 
             4d06b0    227 FUNC RETURNTYPE RAX 1
             4d06b0    227 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4d0703      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+272 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+110h] 
-            4d0744      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [rbx+104h] 
+            4d0744      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [rbx+104h] 
             4d074a      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+40 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+28h]  ; dest 
             4d07a0    293 FUNC RETURNTYPE RAX 1
             4d07a0    293 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4d0829      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+244 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r13+0F4h] 
             4d0832      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX*4 ZZ lea     esi, ds:0[rax*4] 
-            4d083c      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, eax 
+            4d083c      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, eax 
             4d0843      3 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, r12 
             4d08d0    157 FUNC RETURNTYPE RAX 1
             4d08d0    157 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
@@ -8547,7 +8544,7 @@
             4d0970    267 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4d09d5      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+244 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r13+0F4h] 
             4d09de      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX*4 ZZ lea     esi, ds:0[rax*4] 
-            4d09e8      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, eax 
+            4d09e8      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, eax 
             4d09ef      3 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, r12 
             4d0a80    392 FUNC RETURNTYPE RAX 1
             4d0a80    392 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
@@ -8569,7 +8566,7 @@
             4d1095      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+256 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+100h] 
             4d10cd      8 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, [r12+288h] ; src 
             4d11e5      8 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, [r12+288h] 
-            4d11ed      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, ebp 
+            4d11ed      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, ebp 
             4d1240    819 FUNC RETURNTYPE RAX 1
             4d1240    819 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4d13b2      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+R15 ZZ lea     rsi, [rbp+r15+0] 
@@ -8975,7 +8972,7 @@
             4d5230      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
             4d5240    892 FUNC RETURNTYPE RAX 1
             4d5240    892 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
-            4d5512      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, eax 
+            4d5512      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ sub     ecx, eax 
             4d551a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rcx 
             4d55d0    858 FUNC RETURNTYPE RAX 1
             4d55d0    858 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 1 ARG4 1 ARG5 16 
@@ -9212,7 +9209,7 @@
             4d9e79      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBP+-48 ZZ lea     esi, [rbp-30h] 
             4d9eae      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBP+-48 ZZ lea     eax, [rbp-30h] 
             4d9f33      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15+RSI ZZ lea     eax, [r15+rsi] 
-            4da129      3 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, 20h 
+            4da129      3 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, 20h 
             4da2b0      7 FUNC RETURNTYPE RAX 0
             4da2b0      7 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 1 
             4da2c0    352 FUNC RETURNTYPE RAX 1
@@ -9238,14 +9235,14 @@
             4daa3f      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+1 ZZ lea     edi, [r12+1] 
             4dac30    442 FUNC RETURNTYPE RAX 4
             4dac30    442 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            4dad46      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
+            4dad46      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
             4dadf0    471 FUNC RETURNTYPE RAX 1
             4dadf0    471 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4dafd0    112 FUNC RETURNTYPE RAX 1
             4dafd0    112 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 1 
             4db040    312 FUNC RETURNTYPE RAX 4
             4db040    312 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4db0dc      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 4 
+            4db0dc      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 4 
             4db180    123 FUNC RETURNTYPE RAX 4
             4db180    123 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 0 ARG3 16 ARG4 96 ARG5 0 
             4db200     28 FUNC RETURNTYPE RAX 1
@@ -9749,15 +9746,15 @@
             4e2400    349 FUNC RETURNTYPE RAX 1
             4e2400    349 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4e245a      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, [r13+8] 
-            4e249b      3 INSTR CHECK OVERFLOW SIGNED 32  EBX ZZ add     ebx, 1 
+            4e249b      3 INSTR CHECK OVERFLOW SIGNED 32  RBX ZZ add     ebx, 1 
             4e2560    861 FUNC RETURNTYPE RAX 1
             4e2560    861 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            4e25e8      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 31 sub     esi, 41h 
-            4e262e      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EBP ZZ sub     ebp, r15d 
+            4e25e8      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 31 sub     esi, 41h 
+            4e262e      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RBP ZZ sub     ebp, r15d 
             4e26bf      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+-65 ZZ IDIOM 32 lea     ecx, [rax-41h] 
             4e26f4      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RSI+-65 ZZ IDIOM 32 lea     ecx, [rsi-41h] 
-            4e2790      3 INSTR CHECK UNDERFLOW SIGNED 32  EBP ZZ sub     ebp, 1 
-            4e27af      3 INSTR CHECK UNDERFLOW SIGNED 32  EBP ZZ sub     ebp, 1 
+            4e2790      3 INSTR CHECK UNDERFLOW SIGNED 32  RBP ZZ sub     ebp, 1 
+            4e27af      3 INSTR CHECK UNDERFLOW SIGNED 32  RBP ZZ sub     ebp, 1 
             4e28c0     10 FUNC RETURNTYPE RAX 0
             4e28c0     10 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 0 
             4e28d0     10 FUNC RETURNTYPE RAX 0
@@ -9923,8 +9920,8 @@
             4e5c97      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+-6 ZZ lea     edx, [r13-6] 
             4e5d2f      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+9 ZZ lea     esi, [r13+9] 
             4e5d60      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rbx+8]    ; dest 
-            4e5eaa      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, ebx 
-            4e5eac      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 9 
+            4e5eaa      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, ebx 
+            4e5eac      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 9 
             4e5ecc      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [r13+8]    ; dest 
             4e5f78      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+9 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+9]    ; s2 
             4e6001      4 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rax+8] 
@@ -10151,9 +10148,9 @@
             4e8a10    227 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4e8b00   1056 FUNC RETURNTYPE RAX 4
             4e8b00   1056 FUNC INARGS    6  ARG0 0 ARG1 96 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            4e8c3c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1 
+            4e8c3c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1 
             4e8c60      4 INSTR CHECK OVERFLOW UNSIGNED 64  RCX ZZ IDIOM 18 MEMORYSINK add     rcx, 1 
-            4e8ccc      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EAX ZZ add     eax, 1 
+            4e8ccc      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RAX ZZ add     eax, 1 
             4e8ebd      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 RBX ZZ mov     rdx, rbx        ; n 
             4e8f20      3 FUNC RETURNTYPE RAX 0
             4e8f20      3 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
@@ -10633,7 +10630,7 @@
             4eedd0     15 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             4eede0    178 FUNC RETURNTYPE RAX 1
             4eede0    178 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4eee67      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, 8 
+            4eee67      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, 8 
             4eeea0     34 FUNC RETURNTYPE RAX 1
             4eeea0     34 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4eeed0     51 FUNC RETURNTYPE RAX 96
@@ -10661,7 +10658,7 @@
             4ef550    464 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4ef720    199 FUNC RETURNTYPE RAX 1
             4ef720    199 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4ef74c      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 ECX 32 ECX ZZ mov     edx, ecx 
+            4ef74c      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RCX 32 ECX ZZ mov     edx, ecx 
             4ef7f0    464 FUNC RETURNTYPE RAX 1
             4ef7f0    464 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4ef9c0     21 FUNC RETURNTYPE RAX 0
@@ -10681,7 +10678,7 @@
             4f0020     29 FUNC INARGS    2  ARG0 4 ARG1 4 
             4f0040    504 FUNC RETURNTYPE RAX 1
             4f0040    504 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            4f0135      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ IDIOM 19 add     edi, 1 
+            4f0135      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ IDIOM 19 add     edi, 1 
             4f0240    269 FUNC RETURNTYPE RAX 1
             4f0240    269 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4f029f      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+8 ZZ lea     rdi, [rbx+8] 
@@ -10758,7 +10755,7 @@
             4f1370    380 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4f1429      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R14 ZZ mov     rdx, r14        ; n 
             4f143b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R14 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r14]  ; s 
-            4f1441      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r13d 
+            4f1441      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r13d 
             4f1451      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R14+16 ZZ lea     rdi, [r14+10h] 
             4f145f      3 INSTR CHECK UNDERFLOW SIGNED 64  RDI ZZ sub     rdi, rax 
             4f1465      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r14        ; src 
@@ -10824,7 +10821,7 @@
             4f2730    193 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 1 ARG4 4 ARG5 0 
             4f2800    459 FUNC RETURNTYPE RAX 96
             4f2800    459 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 1 ARG4 4 ARG5 0 
-            4f2912      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, r15d 
+            4f2912      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, r15d 
             4f29d0    110 FUNC RETURNTYPE RAX 1
             4f29d0    110 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4f2a40    254 FUNC RETURNTYPE RAX 1
@@ -11103,7 +11100,7 @@
             4f7f80    268 FUNC RETURNTYPE RAX 1
             4f7f80    268 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4f7f80    268 FUNC PROBLEM X509_check_purpose CALLUNRESOLVED 
-            4f8027      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, 9 
+            4f8027      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, 9 
             4f8090    123 FUNC RETURNTYPE RAX 1
             4f8090    123 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4f8110     34 FUNC RETURNTYPE RAX 1
@@ -11252,13 +11249,13 @@
             4fa6aa      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 5          ; src 
             4fa6b6      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rax+8]    ; dest 
             4fa6e8      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+4] 
-            4fa715      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, [rax] 
-            4fa71b      3 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, 1 
+            4fa715      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, [rax] 
+            4fa71b      3 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, 1 
             4fa743      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rax+8]    ; dest 
-            4fa758      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, [rax] 
+            4fa758      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, [rax] 
             4fa780      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+5 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+5] 
-            4fa7ce      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, r13d 
-            4fa7d1      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 1 
+            4fa7ce      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, r13d 
+            4fa7d1      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 1 
             4fa7f8      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rax+8]    ; dest 
             4fa950    709 FUNC RETURNTYPE RAX 4
             4fa950    709 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -11551,7 +11548,7 @@
             500b30   1552 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             500bb7      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+1 ZZ lea     edi, [r12+1] 
             500c0a      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R14+RCX ZZ lea     edx, [r14+rcx] 
-            501080      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            501080      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             5010ac      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, rax 
             501140    243 FUNC RETURNTYPE RAX 1
             501140    243 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -11871,7 +11868,7 @@
             505f70    818 FUNC RETURNTYPE RAX 1
             505f70    818 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             5060d4      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+14 ZZ lea     edi, [rax+0Eh] 
-            5060ea      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, edi 
+            5060ea      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, edi 
             506107      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+14 ZZ lea     edx, [rax+0Eh] 
             5062b0      6 FUNC RETURNTYPE RAX 1
             5062b0      6 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
@@ -12328,12 +12325,12 @@
             525f40    259 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             526050   4277 FUNC RETURNTYPE RAX 1
             526050   4277 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
-            526394      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 40h 
+            526394      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 40h 
             526ea3      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+-1 ZZ lea     esi, [r12-1] 
             526ebc      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+-2 ZZ lea     esi, [r12-2] 
             526ec4      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDX*2 ZZ lea     edx, [rax+rdx*2] 
             526ec4      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+RDX*2 ZZ lea     edx, [rax+rdx*2] 
-            526ec7      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, edx 
+            526ec7      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, edx 
             526ed4      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+-3 ZZ lea     esi, [r12-3] 
             526ee9      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+-4 ZZ lea     esi, [r12-4] 
             527110    476 FUNC RETURNTYPE RAX 1
@@ -12343,12 +12340,12 @@
             527740   4361 FUNC RETURNTYPE RAX 1
             527740   4361 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             527889      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, 8 
-            527a54      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 40h 
+            527a54      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 40h 
             5285fa      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+-1 ZZ lea     esi, [rbx-1] 
             528611      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+-2 ZZ lea     esi, [rbx-2] 
             528617      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDX*2 ZZ lea     edx, [rax+rdx*2] 
             528617      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+RDX*2 ZZ lea     edx, [rax+rdx*2] 
-            52861a      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, edx 
+            52861a      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, edx 
             528627      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+-3 ZZ lea     esi, [rbx-3] 
             52863a      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+-4 ZZ lea     esi, [rbx-4] 
             528850   1492 FUNC RETURNTYPE RAX 1
@@ -12373,7 +12370,7 @@
             52a370   1506 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 1 ARG5 1 
             52a3cd      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+RBP ZZ lea     edx, [rbx+rbp] 
             52a3d0      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RBX+R12 ZZ lea     r8d, [rbx+r12] 
-            52a42e      2 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ neg     edx 
+            52a42e      2 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ neg     edx 
             52a448      3 INSTR CHECK OVERFLOW SIGNED 64  R9 ZZ add     r9d, ebp 
             52a477      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, [rsp+98h+var_60] 
             52a4fb      3 INSTR CHECK OVERFLOW SIGNED 64  R8 ZZ neg     r8d 
@@ -12396,15 +12393,15 @@
             52af0e      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8d, r13d 
             52af35      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, [rsp+98h+var_60] 
             52afb8      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+RAX ZZ lea     rdx, [rbp+rax+0] 
-            52b05c      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r13d 
-            52b062      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r12d 
+            52b05c      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r13d 
+            52b062      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r12d 
             52b06e      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12*8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+r12*8]; s 
             52b06e      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R15+R12*8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+r12*8]; s 
             52b0c5      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r15 
             52b1aa      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+RAX ZZ lea     rdx, [rbp+rax+0] 
             52b275      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8d, ebx 
             52b2ad      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8d, ebx 
-            52b376      2 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ neg     edx 
+            52b376      2 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ neg     edx 
             52b378      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX*2 ZZ lea     edx, [r14+rdx*2] 
             52b378      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R14+RDX*2 ZZ lea     edx, [r14+rdx*2] 
             52b37f      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R10*8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+r10*8]; s 
@@ -12564,12 +12561,12 @@
             531230    887 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             5313c1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+24 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+18h] 
             53141f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+24 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r15+18h] 
-            53143d      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [r15+30h] 
+            53143d      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [r15+30h] 
             5315b0    769 FUNC RETURNTYPE RAX 1
             5315b0    769 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             5316ce      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+24 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+18h] 
             531733      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+24 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r15+18h] 
-            53174e      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [r15+30h] 
+            53174e      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [r15+30h] 
             5318c0    167 FUNC RETURNTYPE RAX 1
             5318c0    167 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             531970    840 FUNC RETURNTYPE RAX 1
@@ -12598,7 +12595,7 @@
             531fd0    524 FUNC RETURNTYPE RAX 1
             531fd0    524 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             532067      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+126 ZZ lea     edx, [rax+7Eh] 
-            532189      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, esi 
+            532189      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, esi 
             5321e0    116 FUNC RETURNTYPE RAX 4
             5321e0    116 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             5321f1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RSI+8 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rsi+8] 
@@ -12630,7 +12627,7 @@
             532ff0   3096 FUNC RETURNTYPE RAX 4
             532ff0   3096 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             53343e      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+14 ZZ lea     ecx, [rax+0Eh] 
-            53366a      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 EAX 32 EAX ZZ mov     edi, eax 
+            53366a      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edi, eax 
             533c10     10 FUNC RETURNTYPE RAX 0
             533c10     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             533c20     10 FUNC RETURNTYPE RAX 0
@@ -12667,7 +12664,7 @@
             533e80    682 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             534130    914 FUNC RETURNTYPE RAX 96
             534130    914 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            5342e4      2 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 32 EAX ZZ mov     esi, eax 
+            5342e4      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     esi, eax 
             5344d0    230 FUNC RETURNTYPE RAX 96
             5344d0    230 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             5345c0    236 FUNC RETURNTYPE RAX 4
@@ -12677,7 +12674,7 @@
             5346b0    257 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             5347c0    334 FUNC RETURNTYPE RAX 0
             5347c0    334 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            5348a2      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 EAX 32 EAX ZZ mov     edi, eax 
+            5348a2      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edi, eax 
             534910     11 FUNC RETURNTYPE RAX 1
             534910     11 FUNC INARGS    4  ARG0 0 ARG1 4 ARG2 0 ARG3 0 
             534920    102 FUNC RETURNTYPE RAX 1
@@ -12889,7 +12886,7 @@
             538c50      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+14 ZZ lea     ecx, [rax+0Eh] 
             538c77      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+14 ZZ lea     ecx, [rax+0Eh] 
             538ccc      4 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, 0Ah 
-            538f2f      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 5 
+            538f2f      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 5 
             5390a0    163 FUNC RETURNTYPE RAX 1
             5390a0    163 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             539150   1234 FUNC RETURNTYPE RAX 1
@@ -12942,13 +12939,13 @@
             53b780   1083 FUNC PROBLEM RSA_eay_public_encrypt CALLUNRESOLVED 
             53ba6a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+120 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+78h] 
             53baba      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+14 ZZ lea     edx, [rax+0Eh] 
-            53bacc      2 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, eax 
+            53bacc      2 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, eax 
             53bad1      5 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rsp+58h+var_40] 
             53bbc0   1401 FUNC RETURNTYPE RAX 1
             53bbc0   1401 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             53bbc0   1401 FUNC PROBLEM RSA_eay_private_encrypt CALLUNRESOLVED 
             53bdec      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+14 ZZ lea     edx, [rax+0Eh] 
-            53be01      2 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, eax 
+            53be01      2 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, eax 
             53be06      5 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rsp+98h+var_80] 
             53bed5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+120 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+78h] 
             53c140   1331 FUNC RETURNTYPE RAX 1
@@ -12991,7 +12988,7 @@
             53d3fd      2 INSTR CHECK SIGNEDNESS UNSIGNED 32 ECX ZZ mov     edx, ecx        ; n 
             53d470    142 FUNC RETURNTYPE RAX 1
             53d470    142 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
-            53d49b      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            53d49b      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             53d4ae      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK sub     rdi, rdx 
             53d4b1      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, rbp        ; dest 
             53d500    416 FUNC RETURNTYPE RAX 1
@@ -13002,7 +12999,7 @@
             53d657      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r13        ; dest 
             53d6a0    960 FUNC RETURNTYPE RAX 1
             53d6a0    960 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 1 ARG4 1 ARG5 1 
-            53d705      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, ebp 
+            53d705      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, ebp 
             53d728      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R13 ZZ mov     rdx, r13        ; n 
             53d73b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R14+R13 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r14+r13]  ; dest 
             53d756      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R14+20 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r14+14h] 
@@ -13011,16 +13008,16 @@
             53da60    773 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 1 ARG5 0 
             53db80      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+1 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+1] 
             53db87      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+41 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+29h]  ; s 
-            53db8b      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, r12d 
+            53db8b      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, r12d 
             53db95      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RCX+-41 ZZ lea     edx, [rcx-29h] 
             53dbae      4 INSTR CHECK UNDERFLOW SIGNED 64  RDI ZZ sub     rdi, 14h 
             53dbb7      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R12 ZZ mov     edx, r12d       ; n 
             53dbba      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK sub     rdi, rax 
-            53dbbd      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, 14h 
+            53dbbd      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, 14h 
             53dbc0      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r15        ; dest 
             53dd70    191 FUNC RETURNTYPE RAX 1
             53dd70    191 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            53ddab      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, 3 
+            53ddab      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, 3 
             53ddcc      2 INSTR CHECK SIGNEDNESS UNSIGNED 32 EBP ZZ mov     edx, ebp        ; n 
             53de30    273 FUNC RETURNTYPE RAX 1
             53de30    273 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 1 ARG4 1 ARG5 0 
@@ -13247,12 +13244,12 @@
             543260     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
             543270   1132 FUNC RETURNTYPE RAX 1
             543270   1132 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            5434b3      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            5434b3      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             5436e0    983 FUNC RETURNTYPE RAX 1
             5436e0    983 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             543ac0   1204 FUNC RETURNTYPE RAX 4
             543ac0   1204 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            543edb      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            543edb      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             543f80      6 FUNC RETURNTYPE RAX 16
             543f80      6 FUNC INARGS    4  ARG0 96 ARG1 16 ARG2 1 ARG3 0 
             543f90     60 FUNC RETURNTYPE RAX 0
@@ -13514,7 +13511,7 @@
             549f40    102 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             549fb0   1160 FUNC RETURNTYPE RAX 1
             549fb0   1160 FUNC INARGS    6  ARG0 16 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            54a161      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            54a161      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             54a163      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+8763552 ZZ IDIOM 18 GLOBALMEMSINK lea     rsi, state[r12] 
             54a31b      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+8763552 ZZ IDIOM 18 GLOBALMEMSINK lea     rsi, state[r12] 
             54a440      9 FUNC RETURNTYPE RAX 0
@@ -13522,13 +13519,13 @@
             54a450   1641 FUNC RETURNTYPE RAX 1
             54a450   1641 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             54a49c      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+-1 ZZ lea     ecx, [r13-1] 
-            54a4b9      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            54a4b9      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             54a4c0      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX*4 ZZ lea     edx, [rdx+rdx*4+5] 
             54a4c0      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX+RDX*4 ZZ lea     edx, [rdx+rdx*4+5] 
             54a4c0      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX+RDX*4+5 ZZ lea     edx, [rdx+rdx*4+5] 
             54a5fb      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, 1 
             54a862      7 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RCX+8763552 ZZ IDIOM 18 GLOBALMEMSINK lea     rsi, state[rcx] 
-            54a869      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r15d 
+            54a869      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r15d 
             54a94d      7 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RCX+8763552 ZZ IDIOM 18 GLOBALMEMSINK lea     rsi, state[rcx] 
             54aac0     10 FUNC RETURNTYPE RAX 0
             54aac0     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
@@ -13540,9 +13537,9 @@
             54aaf0     60 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             54ab30    652 FUNC RETURNTYPE RAX 1
             54ab30    652 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            54ac53      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebp 
+            54ac53      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebp 
             54ac55      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax 
-            54ad99      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebp 
+            54ad99      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebp 
             54ada1      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax        ; buf 
             54adc0     16 FUNC RETURNTYPE RAX 0
             54adc0     16 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
@@ -13790,15 +13787,15 @@
             54e290    346 FUNC RETURNTYPE RAX 96
             54e290    346 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             54e33f      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R8 ZZ add     r8d, 1 
-            54e343      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            54e343      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             54e34a      3 INSTR CHECK OVERFLOW SIGNED 32 EDX ZZ imul    edx, eax 
-            54e35a      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, edx 
+            54e35a      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, edx 
             54e3f0    429 FUNC RETURNTYPE RAX 4
             54e3f0    429 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             54e4ca      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R8 ZZ add     r8d, 1 
-            54e4ce      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            54e4ce      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             54e4d4      3 INSTR CHECK OVERFLOW SIGNED 32 EDX ZZ imul    edx, esi 
-            54e4e5      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, edx 
+            54e4e5      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, edx 
             54e5a0    464 FUNC RETURNTYPE RAX 1
             54e5a0    464 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             54e770    877 FUNC RETURNTYPE RAX 1
@@ -13807,11 +13804,11 @@
             54eae0    124 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             54eb60    295 FUNC RETURNTYPE RAX 4
             54eb60    295 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            54ec01      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ECX ZZ add     ecx, 76Ch 
+            54ec01      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RCX ZZ add     ecx, 76Ch 
             54ec07      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R8 ZZ add     r8d, 1 
             54ec90    381 FUNC RETURNTYPE RAX 4
             54ec90    381 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
-            54ed5a      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ECX ZZ add     ecx, 76Ch 
+            54ed5a      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RCX ZZ add     ecx, 76Ch 
             54ed60      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R8 ZZ add     r8d, 1 
             54ee10     10 FUNC RETURNTYPE RAX 0
             54ee10     10 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 0 
@@ -13829,7 +13826,7 @@
             54efa0     29 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             54efc0    319 FUNC RETURNTYPE RAX 4
             54efc0    319 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            54f041      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 2 
+            54f041      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 2 
             54f100    127 FUNC RETURNTYPE RAX 1
             54f100    127 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             54f180      5 FUNC RETURNTYPE RAX 0
@@ -13858,7 +13855,7 @@
             54f750    120 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             54f7d0    296 FUNC RETURNTYPE RAX 4
             54f7d0    296 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            54f822      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 4 
+            54f822      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 4 
             54f900    123 FUNC RETURNTYPE RAX 4
             54f900    123 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             54f980    801 FUNC RETURNTYPE RAX 0
@@ -13887,7 +13884,7 @@
             550700    377 FUNC RETURNTYPE RAX 1
             550700    377 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
             550700    377 FUNC PROBLEM do_esc_char.part.0 CALLUNRESOLVED 
-            5507f5      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   ecx, cl 
+            5507f5      3 INSTR CHECK TRUNCATION UNSIGNED 32 RCX 8 CL ZZ IDIOM 5 movzx   ecx, cl 
             550880    705 FUNC RETURNTYPE RAX 1
             550880    705 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 96 ARG5 0 
             550880    705 FUNC PROBLEM do_buf CALLUNRESOLVED 
@@ -13899,7 +13896,7 @@
             550f00   1426 FUNC RETURNTYPE RAX 1
             550f00   1426 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             550f00   1426 FUNC PROBLEM do_name_ex CALLUNRESOLVED 
-            5510b9      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, r14d 
+            5510b9      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, r14d 
             5514a0     37 FUNC RETURNTYPE RAX 0
             5514a0     37 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 96 
             5514d0    130 FUNC RETURNTYPE RAX 1
@@ -14077,12 +14074,12 @@
             5531f0    117 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             553270    233 FUNC RETURNTYPE RAX 1
             553270    233 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            5532d8      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 1 
+            5532d8      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 1 
             553360    768 FUNC RETURNTYPE RAX 1
             553360    768 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             553660    471 FUNC RETURNTYPE RAX 1
             553660    471 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            5537e6      6 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 76Ch 
+            5537e6      6 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 76Ch 
             553840     73 FUNC RETURNTYPE RAX 1
             553840     73 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             553890   1259 FUNC RETURNTYPE RAX 1
@@ -14137,7 +14134,7 @@
             554ce0      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             554cf0    497 FUNC RETURNTYPE RAX 1
             554cf0    497 FUNC INARGS    5  ARG0 0 ARG1 4 ARG2 0 ARG3 4 ARG4 4 
-            554ec8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 2 
+            554ec8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 2 
             554ef0   2275 FUNC RETURNTYPE RAX 1
             554ef0   2275 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 4 ARG4 1 ARG5 1 
             554ef0   2275 FUNC PROBLEM asn1_item_print_ctx CALLUNRESOLVED 
@@ -14147,10 +14144,10 @@
             555830    279 FUNC RETURNTYPE RAX 1
             555830    279 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             55587a      5 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, [r12+8] 
-            5558bc      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EBX ZZ add     ebx, 1 
+            5558bc      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RBX ZZ add     ebx, 1 
             555950    755 FUNC RETURNTYPE RAX 1
             555950    755 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            5559d6      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 31 sub     esi, 41h 
+            5559d6      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 31 sub     esi, 41h 
             555a0a      3 INSTR CHECK UNDERFLOW UNSIGNED 64  R12 ZZ sub     r12d, r14d 
             555a80      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+-65 ZZ IDIOM 32 lea     ecx, [rax-41h] 
             555ab5      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RSI+-65 ZZ IDIOM 32 lea     ecx, [rsi-41h] 
@@ -14184,7 +14181,7 @@
             5566a0    222 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             556780   2374 FUNC RETURNTYPE RAX 4
             556780   2374 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            556a9c      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, ebx 
+            556a9c      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, ebx 
             556c0e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+8 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+8] 
             556e1a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+8] 
             5570d0     38 FUNC RETURNTYPE RAX 4
@@ -14193,9 +14190,9 @@
             557100   2741 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 1 ARG4 1 ARG5 0 
             5571ae      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 23 sub     rdx, [r13+0] 
             557558      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RCX ZZ sub     rcx, [r13+0] 
-            557564      4 INSTR CHECK OVERFLOW UNSIGNED 32  ECX ZZ add     ecx, [rsp+178h+var_144] 
+            557564      4 INSTR CHECK OVERFLOW UNSIGNED 32  RCX ZZ add     ecx, [rsp+178h+var_144] 
             557623      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RCX ZZ sub     rcx, [r13+0] 
-            55762a      4 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, [rsp+178h+var_144] 
+            55762a      4 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, [rsp+178h+var_144] 
             557633      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, rax 
             557721      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, [rsp+178h+var_108] 
             55777a      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, [rsp+178h+var_108] 
@@ -14210,13 +14207,13 @@
             557c20     56 FUNC INARGS    4  ARG0 1 ARG1 0 ARG2 0 ARG3 1 
             557c60    472 FUNC RETURNTYPE RAX 4
             557c60    472 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
-            557d78      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
+            557d78      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
             557e40    202 FUNC RETURNTYPE RAX 1
             557e40    202 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             557f10    993 FUNC RETURNTYPE RAX 4
             557f10    993 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             558029      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDX ZZ sub     rdx, rax 
-            55804e      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, ebx 
+            55804e      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, ebx 
             55806b      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+0E8h+ptr]; dest 
             5580a9      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RSI ZZ sub     rsi, [rsp+0E8h+var_E8] 
             558286      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX+1 ZZ lea     edi, [rdx+1] 
@@ -14517,7 +14514,7 @@
             55d790    155 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             55d830    129 FUNC RETURNTYPE RAX 4
             55d830    129 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            55d846      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
+            55d846      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
             55d8c0    190 FUNC RETURNTYPE RAX 1
             55d8c0    190 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             55d980    417 FUNC RETURNTYPE RAX 1
@@ -14651,9 +14648,9 @@
             55f880   2764 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             55fa20      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+512 ZZ lea     esi, [r12+200h] 
             55fc42      4 INSTR CHECK SIGNEDNESS SIGNED 8 SIL ZZ IDIOM 20 movzx   edi, sil 
-            55fcf9      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 ESI 8 SIL ZZ IDIOM 14 movsx   esi, sil 
+            55fcf9      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RSI 8 SIL ZZ IDIOM 14 movsx   esi, sil 
             55fcf9      4 INSTR CHECK SIGNEDNESS UNSIGNED 8 SIL ZZ IDIOM 20 movsx   esi, sil 
-            55fdb8      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 ESI 8 SIL ZZ IDIOM 14 movsx   r15d, sil 
+            55fdb8      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RSI 8 SIL ZZ IDIOM 14 movsx   r15d, sil 
             55fdb8      4 INSTR CHECK SIGNEDNESS UNSIGNED 8 SIL ZZ IDIOM 20 movsx   r15d, sil 
             55fef0      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     edi, [rax+1] 
             55ff3f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ lea     rdx, [rax+1] 
@@ -14668,13 +14665,13 @@
             560430     23 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             560450    955 FUNC RETURNTYPE RAX 4
             560450    955 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            560631      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, r13d 
+            560631      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, r13d 
             560634      3 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, r14 
             560640      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+R14 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdx+r14]  ; s 
             560674      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+R14 ZZ IDIOM 18 MEMORYSINK lea     rax, [rdx+r14-1] 
             560674      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+R14+-1 ZZ IDIOM 18 MEMORYSINK lea     rax, [rdx+r14-1] 
             5606e0      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 1 
-            560721      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, r13d 
+            560721      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, r13d 
             560810     76 FUNC RETURNTYPE RAX 96
             560810     76 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             560860    375 FUNC RETURNTYPE RAX 1
@@ -14867,7 +14864,7 @@
             562ec0     42 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             562ef0    541 FUNC RETURNTYPE RAX 1
             562ef0    541 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            563022      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 1 
+            563022      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 1 
             563110      7 FUNC RETURNTYPE RAX 0
             563110      7 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             563120     81 FUNC RETURNTYPE RAX 1
@@ -14964,10 +14961,10 @@
             565cf0     70 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             565d40   1066 FUNC RETURNTYPE RAX 1
             565d40   1066 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            565fcc      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDI ZZ sub     edi, 8 
+            565fcc      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDI ZZ sub     edi, 8 
             566170   1116 FUNC RETURNTYPE RAX 4
             566170   1116 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 1 ARG3 2 ARG4 0 ARG5 0 
-            566423      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 8 
+            566423      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 8 
             5665d0   1347 FUNC RETURNTYPE RAX 4
             5665d0   1347 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 1 ARG3 2 ARG4 0 ARG5 0 
             566b20    153 FUNC RETURNTYPE RAX 1
@@ -14983,8 +14980,8 @@
             566e2c      3 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBX 32 EBX ZZ mov     r8d, ebx 
             566e70      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBX 32 EBX ZZ mov     esi, ebx 
             566e72      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, rbp 
-            566e75      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, r13d 
-            566e78      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 4 
+            566e75      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, r13d 
+            566e78      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 4 
             566e90    107 FUNC RETURNTYPE RAX 1
             566e90    107 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             566f00   1106 FUNC RETURNTYPE RAX 4
@@ -15042,7 +15039,7 @@
             567df0      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+264 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+108h] ; dest 
             567e20    629 FUNC RETURNTYPE RAX 1
             567e20    629 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            567e83      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, 1 
+            567e83      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, 1 
             567e86      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rax+109h]; s 
             567e86      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX+265 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rax+109h]; s 
             5680a0     35 FUNC RETURNTYPE RAX 1
@@ -15371,7 +15368,7 @@
             573950   1001 FUNC RETURNTYPE RAX 1
             573950   1001 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             573950   1001 FUNC PROBLEM ubsec_rsa_mod_exp CALLUNRESOLVED 
-            573c28      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1 
+            573c28      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1 
             573d40   1112 FUNC RETURNTYPE RAX 1
             573d40   1112 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             573d40   1112 FUNC PROBLEM ubsec_init CALLUNRESOLVED 
@@ -15540,7 +15537,7 @@
             578e60    102 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             578e7e      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RAX ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rax+4]; s 
             578e7e      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rax+4]; s 
-            578e8a      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, eax        ; n 
+            578e8a      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, eax        ; n 
             578e91      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+4] 
             578ed0    194 FUNC RETURNTYPE RAX 1
             578ed0    194 FUNC INARGS    1  ARG0 4 
@@ -15574,7 +15571,7 @@
             57aee2      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RCX+64 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rcx+40h]; s 
             57b11d      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RCX ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rcx+40h]; s 
             57b11d      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RCX+64 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rcx+40h]; s 
-            57b124      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, eax        ; n 
+            57b124      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, eax        ; n 
             57b180    255 FUNC RETURNTYPE RAX 0
             57b180    255 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             57b280   2144 FUNC RETURNTYPE RAX 0
@@ -15619,11 +15616,11 @@
             580760   2034 FUNC RETURNTYPE RAX 1
             580760   2034 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 4 ARG3 4 ARG4 4 ARG5 0 
             580922      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+RDX ZZ IDIOM 32 lea     ecx, [rax+rdx] 
-            580928      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, edx 
-            58092f      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, ecx 
+            580928      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ sub     ecx, edx 
+            58092f      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, ecx 
             580b53      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK sub     rdi, 8 
-            580dd6      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 1 
-            580e1a      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 1 
+            580dd6      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 1 
+            580e1a      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 1 
             580e61      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R10+2 ZZ lea     esi, [r10+2] 
             580ea0      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RAX+1 ZZ lea     esi, [rax+1] 
             580f60    672 FUNC RETURNTYPE RAX 1
@@ -15742,12 +15739,12 @@
             5851f9      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15*4 ZZ lea     edi, ds:0[r15*4] 
             585320    201 FUNC RETURNTYPE RAX 1
             585320    201 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
-            585378      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
+            585378      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 1 
             5853f0    416 FUNC RETURNTYPE RAX 1
             5853f0    416 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             585414      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     ecx, [rax+1] 
             585421      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RCX*4 ZZ lea     edi, ds:0[rcx*4] 
-            585550      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
+            585550      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 1 
             585590    963 FUNC RETURNTYPE RAX 1
             585590    963 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             585960    330 FUNC RETURNTYPE RAX 1
@@ -15782,13 +15779,13 @@
             586110      6 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 4 ARG3 1 
             586120    194 FUNC RETURNTYPE RAX 4
             586120    194 FUNC INARGS    5  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 4 
-            586176      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 EAX 32 EAX ZZ mov     edi, eax 
+            586176      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edi, eax 
             5861a7      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBX 32 EBX ZZ mov     esi, ebx 
             5861f0    258 FUNC RETURNTYPE RAX 4
             5861f0    258 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             586300    240 FUNC RETURNTYPE RAX 4
             586300    240 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
-            586340      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 EAX 32 EAX ZZ mov     edi, eax 
+            586340      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edi, eax 
             586382      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+RAX ZZ lea     edi, [rax+rax+2] 
             586382      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+RAX+2 ZZ lea     edi, [rax+rax+2] 
             5863f0    119 FUNC RETURNTYPE RAX 4
@@ -15802,12 +15799,12 @@
             586730   1234 FUNC RETURNTYPE RAX 1
             586730   1234 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 4 ARG4 1 ARG5 0 
             586914      4 INSTR CHECK UNDERFLOW SIGNED 64  R9 ZZ sub     r9d, 1 
-            586b4c      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, ebx 
+            586b4c      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, ebx 
             586b4e      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r12 
             586c10   1260 FUNC RETURNTYPE RAX 1
             586c10   1260 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 4 ARG5 1 
             586c9f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+-1 ZZ lea     r9d, [rax-1] 
-            587048      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, ebp 
+            587048      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, ebp 
             58704a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             587082      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R14 ZZ mov     rdx, r14        ; n 
             587100    958 FUNC RETURNTYPE RAX 1
@@ -15817,11 +15814,11 @@
             587880   2350 FUNC RETURNTYPE RAX 1
             587880   2350 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             587880   2350 FUNC PROBLEM DSA_generate_parameters_ex CALLUNRESOLVED 
-            587c1b      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 1 
-            587dc3      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 1 
+            587c1b      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 1 
+            587dc3      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 1 
             5881b0   2549 FUNC RETURNTYPE RAX 1
             5881b0   2549 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            58832b      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, 1 
+            58832b      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, 1 
             588bb0    448 FUNC RETURNTYPE RAX 1
             588bb0    448 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             588bb0    448 FUNC PROBLEM DSA_generate_key CALLUNRESOLVED 
@@ -15831,7 +15828,7 @@
             589000     89 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             589060    420 FUNC RETURNTYPE RAX 4
             589060    420 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            5890ca      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, 2 
+            5890ca      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, 2 
             5890f6      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R13 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r13+1]; dest 
             5890f6      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R13+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r13+1]; dest 
             589130      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     edi, [rax+1] 
@@ -15846,7 +15843,7 @@
             589460      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+-1 ZZ lea     esi, [rax-1] 
             589560    300 FUNC RETURNTYPE RAX 1
             589560    300 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            58959d      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 102h       ; mode 
+            58959d      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 102h       ; mode 
             589690    176 FUNC RETURNTYPE RAX 1
             589690    176 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             5896ed      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R12 ZZ mov     rdx, r12        ; n 
@@ -15869,7 +15866,7 @@
             589d70   1061 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             589d70   1061 FUNC PROBLEM BIO_dump_indent_cb CALLUNRESOLVED 
             589f89      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+RBX ZZ lea     eax, [r13+rbx+0] 
-            58a003      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   ecx, cl 
+            58a003      3 INSTR CHECK TRUNCATION UNSIGNED 64 RCX 8 CL ZZ IDIOM 5 movzx   ecx, cl 
             58a0de      3 INSTR CHECK OVERFLOW SIGNED 64  R8 ZZ add     r8d, r14d 
             58a1a0      8 FUNC RETURNTYPE RAX 0
             58a1a0      8 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
@@ -15884,18 +15881,18 @@
             58a230    588 FUNC RETURNTYPE RAX 1
             58a230    588 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             58a294      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+2 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rbx+2] 
-            58a36f      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebx 
+            58a36f      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebx 
             58a371      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, r12        ; buf 
-            58a3a0      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 72h 
-            58a422      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, ebx 
+            58a3a0      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 72h 
+            58a422      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, ebx 
             58a42c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax        ; buf 
             58a480    676 FUNC RETURNTYPE RAX 1
             58a480    676 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             58a4ed      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+2 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [r13+2] 
-            58a588      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r13d 
+            58a588      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r13d 
             58a58e      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax        ; buf 
             58a6c3      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, [rsp+1D8h+var_1D0]; buf 
-            58a6c8      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, r13d 
+            58a6c8      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, r13d 
             58a730     59 FUNC RETURNTYPE RAX 1
             58a730     59 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             58a770     38 FUNC RETURNTYPE RAX 1
@@ -15941,13 +15938,13 @@
             58b840     58 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             58b880    229 FUNC RETURNTYPE RAX 1
             58b880    229 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            58b94b      2 INSTR CHECK TRUNCATION UNSIGNED 32 EDI 32 EDI ZZ IDIOM 26 mov     esi, edi        ; c 
+            58b94b      2 INSTR CHECK TRUNCATION UNSIGNED 64 RDI 32 EDI ZZ IDIOM 26 mov     esi, edi        ; c 
             58b970   1143 FUNC RETURNTYPE RAX 1
             58b970   1143 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 1 ARG5 0 
-            58bb6f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
+            58bb6f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
             58bdf0   1457 FUNC RETURNTYPE RAX 1
             58bdf0   1457 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
-            58c06f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
+            58c06f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
             58c3b0    120 FUNC RETURNTYPE RAX 1
             58c3b0    120 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             58c430    167 FUNC RETURNTYPE RAX 1
@@ -16178,13 +16175,13 @@
             5915d0    465 FUNC RETURNTYPE RAX 1
             5915d0    465 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 0 ARG4 4 ARG5 0 
             591625      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ add     rdx, r14 
-            59172d      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, eax 
+            59172d      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, eax 
             59173a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+RAX ZZ lea     rsi, [r14+rax] 
             5917b0    465 FUNC RETURNTYPE RAX 1
             5917b0    465 FUNC INARGS    6  ARG0 8 ARG1 1 ARG2 4 ARG3 0 ARG4 1 ARG5 4 
             591805      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ add     rdx, r14 
             591900      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+RAX ZZ lea     rsi, [r14+rax] 
-            59190c      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, eax 
+            59190c      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, eax 
             591990    450 FUNC RETURNTYPE RAX 1
             591990    450 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 96 ARG4 96 ARG5 1 
             591b60    402 FUNC RETURNTYPE RAX 1
@@ -16603,7 +16600,7 @@
             59c764      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+7Ch]; src 
             59c764      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX+124 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+7Ch]; src 
             59c769      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R12 ZZ mov     rdx, r12        ; n 
-            59c813      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            59c813      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             59c815      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+65Ah] 
             59c815      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX+1626 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+65Ah] 
             59c8d6      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R12 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+r12+65Ah]; src 
@@ -16619,10 +16616,10 @@
             59cdc4      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX+124 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+7Ch] 
             59cee3      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+68h+var_50]; dest 
             59ceee      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 RAX ZZ mov     rdx, rax        ; n 
-            59cefe      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, r13d 
+            59cefe      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, r13d 
             59cf82      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+7Ch] 
             59cf82      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX+124 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+7Ch] 
-            59d160      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r13d 
+            59d160      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r13d 
             59d23e      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1626 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+65Ah] ; dest 
             59d260    820 FUNC RETURNTYPE RAX 1
             59d260    820 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -16639,7 +16636,7 @@
             59d750    140 FUNC RETURNTYPE RAX 1
             59d750    140 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             59d750    140 FUNC PROBLEM asn1_bio_flush_ex CALLUNRESOLVED 
-            59d77b      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            59d77b      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             59d78f      4 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rbx+48h] 
             59d7e0    526 FUNC RETURNTYPE RAX 1
             59d7e0    526 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-openssl.psexe.infoannot b/tests/commit/save-openssl.psexe.infoannot
index 63001dea..acfea0a4 100644
--- a/tests/commit/save-openssl.psexe.infoannot
+++ b/tests/commit/save-openssl.psexe.infoannot
@@ -247,8 +247,8 @@
             402bd7     75 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             402c22   2202 FUNC RETURNTYPE RAX 1
             402c22   2202 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
-            402d1b      2 INSTR CHECK OVERFLOW SIGNED 32  EBX ZZ inc     ebx 
-            403146      2 INSTR CHECK OVERFLOW SIGNED 32  EBX ZZ inc     ebx 
+            402d1b      2 INSTR CHECK OVERFLOW SIGNED 32  RBX ZZ inc     ebx 
+            403146      2 INSTR CHECK OVERFLOW SIGNED 32  RBX ZZ inc     ebx 
             4034bc     25 FUNC RETURNTYPE RAX 1
             4034bc     25 FUNC INARGS    2  ARG0 16 ARG1 16 
             4034d5     45 FUNC RETURNTYPE RAX 0
@@ -271,7 +271,7 @@
             404a20   1313 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             404a20   1313 FUNC PROBLEM main CALLUNRESOLVED 
             404d8e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+8] 
-            404e75      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ IDIOM 21 sub     ecx, 1 
+            404e75      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ IDIOM 21 sub     ecx, 1 
             404f44     42 FUNC RETURNTYPE RAX 0
             404f44     42 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 0 
             404f70     23 FUNC RETURNTYPE RAX 0
@@ -303,7 +303,7 @@
             405940    367 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             405ab0   1572 FUNC RETURNTYPE RAX 1
             405ab0   1572 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            405faa      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
+            405faa      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 1 
             4060e0   3191 FUNC RETURNTYPE RAX 1
             4060e0   3191 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40622d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+8 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rbp+8] 
@@ -346,8 +346,8 @@
             40b30e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rax+8] 
             40b361      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rax+8] 
             40b877      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R14+14 ZZ lea     edi, [r14+0Eh] 
-            40b8fb      3 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, 1 
-            40b9a5      3 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, 1 
+            40b8fb      3 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, 1 
+            40b9a5      3 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, 1 
             40bbb0    104 FUNC RETURNTYPE RAX 1
             40bbb0    104 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             40bc20   3563 FUNC RETURNTYPE RAX 1
@@ -355,8 +355,8 @@
             40bcfe      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r12+8] 
             40bd56      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r12+8] 
             40c5a2      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R14+14 ZZ lea     edi, [r14+0Eh] 
-            40c64d      3 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, 1 
-            40c6f5      3 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, 1 
+            40c64d      3 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, 1 
+            40c6f5      3 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, 1 
             40ca10    155 FUNC RETURNTYPE RAX 96
             40ca10    155 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40cab0    261 FUNC RETURNTYPE RAX 1
@@ -364,7 +364,7 @@
             40cb70      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDX+-97 ZZ IDIOM 32 lea     esi, [rdx-61h] 
             40cbc0   6725 FUNC RETURNTYPE RAX 1
             40cbc0   6725 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            40e394      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ IDIOM 21 sub     ecx, 1 
+            40e394      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ IDIOM 21 sub     ecx, 1 
             40e3af      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RCX+-1 ZZ lea     eax, [rcx-1] 
             40e5c1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r14+1] 
             40e610   2963 FUNC RETURNTYPE RAX 1
@@ -382,12 +382,12 @@
             4101bb      2 INSTR CHECK SIGNEDNESS UNSIGNED 32 EBP ZZ mov     edi, ebp 
             410440   1169 FUNC RETURNTYPE RAX 1
             410440   1169 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            41064d      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
+            41064d      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
             4108e0    517 FUNC RETURNTYPE RAX 1
             4108e0    517 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
-            4109e7      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 40h 
+            4109e7      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 40h 
             410a06      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDX+-32 ZZ IDIOM 32 lea     eax, [rdx-20h] 
-            410a0f      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 EDX 8 DL ZZ IDIOM 14 movsx   edx, dl 
+            410a0f      3 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RDX 8 DL ZZ IDIOM 14 movsx   edx, dl 
             410af0   1016 FUNC RETURNTYPE RAX 1
             410af0   1016 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             410ef0    342 FUNC RETURNTYPE RAX 1
@@ -404,7 +404,7 @@
             4128c0      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RCX ZZ IDIOM 19 sub     rcx, r13 
             4128ec      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R14+1 ZZ lea     edx, [r14+1] 
             412a02      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r15+8] 
-            412a2c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
+            412a2c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
             413a4c      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RSI ZZ IDIOM 19 sub     rsi, rbx 
             413c30      3 INSTR CHECK OVERFLOW SIGNED 64  RDX ZZ add     rdx, rax 
             41468e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+8] 
@@ -442,7 +442,7 @@
             41910e      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r12+8] 
             419166      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r12+8] 
             419840      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R14+14 ZZ lea     edi, [r14+0Eh] 
-            41985d      3 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, 14h 
+            41985d      3 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, 14h 
             419ce0   2890 FUNC RETURNTYPE RAX 1
             419ce0   2890 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41a7b2      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+1] 
@@ -492,17 +492,17 @@
             4212c0   2843 FUNC RETURNTYPE RAX 1
             4212c0   2843 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             421523      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+RDX ZZ IDIOM 32 lea     ecx, [rax+rdx] 
-            421529      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ IDIOM 1 sub     ecx, edx 
+            421529      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ IDIOM 1 sub     ecx, edx 
             421b08      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDX ZZ sub     rdx, 1Ch 
             421de0   1166 FUNC RETURNTYPE RAX 1
             421de0   1166 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             422270   2777 FUNC RETURNTYPE RAX 1
             422270   2777 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            42276d      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, r14d 
-            422790      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            42276d      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, r14d 
+            422790      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             422797      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX*2 ZZ lea     edx, [rdx+rdx*2] 
             422797      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX+RDX*2 ZZ lea     edx, [rdx+rdx*2] 
-            422c21      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r13d 
+            422c21      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r13d 
             422c24      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r12 
             422ceb      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+R15 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+r15-5]; s1 
             422ceb      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+R15+-5 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+r15-5]; s1 
@@ -521,7 +521,7 @@
             423530  11343 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42381a      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
             4238c2      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
-            42401a      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
+            42401a      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 1 
             424071      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
             4240c6      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
             424110      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
@@ -538,13 +538,13 @@
             425473      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
             4255b1      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
             4255f3      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
-            425740      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
-            4257ab      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
+            425740      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 1 
+            4257ab      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 1 
             42598a      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
             4259cc      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
-            425a51      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
-            425ad2      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
-            425d7a      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
+            425a51      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 1 
+            425ad2      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 1 
+            425d7a      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 1 
             425eac      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
             425eee      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
             425f30      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
@@ -554,20 +554,20 @@
             426060      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
             4260a0      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
             4260e2      4 INSTR CHECK UNDERFLOW SIGNED 64  R12 ZZ sub     r12d, 1 
-            426123      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
+            426123      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 1 
             426180   1809 FUNC RETURNTYPE RAX 1
             426180   1809 FUNC INARGS    6  ARG0 0 ARG1 96 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             426688      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+2 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rdx+2] 
             426692      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK sbb     rdx, 3 
             42669a      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, r13 
-            42674a      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            42674a      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             42674c      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX*4 ZZ lea     edx, [rdx+rdx*4] 
             42674c      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX+RDX*4 ZZ lea     edx, [rdx+rdx*4] 
             42674f      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX*4 ZZ lea     edx, [rdx+rdx*4] 
             42674f      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX+RDX*4 ZZ lea     edx, [rdx+rdx*4] 
-            426752      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r14d 
-            426755      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 0Fh 
-            426775      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            426752      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r14d 
+            426755      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 0Fh 
+            426775      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             42677c      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX*2 ZZ lea     edx, [rdx+rdx*2] 
             42677c      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX+RDX*2 ZZ lea     edx, [rdx+rdx*2] 
             4268a0    221 FUNC RETURNTYPE RAX 1
@@ -607,11 +607,11 @@
             428fbd      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r15 
             42994a      4 INSTR CHECK UNDERFLOW SIGNED 64  R14 ZZ sub     r14d, 1 
             429990      4 INSTR CHECK UNDERFLOW SIGNED 64  R14 ZZ sub     r14d, 1 
-            429a2a      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
-            429aac      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
-            429b0b      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
-            429c83      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
-            429d75      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
+            429a2a      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 1 
+            429aac      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 1 
+            429b0b      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 1 
+            429c83      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 1 
+            429d75      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 1 
             429e50      4 INSTR CHECK UNDERFLOW SIGNED 64  R14 ZZ sub     r14d, 1 
             429e93      4 INSTR CHECK UNDERFLOW SIGNED 64  R14 ZZ sub     r14d, 1 
             429efc      4 INSTR CHECK UNDERFLOW SIGNED 64  R14 ZZ sub     r14d, 1 
@@ -626,7 +626,7 @@
             42a39e      4 INSTR CHECK UNDERFLOW SIGNED 64  R14 ZZ sub     r14d, 1 
             42a3e1      4 INSTR CHECK UNDERFLOW SIGNED 64  R14 ZZ sub     r14d, 1 
             42a423      4 INSTR CHECK UNDERFLOW SIGNED 64  R14 ZZ sub     r14d, 1 
-            42a464      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 1 
+            42a464      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 1 
             42a4c0     34 FUNC RETURNTYPE RAX 0
             42a4c0     34 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             42a4f0     27 FUNC RETURNTYPE RAX 1
@@ -679,7 +679,7 @@
             431cc0    437 FUNC INARGS    6  ARG0 96 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             431db7      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+1 ZZ lea     edi, [r13+1]    ; nfds 
             431dc7      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+RDX ZZ IDIOM 32 lea     ecx, [r13+rdx+0] 
-            431dcf      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ IDIOM 1 sub     ecx, edx 
+            431dcf      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ IDIOM 1 sub     ecx, edx 
             431e80   3015 FUNC RETURNTYPE RAX 1
             431e80   3015 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4323af      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+2 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rdx+2] 
@@ -705,7 +705,7 @@
             432ad0    300 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             432c00    261 FUNC RETURNTYPE RAX 4
             432c00    261 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 96 ARG3 0 ARG4 1 ARG5 0 
-            432c4f      6 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 2800h 
+            432c4f      6 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 2800h 
             432c6e      4 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rbx+8] 
             432d10    530 FUNC RETURNTYPE RAX 1
             432d10    530 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
@@ -745,7 +745,7 @@
             433cd0     37 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             433d00    237 FUNC RETURNTYPE RAX 1
             433d00    237 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 4 ARG4 4 ARG5 0 
-            433d83      2 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ neg     edx 
+            433d83      2 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ neg     edx 
             433df0    227 FUNC RETURNTYPE RAX 1
             433df0    227 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             433ee0    595 FUNC RETURNTYPE RAX 4
@@ -914,10 +914,10 @@
             43e980   3359 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             43ebc0      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX*4 ZZ lea     esi, [rax+rax*4] 
             43ebc0      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+RAX*4 ZZ lea     esi, [rax+rax*4] 
-            43ebc3      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, esi 
+            43ebc3      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, esi 
             43ebf7      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX*4 ZZ lea     esi, [rax+rax*4] 
             43ebf7      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+RAX*4 ZZ lea     esi, [rax+rax*4] 
-            43ebfa      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, esi 
+            43ebfa      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, esi 
             43f6a0   2089 FUNC RETURNTYPE RAX 1
             43f6a0   2089 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             43fed0     68 FUNC RETURNTYPE RAX 0
@@ -950,16 +950,16 @@
             445bd0      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
             445be0    377 FUNC RETURNTYPE RAX 1
             445be0    377 FUNC INARGS    6  ARG0 96 ARG1 96 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            445c3e      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EBP ZZ add     ebp, 1 
+            445c3e      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RBP ZZ add     ebp, 1 
             445c79      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  R13 ZZ IDIOM 18 MEMORYSINK sub     r13, rbx 
             445ca3      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+1 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r12+1] 
             445d60    264 FUNC RETURNTYPE RAX 1
             445d60    264 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            445df0      6 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, 100h 
+            445df0      6 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, 100h 
             445e70   3169 FUNC RETURNTYPE RAX 1
             445e70   3169 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             445e70   3169 FUNC PROBLEM engine_main CALLUNRESOLVED 
-            446129      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, 1 
+            446129      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, 1 
             4464d2      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RAX+1 ZZ lea     edi, [rax+1] 
             446795      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RAX+1 ZZ lea     edi, [rax+1] 
             446ae0    363 FUNC RETURNTYPE RAX 1
@@ -967,12 +967,12 @@
             446c50   1114 FUNC RETURNTYPE RAX 1
             446c50   1114 FUNC INARGS    6  ARG0 0 ARG1 96 ARG2 0 ARG3 16 ARG4 0 ARG5 0 
             446d71      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDI+RDX ZZ IDIOM 32 lea     ecx, [rdi+rdx] 
-            446d74      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1          ; nfds 
-            446d7a      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ IDIOM 1 sub     ecx, edx 
-            446fa6      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1          ; nfds 
-            447019      2 INSTR CHECK OVERFLOW UNSIGNED 32  ECX ZZ add     ecx, edx 
-            44701e      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ IDIOM 1 sub     ecx, edx 
-            447061      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1          ; nfds 
+            446d74      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1          ; nfds 
+            446d7a      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ IDIOM 1 sub     ecx, edx 
+            446fa6      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1          ; nfds 
+            447019      2 INSTR CHECK OVERFLOW UNSIGNED 32  RCX ZZ add     ecx, edx 
+            44701e      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ IDIOM 1 sub     ecx, edx 
+            447061      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1          ; nfds 
             4470b0  11350 FUNC RETURNTYPE RAX 1
             4470b0  11350 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             447f39      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edx, eax 
@@ -980,7 +980,7 @@
             449d10    986 FUNC RETURNTYPE RAX 1
             449d10    986 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             449dc8      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+8 ZZ IDIOM 18 MEMORYSINK lea     rcx, [r12+8] 
-            449de7      3 INSTR CHECK UNDERFLOW SIGNED 32  EBP ZZ sub     ebp, 1 
+            449de7      3 INSTR CHECK UNDERFLOW SIGNED 32  RBP ZZ sub     ebp, 1 
             449f30      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+8 ZZ IDIOM 18 MEMORYSINK lea     rcx, [r12+8] 
             44a0f0      3 FUNC RETURNTYPE RAX 0
             44a0f0      3 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
@@ -994,7 +994,7 @@
             44a550    193 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44a620   5692 FUNC RETURNTYPE RAX 1
             44a620   5692 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            44b75c      3 INSTR CHECK UNDERFLOW SIGNED 32  EDI ZZ sub     edi, r13d 
+            44b75c      3 INSTR CHECK UNDERFLOW SIGNED 32  RDI ZZ sub     edi, r13d 
             44b785      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, rcx        ; src 
             44bc0b      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+1] 
             44bc60    393 FUNC RETURNTYPE RAX 1
@@ -1005,8 +1005,8 @@
             44bf70    643 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
             44c200   6121 FUNC RETURNTYPE RAX 1
             44c200   6121 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            44ccc7      3 INSTR CHECK UNDERFLOW SIGNED 32  EBP ZZ sub     ebp, 1 
-            44ccff      3 INSTR CHECK UNDERFLOW SIGNED 32  EBP ZZ sub     ebp, 1 
+            44ccc7      3 INSTR CHECK UNDERFLOW SIGNED 32  RBP ZZ sub     ebp, 1 
+            44ccff      3 INSTR CHECK UNDERFLOW SIGNED 32  RBP ZZ sub     ebp, 1 
             44ce3f      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ add     rdx, 10h 
             44ce43      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, 8 
             44d9f0     15 FUNC RETURNTYPE RAX 0
@@ -1021,16 +1021,16 @@
             44dcc2      6 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBP+-8304 ZZ lea     eax, [rbp-2070h] 
             44de24      6 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBP+-8240 ZZ lea     eax, [rbp-2030h] 
             44de73      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R14 ZZ add     r14, rax 
-            44de8d      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, esi 
+            44de8d      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ sub     ecx, esi 
             44de8f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             44dee0      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R15 ZZ mov     edx, r15d       ; n 
-            44dee9      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, [rax+120h] 
+            44dee9      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, [rax+120h] 
             44deef      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 8          ; dest 
             44def3      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r14        ; src 
             44df37      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, r14 
             44e00a      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R15 ZZ mov     edx, r15d       ; n 
             44e014      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 14h        ; dest 
-            44e2c6      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, esi 
+            44e2c6      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ sub     ecx, esi 
             44e2c8      3 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, r14 
             44e36a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             44e3aa      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+1]    ; s1 
@@ -1040,17 +1040,17 @@
             44e494      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 48h        ; src 
             44e4c0      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 1          ; dest 
             44e4c4      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 94h        ; src 
-            44e521      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            44e521      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             44e523      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
-            44e56c      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            44e56c      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             44e56e      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             44e69e      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 0B8h 
-            44e760      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            44e760      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             44e762      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             44e7ff      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, 0F0h 
-            44e8c7      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            44e8c7      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             44e8c9      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
-            44ea92      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ IDIOM 31 sub     edx, 10h 
+            44ea92      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ IDIOM 31 sub     edx, 10h 
             44eaae      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+1] 
             44ebd5      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ IDIOM 14 mov     edx, eax 
             44edbf      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
@@ -1082,21 +1082,21 @@
             450131      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             450171      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r13+1] 
             45017b      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 94h 
-            4501d0      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            4501d0      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             4501d2      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
-            450236      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            450236      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             450238      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             4502e1      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 0B8h       ; dest 
             450320      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 1          ; dest 
             450324      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 0B8h       ; src 
             450398      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 48h        ; src 
-            4503e0      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            4503e0      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             4503e2      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
-            450441      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            450441      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             450443      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
-            450540      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            450540      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             450542      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
-            4505b4      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, esi 
+            4505b4      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, esi 
             4505b6      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             450682      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 0CCh 
             4506c9      2 INSTR CHECK TRUNCATION SIGNED 64 RAX 32 EAX ZZ mov     edx, eax 
@@ -1139,7 +1139,7 @@
             451520    205 FUNC RETURNTYPE RAX 1
             451520    205 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
             451520    205 FUNC PROBLEM ssl2_write_error CALLUNRESOLVED 
-            451562      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, ebp 
+            451562      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, ebp 
             45156a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax 
             4515f0     37 FUNC RETURNTYPE RAX 0
             4515f0     37 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 1 
@@ -1167,7 +1167,7 @@
             451ba0    475 FUNC RETURNTYPE RAX 1
             451ba0    475 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             451c44      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RBX+R15 ZZ lea     esi, [rbx+r15] 
-            451c4b      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebx 
+            451c4b      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebx 
             451c57      4 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rax+38h] 
             451ce2      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15+RBX ZZ lea     edx, [r15+rbx]  ; n 
             451d53      2 INSTR CHECK SIGNEDNESS UNSIGNED 32 EBX ZZ mov     edx, ebx        ; n 
@@ -1235,7 +1235,7 @@
             454286      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0A4h 
             4542bc      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax 
             4542d0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+2 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rbx+2] 
-            4542ed      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, r14d 
+            4542ed      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, r14d 
             454800    673 FUNC RETURNTYPE RAX 1
             454800    673 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             45484d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+5 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+5] 
@@ -1283,13 +1283,13 @@
             45695c      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, [rsp+268h+dest] 
             45698f      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, rbp 
             4569c9      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+1 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rdx+1] 
-            4569fd      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, 4 
-            456a18      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, 0Ah 
+            4569fd      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, 4 
+            456a18      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, 0Ah 
             456a62      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+464 ZZ IDIOM 18 MEMORYSINK lea     rcx, [r14+1D0h] 
             456a83      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+448 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r14+1C0h] 
             456ae0    231 FUNC RETURNTYPE RAX 1
             456ae0    231 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            456b0a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 8 
+            456b0a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 8 
             456b81      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 8          ; dest 
             456bd0    390 FUNC RETURNTYPE RAX 1
             456bd0    390 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1328,14 +1328,14 @@
             458f70   4938 FUNC INARGS    1  ARG0 4 
             458f70   4938 FUNC PROBLEM ssl3_get_key_exchange CALLUNRESOLVED 
             45915d      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+2 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+2] 
-            45918b      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, edi 
+            45918b      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, edi 
             45918d      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, rcx        ; s 
             4594ce      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0C4h 
             4594eb      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0A4h 
             459560      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0C4h 
             45957d      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0A4h 
             4595b0      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax 
-            4595bc      4 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, [rsp+1D8h+var_168] 
+            4595bc      4 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, [rsp+1D8h+var_168] 
             459752      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0C4h 
             45976f      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0A4h 
             459bd7      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+4 ZZ IDIOM 18 MEMORYSINK lea     r9, [r12+4] 
@@ -1470,7 +1470,7 @@
             45fbc3      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0A4h 
             45fbdc      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0C4h 
             45fc1c      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 14h 
-            45fc66      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, dword ptr [rsp+118h+dest] 
+            45fc66      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, dword ptr [rsp+118h+dest] 
             45fda0     84 FUNC RETURNTYPE RAX 4
             45fda0     84 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             45fe00    505 FUNC RETURNTYPE RAX 1
@@ -1519,9 +1519,9 @@
             460fe0     21 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
             461000    852 FUNC RETURNTYPE RAX 1
             461000    852 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            4610c1      2 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, ebx 
+            4610c1      2 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, ebx 
             461139      5 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rsp+58h+var_48] 
-            461141      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebx 
+            461141      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebx 
             46114a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r15 
             4612af      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r14        ; dest 
             461360     78 FUNC RETURNTYPE RAX 1
@@ -1547,12 +1547,12 @@
             461e80   4406 FUNC RETURNTYPE RAX 1
             461e80   4406 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             461e80   4406 FUNC PROBLEM ssl3_read_bytes CALLUNRESOLVED 
-            4621ef      6 INSTR CHECK OVERFLOW UNSIGNED 32  ECX ZZ add     ecx, [rbp+124h] 
+            4621ef      6 INSTR CHECK OVERFLOW UNSIGNED 32  RCX ZZ add     ecx, [rbp+124h] 
             46221d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+1 ZZ lea     eax, [r14+1] 
-            46233d      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 EDX 16 DX ZZ IDIOM 14 movsx   r14d, dx 
+            46233d      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 RDX 16 DX ZZ IDIOM 14 movsx   r14d, dx 
             46233d      4 INSTR CHECK SIGNEDNESS UNSIGNED 16 DX ZZ IDIOM 20 movsx   r14d, dx 
             462368      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RAX ZZ sub     rax, 5 
-            4626b5      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, 301h 
+            4626b5      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, 301h 
             462c35      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, [rbp+130h] ; src 
             462c3c      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R12 ZZ mov     edx, r12d       ; n 
             462df1      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+1000 ZZ IDIOM 32 lea     edx, [r12+3E8h] 
@@ -1603,7 +1603,7 @@
             463b10   1030 FUNC RETURNTYPE RAX 1
             463b10   1030 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 4 
             463b10   1030 FUNC PROBLEM ssl3_get_message CALLUNRESOLVED 
-            463c31      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 4 
+            463c31      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 4 
             463e23      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+4 ZZ lea     esi, [rcx+4] 
             463f20    157 FUNC RETURNTYPE RAX 1
             463f20    157 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1651,7 +1651,7 @@
             464d25      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R15+-4 ZZ lea     r8d, [r15-4] 
             464db0      5 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, [rsp+3D8h+var_388] 
             464dd9      5 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 STACKMEMSINK add     rdi, [rsp+3D8h+var_3D0]; dest 
-            464de6      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, ebx        ; n 
+            464de6      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, ebx        ; n 
             46530f      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+-13 ZZ lea     edx, [r12-0Dh] 
             4655a0     85 FUNC RETURNTYPE RAX 1
             4655a0     85 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
@@ -1661,10 +1661,10 @@
             465610   2239 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             465610   2239 FUNC PROBLEM ssl23_get_client_hello CALLUNRESOLVED 
             4657b4      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBP+2 ZZ lea     esi, [rbp+2] 
-            4657d1      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, 2 
+            4657d1      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, 2 
             4657d4      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 2 
             465871      3 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13        ; src 
-            465874      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDI ZZ IDIOM 18 MEMORYSINK sub     edi, edx 
+            465874      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDI ZZ IDIOM 18 MEMORYSINK sub     edi, edx 
             46587f      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, rax        ; dest 
             465ed0    522 FUNC RETURNTYPE RAX 1
             465ed0    522 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1673,7 +1673,6 @@
             4660e0   3738 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4660e0   3738 FUNC PROBLEM ssl23_connect CALLUNRESOLVED 
             46626d      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+200 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdx+0C8h] 
-            466369      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, 10h 
             4663e2      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+196 ZZ lea     rdi, [rax+0C4h] 
             46640f      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R8 ZZ IDIOM 18 MEMORYSINK add     r8, [rsp+98h+var_70] 
             466414      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+RDX ZZ IDIOM 18 MEMORYSINK lea     rsi, [rax+rdx+0C4h]; src 
@@ -1682,7 +1681,7 @@
             46643d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R8+RCX ZZ IDIOM 18 MEMORYSINK lea     rdx, [r8+rcx] 
             466441      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 19 sub     rdx, rsi 
             466444      2 INSTR CHECK TRUNCATION UNSIGNED 64 RDX 32 EDX ZZ mov     ecx, edx 
-            466987      6 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, 3E8h 
+            466987      6 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, 3E8h 
             466a0c      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+196 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rcx+0C4h] 
             466a32      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+46 ZZ IDIOM 18 MEMORYSINK lea     rcx, [r14+2Eh] 
             466afa      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, 1 
@@ -1692,7 +1691,7 @@
             466bb7      2 INSTR CHECK TRUNCATION UNSIGNED 64 RDX 32 EDX ZZ IDIOM 14 mov     esi, edx 
             466bc6      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+5 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r14+5] 
             466bcd      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+-5 ZZ IDIOM 19 lea     edx, [rax-5] 
-            466c9a      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, eax 
+            466c9a      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, eax 
             466ca7      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 94h        ; dest 
             466cb0      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RSI+RAX ZZ IDIOM 18 MEMORYSINK lea     rsi, [rsi+rax+0C4h]; src 
             466cb0      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RSI+RAX+196 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rsi+rax+0C4h]; src 
@@ -1724,7 +1723,7 @@
             46731e      3 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, r13 
             467350     76 FUNC RETURNTYPE RAX 1
             467350     76 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            467378      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, esi 
+            467378      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, esi 
             46737a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, r12 
             4673a0     45 FUNC RETURNTYPE RAX 16
             4673a0     45 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
@@ -1769,21 +1768,21 @@
             467a00     54 FUNC INARGS    4  ARG0 0 ARG1 4 ARG2 0 ARG3 0 
             467a40   2376 FUNC RETURNTYPE RAX 4
             467a40   2376 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            467ad2      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, 3 
+            467ad2      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, 3 
             467b6d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+2 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rcx+2] 
             467b75      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+1 ZZ lea     edx, [rax+1] 
             467b82      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+1 ZZ lea     ecx, [rax+1] 
             467b8c      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R15 ZZ mov     rdx, r15        ; n 
             467b99      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 3          ; dest 
-            467c31      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 1 
+            467c31      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 1 
             467c4c      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 3          ; dest 
-            467cf2      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 2 
+            467cf2      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 2 
             467d32      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 2          ; dest 
             467df7      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R14 ZZ mov     rdx, r14        ; n 
             467f46      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 2 
             468043      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 2 
             4680ea      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R14 ZZ mov     rdx, r14        ; n 
-            468141      2 INSTR CHECK TRUNCATION SIGNED 64 RAX 32 EAX ZZ cdqe 
+            468141      2 INSTR CHECK TRUNCATION SIGNED 64 RAX 32 RAX ZZ cdqe 
             468390   1391 FUNC RETURNTYPE RAX 4
             468390   1391 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             468390   1391 FUNC PROBLEM ssl_add_serverhello_tlsext CALLUNRESOLVED 
@@ -1792,10 +1791,10 @@
             468900   1490 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 8 ARG5 0 
             468900   1490 FUNC PROBLEM ssl_parse_serverhello_tlsext CALLUNRESOLVED 
             468a6b      3 INSTR CHECK OVERFLOW UNSIGNED 64  R15 ZZ IDIOM 18 MEMORYSINK add     r15, r14 
-            468b05      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 16 BX ZZ IDIOM 5 movzx   edx, bx 
-            468b3e      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EBX ZZ IDIOM 29 sub     ebx, 1 
+            468b05      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 16 BX ZZ IDIOM 5 movzx   edx, bx 
+            468b3e      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RBX ZZ IDIOM 29 sub     ebx, 1 
             468ba9      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+5 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+5]    ; src 
-            468d8d      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 16 BX ZZ IDIOM 5 movzx   edx, bx 
+            468d8d      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 16 BX ZZ IDIOM 5 movzx   edx, bx 
             468ee0    356 FUNC RETURNTYPE RAX 1
             468ee0    356 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
             469050    194 FUNC RETURNTYPE RAX 1
@@ -1812,7 +1811,7 @@
             469510    455 FUNC RETURNTYPE RAX 1
             469510    455 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 4 ARG5 0 
             469607      3 INSTR CHECK OVERFLOW UNSIGNED 64  RCX ZZ IDIOM 18 MEMORYSINK add     rcx, rsi 
-            46966b      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 16 DX ZZ IDIOM 5 movzx   edx, dx 
+            46966b      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDX 16 DX ZZ IDIOM 5 movzx   edx, dx 
             4696e0    223 FUNC RETURNTYPE RAX 1
             4696e0    223 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4697c0     52 FUNC RETURNTYPE RAX 1
@@ -1826,7 +1825,7 @@
             469a80   2583 FUNC PROBLEM ssl_parse_clienthello_tlsext CALLUNRESOLVED 
             469bb6      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 R12 16 R12 ZZ IDIOM 5 movzx   eax, r12w 
             469bb6      4 INSTR CHECK SIGNEDNESS UNSIGNED 16 R12 ZZ IDIOM 20 movzx   eax, r12w 
-            469bd4      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, 3 
+            469bd4      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ sub     ecx, 3 
             469be2      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 R13 16 R13 ZZ IDIOM 5 movzx   r15d, r13w 
             469be2      4 INSTR CHECK SIGNEDNESS UNSIGNED 16 R13 ZZ IDIOM 20 movzx   r15d, r13w 
             469c31      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15+1 ZZ IDIOM 32 lea     edi, [r15+1] 
@@ -1837,7 +1836,7 @@
             469f9e      4 INSTR CHECK TRUNCATION UNSIGNED 64 R12 16 R12 ZZ IDIOM 5 movzx   r13d, r12w 
             46a037      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RDI+-1 ZZ IDIOM 32 lea     eax, [rdi-1] 
             46a073      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+5 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+5]    ; src 
-            46a0d5      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EAX ZZ IDIOM 29 sub     eax, 2 
+            46a0d5      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RAX ZZ IDIOM 29 sub     eax, 2 
             46a140      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+6 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+6]    ; src 
             46a236      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 R13 16 R13 ZZ IDIOM 5 movzx   edx, r13w 
             46a236      4 INSTR CHECK SIGNEDNESS UNSIGNED 16 R13 ZZ IDIOM 20 movzx   edx, r13w 
@@ -1919,7 +1918,7 @@
             46d5f1      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0A4h 
             46d627      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax 
             46d63a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+2 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rbx+2] 
-            46d653      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, r13d 
+            46d653      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, r13d 
             46d72e      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0C4h 
             46d74c      7 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 0A4h 
             46d76a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+2 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+2] 
@@ -1939,16 +1938,16 @@
             46e17b      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, rbp 
             46e1b6      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     esi, eax 
             46e1bc      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RSI+-18 ZZ lea     ecx, [rsi-12h] 
-            46e1bf      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, 12h 
+            46e1bf      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, 12h 
             46e1cc      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, 12h 
-            46e200      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, 0Ch 
+            46e200      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ sub     ecx, 0Ch 
             46e232      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+464 ZZ IDIOM 18 MEMORYSINK lea     rcx, [r14+1D0h] 
             46e253      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+448 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r14+1C0h] 
             46e2b0   3897 FUNC RETURNTYPE RAX 1
             46e2b0   3897 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46e2b0   3897 FUNC PROBLEM dtls1_accept CALLUNRESOLVED 
             46ef0e      4 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 4          ; src 
-            46ef3f      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, eax 
+            46ef3f      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ sub     ecx, eax 
             46f1f0     28 FUNC RETURNTYPE RAX 96
             46f1f0     28 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             46f210      6 FUNC RETURNTYPE RAX 16
@@ -2111,14 +2110,13 @@
             4756b7      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 290h       ; src 
             475720    717 FUNC RETURNTYPE RAX 1
             475720    717 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
-            4757c6      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, 1 
             4757ca      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, [r12+8]    ; n 
             4759c7      4 INSTR CHECK TRUNCATION UNSIGNED 64 R12 16 R12 ZZ IDIOM 5 movzx   ecx, r12w 
             4759f0    181 FUNC RETURNTYPE RAX 1
             4759f0    181 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
-            475a51      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, esi 
-            475a53      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, [rax+28h] 
-            475a56      3 INSTR CHECK TRUNCATION UNSIGNED 32 ESI 16 SI ZZ IDIOM 5 movzx   esi, si 
+            475a51      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, esi 
+            475a53      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, [rax+28h] 
+            475a56      3 INSTR CHECK TRUNCATION UNSIGNED 32 RSI 16 SI ZZ IDIOM 5 movzx   esi, si 
             475ab0     98 FUNC RETURNTYPE RAX 4
             475ab0     98 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             475b20    102 FUNC RETURNTYPE RAX 0
@@ -2206,7 +2204,7 @@
             4781e0     97 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             478250    280 FUNC RETURNTYPE RAX 1
             478250    280 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            478352      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, ebx        ; n 
+            478352      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, ebx        ; n 
             478370     12 FUNC RETURNTYPE RAX 0
             478370     12 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             478380     12 FUNC RETURNTYPE RAX 0
@@ -2601,7 +2599,7 @@
             47da70    445 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             47dad3      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+RAX ZZ lea     rax, [r13+rax+2] 
             47dad3      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+RAX+2 ZZ lea     rax, [r13+rax+2] 
-            47db00      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, 1 
+            47db00      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, 1 
             47dc30    469 FUNC RETURNTYPE RAX 1
             47dc30    469 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             47de10    146 FUNC RETURNTYPE RAX 4
@@ -3001,7 +2999,7 @@
             489243      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RSI+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rsi+1]    ; s1 
             4892d0    227 FUNC RETURNTYPE RAX 1
             4892d0    227 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            489311      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, eax 
+            489311      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, eax 
             48932a      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 420h       ; src 
             48934b      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, 461h       ; src 
             489352      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r12        ; dest 
@@ -3157,7 +3155,7 @@
             48ada7      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RSI ZZ sub     rsi, r12 
             48ade4      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+2 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rcx+2] 
             48adf1      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RCX ZZ IDIOM 18 MEMORYSINK sbb     rcx, 3 
-            48adf5      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ IDIOM 19 sub     ecx, ebp 
+            48adf5      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ IDIOM 19 sub     ecx, ebp 
             48ae14      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+RCX ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rbp+rcx+0] 
             48ae21      3 INSTR CHECK UNDERFLOW SIGNED 64  RDX ZZ sub     rdx, rcx 
             48aea8      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+56 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdi+38h]  ; timer 
@@ -3476,7 +3474,7 @@
             4976c4      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+156 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+9Ch]  ; dest 
             4976ea      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R14 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r14+9Ch]; s 
             4976ea      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R14+156 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r14+9Ch]; s 
-            4976f4      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, r14d       ; n 
+            4976f4      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, r14d       ; n 
             497814      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+8] 
             497862      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+152 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+98h] 
             497869      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+156 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+9Ch] 
@@ -3485,7 +3483,7 @@
             497a77      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+156 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+9Ch]  ; dest 
             497a9d      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R14 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r14+9Ch]; s 
             497a9d      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R14+156 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r14+9Ch]; s 
-            497aa7      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, r14d       ; n 
+            497aa7      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, r14d       ; n 
             497bcc      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+8] 
             497be8      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+8] 
             497c29      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+152 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+98h] 
@@ -3543,7 +3541,7 @@
             4988e2      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RCX+64 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rcx+40h]; s 
             498b1d      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RCX ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rcx+40h]; s 
             498b1d      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RCX+64 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rcx+40h]; s 
-            498b24      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, eax        ; n 
+            498b24      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, eax        ; n 
             498b80    255 FUNC RETURNTYPE RAX 0
             498b80    255 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 8 ARG3 0 ARG4 0 ARG5 0 
             498c80   2144 FUNC RETURNTYPE RAX 0
@@ -3751,12 +3749,12 @@
             4aedc0    782 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 4 ARG3 0 
             4af400   4277 FUNC RETURNTYPE RAX 1
             4af400   4277 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
-            4af744      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 40h 
+            4af744      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 40h 
             4b0253      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+-1 ZZ lea     esi, [r12-1] 
             4b026c      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+-2 ZZ lea     esi, [r12-2] 
             4b0274      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDX*2 ZZ lea     edx, [rax+rdx*2] 
             4b0274      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+RDX*2 ZZ lea     edx, [rax+rdx*2] 
-            4b0277      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, edx 
+            4b0277      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, edx 
             4b0284      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+-3 ZZ lea     esi, [r12-3] 
             4b0299      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+-4 ZZ lea     esi, [r12-4] 
             4b04c0    476 FUNC RETURNTYPE RAX 1
@@ -3766,12 +3764,12 @@
             4b0af0   4361 FUNC RETURNTYPE RAX 1
             4b0af0   4361 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             4b0c39      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, 8 
-            4b0e04      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 40h 
+            4b0e04      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 40h 
             4b19aa      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+-1 ZZ lea     esi, [rbx-1] 
             4b19c1      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+-2 ZZ lea     esi, [rbx-2] 
             4b19c7      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDX*2 ZZ lea     edx, [rax+rdx*2] 
             4b19c7      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+RDX*2 ZZ lea     edx, [rax+rdx*2] 
-            4b19ca      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, edx 
+            4b19ca      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, edx 
             4b19d7      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+-3 ZZ lea     esi, [rbx-3] 
             4b19ea      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+-4 ZZ lea     esi, [rbx-4] 
             4b1c00   1492 FUNC RETURNTYPE RAX 1
@@ -3914,7 +3912,7 @@
             4b50a0   1506 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 1 ARG5 1 
             4b50fd      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+RBP ZZ lea     edx, [rbx+rbp] 
             4b5100      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RBX+R12 ZZ lea     r8d, [rbx+r12] 
-            4b515e      2 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ neg     edx 
+            4b515e      2 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ neg     edx 
             4b5178      3 INSTR CHECK OVERFLOW SIGNED 64  R9 ZZ add     r9d, ebp 
             4b51a7      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, [rsp+98h+var_60] 
             4b522b      3 INSTR CHECK OVERFLOW SIGNED 64  R8 ZZ neg     r8d 
@@ -3937,15 +3935,15 @@
             4b5c3e      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8d, r13d 
             4b5c65      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, [rsp+98h+var_60] 
             4b5ce8      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+RAX ZZ lea     rdx, [rbp+rax+0] 
-            4b5d8c      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r13d 
-            4b5d92      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r12d 
+            4b5d8c      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r13d 
+            4b5d92      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r12d 
             4b5d9e      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12*8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+r12*8]; s 
             4b5d9e      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R15+R12*8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+r12*8]; s 
             4b5df5      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r15 
             4b5eda      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+RAX ZZ lea     rdx, [rbp+rax+0] 
             4b5fa5      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8d, ebx 
             4b5fdd      3 INSTR CHECK UNDERFLOW SIGNED 64  R8 ZZ sub     r8d, ebx 
-            4b60a6      2 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ neg     edx 
+            4b60a6      2 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ neg     edx 
             4b60a8      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX*2 ZZ lea     edx, [r14+rdx*2] 
             4b60a8      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R14+RDX*2 ZZ lea     edx, [r14+rdx*2] 
             4b60af      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R10*8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+r10*8]; s 
@@ -4001,15 +3999,15 @@
             4b6f10    220 FUNC PROBLEM BN_mod_lshift CALLUNRESOLVED 
             4b6ff0    698 FUNC RETURNTYPE RAX 4
             4b6ff0    698 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
-            4b7008      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, 2 
+            4b7008      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, 2 
             4b72b0    559 FUNC RETURNTYPE RAX 4
             4b72b0    559 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 96 ARG4 1 ARG5 0 
             4b72c6      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX*2 ZZ lea     esi, [rax+rax*2] 
             4b72c6      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+RAX*2 ZZ lea     esi, [rax+rax*2] 
-            4b72ea      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, edi 
-            4b72ef      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, edi 
+            4b72ea      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, edi 
+            4b72ef      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, edi 
             4b72fa      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15+2 ZZ lea     ecx, [r15+2] 
-            4b730c      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            4b730c      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             4b730e      7 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX*8 ZZ lea     edi, ds:8[rdx*8] 
             4b730e      7 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX*8+8 ZZ lea     edi, ds:8[rdx*8] 
             4b742b      3 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ IDIOM 19 add     rsi, r15 
@@ -4063,14 +4061,14 @@
             4b84c0     16 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 96 
             4b84d0    201 FUNC RETURNTYPE RAX 1
             4b84d0    201 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4b8558      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1 
+            4b8558      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1 
             4b857c      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+1 ZZ lea     esi, [rax+1] 
             4b85a0    276 FUNC RETURNTYPE RAX 1
             4b85a0    276 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4b86c0    394 FUNC RETURNTYPE RAX 1
             4b86c0    394 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4b8761      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13*8 ZZ lea     rdx, ds:0[r13*8]; n 
-            4b8818      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 1 
+            4b8818      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 1 
             4b8850    450 FUNC RETURNTYPE RAX 1
             4b8850    450 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4b8a20    124 FUNC RETURNTYPE RAX 1
@@ -4084,7 +4082,7 @@
             4b8db0      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBP+1 ZZ lea     esi, [rbp+1] 
             4b8dd0    153 FUNC RETURNTYPE RAX 1
             4b8dd0    153 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4b8e50      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1 
+            4b8e50      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1 
             4b8e70    215 FUNC RETURNTYPE RAX 1
             4b8e70    215 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 1 ARG5 4 
             4b8f50    200 FUNC RETURNTYPE RAX 1
@@ -4159,12 +4157,12 @@
             4bd4f0    887 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             4bd681      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+24 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+18h] 
             4bd6df      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+24 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r15+18h] 
-            4bd6fd      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [r15+30h] 
+            4bd6fd      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [r15+30h] 
             4bd870    769 FUNC RETURNTYPE RAX 1
             4bd870    769 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             4bd98e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+24 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r15+18h] 
             4bd9f3      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+24 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r15+18h] 
-            4bda0e      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [r15+30h] 
+            4bda0e      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [r15+30h] 
             4bdb80    167 FUNC RETURNTYPE RAX 1
             4bdb80    167 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4bdc30    840 FUNC RETURNTYPE RAX 1
@@ -4193,7 +4191,7 @@
             4be290    524 FUNC RETURNTYPE RAX 1
             4be290    524 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 96 ARG4 0 ARG5 0 
             4be327      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+126 ZZ lea     edx, [rax+7Eh] 
-            4be449      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, esi 
+            4be449      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, esi 
             4be4a0    116 FUNC RETURNTYPE RAX 4
             4be4a0    116 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4be4b1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RSI+8 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rsi+8] 
@@ -4390,7 +4388,7 @@
             4c1ea4      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+R12*2 ZZ lea     edi, [r12+r12*2] 
             4c1eb0      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+78h+var_68] 
             4c1ed8      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+78h+var_68] 
-            4c1f1d      3 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, r12d 
+            4c1f1d      3 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, r12d 
             4c1f23      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+78h+var_68] 
             4c2056      5 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK sub     rsi, [rsp+78h+var_50] 
             4c20a0     78 FUNC RETURNTYPE RAX 1
@@ -4399,13 +4397,13 @@
             4c20f0    572 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4c2330    194 FUNC RETURNTYPE RAX 4
             4c2330    194 FUNC INARGS    5  ARG0 4 ARG1 0 ARG2 0 ARG3 96 ARG4 96 
-            4c2386      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 EAX 32 EAX ZZ mov     edi, eax 
+            4c2386      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edi, eax 
             4c23b7      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBX 32 EBX ZZ mov     esi, ebx 
             4c2400    258 FUNC RETURNTYPE RAX 4
             4c2400    258 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4c2510    240 FUNC RETURNTYPE RAX 4
             4c2510    240 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
-            4c2550      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 EAX 32 EAX ZZ mov     edi, eax 
+            4c2550      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edi, eax 
             4c2592      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+RAX ZZ lea     edi, [rax+rax+2] 
             4c2592      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+RAX+2 ZZ lea     edi, [rax+rax+2] 
             4c2600    119 FUNC RETURNTYPE RAX 4
@@ -4422,7 +4420,7 @@
             4c30f0   3105 FUNC RETURNTYPE RAX 4
             4c30f0   3105 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4c353e      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+14 ZZ lea     ecx, [rax+0Eh] 
-            4c376a      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 EAX 32 EAX ZZ mov     edi, eax 
+            4c376a      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edi, eax 
             4c3d20     10 FUNC RETURNTYPE RAX 0
             4c3d20     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             4c3d30     10 FUNC RETURNTYPE RAX 0
@@ -4459,7 +4457,7 @@
             4c3f90    682 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             4c4240    914 FUNC RETURNTYPE RAX 96
             4c4240    914 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4c43f4      2 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 32 EAX ZZ mov     esi, eax 
+            4c43f4      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ mov     esi, eax 
             4c45e0    230 FUNC RETURNTYPE RAX 96
             4c45e0    230 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4c46d0    236 FUNC RETURNTYPE RAX 4
@@ -4469,7 +4467,7 @@
             4c47c0    257 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4c48d0    334 FUNC RETURNTYPE RAX 0
             4c48d0    334 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4c49b2      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 EAX 32 EAX ZZ mov     edi, eax 
+            4c49b2      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edi, eax 
             4c4a20    143 FUNC RETURNTYPE RAX 4
             4c4a20    143 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             4c4ab0    278 FUNC RETURNTYPE RAX 4
@@ -4676,7 +4674,7 @@
             4c8550      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+14 ZZ lea     ecx, [rax+0Eh] 
             4c8577      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+14 ZZ lea     ecx, [rax+0Eh] 
             4c85cc      4 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, 0Ah 
-            4c882f      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 5 
+            4c882f      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 5 
             4c89a0    163 FUNC RETURNTYPE RAX 1
             4c89a0    163 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4c8a50    166 FUNC RETURNTYPE RAX 0
@@ -4708,13 +4706,13 @@
             4c9960   1083 FUNC PROBLEM RSA_eay_public_encrypt CALLUNRESOLVED 
             4c9c4a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+120 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+78h] 
             4c9c9a      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+14 ZZ lea     edx, [rax+0Eh] 
-            4c9cac      2 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, eax 
+            4c9cac      2 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, eax 
             4c9cb1      5 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rsp+58h+var_40] 
             4c9da0   1401 FUNC RETURNTYPE RAX 1
             4c9da0   1401 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             4c9da0   1401 FUNC PROBLEM RSA_eay_private_encrypt CALLUNRESOLVED 
             4c9fcc      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+14 ZZ lea     edx, [rax+0Eh] 
-            4c9fe1      2 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, eax 
+            4c9fe1      2 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, eax 
             4c9fe6      5 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rsp+98h+var_80] 
             4ca0b5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+120 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+78h] 
             4ca320   1331 FUNC RETURNTYPE RAX 1
@@ -4765,12 +4763,12 @@
             4cb5e1      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+72 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdi+48h] 
             4cb5ea      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+80 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdi+50h] 
             4cb5f3      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+88 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rdi+58h] 
-            4cb608      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
-            4cb60b      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rax+8] 
-            4cb612      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rax+8] 
-            4cb619      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rax+8] 
-            4cb620      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rax+8] 
-            4cb627      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, [rax+8] 
+            4cb608      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
+            4cb60b      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, [rax+8] 
+            4cb612      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, [rax+8] 
+            4cb619      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, [rax+8] 
+            4cb620      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, [rax+8] 
+            4cb627      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, [rax+8] 
             4cb62a      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDI*8 ZZ lea     edi, ds:98h[rdi*8] 
             4cb62a      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDI*8+152 ZZ lea     edi, ds:98h[rdi*8] 
             4cb8b0    710 FUNC RETURNTYPE RAX 1
@@ -4812,7 +4810,7 @@
             4cca1d      2 INSTR CHECK SIGNEDNESS UNSIGNED 32 ECX ZZ mov     edx, ecx        ; n 
             4cca90    142 FUNC RETURNTYPE RAX 1
             4cca90    142 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
-            4ccabb      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            4ccabb      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             4ccace      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK sub     rdi, rdx 
             4ccad1      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, rbp        ; dest 
             4ccb20    416 FUNC RETURNTYPE RAX 1
@@ -4823,7 +4821,7 @@
             4ccc77      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r13        ; dest 
             4cccc0    960 FUNC RETURNTYPE RAX 1
             4cccc0    960 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 1 ARG4 1 ARG5 1 
-            4ccd25      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, ebp 
+            4ccd25      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, ebp 
             4ccd48      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R13 ZZ mov     rdx, r13        ; n 
             4ccd5b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R14+R13 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r14+r13]  ; dest 
             4ccd76      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R14+20 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r14+14h] 
@@ -4832,18 +4830,18 @@
             4cd080    773 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 1 ARG5 0 
             4cd1a0      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+1 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+1] 
             4cd1a7      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+41 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+29h]  ; s 
-            4cd1ab      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, r12d 
+            4cd1ab      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, r12d 
             4cd1b5      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RCX+-41 ZZ lea     edx, [rcx-29h] 
             4cd1ce      4 INSTR CHECK UNDERFLOW SIGNED 64  RDI ZZ sub     rdi, 14h 
             4cd1d7      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R12 ZZ mov     edx, r12d       ; n 
             4cd1da      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK sub     rdi, rax 
-            4cd1dd      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, 14h 
+            4cd1dd      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, 14h 
             4cd1e0      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r15        ; dest 
             4cd390   1204 FUNC RETURNTYPE RAX 1
             4cd390   1204 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             4cd850    191 FUNC RETURNTYPE RAX 1
             4cd850    191 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            4cd88b      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, 3 
+            4cd88b      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, 3 
             4cd8ac      2 INSTR CHECK SIGNEDNESS UNSIGNED 32 EBP ZZ mov     edx, ebp        ; n 
             4cd910    273 FUNC RETURNTYPE RAX 1
             4cd910    273 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 1 ARG4 1 ARG5 0 
@@ -4897,11 +4895,11 @@
             4ce0e0   2350 FUNC RETURNTYPE RAX 1
             4ce0e0   2350 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 0 ARG4 1 ARG5 1 
             4ce0e0   2350 FUNC PROBLEM DSA_generate_parameters_ex CALLUNRESOLVED 
-            4ce47b      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 1 
-            4ce623      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 1 
+            4ce47b      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 1 
+            4ce623      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 1 
             4cea10   2549 FUNC RETURNTYPE RAX 1
             4cea10   2549 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            4ceb8b      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, 1 
+            4ceb8b      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, 1 
             4cf410    448 FUNC RETURNTYPE RAX 1
             4cf410    448 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4cf410    448 FUNC PROBLEM DSA_generate_key CALLUNRESOLVED 
@@ -5808,11 +5806,11 @@
             4de2b4      7 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ add     rsi, 400h 
             4de380    814 FUNC RETURNTYPE RAX 1
             4de380    814 FUNC INARGS    6  ARG0 8 ARG1 96 ARG2 8 ARG3 4 ARG4 1 ARG5 0 
-            4de484      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r12d 
+            4de484      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r12d 
             4de520      4 INSTR CHECK SIGNEDNESS UNSIGNED 64 R8 ZZ IDIOM 20 movsx   r8d, r8b 
             4de6b0   3833 FUNC RETURNTYPE RAX 0
             4de6b0   3833 FUNC INARGS    6  ARG0 8 ARG1 96 ARG2 4 ARG3 8 ARG4 8 ARG5 4 
-            4de8f1      4 INSTR CHECK TRUNCATION SIGNED 32 EDX 8 DL ZZ IDIOM 14 movsx   r8d, dl 
+            4de8f1      4 INSTR CHECK TRUNCATION SIGNED 32 RDX 8 DL ZZ IDIOM 14 movsx   r8d, dl 
             4dedf1      4 INSTR CHECK SIGNEDNESS UNSIGNED 64 R8 ZZ IDIOM 20 movsx   r8d, r8b 
             4df5b0    260 FUNC RETURNTYPE RAX 1
             4df5b0    260 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 8 ARG3 96 ARG4 96 ARG5 96 
@@ -5830,7 +5828,7 @@
             4df8c0   1061 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4df8c0   1061 FUNC PROBLEM BIO_dump_indent_cb CALLUNRESOLVED 
             4dfad9      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+RBX ZZ lea     eax, [r13+rbx+0] 
-            4dfb53      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   ecx, cl 
+            4dfb53      3 INSTR CHECK TRUNCATION UNSIGNED 64 RCX 8 CL ZZ IDIOM 5 movzx   ecx, cl 
             4dfc2e      3 INSTR CHECK OVERFLOW SIGNED 64  R8 ZZ add     r8d, r14d 
             4dfcf0      8 FUNC RETURNTYPE RAX 0
             4dfcf0      8 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
@@ -5862,12 +5860,12 @@
             4e0240   1497 FUNC RETURNTYPE RAX 1
             4e0240   1497 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4e0240   1497 FUNC PROBLEM BIO_get_accept_socket CALLUNRESOLVED 
-            4e0430      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDI 16 DI ZZ IDIOM 5 movzx   edi, di         ; domain 
-            4e0486      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDI 16 DI ZZ IDIOM 5 movzx   edi, di         ; domain 
+            4e0430      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDI 16 DI ZZ IDIOM 5 movzx   edi, di         ; domain 
+            4e0486      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDI 16 DI ZZ IDIOM 5 movzx   edi, di         ; domain 
             4e0820    988 FUNC RETURNTYPE RAX 1
             4e0820    988 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4e0820    988 FUNC PROBLEM BIO_accept CALLUNRESOLVED 
-            4e0ab4      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   edx, al 
+            4e0ab4      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 8 AL ZZ IDIOM 5 movzx   edx, al 
             4e0c00      6 FUNC RETURNTYPE RAX 1
             4e0c00      6 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             4e0c10     94 FUNC RETURNTYPE RAX 1
@@ -6037,18 +6035,18 @@
             4e4310    588 FUNC RETURNTYPE RAX 1
             4e4310    588 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4e4374      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+2 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rbx+2] 
-            4e444f      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebx 
+            4e444f      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebx 
             4e4451      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, r12        ; buf 
-            4e4480      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 72h 
-            4e4502      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, ebx 
+            4e4480      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 72h 
+            4e4502      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, ebx 
             4e450c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax        ; buf 
             4e4560    676 FUNC RETURNTYPE RAX 1
             4e4560    676 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             4e45cd      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+2 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [r13+2] 
-            4e4668      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r13d 
+            4e4668      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r13d 
             4e466e      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax        ; buf 
             4e47a3      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, [rsp+1D8h+var_1D0]; buf 
-            4e47a8      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, r13d 
+            4e47a8      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, r13d 
             4e4810     59 FUNC RETURNTYPE RAX 1
             4e4810     59 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4e4850     38 FUNC RETURNTYPE RAX 1
@@ -6224,7 +6222,7 @@
             4e8e20    511 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             4e8e20    511 FUNC PROBLEM EVP_EncryptUpdate.part.0 CALLUNRESOLVED 
             4e8ef5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+56 ZZ IDIOM 18 MEMORYSINK lea     r8, [rbx+38h] 
-            4e8eff      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            4e8eff      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             4e8f06      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R8+RAX ZZ IDIOM 18 MEMORYSINK lea     rdi, [r8+rax]   ; dest 
             4e8f0e      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R9 ZZ mov     rdx, r9         ; n 
             4e8fc8      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rax+38h]; dest 
@@ -6538,7 +6536,7 @@
             4ece70    275 FUNC RETURNTYPE RAX 1
             4ece70    275 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4ecec4      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+272 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+110h] 
-            4ecef8      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [rbx+104h] 
+            4ecef8      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [rbx+104h] 
             4ecefe      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+40 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+28h]  ; dest 
             4ecf41      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+272 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+110h] 
             4ecf90    412 FUNC RETURNTYPE RAX 1
@@ -6547,21 +6545,21 @@
             4ed0ec      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 38h        ; dest 
             4ed130    698 FUNC RETURNTYPE RAX 1
             4ed130    698 FUNC INARGS    5  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 
-            4ed2e5      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [rbx+104h] 
+            4ed2e5      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [rbx+104h] 
             4ed2eb      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+28h] 
             4ed342      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+56 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+38h]  ; s2 
-            4ed3ac      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [rbx+104h] 
+            4ed3ac      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [rbx+104h] 
             4ed3b2      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+40 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+28h] 
             4ed3f0    227 FUNC RETURNTYPE RAX 1
             4ed3f0    227 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4ed443      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+272 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+110h] 
-            4ed484      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, [rbx+104h] 
+            4ed484      6 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, [rbx+104h] 
             4ed48a      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+40 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+28h]  ; dest 
             4ed4e0    293 FUNC RETURNTYPE RAX 1
             4ed4e0    293 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4ed569      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+244 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r13+0F4h] 
             4ed572      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX*4 ZZ lea     esi, ds:0[rax*4] 
-            4ed57c      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, eax 
+            4ed57c      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, eax 
             4ed583      3 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, r12 
             4ed610    157 FUNC RETURNTYPE RAX 1
             4ed610    157 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
@@ -6570,7 +6568,7 @@
             4ed6b0    267 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4ed715      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+244 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r13+0F4h] 
             4ed71e      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX*4 ZZ lea     esi, ds:0[rax*4] 
-            4ed728      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, eax 
+            4ed728      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, eax 
             4ed72f      3 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, r12 
             4ed7c0    392 FUNC RETURNTYPE RAX 1
             4ed7c0    392 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
@@ -6592,7 +6590,7 @@
             4eddd5      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+256 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+100h] 
             4ede0d      8 INSTR CHECK OVERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, [r12+288h] ; src 
             4edf25      8 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, [r12+288h] 
-            4edf2d      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, ebp 
+            4edf2d      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, ebp 
             4edf80    819 FUNC RETURNTYPE RAX 1
             4edf80    819 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4ee0f2      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+R15 ZZ lea     rsi, [rbp+r15+0] 
@@ -6952,7 +6950,7 @@
             4f0ff4      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+7Ch]; src 
             4f0ff4      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX+124 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+7Ch]; src 
             4f0ff9      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R12 ZZ mov     rdx, r12        ; n 
-            4f10a3      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            4f10a3      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             4f10a5      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+65Ah] 
             4f10a5      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX+1626 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+65Ah] 
             4f1166      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R12 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+r12+65Ah]; src 
@@ -6968,10 +6966,10 @@
             4f1654      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX+124 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+7Ch] 
             4f1773      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+68h+var_50]; dest 
             4f177e      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 RAX ZZ mov     rdx, rax        ; n 
-            4f178e      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, r13d 
+            4f178e      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, r13d 
             4f1812      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+7Ch] 
             4f1812      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX+124 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+rax+7Ch] 
-            4f19f0      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r13d 
+            4f19f0      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r13d 
             4f1ace      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1626 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+65Ah] ; dest 
             4f1af0    820 FUNC RETURNTYPE RAX 1
             4f1af0    820 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -7138,7 +7136,7 @@
             4f41b0      2 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
             4f41c0    892 FUNC RETURNTYPE RAX 1
             4f41c0    892 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
-            4f4492      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ECX ZZ sub     ecx, eax 
+            4f4492      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RCX ZZ sub     ecx, eax 
             4f449a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rcx 
             4f4550    727 FUNC RETURNTYPE RAX 1
             4f4550    727 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 1 ARG5 16 
@@ -7375,7 +7373,7 @@
             4f8d79      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBP+-48 ZZ lea     esi, [rbp-30h] 
             4f8dae      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBP+-48 ZZ lea     eax, [rbp-30h] 
             4f8e33      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15+RSI ZZ lea     eax, [r15+rsi] 
-            4f9029      3 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, 20h 
+            4f9029      3 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, 20h 
             4f91b0      7 FUNC RETURNTYPE RAX 0
             4f91b0      7 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 1 
             4f91c0    352 FUNC RETURNTYPE RAX 1
@@ -7411,15 +7409,15 @@
             4f9fc0    346 FUNC RETURNTYPE RAX 96
             4f9fc0    346 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4fa06f      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R8 ZZ add     r8d, 1 
-            4fa073      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            4fa073      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             4fa07a      3 INSTR CHECK OVERFLOW SIGNED 32 EDX ZZ imul    edx, eax 
-            4fa08a      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, edx 
+            4fa08a      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, edx 
             4fa120    429 FUNC RETURNTYPE RAX 4
             4fa120    429 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             4fa1fa      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R8 ZZ add     r8d, 1 
-            4fa1fe      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            4fa1fe      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             4fa204      3 INSTR CHECK OVERFLOW SIGNED 32 EDX ZZ imul    edx, esi 
-            4fa215      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, edx 
+            4fa215      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, edx 
             4fa2d0    464 FUNC RETURNTYPE RAX 1
             4fa2d0    464 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4fa4a0    877 FUNC RETURNTYPE RAX 1
@@ -7428,11 +7426,11 @@
             4fa810    124 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             4fa890    295 FUNC RETURNTYPE RAX 4
             4fa890    295 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4fa931      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ECX ZZ add     ecx, 76Ch 
+            4fa931      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RCX ZZ add     ecx, 76Ch 
             4fa937      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R8 ZZ add     r8d, 1 
             4fa9c0    381 FUNC RETURNTYPE RAX 4
             4fa9c0    381 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
-            4faa8a      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ECX ZZ add     ecx, 76Ch 
+            4faa8a      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RCX ZZ add     ecx, 76Ch 
             4faa90      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R8 ZZ add     r8d, 1 
             4fab40     10 FUNC RETURNTYPE RAX 0
             4fab40     10 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 0 
@@ -7450,7 +7448,7 @@
             4facd0     29 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             4facf0    319 FUNC RETURNTYPE RAX 4
             4facf0    319 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4fad71      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 2 
+            4fad71      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 2 
             4fae30    127 FUNC RETURNTYPE RAX 1
             4fae30    127 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 96 ARG3 1 ARG4 1 ARG5 0 
             4faeb0      5 FUNC RETURNTYPE RAX 0
@@ -7464,14 +7462,14 @@
             4fb0df      5 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+1 ZZ lea     edi, [r12+1] 
             4fb2d0    442 FUNC RETURNTYPE RAX 4
             4fb2d0    442 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            4fb3e6      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
+            4fb3e6      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
             4fb490    471 FUNC RETURNTYPE RAX 1
             4fb490    471 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4fb670    112 FUNC RETURNTYPE RAX 1
             4fb670    112 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 1 
             4fb6e0    312 FUNC RETURNTYPE RAX 4
             4fb6e0    312 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4fb77c      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 4 
+            4fb77c      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 4 
             4fb820    123 FUNC RETURNTYPE RAX 4
             4fb820    123 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 0 ARG3 96 ARG4 96 ARG5 0 
             4fb8a0      5 FUNC RETURNTYPE RAX 0
@@ -7534,7 +7532,7 @@
             4fc970    120 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             4fc9f0    296 FUNC RETURNTYPE RAX 4
             4fc9f0    296 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4fca42      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 4 
+            4fca42      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 4 
             4fcb20    123 FUNC RETURNTYPE RAX 4
             4fcb20    123 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4fcba0     46 FUNC RETURNTYPE RAX 1
@@ -7544,7 +7542,7 @@
             4fcbf0    377 FUNC RETURNTYPE RAX 1
             4fcbf0    377 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
             4fcbf0    377 FUNC PROBLEM do_esc_char.part.0 CALLUNRESOLVED 
-            4fcce5      3 INSTR CHECK TRUNCATION UNSIGNED 32 ECX 8 CL ZZ IDIOM 5 movzx   ecx, cl 
+            4fcce5      3 INSTR CHECK TRUNCATION UNSIGNED 32 RCX 8 CL ZZ IDIOM 5 movzx   ecx, cl 
             4fcd70    705 FUNC RETURNTYPE RAX 1
             4fcd70    705 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 96 ARG5 0 
             4fcd70    705 FUNC PROBLEM do_buf CALLUNRESOLVED 
@@ -7556,7 +7554,7 @@
             4fd3f0   1426 FUNC RETURNTYPE RAX 1
             4fd3f0   1426 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4fd3f0   1426 FUNC PROBLEM do_name_ex CALLUNRESOLVED 
-            4fd5a9      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, r14d 
+            4fd5a9      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, r14d 
             4fd990     37 FUNC RETURNTYPE RAX 1
             4fd990     37 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 1 ARG3 96 
             4fd9c0    130 FUNC RETURNTYPE RAX 1
@@ -7910,12 +7908,12 @@
             501ec0    117 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             501f40    233 FUNC RETURNTYPE RAX 1
             501f40    233 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            501fa8      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 1 
+            501fa8      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 1 
             502030    768 FUNC RETURNTYPE RAX 1
             502030    768 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             502330    471 FUNC RETURNTYPE RAX 1
             502330    471 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            5024b6      6 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 76Ch 
+            5024b6      6 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 76Ch 
             502510     73 FUNC RETURNTYPE RAX 1
             502510     73 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             502560   1259 FUNC RETURNTYPE RAX 1
@@ -8251,26 +8249,26 @@
             508850    349 FUNC RETURNTYPE RAX 1
             508850    349 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             5088aa      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, [r13+8] 
-            5088eb      3 INSTR CHECK OVERFLOW SIGNED 32  EBX ZZ add     ebx, 1 
+            5088eb      3 INSTR CHECK OVERFLOW SIGNED 32  RBX ZZ add     ebx, 1 
             5089b0    861 FUNC RETURNTYPE RAX 1
             5089b0    861 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
-            508a38      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 31 sub     esi, 41h 
-            508a7e      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EBP ZZ sub     ebp, r15d 
+            508a38      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 31 sub     esi, 41h 
+            508a7e      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RBP ZZ sub     ebp, r15d 
             508b0f      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+-65 ZZ IDIOM 32 lea     ecx, [rax-41h] 
             508b44      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RSI+-65 ZZ IDIOM 32 lea     ecx, [rsi-41h] 
-            508be0      3 INSTR CHECK UNDERFLOW SIGNED 32  EBP ZZ sub     ebp, 1 
-            508bff      3 INSTR CHECK UNDERFLOW SIGNED 32  EBP ZZ sub     ebp, 1 
+            508be0      3 INSTR CHECK UNDERFLOW SIGNED 32  RBP ZZ sub     ebp, 1 
+            508bff      3 INSTR CHECK UNDERFLOW SIGNED 32  RBP ZZ sub     ebp, 1 
             508d10    800 FUNC RETURNTYPE RAX 4
             508d10    800 FUNC INARGS    6  ARG0 1 ARG1 4 ARG2 4 ARG3 1 ARG4 1 ARG5 0 
             508d10    800 FUNC PROBLEM d2i_RSA_NET_2.isra.0 CALLUNRESOLVED 
             508ecf      4 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rbp+0] 
-            508ee0      4 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, [rsp+278h+var_23C] 
+            508ee0      4 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, [rsp+278h+var_23C] 
             509030    704 FUNC RETURNTYPE RAX 4
             509030    704 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
             509030    704 FUNC PROBLEM d2i_RSA_NET_2.isra.0.constprop.5 CALLUNRESOLVED 
             5090d7      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+2 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r13+2] 
             509192      4 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rbp+0] 
-            5091a3      4 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, [rsp+268h+var_23C] 
+            5091a3      4 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, [rsp+268h+var_23C] 
             509300     10 FUNC RETURNTYPE RAX 1
             509300     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 1 
             509310   1172 FUNC RETURNTYPE RAX 96
@@ -8346,7 +8344,7 @@
             50aa90    222 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             50ab70   2374 FUNC RETURNTYPE RAX 4
             50ab70   2374 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            50ae8c      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, ebx 
+            50ae8c      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, ebx 
             50affe      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+8 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+8] 
             50b20a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+8] 
             50b4c0     38 FUNC RETURNTYPE RAX 4
@@ -8355,9 +8353,9 @@
             50b4f0   2741 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 1 ARG5 1 
             50b59e      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ IDIOM 23 sub     rdx, [r13+0] 
             50b948      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RCX ZZ sub     rcx, [r13+0] 
-            50b954      4 INSTR CHECK OVERFLOW UNSIGNED 32  ECX ZZ add     ecx, [rsp+178h+var_144] 
+            50b954      4 INSTR CHECK OVERFLOW UNSIGNED 32  RCX ZZ add     ecx, [rsp+178h+var_144] 
             50ba13      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RCX ZZ sub     rcx, [r13+0] 
-            50ba1a      4 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, [rsp+178h+var_144] 
+            50ba1a      4 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, [rsp+178h+var_144] 
             50ba23      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RDX ZZ sub     rdx, rax 
             50bb11      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, [rsp+178h+var_108] 
             50bb6a      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, [rsp+178h+var_108] 
@@ -8550,8 +8548,8 @@
             5102c7      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+-6 ZZ lea     edx, [r13-6] 
             51035f      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+9 ZZ lea     esi, [r13+9] 
             510390      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rbx+8]    ; dest 
-            5104da      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, ebx 
-            5104dc      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 9 
+            5104da      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, ebx 
+            5104dc      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 9 
             5104fc      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [r13+8]    ; dest 
             5105a8      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+9 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+9]    ; s2 
             510631      4 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rax+8] 
@@ -8884,9 +8882,9 @@
             515b10    227 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             515c00   1056 FUNC RETURNTYPE RAX 4
             515c00   1056 FUNC INARGS    6  ARG0 1 ARG1 96 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
-            515d3c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1 
+            515d3c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1 
             515d60      4 INSTR CHECK OVERFLOW UNSIGNED 64  RCX ZZ IDIOM 18 MEMORYSINK add     rcx, 1 
-            515dcc      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EAX ZZ add     eax, 1 
+            515dcc      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RAX ZZ add     eax, 1 
             515fbd      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 RBX ZZ mov     rdx, rbx        ; n 
             516020    300 FUNC RETURNTYPE RAX 4
             516020    300 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 16 ARG3 0 ARG4 0 ARG5 0 
@@ -9536,7 +9534,7 @@
             51e8f0     15 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             51e900    178 FUNC RETURNTYPE RAX 1
             51e900    178 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            51e987      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, 8 
+            51e987      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, 8 
             51e9c0     34 FUNC RETURNTYPE RAX 1
             51e9c0     34 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             51e9f0     51 FUNC RETURNTYPE RAX 96
@@ -9564,7 +9562,7 @@
             51f070    464 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             51f240    199 FUNC RETURNTYPE RAX 1
             51f240    199 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            51f26c      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 ECX 32 ECX ZZ mov     edx, ecx 
+            51f26c      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RCX 32 ECX ZZ mov     edx, ecx 
             51f310    464 FUNC RETURNTYPE RAX 1
             51f310    464 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             51f4e0     21 FUNC RETURNTYPE RAX 0
@@ -9584,7 +9582,7 @@
             51fb40     29 FUNC INARGS    2  ARG0 4 ARG1 4 
             51fb60    504 FUNC RETURNTYPE RAX 1
             51fb60    504 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            51fc55      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ IDIOM 19 add     edi, 1 
+            51fc55      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ IDIOM 19 add     edi, 1 
             51fd60    269 FUNC RETURNTYPE RAX 1
             51fd60    269 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             51fdbf      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+8 ZZ lea     rdi, [rbx+8] 
@@ -9730,7 +9728,7 @@
             522890    380 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             522949      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R14 ZZ mov     rdx, r14        ; n 
             52295b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R14 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r14]  ; s 
-            522961      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r13d 
+            522961      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r13d 
             522971      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R14+16 ZZ lea     rdi, [r14+10h] 
             52297f      3 INSTR CHECK UNDERFLOW SIGNED 64  RDI ZZ sub     rdi, rax 
             522985      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r14        ; src 
@@ -9796,7 +9794,7 @@
             523c50    193 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 1 ARG4 4 ARG5 0 
             523d20    459 FUNC RETURNTYPE RAX 96
             523d20    459 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 1 ARG4 4 ARG5 0 
-            523e32      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, r15d 
+            523e32      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, r15d 
             523ef0    110 FUNC RETURNTYPE RAX 1
             523ef0    110 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             523f60    254 FUNC RETURNTYPE RAX 1
@@ -10075,7 +10073,7 @@
             5294a0    268 FUNC RETURNTYPE RAX 1
             5294a0    268 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 1 ARG4 1 ARG5 1 
             5294a0    268 FUNC PROBLEM X509_check_purpose CALLUNRESOLVED 
-            529547      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, 9 
+            529547      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, 9 
             5295b0    123 FUNC RETURNTYPE RAX 1
             5295b0    123 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             529630     34 FUNC RETURNTYPE RAX 1
@@ -10224,13 +10222,13 @@
             52bbca      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, 5          ; src 
             52bbd6      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rax+8]    ; dest 
             52bc08      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+4] 
-            52bc35      2 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, [rax] 
-            52bc3b      3 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, 1 
+            52bc35      2 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, [rax] 
+            52bc3b      3 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, 1 
             52bc63      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rax+8]    ; dest 
-            52bc78      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, [rax] 
+            52bc78      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, [rax] 
             52bca0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+5 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+5] 
-            52bcee      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, r13d 
-            52bcf1      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 1 
+            52bcee      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, r13d 
+            52bcf1      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 1 
             52bd18      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rax+8]    ; dest 
             52be70    709 FUNC RETURNTYPE RAX 4
             52be70    709 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -10387,9 +10385,9 @@
             52ed80   2764 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             52ef20      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+512 ZZ lea     esi, [r12+200h] 
             52f142      4 INSTR CHECK SIGNEDNESS SIGNED 8 SIL ZZ IDIOM 20 movzx   edi, sil 
-            52f1f9      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 ESI 8 SIL ZZ IDIOM 14 movsx   esi, sil 
+            52f1f9      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RSI 8 SIL ZZ IDIOM 14 movsx   esi, sil 
             52f1f9      4 INSTR CHECK SIGNEDNESS UNSIGNED 8 SIL ZZ IDIOM 20 movsx   esi, sil 
-            52f2b8      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 ESI 8 SIL ZZ IDIOM 14 movsx   r15d, sil 
+            52f2b8      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RSI 8 SIL ZZ IDIOM 14 movsx   r15d, sil 
             52f2b8      4 INSTR CHECK SIGNEDNESS UNSIGNED 8 SIL ZZ IDIOM 20 movsx   r15d, sil 
             52f3f0      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     edi, [rax+1] 
             52f43f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ lea     rdx, [rax+1] 
@@ -10444,13 +10442,13 @@
             530600     23 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             530620    955 FUNC RETURNTYPE RAX 4
             530620    955 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            530801      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, r13d 
+            530801      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, r13d 
             530804      3 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, r14 
             530810      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+R14 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdx+r14]  ; s 
             530844      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+R14 ZZ IDIOM 18 MEMORYSINK lea     rax, [rdx+r14-1] 
             530844      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX+R14+-1 ZZ IDIOM 18 MEMORYSINK lea     rax, [rdx+r14-1] 
             5308b0      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 1 
-            5308f1      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, r13d 
+            5308f1      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, r13d 
             5309e0     76 FUNC RETURNTYPE RAX 96
             5309e0     76 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             530a30    375 FUNC RETURNTYPE RAX 1
@@ -10790,7 +10788,7 @@
             537ba0   1552 FUNC INARGS    6  ARG0 96 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             537c27      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+1 ZZ lea     edi, [r12+1] 
             537c7a      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R14+RCX ZZ lea     edx, [r14+rcx] 
-            5380f0      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            5380f0      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             53811c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, rax 
             5381b0    243 FUNC RETURNTYPE RAX 1
             5381b0    243 FUNC INARGS    6  ARG0 96 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -11287,7 +11285,7 @@
             53ea00     42 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             53ea30    541 FUNC RETURNTYPE RAX 1
             53ea30    541 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            53eb62      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 1 
+            53eb62      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 1 
             53ec50      7 FUNC RETURNTYPE RAX 0
             53ec50      7 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             53ec60     81 FUNC RETURNTYPE RAX 1
@@ -11524,10 +11522,10 @@
             5449f0     70 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             544a40   1066 FUNC RETURNTYPE RAX 1
             544a40   1066 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            544ccc      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDI ZZ sub     edi, 8 
+            544ccc      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDI ZZ sub     edi, 8 
             544e70   1116 FUNC RETURNTYPE RAX 4
             544e70   1116 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 1 ARG3 2 ARG4 0 ARG5 0 
-            545123      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 8 
+            545123      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 8 
             5452d0   1347 FUNC RETURNTYPE RAX 4
             5452d0   1347 FUNC INARGS    6  ARG0 4 ARG1 16 ARG2 1 ARG3 2 ARG4 0 ARG5 0 
             545820    153 FUNC RETURNTYPE RAX 1
@@ -11566,8 +11564,8 @@
             54646c      3 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBX 32 EBX ZZ mov     r8d, ebx 
             5464b0      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RBX 32 EBX ZZ mov     esi, ebx 
             5464b2      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, rbp 
-            5464b5      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, r13d 
-            5464b8      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 4 
+            5464b5      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, r13d 
+            5464b8      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 4 
             5464d0    107 FUNC RETURNTYPE RAX 1
             5464d0    107 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             546540   1106 FUNC RETURNTYPE RAX 4
@@ -11800,7 +11798,7 @@
             548f90   3666 FUNC PROBLEM TS_RESP_create_response CALLUNRESOLVED 
             549207      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBP+-1 ZZ lea     r15d, [rbp-1] 
             549649      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R8 ZZ add     r8d, 1 
-            54964d      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ECX ZZ add     ecx, 76Ch 
+            54964d      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RCX ZZ add     ecx, 76Ch 
             5499e2      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edi, eax 
             549d99      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+2 ZZ lea     esi, [r12+2] 
             549df0    519 FUNC RETURNTYPE RAX 1
@@ -12061,7 +12059,7 @@
             54e900    818 FUNC RETURNTYPE RAX 1
             54e900    818 FUNC INARGS    6  ARG0 4 ARG1 8 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             54ea64      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+14 ZZ lea     edi, [rax+0Eh] 
-            54ea7a      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ add     edi, edi 
+            54ea7a      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ add     edi, edi 
             54ea97      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+14 ZZ lea     edx, [rax+0Eh] 
             54ec40      6 FUNC RETURNTYPE RAX 1
             54ec40      6 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
@@ -12409,7 +12407,7 @@
             55a7f0   1001 FUNC RETURNTYPE RAX 1
             55a7f0   1001 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             55a7f0   1001 FUNC PROBLEM ubsec_rsa_mod_exp CALLUNRESOLVED 
-            55aac8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 1 
+            55aac8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 1 
             55abe0   1112 FUNC RETURNTYPE RAX 1
             55abe0   1112 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             55abe0   1112 FUNC PROBLEM ubsec_init CALLUNRESOLVED 
@@ -12568,7 +12566,7 @@
             55e830    102 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             55e84e      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RAX ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rax+4]; s 
             55e84e      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+RAX+4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rax+4]; s 
-            55e85a      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, eax        ; n 
+            55e85a      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, eax        ; n 
             55e861      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+4 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+4] 
             55e8a0      6 FUNC RETURNTYPE RAX 1
             55e8a0      6 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
@@ -12850,11 +12848,11 @@
             56fc70   2034 FUNC RETURNTYPE RAX 1
             56fc70   2034 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 4 ARG3 4 ARG4 4 ARG5 0 
             56fe32      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+RDX ZZ IDIOM 32 lea     ecx, [rax+rdx] 
-            56fe38      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, edx 
-            56fe3f      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, ecx 
+            56fe38      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ sub     ecx, edx 
+            56fe3f      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, ecx 
             570063      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK sub     rdi, 8 
-            5702e6      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 1 
-            57032a      3 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, 1 
+            5702e6      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 1 
+            57032a      3 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, 1 
             570371      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R10+2 ZZ lea     esi, [r10+2] 
             5703b0      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RAX+1 ZZ lea     esi, [rax+1] 
             570470    508 FUNC RETURNTYPE RAX 4
@@ -13002,12 +13000,12 @@
             5750b9      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R15*4 ZZ lea     edi, ds:0[r15*4] 
             5751e0    201 FUNC RETURNTYPE RAX 1
             5751e0    201 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
-            575238      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
+            575238      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 1 
             5752b0    416 FUNC RETURNTYPE RAX 1
             5752b0    416 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             5752d4      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     ecx, [rax+1] 
             5752e1      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RCX*4 ZZ lea     edi, ds:0[rcx*4] 
-            575410      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
+            575410      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 1 
             575450    963 FUNC RETURNTYPE RAX 1
             575450    963 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             575820    330 FUNC RETURNTYPE RAX 1
@@ -13297,12 +13295,12 @@
             57d1f0     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 96 ARG3 96 
             57d200   1132 FUNC RETURNTYPE RAX 1
             57d200   1132 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            57d443      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            57d443      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             57d670    983 FUNC RETURNTYPE RAX 1
             57d670    983 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             57da50   1204 FUNC RETURNTYPE RAX 4
             57da50   1204 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            57de6b      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            57de6b      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             57df10      6 FUNC RETURNTYPE RAX 16
             57df10      6 FUNC INARGS    4  ARG0 96 ARG1 16 ARG2 1 ARG3 0 
             57df20     60 FUNC RETURNTYPE RAX 0
@@ -13461,7 +13459,7 @@
             580550    102 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             5805c0   1105 FUNC RETURNTYPE RAX 1
             5805c0   1105 FUNC INARGS    6  ARG0 16 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            580771      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            580771      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             580773      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+8727584 ZZ IDIOM 18 GLOBALMEMSINK lea     rsi, state[r12] 
             58092b      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R12+8727584 ZZ IDIOM 18 GLOBALMEMSINK lea     rsi, state[r12] 
             580a20      9 FUNC RETURNTYPE RAX 0
@@ -13469,13 +13467,13 @@
             580a30   1641 FUNC RETURNTYPE RAX 1
             580a30   1641 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             580a7c      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+-1 ZZ lea     ecx, [r13-1] 
-            580a99      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ecx 
+            580a99      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ecx 
             580aa0      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX*4 ZZ lea     edx, [rdx+rdx*4+5] 
             580aa0      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX+RDX*4 ZZ lea     edx, [rdx+rdx*4+5] 
             580aa0      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX+RDX*4+5 ZZ lea     edx, [rdx+rdx*4+5] 
             580bdb      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, 1 
             580e42      7 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RCX+8727584 ZZ IDIOM 18 GLOBALMEMSINK lea     rsi, state[rcx] 
-            580e49      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r15d 
+            580e49      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r15d 
             580f2d      7 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RCX+8727584 ZZ IDIOM 18 GLOBALMEMSINK lea     rsi, state[rcx] 
             5810a0     10 FUNC RETURNTYPE RAX 0
             5810a0     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
@@ -13487,9 +13485,9 @@
             5810d0     60 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             581110    652 FUNC RETURNTYPE RAX 1
             581110    652 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            581233      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebp 
+            581233      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebp 
             581235      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax 
-            581379      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebp 
+            581379      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebp 
             581381      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 STACKMEMSINK add     rsi, rax        ; buf 
             5813a0     21 FUNC RETURNTYPE RAX 1
             5813a0     21 FUNC INARGS    4  ARG0 4 ARG1 96 ARG2 4 ARG3 96 
@@ -13636,13 +13634,13 @@
             583cd0     58 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             583d10    229 FUNC RETURNTYPE RAX 1
             583d10    229 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            583ddb      2 INSTR CHECK TRUNCATION UNSIGNED 32 EDI 32 EDI ZZ IDIOM 26 mov     esi, edi        ; c 
+            583ddb      2 INSTR CHECK TRUNCATION UNSIGNED 64 RDI 32 EDI ZZ IDIOM 26 mov     esi, edi        ; c 
             583e00   1143 FUNC RETURNTYPE RAX 1
             583e00   1143 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 1 ARG5 0 
-            583fff      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
+            583fff      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
             584280   1457 FUNC RETURNTYPE RAX 1
             584280   1457 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
-            5844ff      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
+            5844ff      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
             584840     10 FUNC RETURNTYPE RAX 0
             584840     10 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 0 
             584850     10 FUNC RETURNTYPE RAX 0
@@ -13681,7 +13679,7 @@
             584b00      5 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 0 
             584b10    497 FUNC RETURNTYPE RAX 1
             584b10    497 FUNC INARGS    5  ARG0 0 ARG1 4 ARG2 0 ARG3 4 ARG4 4 
-            584ce8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 2 
+            584ce8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 2 
             584d10   2275 FUNC RETURNTYPE RAX 1
             584d10   2275 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 4 ARG4 1 ARG5 1 
             584d10   2275 FUNC PROBLEM asn1_item_print_ctx CALLUNRESOLVED 
@@ -13691,10 +13689,10 @@
             585650    279 FUNC RETURNTYPE RAX 1
             585650    279 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             58569a      5 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, [r12+8] 
-            5856dc      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EBX ZZ add     ebx, 1 
+            5856dc      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RBX ZZ add     ebx, 1 
             585770    755 FUNC RETURNTYPE RAX 1
             585770    755 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            5857f6      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 31 sub     esi, 41h 
+            5857f6      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ IDIOM 31 sub     esi, 41h 
             58582a      3 INSTR CHECK UNDERFLOW UNSIGNED 64  R12 ZZ sub     r12d, r14d 
             5858a0      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+-65 ZZ IDIOM 32 lea     ecx, [rax-41h] 
             5858d5      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RSI+-65 ZZ IDIOM 32 lea     ecx, [rsi-41h] 
@@ -13755,13 +13753,13 @@
             5879c0    403 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             587b60    472 FUNC RETURNTYPE RAX 4
             587b60    472 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
-            587c78      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
+            587c78      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
             587d40    202 FUNC RETURNTYPE RAX 1
             587d40    202 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             587e10    993 FUNC RETURNTYPE RAX 4
             587e10    993 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             587f29      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDX ZZ sub     rdx, rax 
-            587f4e      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ add     esi, ebx 
+            587f4e      2 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ add     esi, ebx 
             587f6b      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rsp+0E8h+ptr]; dest 
             587fa9      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RSI ZZ sub     rsi, [rsp+0E8h+var_E8] 
             588186      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX+1 ZZ lea     edi, [rdx+1] 
@@ -13819,7 +13817,7 @@
             588e20    155 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             588ec0    129 FUNC RETURNTYPE RAX 4
             588ec0    129 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            588ed6      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, 1 
+            588ed6      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDI ZZ add     edi, 1 
             588f50     25 FUNC RETURNTYPE RAX 0
             588f50     25 FUNC INARGS    4  ARG0 4 ARG1 4 ARG2 0 ARG3 0 
             588f70     10 FUNC RETURNTYPE RAX 1
@@ -13924,7 +13922,7 @@
             589920      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+264 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+108h] ; dest 
             589950    629 FUNC RETURNTYPE RAX 1
             589950    629 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            5899b3      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, 1 
+            5899b3      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, 1 
             5899b6      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rax+109h]; s 
             5899b6      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX+265 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rax+109h]; s 
             589bd0     35 FUNC RETURNTYPE RAX 1
@@ -13983,13 +13981,13 @@
             58cf30    465 FUNC RETURNTYPE RAX 1
             58cf30    465 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 0 ARG3 0 ARG4 4 ARG5 0 
             58cf85      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ add     rdx, r14 
-            58d08d      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, eax 
+            58d08d      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, eax 
             58d09a      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+RAX ZZ lea     rsi, [r14+rax] 
             58d110    465 FUNC RETURNTYPE RAX 1
             58d110    465 FUNC INARGS    6  ARG0 8 ARG1 1 ARG2 4 ARG3 0 ARG4 1 ARG5 4 
             58d165      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ add     rdx, r14 
             58d260      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+RAX ZZ lea     rsi, [r14+rax] 
-            58d26c      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, eax 
+            58d26c      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, eax 
             58d2f0    450 FUNC RETURNTYPE RAX 1
             58d2f0    450 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 96 ARG4 96 ARG5 1 
             58d4c0    402 FUNC RETURNTYPE RAX 1
@@ -14277,12 +14275,12 @@
             5969f0   1234 FUNC RETURNTYPE RAX 1
             5969f0   1234 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 4 ARG4 1 ARG5 0 
             596bd4      4 INSTR CHECK UNDERFLOW SIGNED 64  R9 ZZ sub     r9d, 1 
-            596e0c      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, ebx 
+            596e0c      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, ebx 
             596e0e      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r12 
             596ed0   1260 FUNC RETURNTYPE RAX 1
             596ed0   1260 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 4 ARG5 1 
             596f5f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+-1 ZZ lea     r9d, [rax-1] 
-            597308      2 INSTR CHECK UNDERFLOW UNSIGNED 32  EDX ZZ sub     edx, ebp 
+            597308      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RDX ZZ sub     edx, ebp 
             59730a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r13 
             597342      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R14 ZZ mov     rdx, r14        ; n 
             5973c0    958 FUNC RETURNTYPE RAX 1
@@ -14293,7 +14291,7 @@
             597b40     89 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             597ba0    420 FUNC RETURNTYPE RAX 4
             597ba0    420 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            597c0a      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, 2 
+            597c0a      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, 2 
             597c36      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R13 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r13+1]; dest 
             597c36      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+R13+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+r13+1]; dest 
             597c70      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     edi, [rax+1] 
@@ -14308,7 +14306,7 @@
             597fa0      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+-1 ZZ lea     esi, [rax-1] 
             5980a0    300 FUNC RETURNTYPE RAX 1
             5980a0    300 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            5980dd      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 102h       ; mode 
+            5980dd      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 102h       ; mode 
             5981d0    176 FUNC RETURNTYPE RAX 1
             5981d0    176 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             59822d      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R12 ZZ mov     rdx, r12        ; n 
@@ -14336,7 +14334,7 @@
             598a40    140 FUNC RETURNTYPE RAX 1
             598a40    140 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             598a40    140 FUNC PROBLEM asn1_bio_flush_ex CALLUNRESOLVED 
-            598a6b      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            598a6b      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             598a7f      4 INSTR CHECK OVERFLOW SIGNED 64  RSI ZZ add     rsi, [rbx+48h] 
             598ad0    526 FUNC RETURNTYPE RAX 1
             598ad0    526 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-synaptic.psexe.infoannot b/tests/commit/save-synaptic.psexe.infoannot
index 25a91ccd..b774af6e 100644
--- a/tests/commit/save-synaptic.psexe.infoannot
+++ b/tests/commit/save-synaptic.psexe.infoannot
@@ -1910,13 +1910,13 @@
             41fa91      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+1 ZZ lea     esi, [r13+1] 
             41fba0    238 FUNC RETURNTYPE RAX 0
             41fba0    238 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            41fbde      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   esi, bl 
+            41fbde      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BL ZZ IDIOM 5 movzx   esi, bl 
             41fc90    284 FUNC RETURNTYPE RAX 0
             41fc90    284 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41fd93      2 INSTR CHECK TRUNCATION SIGNED 64 RBP 32 EBP ZZ mov     esi, ebp 
             41fdb0    407 FUNC RETURNTYPE RAX 0
             41fdb0    407 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            41fe0f      4 INSTR CHECK TRUNCATION UNSIGNED 32 EBP 8 BPL ZZ IDIOM 5 movzx   esi, bpl 
+            41fe0f      4 INSTR CHECK TRUNCATION UNSIGNED 32 RBP 8 BPL ZZ IDIOM 5 movzx   esi, bpl 
             41ff50    796 FUNC RETURNTYPE RAX 4
             41ff50    796 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             420270   1545 FUNC RETURNTYPE RAX 4
@@ -1957,8 +1957,8 @@
             4225d8      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+56 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbx+38h]  ; std::string * 
             42266f      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+16 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+10h]  ; this 
             422694      7 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RSI ZZ sub     rsi, [rbp+0A0h] 
-            4226af      3 INSTR CHECK UNDERFLOW SIGNED 32  ESI ZZ sub     esi, 1 
-            422727      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
+            4226af      3 INSTR CHECK UNDERFLOW SIGNED 32  RSI ZZ sub     esi, 1 
+            422727      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 1 
             422790      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+160 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+0A0h] 
             4228a0   1194 FUNC RETURNTYPE RAX 1
             4228a0   1194 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -2147,8 +2147,8 @@
             428620    882 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             429790   1514 FUNC RETURNTYPE RAX 0
             429790   1514 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4298cc      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 16 DX ZZ IDIOM 5 movzx   edx, dx 
-            4298d3      4 INSTR CHECK TRUNCATION UNSIGNED 32 EDI 8 DIL ZZ IDIOM 5 movzx   edi, dil 
+            4298cc      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDX 16 DX ZZ IDIOM 5 movzx   edx, dx 
+            4298d3      4 INSTR CHECK TRUNCATION UNSIGNED 32 RDI 8 DIL ZZ IDIOM 5 movzx   edi, dil 
             429d80     25 FUNC RETURNTYPE RAX 96
             429d80     25 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             429da0     12 FUNC RETURNTYPE RAX 0
@@ -2460,8 +2460,8 @@
             434380    236 FUNC PROBLEM sub_434380 CALLUNRESOLVED 
             434480    810 FUNC RETURNTYPE RAX 0
             434480    810 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
-            434537      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   esi, al 
-            43454f      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   esi, al 
+            434537      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 8 AL ZZ IDIOM 5 movzx   esi, al 
+            43454f      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 8 AL ZZ IDIOM 5 movzx   esi, al 
             4347e0    232 FUNC RETURNTYPE RAX 0
             4347e0    232 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4347e0    232 FUNC PROBLEM sub_4347E0 CALLUNRESOLVED 
@@ -2696,7 +2696,7 @@
             446869      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RSI*8 ZZ lea     rsi, [rcx+rsi*8]; std::string * 
             446869      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+RSI*8 ZZ lea     rsi, [rcx+rsi*8]; std::string * 
             4468a4      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+236 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r12+0ECh] 
-            446abc      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, 1 
+            446abc      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, 1 
             446ed0    120 FUNC RETURNTYPE RAX 0
             446ed0    120 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             446ed0    120 FUNC PROBLEM sub_446ED0 CALLUNRESOLVED 
@@ -2723,7 +2723,7 @@
             448380    353 FUNC RETURNTYPE RAX 1
             448380    353 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             448380    353 FUNC PROBLEM sub_448380 CALLUNRESOLVED 
-            4483bc      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   esi, bl 
+            4483bc      3 INSTR CHECK TRUNCATION UNSIGNED 32 RBX 8 BL ZZ IDIOM 5 movzx   esi, bl 
             4484f0   1996 FUNC RETURNTYPE RAX 16
             4484f0   1996 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             448cc0   2741 FUNC RETURNTYPE RAX 96
@@ -2917,12 +2917,12 @@
             450bc0    204 FUNC INARGS    1  ARG0 4 
             450ca0     44 FUNC RETURNTYPE RAX 0
             450ca0     44 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 96 ARG4 0 ARG5 0 
-            450ca1      4 INSTR CHECK TRUNCATION UNSIGNED 32 ESI 8 SIL ZZ IDIOM 5 movzx   edx, sil 
+            450ca1      4 INSTR CHECK TRUNCATION UNSIGNED 32 RSI 8 SIL ZZ IDIOM 5 movzx   edx, sil 
             450cd0     55 FUNC RETURNTYPE RAX 0
             450cd0     55 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             450d10    198 FUNC RETURNTYPE RAX 0
             450d10    198 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
-            450da5      4 INSTR CHECK TRUNCATION UNSIGNED 32 EBP 8 BPL ZZ IDIOM 5 movzx   edx, bpl 
+            450da5      4 INSTR CHECK TRUNCATION UNSIGNED 32 RBP 8 BPL ZZ IDIOM 5 movzx   edx, bpl 
             450df0   1276 FUNC RETURNTYPE RAX 4
             450df0   1276 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 8 ARG3 1 ARG4 0 ARG5 0 
             450eac      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+1 ZZ lea     rdx, [rax+1]    ; unsigned __int64 
@@ -3486,8 +3486,8 @@
             468580    834 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             468587      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI+736 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdi+2E0h] ; timer 
             4685e3      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 STACKMEMSINK add     rdi, [rbp-18h] 
-            4686c9      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ECX ZZ add     ecx, 1 
-            4686cc      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 76Ch 
+            4686c9      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RCX ZZ add     ecx, 1 
+            4686cc      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 76Ch 
             4689a0   2425 FUNC RETURNTYPE RAX 1
             4689a0   2425 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 0 ARG4 0 ARG5 0 
             4689a0   2425 FUNC PROBLEM sub_4689A0 CALLUNRESOLVED 
@@ -3511,7 +3511,7 @@
             469b0a      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 AL ZZ IDIOM 20 movsx   esi, al         ; char 
             469b95      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 AL ZZ IDIOM 20 movsx   esi, al         ; char 
             469bd4      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 AL ZZ IDIOM 20 movsx   esi, al         ; char 
-            469d14      2 INSTR CHECK UNDERFLOW SIGNED 32  EBX ZZ sub     ebx, ecx 
+            469d14      2 INSTR CHECK UNDERFLOW SIGNED 32  RBX ZZ sub     ebx, ecx 
             469d9b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+RDX ZZ lea     esi, [rax+rdx+1] 
             469d9b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+RDX+1 ZZ lea     esi, [rax+rdx+1] 
             469ea0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+80 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+50h] 
@@ -4011,9 +4011,9 @@
             478574      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+-8 ZZ IDIOM 18 MEMORYSINK lea     rdx, [r13-8] 
             47857b      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX*8 ZZ IDIOM 32 lea     rsi, [rbx+rax*8] 
             47857b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX*8 ZZ IDIOM 32 lea     rsi, [rbx+rax*8] 
-            47857f      3 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 EBP 8 BPL ZZ mov     cl, bpl 
+            47857f      3 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 RBP 8 BPL ZZ mov     cl, bpl 
             4786cb      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RAX ZZ IDIOM 19 sub     rax, rbx 
-            478713      3 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 EBP 8 BPL ZZ mov     r8b, bpl 
+            478713      3 INSTR CHECK TRUNCATION UNKNOWNSIGN 32 RBP 8 BPL ZZ mov     r8b, bpl 
             478740    192 FUNC RETURNTYPE RAX 96
             478740    192 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             47878b      3 INSTR CHECK UNDERFLOW SIGNED 64  RDX ZZ sub     rdx, rax 
@@ -4370,7 +4370,7 @@
             4892f9      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+48 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [r12+30h]  ; this 
             489394      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14*8 ZZ IDIOM 32 lea     rdi, ds:8[r14*8]; unsigned __int64 
             489394      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14*8+8 ZZ IDIOM 32 lea     rdi, ds:8[r14*8]; unsigned __int64 
-            489417      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 16 AX ZZ IDIOM 5 movzx   edi, ax 
+            489417      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 16 AX ZZ IDIOM 5 movzx   edi, ax 
             48941d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDI*8 ZZ IDIOM 32 lea     rdi, [r8+rdi*8] ; this 
             48941d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R8+RDI*8 ZZ IDIOM 32 lea     rdi, [r8+rdi*8] ; this 
             4894dd      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RDX+-8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rdx-8]    ; void * 
diff --git a/tests/commit/save-xedit.psexe.infoannot b/tests/commit/save-xedit.psexe.infoannot
index 5970cd51..a3103e4a 100644
--- a/tests/commit/save-xedit.psexe.infoannot
+++ b/tests/commit/save-xedit.psexe.infoannot
@@ -410,7 +410,7 @@
             405455      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBP*8 ZZ lea     esi, ds:8[rbp*8] 
             405455      7 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBP*8+8 ZZ lea     esi, ds:8[rbp*8] 
             4054bd      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R15+1 ZZ lea     edi, [r15+1] 
-            4056db      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     32 ESI 8 SIL ZZ IDIOM 14 movsx   ecx, sil 
+            4056db      4 INSTR CHECK TRUNCATION UNKNOWNSIGN     64 RSI 8 SIL ZZ IDIOM 14 movsx   ecx, sil 
             40574a      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RCX ZZ IDIOM 21 sub     rcx, 1 
             4059d8     42 FUNC RETURNTYPE RAX 0
             4059d8     42 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 0 
@@ -475,7 +475,7 @@
             4079c6      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RSI+2 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rsi+2] 
             4079d0      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RSI ZZ IDIOM 18 MEMORYSINK sbb     rsi, 3 
             4079d4      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RSI ZZ IDIOM 19 sub     rsi, rbx 
-            4079f4      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, 2 
+            4079f4      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, 2 
             407ae0    937 FUNC RETURNTYPE RAX 1
             407ae0    937 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             407e90    157 FUNC RETURNTYPE RAX 96
@@ -523,12 +523,12 @@
             409280   6495 FUNC RETURNTYPE RAX 1
             409280   6495 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             409670      3 INSTR CHECK TRUNCATION SIGNED 64 RBP 32 EBP ZZ mov     r8d, ebp 
-            40981d      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, 30h 
+            40981d      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, 30h 
             409832      4 INSTR CHECK OVERFLOW SIGNED 64 RCX ZZ imul    rcx, r9 
-            409eb0      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 1 
+            409eb0      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 1 
             409fe2      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RBP+-1 ZZ lea     rsi, [rbp-1] 
             409ff4      4 INSTR CHECK OVERFLOW UNSIGNED 64  R8 ZZ add     r8d, 1 
-            40a0f2      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, ebx 
+            40a0f2      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, ebx 
             40a113      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r13        ; dest 
             40a1e4      7 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX+1024 ZZ lea     rsi, [rax+400h] 
             40a26e      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RAX+RCX ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+rcx]  ; dest 
@@ -573,7 +573,7 @@
             40b301      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     edi, [rax+1] 
             40b370    426 FUNC RETURNTYPE RAX 1
             40b370    426 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            40b47e      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ECX ZZ add     ecx, 1 
+            40b47e      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RCX ZZ add     ecx, 1 
             40b520    303 FUNC RETURNTYPE RAX 0
             40b520    303 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40b573      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     edi, [rax+1] 
@@ -598,7 +598,7 @@
             40d159      8 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RAX*8+6883808 ZZ IDIOM 18 GLOBALMEMSINK lea     rsi, off_6909E0[rax*8] 
             40d3ba      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rax+1] 
             40d45d      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     edi, [rax+1] 
-            40d55a      2 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ neg     edx 
+            40d55a      2 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ neg     edx 
             40d670    443 FUNC RETURNTYPE RAX 1
             40d670    443 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             40d830     62 FUNC RETURNTYPE RAX 0
@@ -609,9 +609,9 @@
             40eb40   3914 FUNC RETURNTYPE RAX 96
             40eb40   3914 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             40f2cb      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     edi, [rax+1] 
-            40f858      8 INSTR CHECK OVERFLOW UNSIGNED 16  EDX ZZ add     dx, [rsp+238h+var_14E] 
-            40f88f      3 INSTR CHECK UNDERFLOW UNSIGNED 16  EDI ZZ sub     di, dx 
-            40f8b4      3 INSTR CHECK UNDERFLOW UNSIGNED 16  EDX ZZ sub     dx, ax 
+            40f858      8 INSTR CHECK OVERFLOW UNSIGNED 16  RDX ZZ add     dx, [rsp+238h+var_14E] 
+            40f88f      3 INSTR CHECK UNDERFLOW UNSIGNED 16  RDI ZZ sub     di, dx 
+            40f8b4      3 INSTR CHECK UNDERFLOW UNSIGNED 16  RDX ZZ sub     dx, ax 
             40f8bc      4 INSTR CHECK TRUNCATION SIGNED 64 R12 16 R12 ZZ movsx   rdx, r12w 
             40f8bc      4 INSTR CHECK SIGNEDNESS UNSIGNED 16 R12 ZZ movsx   rdx, r12w 
             40fa90     38 FUNC RETURNTYPE RAX 96
@@ -658,12 +658,12 @@
             411600   1557 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             411799      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     edi, [rax+1] 
             4117ae      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+16 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+10h] 
-            41198e      3 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, r12d 
+            41198e      3 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, r12d 
             4119a8      3 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r13        ; dest 
             411a3b      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RBX+1 ZZ lea     rsi, [rbx+1] 
             411c20   2035 FUNC RETURNTYPE RAX 1
             411c20   2035 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            411d8a      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EAX ZZ sub     eax, 1 
+            411d8a      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RAX ZZ sub     eax, 1 
             411e93      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+1 ZZ lea     edi, [r12+1] 
             411eb7      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R12 ZZ mov     rdx, r12        ; n 
             4120b0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+1 ZZ IDIOM 18 MEMORYSINK lea     r8, [r13+1] 
@@ -727,7 +727,7 @@
             413760    362 FUNC RETURNTYPE RAX 4
             413760    362 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4137f2      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     edi, [rax+1] 
-            4138b4      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ sub     esi, eax 
+            4138b4      2 INSTR CHECK UNDERFLOW UNSIGNED 32  RSI ZZ sub     esi, eax 
             4138b6      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, rbx 
             4138d0    187 FUNC RETURNTYPE RAX 0
             4138d0    187 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -735,7 +735,7 @@
             413990    158 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 4 ARG4 0 ARG5 0 
             413a30    190 FUNC RETURNTYPE RAX 0
             413a30    190 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            413aa0      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, 1 
+            413aa0      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, 1 
             413af0    226 FUNC RETURNTYPE RAX 0
             413af0    226 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             413be0   1666 FUNC RETURNTYPE RAX 96
@@ -761,30 +761,30 @@
             414f30     74 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 96 ARG3 96 ARG4 1 ARG5 0 
             414f80    476 FUNC RETURNTYPE RAX 0
             414f80    476 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            414fde      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
-            414fee      4 INSTR CHECK TRUNCATION UNSIGNED 32 EBP 8 BPL ZZ IDIOM 5 movzx   esi, bpl 
+            414fde      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 1 
+            414fee      4 INSTR CHECK TRUNCATION UNSIGNED 32 RBP 8 BPL ZZ IDIOM 5 movzx   esi, bpl 
             414fee      4 INSTR CHECK SIGNEDNESS SIGNED 8 BPL ZZ IDIOM 20 movzx   esi, bpl 
             415008      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 8 AH ZZ IDIOM 5 movzx   esi, ah 
             415008      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 AH ZZ IDIOM 20 movzx   esi, ah 
-            41501a      3 INSTR CHECK UNDERFLOW SIGNED 32  EBP ZZ sub     ebp, 1 
-            41506a      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
+            41501a      3 INSTR CHECK UNDERFLOW SIGNED 32  RBP ZZ sub     ebp, 1 
+            41506a      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 1 
             4150b9      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RDX+4 ZZ lea     rcx, [rdx+4] 
-            4150ef      3 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, 3Bh 
+            4150ef      3 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, 3Bh 
             415160    444 FUNC RETURNTYPE RAX 0
             415160    444 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4151a6      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
-            4151b6      4 INSTR CHECK TRUNCATION UNSIGNED 32 EBP 8 BPL ZZ IDIOM 5 movzx   esi, bpl 
+            4151a6      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 1 
+            4151b6      4 INSTR CHECK TRUNCATION UNSIGNED 32 RBP 8 BPL ZZ IDIOM 5 movzx   esi, bpl 
             4151b6      4 INSTR CHECK SIGNEDNESS SIGNED 8 BPL ZZ IDIOM 20 movzx   esi, bpl 
             4151d0      3 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 8 AH ZZ IDIOM 5 movzx   esi, ah 
             4151d0      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 AH ZZ IDIOM 20 movzx   esi, ah 
-            415234      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
+            415234      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 1 
             415320     55 FUNC RETURNTYPE RAX 0
             415320     55 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 96 ARG4 1 ARG5 0 
             415360   2949 FUNC RETURNTYPE RAX 1
             415360   2949 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
-            4153c6      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 1 
+            4153c6      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 1 
             41542b      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX+-1 ZZ lea     esi, [rdx-1]    ; jumptable 0000000000415401 default case 
-            4155ae      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, 1 
+            4155ae      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, 1 
             415647      3 INSTR CHECK TRUNCATION UNSIGNED 64 RCX 8 CH ZZ IDIOM 5 movzx   esi, ch 
             415647      3 INSTR CHECK SIGNEDNESS UNSIGNED 8 CH ZZ IDIOM 20 movzx   esi, ch 
             41580b      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+1 ZZ lea     eax, [r13+1] 
@@ -792,15 +792,15 @@
             41583e      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 RBP ZZ mov     rdx, rbp        ; n 
             415956      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rbx+10h]  ; dest 
             415961      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R15 ZZ mov     rdx, r15        ; n 
-            415b45      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
-            415b5e      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  ESI ZZ sub     esi, 1 
+            415b45      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 1 
+            415b5e      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RSI ZZ sub     esi, 1 
             415b7c      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RDX ZZ sub     rdx, 3 
             415e07      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+1 ZZ lea     eax, [r13+1] 
             415e45      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, [rbx+8]    ; dest 
             415e4c      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 RBP ZZ mov     rdx, rbp        ; n 
             415ef0    525 FUNC RETURNTYPE RAX 1
             415ef0    525 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            415ff7      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, r12d 
+            415ff7      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, r12d 
             416100   3084 FUNC RETURNTYPE RAX 1
             416100   3084 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             416444      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ IDIOM 32 lea     edx, [rax+1] 
@@ -862,9 +862,9 @@
             4195a0    204 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             419670   3976 FUNC RETURNTYPE RAX 4
             419670   3976 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
-            4199bd      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 8 DL ZZ IDIOM 5 movzx   esi, dl 
+            4199bd      3 INSTR CHECK TRUNCATION UNSIGNED 64 RDX 8 DL ZZ IDIOM 5 movzx   esi, dl 
             419acd      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RCX+-1 ZZ lea     edx, [rcx-1] 
-            419ae0      3 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, 1 
+            419ae0      3 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, 1 
             419ec7      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RAX+-1 ZZ lea     edx, [rax-1] 
             41a600    115 FUNC RETURNTYPE RAX 1
             41a600    115 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -941,7 +941,7 @@
             41e450    158 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41e4f0    308 FUNC RETURNTYPE RAX 4
             41e4f0    308 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            41e59a      3 INSTR CHECK OVERFLOW SIGNED 32  EAX ZZ SINKMALLOC add     eax, 10h 
+            41e59a      3 INSTR CHECK OVERFLOW SIGNED 32  RAX ZZ SINKMALLOC add     eax, 10h 
             41e630    188 FUNC RETURNTYPE RAX 4
             41e630    188 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             41e674      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+1 ZZ lea     rdi, [r12+1]    ; size 
@@ -956,24 +956,24 @@
             41e9e0    162 FUNC INARGS    6  ARG0 96 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41ea90     98 FUNC RETURNTYPE RAX 0
             41ea90     98 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 96 ARG3 96 ARG4 0 ARG5 0 
-            41eaa7      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ SINKMALLOC add     esi, 100h 
+            41eaa7      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ SINKMALLOC add     esi, 100h 
             41eb00     81 FUNC RETURNTYPE RAX 0
             41eb00     81 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 4 ARG3 1 ARG4 0 ARG5 0 
-            41eb10      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ SINKMALLOC add     esi, 100h 
+            41eb10      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ SINKMALLOC add     esi, 100h 
             41eb60     98 FUNC RETURNTYPE RAX 0
             41eb60     98 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 96 ARG3 4 ARG4 1 ARG5 1 
-            41eb77      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ SINKMALLOC add     esi, 100h 
+            41eb77      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ SINKMALLOC add     esi, 100h 
             41ebd0    146 FUNC RETURNTYPE RAX 0
             41ebd0    146 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 4 ARG3 1 ARG4 1 ARG5 0 
-            41ebe4      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ SINKMALLOC add     esi, 100h 
-            41ec14      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ SINKMALLOC add     esi, 100h 
+            41ebe4      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ SINKMALLOC add     esi, 100h 
+            41ec14      6 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ SINKMALLOC add     esi, 100h 
             41ec70    120 FUNC RETURNTYPE RAX 1
             41ec70    120 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             41ed30    246 FUNC RETURNTYPE RAX 0
             41ed30    246 FUNC PROBLEM sub_41ED30 STACKANALYSIS 
             41ee30    309 FUNC RETURNTYPE RAX 0
             41ee30    309 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            41ee9f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ SINKMALLOC add     esi, 1 
+            41ee9f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ SINKMALLOC add     esi, 1 
             41ef70    127 FUNC RETURNTYPE RAX 4
             41ef70    127 FUNC INARGS    5  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 
             41eff0     87 FUNC RETURNTYPE RAX 4
@@ -1033,14 +1033,14 @@
             4200c0      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RCX+-8 ZZ lea     rdx, [rcx-8] 
             420220   5818 FUNC RETURNTYPE RAX 0
             420220   5818 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 1 ARG4 1 ARG5 0 
-            420a10      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EAX ZZ add     eax, 1 
-            420db8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EAX ZZ add     eax, 1 
-            420e40      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EAX ZZ add     eax, 1 
-            42115b      3 INSTR CHECK OVERFLOW UNSIGNED 32  ECX ZZ add     ecx, 1 
+            420a10      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RAX ZZ add     eax, 1 
+            420db8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RAX ZZ add     eax, 1 
+            420e40      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RAX ZZ add     eax, 1 
+            42115b      3 INSTR CHECK OVERFLOW UNSIGNED 32  RCX ZZ add     ecx, 1 
             4218e0    288 FUNC RETURNTYPE RAX 96
             4218e0    288 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            421948      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 1 
-            4219df      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 1 
+            421948      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 1 
+            4219df      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 1 
             421a00    489 FUNC RETURNTYPE RAX 96
             421a00    489 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 4 ARG4 0 ARG5 0 
             421b34      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RDX+1 ZZ lea     esi, [rdx+1] 
@@ -1048,10 +1048,10 @@
             421bf0    874 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             421f60    384 FUNC RETURNTYPE RAX 4
             421f60    384 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            421fa8      3 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ SINKMALLOC add     esi, 2 
+            421fa8      3 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ SINKMALLOC add     esi, 2 
             4220e0    452 FUNC RETURNTYPE RAX 96
             4220e0    452 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            422180      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 1 
+            422180      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 1 
             4221c0      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, 10h        ; env 
             4222b0    106 FUNC RETURNTYPE RAX 96
             4222b0    106 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1059,19 +1059,19 @@
             422320     76 FUNC INARGS    6  ARG0 96 ARG1 96 ARG2 96 ARG3 96 ARG4 4 ARG5 4 
             422370    238 FUNC RETURNTYPE RAX 96
             422370    238 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            42240a      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 1 
+            42240a      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 1 
             422460     46 FUNC RETURNTYPE RAX 96
             422460     46 FUNC INARGS    6  ARG0 0 ARG1 96 ARG2 0 ARG3 96 ARG4 4 ARG5 4 
             422490     92 FUNC RETURNTYPE RAX 0
             422490     92 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4224f0    464 FUNC RETURNTYPE RAX 4
             4224f0    464 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            42266a      3 INSTR CHECK OVERFLOW SIGNED 32  EAX ZZ SINKMALLOC add     eax, 10h 
+            42266a      3 INSTR CHECK OVERFLOW SIGNED 32  RAX ZZ SINKMALLOC add     eax, 10h 
             4226c0    423 FUNC RETURNTYPE RAX 1
             4226c0    423 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
             422870    311 FUNC RETURNTYPE RAX 4
             422870    311 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            42291a      3 INSTR CHECK OVERFLOW SIGNED 32  EAX ZZ SINKMALLOC add     eax, 10h 
+            42291a      3 INSTR CHECK OVERFLOW SIGNED 32  RAX ZZ SINKMALLOC add     eax, 10h 
             4229b0    131 FUNC RETURNTYPE RAX 4
             4229b0    131 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             422a40    149 FUNC RETURNTYPE RAX 4
@@ -1537,12 +1537,12 @@
             44269e      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 STACKMEMSINK add     rdi, r13 
             4426b6      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  R8 ZZ sub     r8d, eax 
             44270a      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RCX ZZ IDIOM 19 sub     rcx, rbp 
-            442716      3 INSTR CHECK UNDERFLOW UNSIGNED 32  ECX ZZ sub     ecx, 1 
+            442716      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RCX ZZ sub     ecx, 1 
             442800      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+1 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+1]    ; src 
             442889      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+RDI ZZ IDIOM 18 MEMORYSINK lea     rsi, [r13+rdi+1]; src 
             442889      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+RDI+1 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r13+rdi+1]; src 
             44288e      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r13        ; dest 
-            4428c1      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ IDIOM 19 sub     edx, r14d 
+            4428c1      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ IDIOM 19 sub     edx, r14d 
             44293f      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RBP+1 ZZ lea     edx, [rbp+1] 
             442942      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r13        ; dest 
             442a28      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R8+1 ZZ lea     edx, [r8+1] 
@@ -1582,8 +1582,8 @@
             443250    794 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 1 ARG4 1 ARG5 1 
             4433b5      4 INSTR CHECK OVERFLOW UNSIGNED 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, 1 
             4434f5      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, [rsp+0F8h+s] 
-            4434fd      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, r15d 
-            443533      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r14d 
+            4434fd      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, r15d 
+            443533      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r14d 
             443570    530 FUNC RETURNTYPE RAX 1
             443570    530 FUNC INARGS    6  ARG0 0 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             443790   1650 FUNC RETURNTYPE RAX 1
@@ -1600,11 +1600,11 @@
             444007      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+1 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rcx+1]    ; src 
             444015      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r12        ; dest 
             444125      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RCX ZZ IDIOM 19 sub     rcx, r12 
-            44420d      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ IDIOM 19 sub     edx, ebp 
+            44420d      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ IDIOM 19 sub     edx, ebp 
             44428d      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RCX+1 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rcx+1]    ; src 
             444299      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r12        ; dest 
             4442a0      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R8 ZZ mov     rdx, r8         ; n 
-            4442c2      4 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, dword ptr [rsp+2C8h+var_2B8] 
+            4442c2      4 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, dword ptr [rsp+2C8h+var_2B8] 
             4442c6      3 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, r8 
             4442c9      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r12        ; s 
             4443c7      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+RAX ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+rax+1]; src 
@@ -1614,7 +1614,7 @@
             444448      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r12        ; dest 
             444459      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RBP+-2 ZZ IDIOM 19 lea     esi, [rbp-2] 
             444475      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r12        ; dest 
-            444478      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, ebp 
+            444478      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, ebp 
             44447d      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RCX+RBP ZZ IDIOM 18 MEMORYSINK lea     rsi, [rcx+rbp+1]; src 
             44447d      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RCX+RBP+1 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rcx+rbp+1]; src 
             4444b3      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+1 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r12+1] 
@@ -1676,12 +1676,12 @@
             446a15      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+R8 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+r8]   ; dest 
             446a19      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R9 ZZ mov     rdx, r9         ; n 
             446a43      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R9+R8 ZZ lea     rdi, [r9+r8] 
-            446a47      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, r15d 
+            446a47      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, r15d 
             446a4d      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r12        ; s 
             446a98      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R13+1 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r13+1]    ; src 
             446a9f      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r12        ; dest 
-            446b0d      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ IDIOM 19 sub     edx, ebp 
-            446bf1      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, ebp 
+            446b0d      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ IDIOM 19 sub     edx, ebp 
+            446bf1      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, ebp 
             446bf6      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, r12        ; dest 
             446bf9      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+RBP ZZ IDIOM 18 MEMORYSINK lea     rsi, [r13+rbp+1]; src 
             446bf9      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+RBP+1 ZZ IDIOM 18 MEMORYSINK lea     rsi, [r13+rbp+1]; src 
@@ -1700,11 +1700,11 @@
             449710      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP*2 ZZ lea     rdi, [rbp+rbp*2+0] 
             449710      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+RBP*2 ZZ lea     rdi, [rbp+rbp*2+0] 
             44971d      7 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ IDIOM 18 GLOBALMEMSINK add     rdi, 696860h 
-            4499d8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ IDIOM 15 add     esi, 1 
+            4499d8      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ IDIOM 15 add     esi, 1 
             449a0c      3 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 32 RAX+1 ZZ lea     edi, [rax+1] 
             449a50    993 FUNC RETURNTYPE RAX 1
             449a50    993 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            449d95      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, ebx 
+            449d95      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, ebx 
             449e40    724 FUNC RETURNTYPE RAX 4
             449e40    724 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44a120     50 FUNC RETURNTYPE RAX 0
@@ -1717,7 +1717,7 @@
             44a220    240 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             44a310    207 FUNC RETURNTYPE RAX 0
             44a310    207 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            44a371      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EAX ZZ IDIOM 31 sub     eax, 3 
+            44a371      3 INSTR CHECK UNDERFLOW UNSIGNED 32  RAX ZZ IDIOM 31 sub     eax, 3 
             44a3e0    527 FUNC RETURNTYPE RAX 4
             44a3e0    527 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44a5f0    310 FUNC RETURNTYPE RAX 0
@@ -1929,7 +1929,7 @@
             44d110    215 FUNC RETURNTYPE RAX 4
             44d110    215 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             44d158      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX+8 ZZ lea     esi, [rdx+8] 
-            44d17c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ESI ZZ add     esi, 8 
+            44d17c      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RSI ZZ add     esi, 8 
             44d1a5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+16 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r14+10h] 
             44d1f0    547 FUNC RETURNTYPE RAX 96
             44d1f0    547 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -1998,7 +1998,7 @@
             44ed78      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+10h] 
             44ede0    664 FUNC RETURNTYPE RAX 0
             44ede0    664 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 1 
-            44efca      3 INSTR CHECK TRUNCATION SIGNED 32 EAX 16 AX ZZ movsx   edx, ax 
+            44efca      3 INSTR CHECK TRUNCATION SIGNED 32 RAX 16 AX ZZ movsx   edx, ax 
             44f032      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+16 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+10h] 
             44f080   3645 FUNC RETURNTYPE RAX 0
             44f080   3645 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 96 ARG3 4 ARG4 1 ARG5 1 
@@ -2010,7 +2010,7 @@
             44ff20    269 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
             4504d0    143 FUNC RETURNTYPE RAX 1
             4504d0    143 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            45053f      3 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, 5 
+            45053f      3 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, 5 
             450560    357 FUNC RETURNTYPE RAX 96
             450560    357 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4506d0    220 FUNC RETURNTYPE RAX 4
@@ -2026,7 +2026,7 @@
             450b90    202 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             450c60    140 FUNC RETURNTYPE RAX 4
             450c60    140 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            450cca      3 INSTR CHECK TRUNCATION SIGNED 32 EBX 16 BX ZZ movsx   esi, bx 
+            450cca      3 INSTR CHECK TRUNCATION SIGNED 32 RBX 16 BX ZZ movsx   esi, bx 
             450cd5      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+16 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+10h] 
             450cf0    203 FUNC RETURNTYPE RAX 4
             450cf0    203 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
@@ -2046,10 +2046,10 @@
             451500     10 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             451680    180 FUNC RETURNTYPE RAX 0
             451680    180 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            451702      3 INSTR CHECK OVERFLOW UNSIGNED 32  ESI ZZ add     esi, 9 
+            451702      3 INSTR CHECK OVERFLOW UNSIGNED 32  RSI ZZ add     esi, 9 
             451740    361 FUNC RETURNTYPE RAX 96
             451740    361 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4517cf      3 INSTR CHECK TRUNCATION SIGNED 32 EAX 16 AX ZZ movsx   edx, ax 
+            4517cf      3 INSTR CHECK TRUNCATION SIGNED 32 RAX 16 AX ZZ movsx   edx, ax 
             4518b0    168 FUNC RETURNTYPE RAX 96
             4518b0    168 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4519f0    205 FUNC RETURNTYPE RAX 4
@@ -2090,33 +2090,33 @@
             463ab0     16 FUNC INARGS    4  ARG0 0 ARG1 1 ARG2 1 ARG3 96 
             463ac0    703 FUNC RETURNTYPE RAX 1
             463ac0    703 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 4 ARG3 0 ARG4 0 ARG5 0 
-            463c70      4 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, [rsp+68h+var_5C] 
-            463ca0      4 INSTR CHECK OVERFLOW SIGNED 32  ECX ZZ add     ecx, [rsp+68h+var_5C] 
+            463c70      4 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, [rsp+68h+var_5C] 
+            463ca0      4 INSTR CHECK OVERFLOW SIGNED 32  RCX ZZ add     ecx, [rsp+68h+var_5C] 
             463d80    338 FUNC RETURNTYPE RAX 1
             463d80    338 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 4 ARG4 0 ARG5 0 
             463ef0   1127 FUNC RETURNTYPE RAX 1
             463ef0   1127 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 8 ARG3 8 ARG4 8 ARG5 4 
             463ffb      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+1] 
-            464076      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, 1 
+            464076      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, 1 
             464091      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R8 ZZ mov     rdx, r8         ; n 
             464360     84 FUNC RETURNTYPE RAX 0
             464360     84 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4643c0  10192 FUNC RETURNTYPE RAX 4
             4643c0  10192 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4644e8      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r12+1] 
-            464f3b      2 INSTR CHECK UNDERFLOW SIGNED 32  ECX ZZ sub     ecx, edx 
+            464f3b      2 INSTR CHECK UNDERFLOW SIGNED 32  RCX ZZ sub     ecx, edx 
             464f89      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+36 ZZ IDIOM 18 MEMORYSINK lea     r8, [rbx+24h] 
-            464ff2      3 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 8 AL ZZ IDIOM 5 movzx   esi, al 
-            464fff      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 8 DL ZZ IDIOM 5 movzx   ecx, dl 
-            46521b      3 INSTR CHECK TRUNCATION UNSIGNED 32 EDX 8 DL ZZ IDIOM 5 movzx   ecx, dl 
+            464ff2      3 INSTR CHECK TRUNCATION UNSIGNED 32 RAX 8 AL ZZ IDIOM 5 movzx   esi, al 
+            464fff      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDX 8 DL ZZ IDIOM 5 movzx   ecx, dl 
+            46521b      3 INSTR CHECK TRUNCATION UNSIGNED 32 RDX 8 DL ZZ IDIOM 5 movzx   ecx, dl 
             4656ae      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+36 ZZ IDIOM 18 MEMORYSINK lea     r8, [rbx+24h] 
-            465975      3 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, r13d 
-            465acc      2 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, ecx 
+            465975      3 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, r13d 
+            465acc      2 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, ecx 
             4666a0      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+36 ZZ IDIOM 18 MEMORYSINK lea     r8, [rbx+24h] 
-            466a6e      3 INSTR CHECK OVERFLOW UNSIGNED 32  ECX ZZ add     ecx, r13d 
-            466a7c      2 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, ecx 
-            466a9d      3 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, r12d 
-            466b83      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, r13d 
+            466a6e      3 INSTR CHECK OVERFLOW UNSIGNED 32  RCX ZZ add     ecx, r13d 
+            466a7c      2 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, ecx 
+            466a9d      3 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, r12d 
+            466b83      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, r13d 
             466e40     71 FUNC RETURNTYPE RAX 0
             466e40     71 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             466e90    834 FUNC RETURNTYPE RAX 1
@@ -2132,23 +2132,23 @@
             468900    485 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 4 ARG5 4 
             469e60    610 FUNC RETURNTYPE RAX 1
             469e60    610 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            469ed1      3 INSTR CHECK OVERFLOW SIGNED 32  EDX ZZ add     edx, 1 
+            469ed1      3 INSTR CHECK OVERFLOW SIGNED 32  RDX ZZ add     edx, 1 
             46a0d0   1009 FUNC RETURNTYPE RAX 96
             46a0d0   1009 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46ab00    147 FUNC RETURNTYPE RAX 1
             46ab00    147 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46ab73      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+1 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+1]    ; src 
-            46ab7a      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDX ZZ sub     edx, 1 
+            46ab7a      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  RDX ZZ sub     edx, 1 
             46aba0    284 FUNC RETURNTYPE RAX 4
             46aba0    284 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            46ac38      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDX ZZ add     edx, 2 
+            46ac38      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RDX ZZ add     edx, 2 
             46ac45      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RDX*4 ZZ lea     rsi, [rdx+rdx*4] 
             46ac45      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 RDX+RDX*4 ZZ lea     rsi, [rdx+rdx*4] 
             46acc0    120 FUNC RETURNTYPE RAX 4
             46acc0    120 FUNC INARGS    6  ARG0 16 ARG1 96 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
             46ad40    272 FUNC RETURNTYPE RAX 4
             46ad40    272 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
-            46ad8c      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDX ZZ add     edx, edx 
+            46ad8c      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDX ZZ add     edx, edx 
             46ae50    169 FUNC RETURNTYPE RAX 4
             46ae50    169 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46af00      9 FUNC RETURNTYPE RAX 0
@@ -2172,7 +2172,7 @@
             46b1c0    235 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             46b2b0    167 FUNC RETURNTYPE RAX 1
             46b2b0    167 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            46b2fe      6 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ SINKMALLOC add     esi, cs:dword_69A170 
+            46b2fe      6 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ SINKMALLOC add     esi, cs:dword_69A170 
             46b360    174 FUNC RETURNTYPE RAX 4
             46b360    174 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             46b3a3      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R14+1 ZZ lea     r13d, [r14+1] 
@@ -2188,11 +2188,11 @@
             46b990    262 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 0 ARG4 0 ARG5 0 
             46b9e4      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ IDIOM 18 MEMORYSINK add     rdi, rax        ; dest 
             46b9e7      3 INSTR CHECK SIGNEDNESS UNSIGNED 64 R13 ZZ mov     rdx, r13        ; n 
-            46ba48      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  ECX ZZ add     ecx, r12d 
+            46ba48      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  RCX ZZ add     ecx, r12d 
             46ba62      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R13 ZZ SINKMALLOC add     r13d, ecx 
             46bae0    177 FUNC RETURNTYPE RAX 4
             46bae0    177 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            46bb48      6 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ SINKMALLOC add     esi, cs:dword_69A170 
+            46bb48      6 INSTR CHECK OVERFLOW SIGNED 32  RSI ZZ SINKMALLOC add     esi, cs:dword_69A170 
             46bba0      5 FUNC RETURNTYPE RAX 0
             46bba0      5 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 0 
             46bbb0      5 FUNC RETURNTYPE RAX 0
@@ -2290,11 +2290,11 @@
             46d2fc      8 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R12*4 ZZ lea     rsi, ds:0[r12*4] 
             46d340    644 FUNC RETURNTYPE RAX 1
             46d340    644 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            46d583      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ neg     edi             ; exponent 
+            46d583      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ neg     edi             ; exponent 
             46d594      8 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP*4 ZZ lea     rsi, ds:0[rbp*4] 
             46d5d0    717 FUNC RETURNTYPE RAX 0
             46d5d0    717 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
-            46d643      3 INSTR CHECK UNDERFLOW SIGNED 32  EAX ZZ sub     eax, 2Fh 
+            46d643      3 INSTR CHECK UNDERFLOW SIGNED 32  RAX ZZ sub     eax, 2Fh 
             46d6c2      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBP 32 EBP ZZ mov     esi, ebp 
             46d800      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RAX+-97 ZZ IDIOM 32 lea     edx, [rax-61h] 
             46d8a0    797 FUNC RETURNTYPE RAX 1
@@ -2396,7 +2396,7 @@
             470240     51 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 1 ARG3 1 ARG4 0 ARG5 0 
             470280    276 FUNC RETURNTYPE RAX 0
             470280    276 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            470341      2 INSTR CHECK OVERFLOW SIGNED 32  EDI ZZ neg     edi             ; exponent 
+            470341      2 INSTR CHECK OVERFLOW SIGNED 32  RDI ZZ neg     edi             ; exponent 
             470440    158 FUNC RETURNTYPE RAX 96
             470440    158 FUNC INARGS    6  ARG0 4 ARG1 0 ARG2 0 ARG3 96 ARG4 1 ARG5 0 
             4704e0      7 FUNC RETURNTYPE RAX 1
@@ -2450,8 +2450,8 @@
             470a3d      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rax+1] 
             470a9f      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+RDI ZZ IDIOM 32 lea     edi, [r14+rdi+2] 
             470a9f      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+RDI+2 ZZ IDIOM 32 lea     edi, [r14+rdi+2] 
-            470aa4      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, ebx 
-            470aa6      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, eax 
+            470aa4      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, ebx 
+            470aa6      2 INSTR CHECK OVERFLOW UNSIGNED 32  RDI ZZ add     edi, eax 
             470ac0    137 FUNC RETURNTYPE RAX 0
             470ac0    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             470ac0    137 FUNC PROBLEM init CALLUNRESOLVED 
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 6cdb43a3..1f3b5cd7 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 @@
-b523d82aaebb33fd8309b454c48e3ba09a229523
\ No newline at end of file
+5ed023069117f30d8e40a0cd1e96c1918b2059cc
\ 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 1eaa48c4..ab1ed1d4 100644
--- a/tests/commit/trimmed-sorted-save-bzip2.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-bzip2.psexe.annot
@@ -586,7 +586,7 @@
             4013a2     -3 INSTR LOCAL NoWarn push    r12 
             4013a4     -1 INSTR LOCAL MetadataUnused mov     r12, rsi 
             4013a4      3 INSTR BELONGTO 4013a0 
-            4013a7     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset handler; handler 
+            4013a7     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset handler; handler 
             4013a7      5 INSTR BELONGTO 4013a0 
             4013a7      5 INSTR DEADREGS  EFLAGS RSI R13 ZZ mov     esi, offset handler; handler 
             4013ac      1 INSTR BELONGTO 4013a0 
@@ -594,7 +594,7 @@
             4013ac     -3 INSTR LOCAL NoWarn push    rbp 
             4013ad     -1 INSTR LOCAL MetadataUnused mov     ebp, edi 
             4013ad      2 INSTR BELONGTO 4013a0 
-            4013af     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Bh        ; sig 
+            4013af     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Bh        ; sig 
             4013af      5 INSTR BELONGTO 4013a0 
             4013af      5 INSTR DEADREGS  EFLAGS RDI R13 ZZ mov     edi, 0Bh        ; sig 
             4013b4      1 INSTR BELONGTO 4013a0 
@@ -664,7 +664,7 @@
             40146c     -1 INSTR LOCAL NoMetaUpdate call    sub_403080 
             40146c      5 INSTR BELONGTO 4013a0 
             40146c      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    sub_403080 
-            401471     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, cs:byte_6072C0 
+            401471     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, cs:byte_6072C0 
             401471      7 INSTR BELONGTO 4013a0 
             401471      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R13 ZZ movzx   eax, cs:byte_6072C0 
             401478      5 INSTR BELONGTO 4013a0 
@@ -679,7 +679,7 @@
             40148d      2 INSTR BELONGTO 4013a0 
             40148f     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4014C1 
             40148f      2 INSTR BELONGTO 4013a0 
-            401498     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rdx+1] 
+            401498     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rdx+1] 
             401498      4 INSTR BELONGTO 4013a0 
             401498      4 INSTR DEADREGS  EFLAGS RAX RBX RDI R13 ZZ movzx   eax, byte ptr [rdx+1] 
             40149c     -1 INSTR LOCAL NoMetaUpdate test    al, al 
@@ -694,7 +694,7 @@
             4014a5      4 INSTR DEADREGS  RAX RCX RBX RDI R13 ZZ lea     rcx, [rdx+1] 
             4014a9     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401498 
             4014a9      2 INSTR BELONGTO 4013a0 
-            4014ab     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rdx+1] 
+            4014ab     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rdx+1] 
             4014ab      4 INSTR BELONGTO 4013a0 
             4014ab      4 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI RDI R13 ZZ movzx   eax, byte ptr [rdx+1] 
             4014af      4 INSTR BELONGTO 4013a0 
@@ -794,7 +794,7 @@
             40156e      2 INSTR BELONGTO 4013a0 
             401570      3 INSTR BELONGTO 4013a0 
             401570      3 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     rdi, [rbx]      ; s 
-            401573     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
+            401573     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
             401573      3 INSTR BELONGTO 4013a0 
             401573      3 INSTR DEADREGS  EFLAGS RAX ZZ movzx   eax, byte ptr [rdi] 
             401576     -1 INSTR LOCAL NoMetaUpdate cmp     al, 2Dh 
@@ -894,7 +894,7 @@
             401643      5 INSTR BELONGTO 4013a0 
             401648     -1 INSTR LOCAL NoMetaUpdate jz      loc_4016D5 
             401648      6 INSTR BELONGTO 4013a0 
-            40164e     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [r8+1] 
+            40164e     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [r8+1] 
             40164e      5 INSTR BELONGTO 4013a0 
             40164e      5 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ movzx   eax, byte ptr [r8+1] 
             401653     -1 INSTR LOCAL NoMetaUpdate cmp     al, 2Dh 
@@ -905,7 +905,7 @@
             401657      2 INSTR BELONGTO 4013a0 
             401659     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4016C8 
             401659      2 INSTR BELONGTO 4013a0 
-            40165b     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            40165b     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             40165b      5 INSTR BELONGTO 4013a0 
             40165b      5 INSTR DEADREGS  EFLAGS RCX RBX R12 R13 ZZ mov     ecx, 2 
             401660     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     eax, 31h 
@@ -920,12 +920,12 @@
             401672      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 ZZ mov     rdi, cs:stderr 
             401679      5 INSTR BELONGTO 4013a0 
             401679      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 R13 ZZ mov     edx, offset aSBadFlagS; "%s: Bad flag `%s'\n" 
-            40167e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40167e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40167e      5 INSTR BELONGTO 4013a0 
             40167e      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 ZZ mov     esi, 1 
             401683      2 INSTR BELONGTO 4013a0 
             401683      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-            401683     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401683     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401685     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             401685      5 INSTR BELONGTO 4013a0 
             401685      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    ___fprintf_chk 
@@ -934,7 +934,7 @@
             401691     -1 INSTR LOCAL NoMetaUpdate call    sub_4022E0 
             401691      5 INSTR BELONGTO 4013a0 
             401691      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    sub_4022E0 
-            401696     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
+            401696     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
             401696      5 INSTR BELONGTO 4013a0 
             401696      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     edi, 1          ; status 
             40169b     -1 INSTR LOCAL NoMetaUpdate call    _exit 
@@ -947,7 +947,7 @@
             4016ab     10 INSTR BELONGTO 4013a0 
             4016ab     10 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ mov     cs:dword_608350, 1; jumptable 0000000000401753 case 73 
             4016b5      3 INSTR BELONGTO 4013a0 
-            4016b8     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [r8+rcx] 
+            4016b8     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [r8+rcx] 
             4016b8      5 INSTR BELONGTO 4013a0 
             4016b8      5 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ movzx   eax, byte ptr [r8+rcx] 
             4016bd     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rcx, 1 
@@ -1007,7 +1007,7 @@
             40172d      2 INSTR BELONGTO 4013a0 
             40172f      5 INSTR BELONGTO 4013a0 
             40172f      5 INSTR DEADREGS  RCX RSI RDI R13 ZZ mov     edi, offset aDecompress; "--decompress" 
-            401734     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Dh 
+            401734     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Dh 
             401734      5 INSTR BELONGTO 4013a0 
             401734      5 INSTR DEADREGS  RCX RSI R13 ZZ mov     ecx, 0Dh 
             401739      3 INSTR BELONGTO 4013a0 
@@ -1020,7 +1020,7 @@
             401744     10 INSTR DEADREGS  EFLAGS RBX R13 ZZ mov     cs:dword_608350, 2 
             40174e     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4016FA 
             40174e      2 INSTR BELONGTO 4013a0 
-            401750     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, al 
+            401750     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, al 
             401750      3 INSTR BELONGTO 4013a0 
             401750      3 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ movzx   eax, al 
             401753     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_406088[rax*8]; switch jump 
@@ -1065,7 +1065,7 @@
             4017bb      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    sub_4022E0 
             4017c0      2 INSTR BELONGTO 4013a0 
             4017c0      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ xor     edi, edi        ; status 
-            4017c0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; status 
+            4017c0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; status 
             4017c2     -1 INSTR LOCAL NoMetaUpdate call    _exit 
             4017c2      5 INSTR BELONGTO 4013a0 
             4017c2      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _exit 
@@ -1088,7 +1088,7 @@
             4017f4      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    sub_4022B0      ; jumptable 0000000000401753 cases 27,37 
             4017f9      2 INSTR BELONGTO 4013a0 
             4017f9      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ xor     edi, edi        ; status 
-            4017f9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; status 
+            4017f9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; status 
             4017fb     -1 INSTR LOCAL NoMetaUpdate call    _exit 
             4017fb      5 INSTR BELONGTO 4013a0 
             4017fb      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _exit 
@@ -1130,7 +1130,7 @@
             401882      5 INSTR BELONGTO 4013a0 
             401890      5 INSTR BELONGTO 4013a0 
             401890      5 INSTR DEADREGS  RCX RSI RDI R13 ZZ mov     edi, offset aCompress; "--compress" 
-            401895     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Bh 
+            401895     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Bh 
             401895      5 INSTR BELONGTO 4013a0 
             401895      5 INSTR DEADREGS  RCX RSI R13 ZZ mov     ecx, 0Bh 
             40189a      3 INSTR BELONGTO 4013a0 
@@ -1245,7 +1245,7 @@
             401995      2 INSTR BELONGTO 4013a0 
             401997      3 INSTR BELONGTO 4013a0 
             401997      3 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 ZZ mov     rdi, [rbx]      ; src 
-            40199a     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
+            40199a     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
             40199a      3 INSTR BELONGTO 4013a0 
             40199a      3 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ movzx   eax, byte ptr [rdi] 
             40199d     -1 INSTR LOCAL NoMetaUpdate cmp     al, 2Dh 
@@ -1266,7 +1266,7 @@
             4019b7      2 INSTR BELONGTO 4013a0 
             4019b9      2 INSTR BELONGTO 4013a0 
             4019b9      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ xor     edi, edi        ; src 
-            4019b9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; src 
+            4019b9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; src 
             4019bb     -1 INSTR LOCAL NoMetaUpdate call    sub_403C00 
             4019bb      5 INSTR BELONGTO 4013a0 
             4019bb      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 R13 ZZ call    sub_403C00 
@@ -1460,7 +1460,7 @@
             401b2f      6 INSTR BELONGTO 4013a0 
             401b35      3 INSTR BELONGTO 4013a0 
             401b35      3 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 ZZ mov     rdi, [rbx]      ; src 
-            401b38     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
+            401b38     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
             401b38      3 INSTR BELONGTO 4013a0 
             401b38      3 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ movzx   eax, byte ptr [rdi] 
             401b3b     -1 INSTR LOCAL NoMetaUpdate cmp     al, 2Dh 
@@ -1489,16 +1489,16 @@
             401b67      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R12 R13 ZZ mov     rcx, cs:s 
             401b6e      5 INSTR BELONGTO 4013a0 
             401b6e      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 R13 ZZ mov     edx, offset aSCAndTCannotBe; "%s: -c and -t cannot be used together.\"... 
-            401b73     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            401b73     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             401b73      5 INSTR BELONGTO 4013a0 
             401b73      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 ZZ mov     esi, 1 
             401b78      2 INSTR BELONGTO 4013a0 
             401b78      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-            401b78     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401b78     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401b7a     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             401b7a      5 INSTR BELONGTO 4013a0 
             401b7a      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    ___fprintf_chk 
-            401b7f     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
+            401b7f     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
             401b7f      5 INSTR BELONGTO 4013a0 
             401b7f      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     edi, 1          ; status 
             401b84     -1 INSTR LOCAL NoMetaUpdate call    _exit 
@@ -1522,7 +1522,7 @@
             401bb9      5 INSTR BELONGTO 4013a0 
             401bbe      2 INSTR BELONGTO 4013a0 
             401bbe      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ xor     edi, edi        ; src 
-            401bbe     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; src 
+            401bbe     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; src 
             401bc0     -1 INSTR LOCAL NoMetaUpdate call    sub_403EF0 
             401bc0      5 INSTR BELONGTO 4013a0 
             401bc0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 R13 ZZ call    sub_403EF0 
@@ -1565,7 +1565,7 @@
             401c0c      2 INSTR BELONGTO 4013a0 
             401c0e      3 INSTR BELONGTO 4013a0 
             401c0e      3 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 ZZ mov     rdi, [rbx]      ; src 
-            401c11     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
+            401c11     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
             401c11      3 INSTR BELONGTO 4013a0 
             401c11      3 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ movzx   eax, byte ptr [rdi] 
             401c14     -1 INSTR LOCAL NoMetaUpdate cmp     al, 2Dh 
@@ -1593,7 +1593,7 @@
             401c34      2 INSTR BELONGTO 4013a0 
             401c36      2 INSTR BELONGTO 4013a0 
             401c36      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ xor     edi, edi        ; src 
-            401c36     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; src 
+            401c36     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; src 
             401c38     -1 INSTR LOCAL NoMetaUpdate call    sub_403480 
             401c38      5 INSTR BELONGTO 4013a0 
             401c38      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 R13 ZZ call    sub_403480 
@@ -1612,10 +1612,10 @@
             401c63     -1 INSTR LOCAL NoMetaUpdate call    _exit 
             401c63      5 INSTR BELONGTO 4013a0 
             401c63      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _exit 
-            401c68     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_402280; handler 
+            401c68     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_402280; handler 
             401c68      5 INSTR BELONGTO 4013a0 
             401c68      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, offset sub_402280; handler 
-            401c6d     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2          ; sig 
+            401c6d     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2          ; sig 
             401c6d      5 INSTR BELONGTO 4013a0 
             401c6d      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     edi, 2          ; sig 
             401c72     -1 INSTR LOCAL NoMetaUpdate call    _signal 
@@ -1761,7 +1761,7 @@
             401d83      2 INSTR BELONGTO 4013a0 
             401d85     -1 INSTR LOCAL NoMetaUpdate jz      loc_4017B4      ; jumptable 0000000000401753 case 55 
             401d85      6 INSTR BELONGTO 4013a0 
-            401d8b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2          ; n 
+            401d8b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2          ; n 
             401d8b      5 INSTR BELONGTO 4013a0 
             401d8b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     edx, 2          ; n 
             401d90      5 INSTR BELONGTO 4013a0 
@@ -1781,7 +1781,7 @@
             401da8      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R13 ZZ mov     rcx, cs:s 
             401daf      5 INSTR BELONGTO 4013a0 
             401daf      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 ZZ mov     edx, offset aSBadFlagS; "%s: Bad flag `%s'\n" 
-            401db4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            401db4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             401db4      5 INSTR BELONGTO 4013a0 
             401db4      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, 1 
             401db9      7 INSTR BELONGTO 4013a0 
@@ -1794,10 +1794,10 @@
             401dcc      6 INSTR BELONGTO 4013a0 
             401dd2      7 INSTR BELONGTO 4013a0 
             401dd2      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R13 ZZ mov     rcx, cs:stderr  ; s 
-            401dd9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 70h        ; n 
+            401dd9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 70h        ; n 
             401dd9      5 INSTR BELONGTO 4013a0 
             401dd9      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 ZZ mov     edx, 70h        ; n 
-            401dde     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            401dde     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             401dde      5 INSTR BELONGTO 4013a0 
             401dde      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, 1          ; size 
             401de3      5 INSTR BELONGTO 4013a0 
@@ -1933,7 +1933,7 @@
             401eb9      3 INSTR BELONGTO 401eb0 
             401ebc     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401ED0 
             401ebc      2 INSTR BELONGTO 401eb0 
-            401ebe     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            401ebe     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             401ebe      5 INSTR BELONGTO 401eb0 
             401ec3     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             401ec3      3 INSTR BELONGTO 401eb0 
@@ -1982,19 +1982,19 @@
             401f10      5 PTRIMMEDESP STACK 39 displ lea     rcx, [rsp+38h+var_18+7]
             401f15      2 INSTR BELONGTO 401ee0 
             401f15      2 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ xor     esi, esi 
-            401f15     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            401f15     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             401f17      9 INSTR BELONGTO 401ee0 
-            401f20     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rcx] 
+            401f20     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rcx] 
             401f20      3 INSTR BELONGTO 401ee0 
             401f20      3 INSTR DEADREGS  EFLAGS RAX RDX ZZ movzx   eax, byte ptr [rcx] 
-            401f23     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM shl     esi, 8 
+            401f23     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM shl     esi, 8 
             401f23      3 INSTR BELONGTO 401ee0 
             401f23      3 INSTR DEADREGS  EFLAGS RDX ZZ shl     esi, 8 
             401f26     -1 INSTR LOCAL MetadataRedundant add     esi, eax 
             401f26      2 INSTR BELONGTO 401ee0 
             401f28     -1 INSTR LOCAL MetadataRedundant mov     eax, esi 
             401f28      2 INSTR BELONGTO 401ee0 
-            401f2a     -2 INSTR LOCAL n EAX EDX ZZ  AlwaysNUM mul     r8d 
+            401f2a     -2 INSTR LOCAL n RAX RDX ZZ  AlwaysNUM mul     r8d 
             401f2a      3 INSTR BELONGTO 401ee0 
             401f2a      3 INSTR DEADREGS  EFLAGS RDX ZZ mul     r8d 
             401f2d     -1 INSTR LOCAL MetadataRedundant shr     edx, 3 
@@ -2046,7 +2046,7 @@
             401f72      3 INSTR BELONGTO 401ee0 
             401f75     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     edx, 1 
             401f75      3 INSTR BELONGTO 401ee0 
-            401f78     -2 INSTR LOCAL n ESI ZZ  NumericDEFs movzx   esi, [rsp+rsi+38h+var_38] 
+            401f78     -2 INSTR LOCAL n RSI ZZ  NumericDEFs movzx   esi, [rsp+rsi+38h+var_38] 
             401f78      4 INSTR BELONGTO 401ee0 
             401f78      4 INSTR DEADREGS  EFLAGS ZZ movzx   esi, [rsp+rsi+38h+var_38] 
             401f78      4 PTRIMMEDESP STACK 0 displ movzx   esi, [rsp+rsi+38h+var_38]
@@ -2110,7 +2110,7 @@
             401fd4      5 INSTR DEADREGS  EFLAGS ZZ call    _strlen 
             401fd9      2 INSTR BELONGTO 401fb0 
             401fd9      2 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, eax 
-            401fd9     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, eax 
+            401fd9     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, eax 
             401fdb     -1 INSTR LOCAL MetadataRedundant xor     eax, eax 
             401fdb      2 INSTR BELONGTO 401fb0 
             401fdd     -1 INSTR LOCAL NoMetaUpdate cmp     r12d, edx 
@@ -2163,7 +2163,7 @@
             402016      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _fopen64 
             40201b     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40201b      3 INSTR BELONGTO 402010 
-            40201e     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM setnz   bl 
+            40201e     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM setnz   bl 
             40201e      3 INSTR BELONGTO 402010 
             40201e      3 INSTR DEADREGS  RBX ZZ setnz   bl 
             402021     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40202B 
@@ -2175,7 +2175,7 @@
             402026      5 INSTR DEADREGS  EFLAGS ZZ call    _fclose 
             40202b      2 INSTR BELONGTO 402010 
             40202b      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, ebx 
-            40202b     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            40202b     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             40202d      1 INSTR BELONGTO 402010 
             40202d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40202e      1 INSTR BELONGTO 402010 
@@ -2194,7 +2194,7 @@
             402034      5 INSTR DEADREGS  EFLAGS ZZ call    _fgetc 
             402039      2 INSTR BELONGTO 402030 
             402039      2 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, eax        ; c 
-            40203b     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40203b     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40203b      5 INSTR BELONGTO 402030 
             40203b      5 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, 1 
             402040     -1 INSTR LOCAL NoMetaUpdate cmp     edi, 0FFFFFFFFh 
@@ -2208,7 +2208,7 @@
             402048      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _ungetc 
             40204d      2 INSTR BELONGTO 402030 
             40204d      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40204d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40204d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40204f      1 INSTR BELONGTO 402030 
             40204f      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             402050      1 INSTR BELONGTO 402030 
@@ -2229,7 +2229,7 @@
             402076      5 INSTR BELONGTO 402060 
             40207b      2 INSTR BELONGTO 402060 
             40207b      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 ZZ xor     eax, eax 
-            40207b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40207b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40207d     -1 INSTR LOCAL NoMetaUpdate jmp     ___fprintf_chk 
             40207d      5 INSTR BELONGTO 402060 
             40207d      5 INSTR DEADREGS  EFLAGS RSI RDI R8 ZZ jmp     ___fprintf_chk 
@@ -2242,10 +2242,10 @@
             402090      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402094      7 INSTR BELONGTO 402090 
             402094      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, cs:stderr  ; s 
-            40209b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0EBh       ; n 
+            40209b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0EBh       ; n 
             40209b      5 INSTR BELONGTO 402090 
             40209b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 0EBh       ; n 
-            4020a0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            4020a0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             4020a0      5 INSTR BELONGTO 402090 
             4020a0      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 1          ; size 
             4020a5      5 INSTR BELONGTO 402090 
@@ -2272,7 +2272,7 @@
             4020d0    432 FUNC GLOBAL sub_4020D0 FUNC_UNSAFE NOFP NORET             40227f 
             4020d1      2 INSTR BELONGTO 4020d0 
             4020d1      2 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, edi 
-            4020d1     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, edi 
+            4020d1     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     ebx, edi 
             4020d3    160 DATAREF STACK 276 esp + 0 PARENT LocalFrame LOCALFRAME
             4020d3      4 DATAREF STACK 277 esp + 0 CHILDOF 276 OFFSET 0 OutArgsRegion OUTARGS
             4020d3      7 INSTR BELONGTO 4020d0 
@@ -2323,7 +2323,7 @@
             402132      5 PTRIMMEDESP STACK 16 displ lea     rdx, [rsp+0A8h+stat_buf]; stat_buf
             402137      5 INSTR BELONGTO 4020d0 
             402137      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset dest; filename 
-            40213c     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            40213c     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             40213c      5 INSTR BELONGTO 4020d0 
             40213c      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 1          ; ver 
             402141     -1 INSTR LOCAL NoMetaUpdate call    ___xstat64 
@@ -2361,12 +2361,12 @@
             402185      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rdi, cs:stderr 
             40218c      5 INSTR BELONGTO 4020d0 
             40218c      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSWarningDeleti; "%s: WARNING: deletion of output file (a"... 
-            402191     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402191     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402191      5 INSTR BELONGTO 4020d0 
             402191      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             402196      2 INSTR BELONGTO 4020d0 
             402196      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            402196     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402196     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402198     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             402198      5 INSTR BELONGTO 4020d0 
             402198      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -2380,12 +2380,12 @@
             4021ac      7 INSTR DEADREGS  EFLAGS RSI RDI R8 ZZ mov     rdi, cs:stderr 
             4021b3      2 INSTR BELONGTO 4020d0 
             4021b3      2 INSTR DEADREGS  EFLAGS RSI R8 ZZ sub     edx, eax 
-            4021b5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4021b5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4021b5      5 INSTR BELONGTO 4020d0 
             4021b5      5 INSTR DEADREGS  EFLAGS RAX RSI R8 ZZ mov     esi, 1 
             4021ba      2 INSTR BELONGTO 4020d0 
             4021ba      2 INSTR DEADREGS  EFLAGS RAX R8 ZZ xor     eax, eax 
-            4021ba     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4021ba     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4021bc      3 INSTR BELONGTO 4020d0 
             4021bc      3 INSTR DEADREGS  EFLAGS R8 ZZ mov     [rsp+0A8h+var_A8], edx 
             4021bc      3 PTRIMMEDESP STACK 0 displ mov     [rsp+0A8h+var_A8], edx
@@ -2404,12 +2404,12 @@
             4021d8      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rdi, cs:stderr 
             4021df      5 INSTR BELONGTO 4020d0 
             4021df      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSWarningDele_0; "%s: WARNING: deletion of output file su"... 
-            4021e4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4021e4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4021e4      5 INSTR BELONGTO 4020d0 
             4021e4      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             4021e9      2 INSTR BELONGTO 4020d0 
             4021e9      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4021e9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4021e9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4021eb     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4021eb      5 INSTR BELONGTO 4020d0 
             4021eb      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -2423,7 +2423,7 @@
             402203      5 INSTR BELONGTO 4020d0 
             402208      2 INSTR BELONGTO 4020d0 
             402208      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            402208     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402208     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40220a     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40220a      5 INSTR BELONGTO 4020d0 
             40220a      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -2439,7 +2439,7 @@
             402228      5 INSTR BELONGTO 4020d0 
             40222d      2 INSTR BELONGTO 4020d0 
             40222d      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40222d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40222d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40222f     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40222f      5 INSTR BELONGTO 4020d0 
             40222f      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -2453,7 +2453,7 @@
             402247      5 INSTR BELONGTO 4020d0 
             40224c      2 INSTR BELONGTO 4020d0 
             40224c      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40224c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40224c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40224e     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40224e      5 INSTR BELONGTO 4020d0 
             40224e      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -2467,7 +2467,7 @@
             402266      6 INSTR DEADREGS  EFLAGS RDX RSI R8 ZZ mov     r8d, offset file 
             40226c      5 INSTR BELONGTO 4020d0 
             40226c      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, offset aSDeletingOutpu; "%s: Deleting output file %s, if it exis"... 
-            402271     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402271     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402271      5 INSTR BELONGTO 4020d0 
             402271      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
             402276     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -2488,16 +2488,16 @@
             40228b      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ mov     rcx, cs:s 
             402292      5 INSTR BELONGTO 402280 
             402292      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSControlCOrSim; "\n%s: Control-C or similar caught, quit"... 
-            402297     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402297     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402297      5 INSTR BELONGTO 402280 
             402297      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             40229c      2 INSTR BELONGTO 402280 
             40229c      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40229c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40229c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40229e     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40229e      5 INSTR BELONGTO 402280 
             40229e      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
-            4022a3     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            4022a3     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             4022a3      5 INSTR BELONGTO 402280 
             4022a3      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1 
             4022a8     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -2523,7 +2523,7 @@
             4022c8      5 INSTR BELONGTO 4022b0 
             4022cd      2 INSTR BELONGTO 4022b0 
             4022cd      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            4022cd     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4022cd     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4022cf     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             4022cf      4 INSTR BELONGTO 4022b0 
             4022d3     -1 INSTR LOCAL NoMetaUpdate jmp     ___fprintf_chk 
@@ -2556,7 +2556,7 @@
             4022fc      5 INSTR BELONGTO 4022e0 
             402301      2 INSTR BELONGTO 4022e0 
             402301      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            402301     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402301     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402303     -1 INSTR LOCAL NoMetaUpdate jmp     ___fprintf_chk 
             402303      5 INSTR BELONGTO 4022e0 
             402303      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     ___fprintf_chk 
@@ -2572,7 +2572,7 @@
             402319      2 INSTR DEADREGS  EFLAGS ZZ rep retn 
             402320      7 INSTR BELONGTO 402310 
             402320      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     rcx, cs:stderr 
-            402327     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0F0h 
+            402327     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0F0h 
             402327      5 INSTR BELONGTO 402310 
             402327      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 0F0h 
             40232c     -1 INSTR LOCAL MetadataUnused mov     esi, 1 
@@ -2604,7 +2604,7 @@
             402367      5 INSTR BELONGTO 402340 
             40236c      2 INSTR BELONGTO 402340 
             40236c      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 ZZ xor     eax, eax 
-            40236c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40236c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40236e     -1 INSTR LOCAL NoMetaUpdate jmp     ___fprintf_chk 
             40236e      5 INSTR BELONGTO 402340 
             40236e      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 ZZ jmp     ___fprintf_chk 
@@ -2621,19 +2621,19 @@
             40238b      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ mov     rcx, cs:s 
             402392      5 INSTR BELONGTO 402380 
             402392      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSCouldnTAlloca; "\n%s: couldn't allocate enough memory\n" 
-            402397     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402397     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402397      5 INSTR BELONGTO 402380 
             402397      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             40239c      2 INSTR BELONGTO 402380 
             40239c      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40239c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40239c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40239e     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40239e      5 INSTR BELONGTO 402380 
             40239e      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
             4023a3     -1 INSTR LOCAL NoMetaUpdate call    sub_402340 
             4023a3      5 INSTR BELONGTO 402380 
             4023a3      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_402340 
-            4023a8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            4023a8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             4023a8      5 INSTR BELONGTO 402380 
             4023a8      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1 
             4023ad     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -2654,19 +2654,19 @@
             4023ce      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rdi, cs:stderr 
             4023d5      5 INSTR BELONGTO 4023c0 
             4023d5      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSPanicInternal; "\n%s: PANIC -- internal consistency err"... 
-            4023da     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4023da     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4023da      5 INSTR BELONGTO 4023c0 
             4023da      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             4023df      2 INSTR BELONGTO 4023c0 
             4023df      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4023df     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4023df     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4023e1     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4023e1      5 INSTR BELONGTO 4023c0 
             4023e1      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
             4023e6     -1 INSTR LOCAL NoMetaUpdate call    sub_402340 
             4023e6      5 INSTR BELONGTO 4023c0 
             4023e6      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_402340 
-            4023eb     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
+            4023eb     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
             4023eb      5 INSTR BELONGTO 4023c0 
             4023eb      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 3 
             4023f0     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -2689,12 +2689,12 @@
             402414      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rdi, cs:stderr 
             40241b      5 INSTR BELONGTO 402400 
             40241b      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSCaughtASigseg; "\n%s: Caught a SIGSEGV or SIGBUS whilst"... 
-            402420     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402420     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402420      5 INSTR BELONGTO 402400 
             402420      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             402425      2 INSTR BELONGTO 402400 
             402425      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            402425     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402425     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402427     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             402427      5 INSTR BELONGTO 402400 
             402427      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -2708,7 +2708,7 @@
             40243a     -1 INSTR LOCAL NoMetaUpdate call    sub_402310 
             40243a      5 INSTR BELONGTO 402400 
             40243a      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_402310 
-            40243f     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            40243f     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             40243f      5 INSTR BELONGTO 402400 
             40243f      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 2 
             402444     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -2718,18 +2718,18 @@
             402449      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rdi, cs:stderr 
             402450      5 INSTR BELONGTO 402400 
             402450      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSCaughtASigs_0; "\n%s: Caught a SIGSEGV or SIGBUS whilst"... 
-            402455     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402455     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402455      5 INSTR BELONGTO 402400 
             402455      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             40245a      2 INSTR BELONGTO 402400 
             40245a      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40245a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40245a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40245c     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40245c      5 INSTR BELONGTO 402400 
             40245c      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
             402461     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40242C 
             402461      2 INSTR BELONGTO 402400 
-            402463     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
+            402463     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
             402463      5 INSTR BELONGTO 402400 
             402463      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 3 
             402468     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -2748,12 +2748,12 @@
             40247b      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rdi, cs:stderr 
             402482      5 INSTR BELONGTO 402470 
             402482      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSIOOrOtherErro; "\n%s: I/O or other error, bailing out. "... 
-            402487     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402487     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402487      5 INSTR BELONGTO 402470 
             402487      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             40248c      2 INSTR BELONGTO 402470 
             40248c      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40248c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40248c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40248e     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40248e      5 INSTR BELONGTO 402470 
             40248e      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -2765,7 +2765,7 @@
             40249f     -1 INSTR LOCAL NoMetaUpdate call    sub_402340 
             40249f      5 INSTR BELONGTO 402470 
             40249f      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_402340 
-            4024a4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            4024a4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             4024a4      5 INSTR BELONGTO 402470 
             4024a4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1 
             4024a9     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -2890,7 +2890,7 @@
             40255f      2 INSTR BELONGTO 4024e0 
             402561      7 INSTR BELONGTO 4024e0 
             402561      7 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     rsi, cs:stderr  ; stream 
-            402568     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ah        ; c 
+            402568     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ah        ; c 
             402568      5 INSTR BELONGTO 4024e0 
             402568      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     edi, 0Ah        ; c 
             40256d     -1 INSTR LOCAL NoMetaUpdate call    _fputc 
@@ -2911,10 +2911,10 @@
             402588      5 PTRIMMEDESP STACK 112 displ lea     rdi, [rsp+1498h+ptr]; ptr
             40258d      3 INSTR BELONGTO 4024e0 
             40258d      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R12 R13 ZZ mov     rcx, r14        ; stream 
-            402590     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1388h      ; n 
+            402590     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1388h      ; n 
             402590      5 INSTR BELONGTO 4024e0 
             402590      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 ZZ mov     edx, 1388h      ; n 
-            402595     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402595     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402595      5 INSTR BELONGTO 4024e0 
             402595      5 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 ZZ mov     esi, 1          ; size 
             40259a     -1 INSTR LOCAL NoMetaUpdate call    _fread 
@@ -2976,7 +2976,7 @@
             4025ea      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R12 R14 XMM0 XMM1 XMM2 XMM3 XMM4 ZZ mov     r8, rbp 
             4025ed      3 INSTR BELONGTO 4024e0 
             4025ed      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R14 XMM0 XMM1 XMM2 XMM3 XMM4 ZZ mov     rcx, rbx 
-            4025f0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4025f0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4025f0      5 INSTR BELONGTO 4024e0 
             4025f0      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R14 XMM0 XMM1 XMM2 XMM3 XMM4 ZZ mov     edx, 1 
             4025f5      3 INSTR BELONGTO 4024e0 
@@ -3033,7 +3033,7 @@
             40264c      5 PTRIMMEDESP STACK 104 displ lea     rdi, [rsp+1498h+var_1430]
             402651      2 INSTR BELONGTO 4024e0 
             402651      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R9 ZZ xor     edx, edx 
-            402651     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            402651     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             402653      3 INSTR BELONGTO 4024e0 
             402653      3 INSTR DEADREGS  EFLAGS RCX RSI R8 R9 ZZ mov     r9, r12 
             402656      3 INSTR BELONGTO 4024e0 
@@ -3347,7 +3347,7 @@
             4028f9      4 INSTR BELONGTO 4024e0 
             4028fd      5 INSTR BELONGTO 4024e0 
             4028fd      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 R13 R14 R15 ZZ mov     edx, offset a6_3f16_3fBitsB; "%6.3f:1, %6.3f bits/byte, %5.2f%% saved"... 
-            402902     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402902     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402902      5 INSTR BELONGTO 4024e0 
             402902      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 R14 R15 ZZ mov     esi, 1 
             402907     -1 INSTR LOCAL MetadataRedundant mov     eax, 3 
@@ -3396,10 +3396,10 @@
             402957      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 ZZ retn 
             402958      7 INSTR BELONGTO 4024e0 
             402958      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 ZZ mov     rcx, cs:stderr  ; s 
-            40295f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 15h        ; n 
+            40295f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 15h        ; n 
             40295f      5 INSTR BELONGTO 4024e0 
             40295f      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 ZZ mov     edx, 15h        ; n 
-            402964     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402964     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402964      5 INSTR BELONGTO 4024e0 
             402964      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 ZZ mov     esi, 1          ; size 
             402969      5 INSTR BELONGTO 4024e0 
@@ -3438,7 +3438,7 @@
             402997      8 PTRIMMEDESP STACK 10040 displ mov     [rsp+2758h+var_20], rax
             40299f      2 INSTR BELONGTO 402980 
             40299f      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            40299f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40299f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4029a1      8 INSTR BELONGTO 402980 
             4029a1      8 INSTR DEADREGS  EFLAGS R12 ZZ mov     [rsp+2758h+var_273C], 0 
             4029a1      8 PTRIMMEDESP STACK 28 displ mov     [rsp+2758h+var_273C], 0
@@ -3454,7 +3454,7 @@
             4029b6      5 PTRIMMEDESP STACK 28 displ mov     r9d, [rsp+2758h+var_273C]
             4029bb     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
             4029bb      2 INSTR BELONGTO 402980 
-            4029bd     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movzx   ecx, cs:byte_607AF4 
+            4029bd     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movzx   ecx, cs:byte_607AF4 
             4029bd      7 INSTR BELONGTO 402980 
             4029bd      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 ZZ movzx   ecx, cs:byte_607AF4 
             4029c4      6 INSTR BELONGTO 402980 
@@ -3497,7 +3497,7 @@
             402a09      5 INSTR BELONGTO 402980 
             402a09      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ lea     rdi, [rsp+2758h+var_2744] 
             402a09      5 PTRIMMEDESP STACK 20 displ lea     rdi, [rsp+2758h+var_2744]
-            402a0e     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1388h 
+            402a0e     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1388h 
             402a0e      5 INSTR BELONGTO 402980 
             402a0e      5 INSTR DEADREGS  EFLAGS RCX RSI ZZ mov     ecx, 1388h 
             402a13      3 INSTR BELONGTO 402980 
@@ -3568,7 +3568,7 @@
             402a81      3 INSTR BELONGTO 402980 
             402a84     -1 INSTR LOCAL NoMetaUpdate jnz     loc_402C4F 
             402a84      6 INSTR BELONGTO 402980 
-            402a8a     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rsp+2758h+var_273C] 
+            402a8a     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rsp+2758h+var_273C] 
             402a8a      4 INSTR BELONGTO 402980 
             402a8a      4 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ mov     eax, [rsp+2758h+var_273C] 
             402a8a      4 PTRIMMEDESP STACK 28 displ mov     eax, [rsp+2758h+var_273C]
@@ -3585,8 +3585,8 @@
             402a9a      4 INSTR BELONGTO 402980 
             402a9e      2 INSTR BELONGTO 402980 
             402a9e      2 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ xor     eax, eax 
-            402a9e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            402aa0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [rcx+rax] 
+            402a9e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            402aa0     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [rcx+rax] 
             402aa0      4 INSTR BELONGTO 402980 
             402aa0      4 INSTR DEADREGS  EFLAGS RDX RDI ZZ movzx   edx, byte ptr [rcx+rax] 
             402aa4      7 INSTR BELONGTO 402980 
@@ -3642,12 +3642,12 @@
             402b05      6 INSTR DEADREGS  EFLAGS RAX RDX RSI R8 R12 ZZ mov     r8d, offset dest 
             402b0b      5 INSTR BELONGTO 402980 
             402b0b      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 ZZ mov     edx, offset aSS ; "%s: %s: " 
-            402b10     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402b10     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402b10      5 INSTR BELONGTO 402980 
             402b10      5 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ mov     esi, 1 
             402b15      2 INSTR BELONGTO 402980 
             402b15      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            402b15     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402b15     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402b17     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             402b17      5 INSTR BELONGTO 402980 
             402b17      5 INSTR DEADREGS  EFLAGS R12 ZZ call    ___fprintf_chk 
@@ -3661,17 +3661,17 @@
             402b26      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ call    sub_402090      ; jumptable 0000000000402A58 case 0 
             402b2b      7 INSTR BELONGTO 402980 
             402b2b      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; jumptable 0000000000402A58 case 2 
-            402b32     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 17h        ; n 
+            402b32     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 17h        ; n 
             402b32      5 INSTR BELONGTO 402980 
             402b32      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 17h        ; n 
-            402b37     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402b37     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402b37      5 INSTR BELONGTO 402980 
             402b37      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 1          ; size 
             402b3c      5 INSTR BELONGTO 402980 
             402b3c      5 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     edi, offset aFileEndsUnexpe; "file ends unexpectedly\n" 
             402b41      2 INSTR BELONGTO 402980 
             402b41      2 INSTR DEADREGS  EFLAGS RBX R12 ZZ xor     ebx, ebx 
-            402b41     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            402b41     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             402b43     -1 INSTR LOCAL NoMetaUpdate call    _fwrite 
             402b43      5 INSTR BELONGTO 402980 
             402b43      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _fwrite 
@@ -3683,7 +3683,7 @@
             402b50      9 INSTR BELONGTO 402980 
             402b59      2 INSTR BELONGTO 402980 
             402b59      2 INSTR DEADREGS  RAX R12 ZZ mov     eax, ebx 
-            402b59     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            402b59     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             402b5b     -1 INSTR LOCAL NoMetaUpdate jnz     loc_402C4A 
             402b5b      6 INSTR BELONGTO 402980 
             402b61     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 2740h 
@@ -3712,17 +3712,17 @@
             402b81      2 INSTR BELONGTO 402980 
             402b83     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_607B18, 0 
             402b83      7 INSTR BELONGTO 402980 
-            402b8a     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            402b8a     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             402b8a      5 INSTR BELONGTO 402980 
             402b8a      5 INSTR DEADREGS  RDX RBX R12 ZZ mov     ebx, 1 
             402b8f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_402B48 
             402b8f      2 INSTR BELONGTO 402980 
             402b91      7 INSTR BELONGTO 402980 
             402b91      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; s 
-            402b98     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 23h        ; n 
+            402b98     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 23h        ; n 
             402b98      5 INSTR BELONGTO 402980 
             402b98      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 23h        ; n 
-            402b9d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402b9d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402b9d      5 INSTR BELONGTO 402980 
             402b9d      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 1          ; size 
             402ba2      5 INSTR BELONGTO 402980 
@@ -3734,17 +3734,17 @@
             402bac      2 INSTR BELONGTO 402980 
             402bae      7 INSTR BELONGTO 402980 
             402bae      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; jumptable 0000000000402A58 case 5 
-            402bb5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 23h        ; n 
+            402bb5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 23h        ; n 
             402bb5      5 INSTR BELONGTO 402980 
             402bb5      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 23h        ; n 
-            402bba     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402bba     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402bba      5 INSTR BELONGTO 402980 
             402bba      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 1          ; size 
             402bbf      5 INSTR BELONGTO 402980 
             402bbf      5 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     edi, offset aDataIntegrityC; "data integrity (CRC) error in data\n" 
             402bc4      2 INSTR BELONGTO 402980 
             402bc4      2 INSTR DEADREGS  EFLAGS RBX R12 ZZ xor     ebx, ebx 
-            402bc4     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            402bc4     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             402bc6     -1 INSTR LOCAL NoMetaUpdate call    _fwrite 
             402bc6      5 INSTR BELONGTO 402980 
             402bc6      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _fwrite 
@@ -3755,17 +3755,17 @@
             402bd0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R12 ZZ call    sub_402380      ; jumptable 0000000000402A58 case 6 
             402bd5      7 INSTR BELONGTO 402980 
             402bd5      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; s 
-            402bdc     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2Dh        ; n 
+            402bdc     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2Dh        ; n 
             402bdc      5 INSTR BELONGTO 402980 
             402bdc      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 2Dh        ; n 
-            402be1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402be1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402be1      5 INSTR BELONGTO 402980 
             402be1      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 1          ; size 
             402be6      5 INSTR BELONGTO 402980 
             402be6      5 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     edi, offset aBadMagicNumber; "bad magic number (file not created by b"... 
             402beb      2 INSTR BELONGTO 402980 
             402beb      2 INSTR DEADREGS  EFLAGS RBX R12 ZZ xor     ebx, ebx 
-            402beb     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            402beb     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             402bed     -1 INSTR LOCAL NoMetaUpdate call    _fwrite 
             402bed      5 INSTR BELONGTO 402980 
             402bed      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _fwrite 
@@ -3791,17 +3791,17 @@
             402c12      6 INSTR BELONGTO 402980 
             402c18     -1 INSTR LOCAL NoMetaUpdate cmp     cs:dword_6076CC, 1 
             402c18      7 INSTR BELONGTO 402980 
-            402c1f     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            402c1f     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             402c1f      5 INSTR BELONGTO 402980 
             402c1f      5 INSTR DEADREGS  RDX RBX R12 ZZ mov     ebx, 1 
             402c24     -1 INSTR LOCAL NoMetaUpdate jle     loc_402B48 
             402c24      6 INSTR BELONGTO 402980 
             402c2a      7 INSTR BELONGTO 402980 
             402c2a      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; s 
-            402c31     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; n 
+            402c31     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; n 
             402c31      5 INSTR BELONGTO 402980 
             402c31      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 5          ; n 
-            402c36     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402c36     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402c36      5 INSTR BELONGTO 402980 
             402c36      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 1          ; size 
             402c3b      5 INSTR BELONGTO 402980 
@@ -3852,7 +3852,7 @@
             402c7f      8 PTRIMMEDESP STACK 10040 displ mov     [rsp+2768h+var_30], rax
             402c87      2 INSTR BELONGTO 402c60 
             402c87      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            402c87     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402c87     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402c89      8 INSTR BELONGTO 402c60 
             402c89      8 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     [rsp+2768h+var_274C], 0 
             402c89      8 PTRIMMEDESP STACK 28 displ mov     [rsp+2768h+var_274C], 0
@@ -3877,7 +3877,7 @@
             402cae      5 PTRIMMEDESP STACK 28 displ mov     r9d, [rsp+2768h+var_274C]
             402cb3     -1 INSTR LOCAL MetadataUnused xor     r12d, r12d 
             402cb3      3 INSTR BELONGTO 402c60 
-            402cb6     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movzx   ecx, cs:byte_607AF4 
+            402cb6     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movzx   ecx, cs:byte_607AF4 
             402cb6      7 INSTR BELONGTO 402c60 
             402cb6      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 ZZ movzx   ecx, cs:byte_607AF4 
             402cbd      6 INSTR BELONGTO 402c60 
@@ -3915,7 +3915,7 @@
             402cfd      5 INSTR BELONGTO 402c60 
             402cfd      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ lea     rdi, [rsp+2768h+var_2754] 
             402cfd      5 PTRIMMEDESP STACK 20 displ lea     rdi, [rsp+2768h+var_2754]
-            402d02     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1388h 
+            402d02     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1388h 
             402d02      5 INSTR BELONGTO 402c60 
             402d02      5 INSTR DEADREGS  EFLAGS RCX RSI ZZ mov     ecx, 1388h 
             402d07      3 INSTR BELONGTO 402c60 
@@ -3950,7 +3950,7 @@
             402d2e      3 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ movsxd  rdx, eax        ; n 
             402d31      3 INSTR BELONGTO 402c60 
             402d31      3 INSTR DEADREGS  EFLAGS RCX RSI ZZ mov     rcx, rbx        ; s 
-            402d34     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402d34     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402d34      5 INSTR BELONGTO 402c60 
             402d34      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1          ; size 
             402d39     -1 INSTR LOCAL NoMetaUpdate call    _fwrite 
@@ -3996,7 +3996,7 @@
             402d7a      2 INSTR BELONGTO 402c60 
             402d7c     -1 INSTR LOCAL NoMetaUpdate jnz     loc_403067 
             402d7c      6 INSTR BELONGTO 402c60 
-            402d82     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rsp+2768h+var_274C] 
+            402d82     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rsp+2768h+var_274C] 
             402d82      4 INSTR BELONGTO 402c60 
             402d82      4 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ mov     eax, [rsp+2768h+var_274C] 
             402d82      4 PTRIMMEDESP STACK 28 displ mov     eax, [rsp+2768h+var_274C]
@@ -4013,9 +4013,9 @@
             402d92      4 INSTR BELONGTO 402c60 
             402d96      2 INSTR BELONGTO 402c60 
             402d96      2 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ xor     eax, eax 
-            402d96     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402d96     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402d98      8 INSTR BELONGTO 402c60 
-            402da0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [rcx+rax] 
+            402da0     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [rcx+rax] 
             402da0      4 INSTR BELONGTO 402c60 
             402da0      4 INSTR DEADREGS  EFLAGS RDX RDI ZZ movzx   edx, byte ptr [rcx+rax] 
             402da4      7 INSTR BELONGTO 402c60 
@@ -4104,10 +4104,10 @@
             402e38      5 PTRIMMEDESP STACK 32 displ lea     rdi, [rsp+2768h+ptr]; ptr
             402e3d      3 INSTR BELONGTO 402c60 
             402e3d      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R13 ZZ mov     rcx, rbp        ; stream 
-            402e40     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1388h      ; n 
+            402e40     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1388h      ; n 
             402e40      5 INSTR BELONGTO 402c60 
             402e40      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 ZZ mov     edx, 1388h      ; n 
-            402e45     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402e45     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402e45      5 INSTR BELONGTO 402c60 
             402e45      5 INSTR DEADREGS  EFLAGS RSI R12 R13 ZZ mov     esi, 1          ; size 
             402e4a     -1 INSTR LOCAL NoMetaUpdate call    _fread 
@@ -4137,7 +4137,7 @@
             402e6c      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 ZZ movsxd  rdx, r12d       ; n 
             402e6f      3 INSTR BELONGTO 402c60 
             402e6f      3 INSTR DEADREGS  EFLAGS RCX RSI R12 R13 ZZ mov     rcx, rbx        ; s 
-            402e72     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402e72     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402e72      5 INSTR BELONGTO 402c60 
             402e72      5 INSTR DEADREGS  EFLAGS RSI R12 R13 ZZ mov     esi, 1          ; size 
             402e77     -1 INSTR LOCAL NoMetaUpdate call    _fwrite 
@@ -4234,17 +4234,17 @@
             402f16      7 INSTR BELONGTO 402c60 
             402f1d     11 INSTR BELONGTO 402c60 
             402f1d     11 INSTR DEADREGS  RDX RBX R12 R13 ZZ mov     cs:stream, 0 
-            402f28     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            402f28     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             402f28      5 INSTR BELONGTO 402c60 
             402f28      5 INSTR DEADREGS  RDX RBX R12 R13 ZZ mov     ebx, 1 
             402f2d     -1 INSTR LOCAL NoMetaUpdate jle     short loc_402F4A 
             402f2d      2 INSTR BELONGTO 402c60 
             402f2f      7 INSTR BELONGTO 402c60 
             402f2f      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 ZZ mov     rcx, cs:stderr  ; s 
-            402f36     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; n 
+            402f36     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; n 
             402f36      5 INSTR BELONGTO 402c60 
             402f36      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     edx, 5          ; n 
-            402f3b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402f3b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402f3b      5 INSTR BELONGTO 402c60 
             402f3b      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, 1          ; size 
             402f40      5 INSTR BELONGTO 402c60 
@@ -4260,7 +4260,7 @@
             402f52      9 INSTR BELONGTO 402c60 
             402f5b      2 INSTR BELONGTO 402c60 
             402f5b      2 INSTR DEADREGS  RAX R12 R13 ZZ mov     eax, ebx 
-            402f5b     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            402f5b     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             402f5d     -1 INSTR LOCAL NoMetaUpdate jnz     loc_403071 
             402f5d      6 INSTR BELONGTO 402c60 
             402f63     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 2748h 
@@ -4288,12 +4288,12 @@
             402f82      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R12 R13 ZZ mov     rcx, cs:s 
             402f89      5 INSTR BELONGTO 402c60 
             402f89      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 R13 ZZ mov     edx, offset aSDataIntegrity; "\n%s: Data integrity error when decompr"... 
-            402f8e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402f8e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402f8e      5 INSTR BELONGTO 402c60 
             402f8e      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 ZZ mov     esi, 1 
             402f93      2 INSTR BELONGTO 402c60 
             402f93      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-            402f93     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402f93     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402f95     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             402f95      5 INSTR BELONGTO 402c60 
             402f95      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    ___fprintf_chk 
@@ -4303,7 +4303,7 @@
             402f9f     -1 INSTR LOCAL NoMetaUpdate call    sub_402310 
             402f9f      5 INSTR BELONGTO 402c60 
             402f9f      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ call    sub_402310 
-            402fa4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            402fa4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             402fa4      5 INSTR BELONGTO 402c60 
             402fa4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ mov     edi, 2 
             402fa9     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -4329,14 +4329,14 @@
             402fcb      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _fclose 
             402fd0      2 INSTR BELONGTO 402c60 
             402fd0      2 INSTR DEADREGS  EFLAGS RAX RDX RBX R13 ZZ xor     ebx, ebx 
-            402fd0     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            402fd0     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             402fd2     -1 INSTR LOCAL NoMetaUpdate cmp     r12d, 1 
             402fd2      4 INSTR BELONGTO 402c60 
             402fd6     -1 INSTR LOCAL NoMetaUpdate jz      loc_402F4A 
             402fd6      6 INSTR BELONGTO 402c60 
             402fdc     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_607B18, 0 
             402fdc      7 INSTR BELONGTO 402c60 
-            402fe3     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            402fe3     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             402fe3      5 INSTR BELONGTO 402c60 
             402fe3      5 INSTR DEADREGS  RAX RDX RBX R12 R13 ZZ mov     ebx, 1 
             402fe8     -1 INSTR LOCAL NoMetaUpdate jz      loc_402F4A 
@@ -4349,12 +4349,12 @@
             402ffc      6 INSTR DEADREGS  EFLAGS RAX RDX RSI R8 R12 R13 ZZ mov     r8d, offset dest 
             403002      5 INSTR BELONGTO 402c60 
             403002      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 ZZ mov     edx, offset aSSTrailingGarb; "\n%s: %s: trailing garbage after EOF ig"... 
-            403007     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403007     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403007      5 INSTR BELONGTO 402c60 
             403007      5 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 ZZ mov     esi, 1 
             40300c      2 INSTR BELONGTO 402c60 
             40300c      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            40300c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40300c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40300e     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40300e      5 INSTR BELONGTO 402c60 
             40300e      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    ___fprintf_chk 
@@ -4364,7 +4364,7 @@
             403018      7 INSTR BELONGTO 402c60 
             40301f     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_403030 
             40301f      2 INSTR BELONGTO 402c60 
-            403021     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            403021     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             403021      5 INSTR BELONGTO 402c60 
             403021      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ mov     edi, 2 
             403026     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -4379,12 +4379,12 @@
             403037      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 ZZ mov     rdi, cs:stderr 
             40303e      5 INSTR BELONGTO 402c60 
             40303e      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 R13 ZZ mov     edx, offset aSCompressedFil; "\n%s: Compressed file ends unexpectedly"... 
-            403043     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403043     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403043      5 INSTR BELONGTO 402c60 
             403043      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 ZZ mov     esi, 1 
             403048      2 INSTR BELONGTO 402c60 
             403048      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-            403048     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403048     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40304a     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40304a      5 INSTR BELONGTO 402c60 
             40304a      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    ___fprintf_chk 
@@ -4439,7 +4439,7 @@
             4030a4      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rsi, rbx        ; src 
             4030a7      3 INSTR BELONGTO 403080 
             4030a7      3 INSTR DEADREGS  EFLAGS RDX RBX RDI ZZ mov     rdi, rbp        ; dest 
-            4030aa     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 400h       ; n 
+            4030aa     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 400h       ; n 
             4030aa      5 INSTR BELONGTO 403080 
             4030aa      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 400h       ; n 
             4030af     -1 INSTR LOCAL NoMetaUpdate call    _strncpy 
@@ -4462,7 +4462,7 @@
             4030ca      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 ZZ mov     rdi, cs:stderr 
             4030d1      2 INSTR BELONGTO 403080 
             4030d1      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 ZZ xor     eax, eax 
-            4030d1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4030d1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4030d3     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 400h 
             4030d3      6 INSTR BELONGTO 403080 
             4030d3      6 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 ZZ mov     r8d, 400h 
@@ -4470,7 +4470,7 @@
             4030d9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ mov     rcx, rbx 
             4030dc      5 INSTR BELONGTO 403080 
             4030dc      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, offset aBzip2FileNameS; "bzip2: file name\n`%s'\nis suspiciously"... 
-            4030e1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4030e1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4030e1      5 INSTR BELONGTO 403080 
             4030e1      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             4030e6     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -4523,7 +4523,7 @@
             403132      2 INSTR BELONGTO 403110 
             403134      2 INSTR BELONGTO 403110 
             403134      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ xor     edi, edi 
-            403134     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403134     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403136     -1 INSTR LOCAL NoMetaUpdate call    sub_403110 
             403136      5 INSTR BELONGTO 403110 
             403136      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_403110 
@@ -4540,7 +4540,7 @@
             403147      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
             403148      1 INSTR BELONGTO 403110 
             403148      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-            403149     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h        ; size 
+            403149     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h        ; size 
             403149      5 INSTR BELONGTO 403110 
             403149      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 10h        ; size 
             40314e      5 INSTR BELONGTO 403110 
@@ -4570,7 +4570,7 @@
             40317c     -1 INSTR LOCAL NoMetaUpdate call    _strlen 
             40317c      5 INSTR BELONGTO 403110 
             40317c      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _strlen 
-            403181     -2 INSTR LOCAL n EDI ZZ  NumericDEFs lea     edi, [rax+5] 
+            403181     -2 INSTR LOCAL n RDI ZZ  NumericDEFs lea     edi, [rax+5] 
             403181      3 INSTR BELONGTO 403110 
             403181      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ lea     edi, [rax+5] 
             403184     -1 INSTR LOCAL MetadataRedundant movsxd  rdi, edi        ; size 
@@ -4666,7 +4666,7 @@
             403209      2 INSTR BELONGTO 4031b0 
             40320b      2 INSTR BELONGTO 4031b0 
             40320b      2 INSTR DEADREGS  EFLAGS ZZ xor     ebp, ebp 
-            40320b     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40320b     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40320d     -1 INSTR LOCAL NoMetaUpdate test    r14b, r14b 
             40320d      3 INSTR BELONGTO 4031b0 
             403210     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4031D7 
@@ -4693,16 +4693,16 @@
             403238      2 INSTR BELONGTO 4031b0 
             40323a     -1 INSTR LOCAL NoMetaUpdate cmp     ebp, 400h 
             40323a      6 INSTR BELONGTO 4031b0 
-            403240     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, r13d 
+            403240     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, r13d 
             403240      3 INSTR BELONGTO 4031b0 
             403240      3 INSTR DEADREGS  RAX RCX RDX RSI RDI R14 ZZ mov     ecx, r13d 
             403243     -1 INSTR LOCAL MetadataRedundant cmovle  ecx, ebp 
             403243      3 INSTR BELONGTO 4031b0 
             403246      2 INSTR BELONGTO 4031b0 
             403246      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R14 ZZ xor     eax, eax 
-            403246     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403246     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403248      8 INSTR BELONGTO 4031b0 
-            403250     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [rbx+rax] 
+            403250     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [rbx+rax] 
             403250      4 INSTR BELONGTO 4031b0 
             403250      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 ZZ movzx   edx, byte ptr [rbx+rax] 
             403254      6 INSTR BELONGTO 4031b0 
@@ -4761,22 +4761,22 @@
             4032a5      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
             4032aa      2 INSTR BELONGTO 4032a0 
             4032aa      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ xor     eax, eax 
-            4032aa     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4032aa     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4032ac     24 DATAREF STACK 290 esp + 0 PARENT LocalFrame LOCALFRAME
             4032ac      4 INSTR BELONGTO 4032a0 
             4032ac      4 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ sub     rsp, 18h 
             4032ac      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
-            4032b0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 180h 
+            4032b0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 180h 
             4032b0      5 INSTR BELONGTO 4032a0 
             4032b0      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 180h 
-            4032b5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0C1h       ; oflag 
+            4032b5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0C1h       ; oflag 
             4032b5      5 INSTR BELONGTO 4032a0 
             4032b5      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 0C1h       ; oflag 
             4032ba      5 INSTR BELONGTO 4032a0 
             4032ba      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, offset file; file 
             4032bf      2 INSTR BELONGTO 4032a0 
             4032bf      2 INSTR DEADREGS  EFLAGS RBX ZZ xor     ebp, ebp 
-            4032bf     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            4032bf     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             4032c1     -1 INSTR LOCAL NoMetaUpdate call    _open64 
             4032c1      5 INSTR BELONGTO 4032a0 
             4032c1      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _open64 
@@ -4827,7 +4827,7 @@
             403310      8 MEMORYHOLE STACK esp + 152 ReturnAddress 
             403317      5 INSTR BELONGTO 403310 
             403317      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     esi, offset dest; filename 
-            40331c     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            40331c     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             40331c      5 INSTR BELONGTO 403310 
             40331c      5 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edi, 1          ; ver 
             403321      3 INSTR BELONGTO 403310 
@@ -4838,7 +4838,7 @@
             403324      5 INSTR DEADREGS  EFLAGS ZZ call    ___lxstat64 
             403329     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             403329      2 INSTR BELONGTO 403310 
-            40332b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40332b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40332b      5 INSTR BELONGTO 403310 
             40332b      5 INSTR DEADREGS  RAX RDX R8 R9 R10 R11 ZZ mov     edx, 1 
             403330     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_403343 
@@ -4849,12 +4849,12 @@
             403336      5 INSTR BELONGTO 403310 
             40333b     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 8000h 
             40333b      5 INSTR BELONGTO 403310 
-            403340     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setnz   dl 
+            403340     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setnz   dl 
             403340      3 INSTR BELONGTO 403310 
             403340      3 INSTR DEADREGS  RAX RDX R8 R9 R10 R11 ZZ setnz   dl 
             403343      2 INSTR BELONGTO 403310 
             403343      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, edx 
-            403343     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edx 
+            403343     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edx 
             403345     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 98h 
             403345      7 INSTR BELONGTO 403310 
             40334c    152 DEALLOC STACK esp - 152 retn
@@ -4871,7 +4871,7 @@
             403354      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset stat_buf; stat_buf 
             403359      5 INSTR BELONGTO 403350 
             403359      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset dest; filename 
-            40335e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            40335e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             40335e      5 INSTR BELONGTO 403350 
             40335e      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 1          ; ver 
             403363     -1 INSTR LOCAL NoMetaUpdate call    ___xstat64 
@@ -4944,7 +4944,7 @@
             4033cc      6 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ lea     eax, [rcx-1010101h] 
             4033d2      2 INSTR BELONGTO 4033c0 
             4033d2      2 INSTR DEADREGS  EFLAGS RBX RSI ZZ not     ecx 
-            4033d2     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM not     ecx 
+            4033d2     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM not     ecx 
             4033d4      2 INSTR BELONGTO 4033c0 
             4033d4      2 INSTR DEADREGS  EFLAGS RBX RSI ZZ and     eax, ecx 
             4033d6      5 INSTR BELONGTO 4033c0 
@@ -4953,7 +4953,7 @@
             4033db      2 INSTR BELONGTO 4033c0 
             4033dd      2 INSTR BELONGTO 4033c0 
             4033dd      2 INSTR DEADREGS  EFLAGS RCX RBX RSI ZZ mov     ecx, eax 
-            4033dd     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, eax 
+            4033dd     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, eax 
             4033df      6 INSTR BELONGTO 4033c0 
             4033df      6 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, cs:dword_607B04 
             4033e5     -1 INSTR LOCAL MetadataUnused mov     ebx, 1 
@@ -4984,7 +4984,7 @@
             403412      2 INSTR BELONGTO 4033c0 
             403414      7 INSTR BELONGTO 4033c0 
             403414      7 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, cs:stderr  ; stream 
-            40341b     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 20h        ; c 
+            40341b     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 20h        ; c 
             40341b      5 INSTR BELONGTO 4033c0 
             40341b      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 20h        ; c 
             403420     -1 INSTR LOCAL MetadataUnused add     ebx, 1 
@@ -5004,7 +5004,7 @@
             403439      6 INSTR DEADREGS  EFLAGS RAX ZZ lea     eax, [rcx-1010101h] 
             40343f      2 INSTR BELONGTO 4033c0 
             40343f      2 INSTR DEADREGS  EFLAGS ZZ not     ecx 
-            40343f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM not     ecx 
+            40343f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM not     ecx 
             403441      2 INSTR BELONGTO 4033c0 
             403441      2 INSTR DEADREGS  EFLAGS ZZ and     eax, ecx 
             403443      5 INSTR BELONGTO 4033c0 
@@ -5013,7 +5013,7 @@
             403448      2 INSTR BELONGTO 4033c0 
             40344a      2 INSTR BELONGTO 4033c0 
             40344a      2 INSTR DEADREGS  EFLAGS RCX ZZ mov     ecx, eax 
-            40344a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, eax 
+            40344a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, eax 
             40344c     -1 INSTR LOCAL MetadataRedundant shr     ecx, 10h 
             40344c      3 INSTR BELONGTO 4033c0 
             40344f     -1 INSTR LOCAL NoMetaUpdate test    eax, 8080h 
@@ -5169,7 +5169,7 @@
             40356f      4 INSTR BELONGTO 403480 
             403573     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40354C 
             403573      2 INSTR BELONGTO 403480 
-            403575     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40Ah 
+            403575     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40Ah 
             403575      5 INSTR BELONGTO 403480 
             403575      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 40Ah 
             40357a      5 INSTR BELONGTO 403480 
@@ -5223,7 +5223,7 @@
             4035f4      6 INSTR DEADREGS  EFLAGS RAX RDI ZZ lea     eax, [rdx-1010101h] 
             4035fa      2 INSTR BELONGTO 403480 
             4035fa      2 INSTR DEADREGS  EFLAGS RDI ZZ not     edx 
-            4035fa     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM not     edx 
+            4035fa     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM not     edx 
             4035fc      2 INSTR BELONGTO 403480 
             4035fc      2 INSTR DEADREGS  EFLAGS RDI ZZ and     eax, edx 
             4035fe      5 INSTR BELONGTO 403480 
@@ -5232,7 +5232,7 @@
             403603      2 INSTR BELONGTO 403480 
             403605      2 INSTR BELONGTO 403480 
             403605      2 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edx, eax 
-            403605     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, eax 
+            403605     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, eax 
             403607      3 INSTR BELONGTO 403480 
             403607      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, r12        ; s 
             40360a     -1 INSTR LOCAL MetadataRedundant shr     edx, 10h 
@@ -5258,7 +5258,7 @@
             40362f      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     rsi, rbx 
             403632     -1 INSTR LOCAL 2ndSrcNumeric sub     rbp, rax 
             403632      3 INSTR BELONGTO 403480 
-            403635     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40Ah 
+            403635     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40Ah 
             403635      5 INSTR BELONGTO 403480 
             403635      5 INSTR DEADREGS  EFLAGS RDX RBX RDI R12 ZZ mov     edx, 40Ah 
             40363a      5 INSTR BELONGTO 403480 
@@ -5304,12 +5304,12 @@
             403696      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R12 ZZ mov     ecx, offset dest 
             40369b      5 INSTR BELONGTO 403480 
             40369b      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 ZZ mov     edx, offset aS  ; "  %s: " 
-            4036a0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4036a0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4036a0      5 INSTR BELONGTO 403480 
             4036a0      5 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ mov     esi, 1 
             4036a5      2 INSTR BELONGTO 403480 
             4036a5      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            4036a5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4036a5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4036a7     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4036a7      5 INSTR BELONGTO 403480 
             4036a7      5 INSTR DEADREGS  EFLAGS R12 ZZ call    ___fprintf_chk 
@@ -5352,10 +5352,10 @@
             403701      2 INSTR BELONGTO 403480 
             403703      7 INSTR BELONGTO 403480 
             403703      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; s 
-            40370a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; n 
+            40370a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; n 
             40370a      5 INSTR BELONGTO 403480 
             40370a      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 5          ; n 
-            40370f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            40370f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             40370f      5 INSTR BELONGTO 403480 
             40370f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 1          ; size 
             403714      5 INSTR BELONGTO 403480 
@@ -5395,10 +5395,10 @@
             403767      6 INSTR BELONGTO 403480 
             40376d      7 INSTR BELONGTO 403480 
             40376d      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; s 
-            403774     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 12h        ; n 
+            403774     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 12h        ; n 
             403774      5 INSTR BELONGTO 403480 
             403774      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 12h        ; n 
-            403779     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            403779     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             403779      5 INSTR BELONGTO 403480 
             403779      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 1          ; size 
             40377e      5 INSTR BELONGTO 403480 
@@ -5457,12 +5457,12 @@
             4037e1      6 INSTR DEADREGS  EFLAGS RAX RDX RSI R8 R12 ZZ mov     r8d, offset dest 
             4037e7      5 INSTR BELONGTO 403480 
             4037e7      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 ZZ mov     edx, offset aSCanTOpenInput; "%s: Can't open input file %s: %s.\n" 
-            4037ec     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4037ec     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4037ec      5 INSTR BELONGTO 403480 
             4037ec      5 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ mov     esi, 1 
             4037f1      2 INSTR BELONGTO 403480 
             4037f1      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            4037f1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4037f1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4037f3     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4037f3      5 INSTR BELONGTO 403480 
             4037f3      5 INSTR DEADREGS  EFLAGS R12 ZZ call    ___fprintf_chk 
@@ -5526,8 +5526,8 @@
             403871      7 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 ZZ mov     rdi, cs:stderr 
             403878      2 INSTR BELONGTO 403480 
             403878      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 ZZ xor     eax, eax 
-            403878     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            40387a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403878     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            40387a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40387a      5 INSTR BELONGTO 403480 
             40387a      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 1 
             40387f     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -5549,14 +5549,14 @@
             4038af      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R12 ZZ mov     rdi, cs:stderr 
             4038b6      2 INSTR BELONGTO 403480 
             4038b6      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 R9 R12 ZZ xor     eax, eax 
-            4038b6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4038b6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4038b8      6 INSTR BELONGTO 403480 
             4038b8      6 INSTR DEADREGS  EFLAGS RDX RBX RSI R8 R9 R12 ZZ mov     r9d, offset file 
             4038be      6 INSTR BELONGTO 403480 
             4038be      6 INSTR DEADREGS  EFLAGS RDX RBX RSI R8 R12 ZZ mov     r8d, offset dest 
             4038c4      5 INSTR BELONGTO 403480 
             4038c4      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 ZZ mov     edx, offset aSCanTGuessOrig; "%s: Can't guess original name for %s --"... 
-            4038c9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4038c9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4038c9      5 INSTR BELONGTO 403480 
             4038c9      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 1 
             4038ce     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -5609,7 +5609,7 @@
             403940      5 PTRIMMEDESP STACK 16 displ lea     rdx, [rsp+148h+stat_buf]; stat_buf
             403945      5 INSTR BELONGTO 403480 
             403945      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset dest; filename 
-            40394a     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            40394a     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             40394a      5 INSTR BELONGTO 403480 
             40394a      5 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     edi, 1          ; ver 
             40394f     -1 INSTR LOCAL NoMetaUpdate call    ___xstat64 
@@ -5659,12 +5659,12 @@
             4039be      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 R12 ZZ mov     r8d, offset dest 
             4039c4      5 INSTR BELONGTO 403480 
             4039c4      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 ZZ mov     edx, offset byte_404723 
-            4039c9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4039c9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4039c9      5 INSTR BELONGTO 403480 
             4039c9      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 ZZ mov     esi, 1 
             4039ce      2 INSTR BELONGTO 403480 
             4039ce      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            4039ce     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4039ce     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4039d0     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4039d0      5 INSTR BELONGTO 403480 
             4039d0      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    ___fprintf_chk 
@@ -5675,7 +5675,7 @@
             4039e0      8 PTRIMMEDESP STACK 160 displ lea     rdx, [rsp+148h+var_A8]; stat_buf
             4039e8      5 INSTR BELONGTO 403480 
             4039e8      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset dest; filename 
-            4039ed     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            4039ed     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             4039ed      5 INSTR BELONGTO 403480 
             4039ed      5 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     edi, 1          ; ver 
             4039f2     -1 INSTR LOCAL NoMetaUpdate call    ___lxstat64 
@@ -5709,12 +5709,12 @@
             403a34      4 INSTR BELONGTO 403480 
             403a34      4 INSTR DEADREGS  EFLAGS RDX RBX RSI R8 R12 ZZ mov     [rsp+148h+var_148], rax 
             403a34      4 PTRIMMEDESP STACK 0 displ mov     [rsp+148h+var_148], rax
-            403a38     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403a38     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403a38      5 INSTR BELONGTO 403480 
             403a38      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 R12 ZZ mov     esi, 1 
             403a3d      2 INSTR BELONGTO 403480 
             403a3d      2 INSTR DEADREGS  EFLAGS RAX RDX RBX R8 R12 ZZ xor     eax, eax 
-            403a3d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403a3d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403a3f      6 INSTR BELONGTO 403480 
             403a3f      6 INSTR DEADREGS  EFLAGS RDX RBX R8 R12 ZZ mov     r8d, offset dest 
             403a45      5 INSTR BELONGTO 403480 
@@ -5740,12 +5740,12 @@
             403a87      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 ZZ mov     rdi, cs:stderr 
             403a8e      5 INSTR BELONGTO 403480 
             403a8e      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 ZZ mov     edx, offset aSIWonTReadComp; "%s: I won't read compressed data from a"... 
-            403a93     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403a93     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403a93      5 INSTR BELONGTO 403480 
             403a93      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 ZZ mov     esi, 1 
             403a98      2 INSTR BELONGTO 403480 
             403a98      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            403a98     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403a98     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403a9a     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             403a9a      5 INSTR BELONGTO 403480 
             403a9a      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    ___fprintf_chk 
@@ -5759,8 +5759,8 @@
             403aae      7 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 ZZ mov     rdi, cs:stderr 
             403ab5      2 INSTR BELONGTO 403480 
             403ab5      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 ZZ xor     eax, eax 
-            403ab5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            403ab7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403ab5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            403ab7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403ab7      5 INSTR BELONGTO 403480 
             403ab7      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 1 
             403abc     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -5853,10 +5853,10 @@
             403b9d      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 R12 ZZ mov     r8d, offset file 
             403ba3      2 INSTR BELONGTO 403480 
             403ba3      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 ZZ xor     eax, eax 
-            403ba3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403ba3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403ba5      5 INSTR BELONGTO 403480 
             403ba5      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 ZZ mov     edx, offset aSCanTCreateOut; "%s: Can't create output file %s: %s.\n" 
-            403baa     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403baa     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403baa      5 INSTR BELONGTO 403480 
             403baa      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 1 
             403baf     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -5881,12 +5881,12 @@
             403bd8      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 R12 ZZ mov     r8d, offset dest 
             403bde      5 INSTR BELONGTO 403480 
             403bde      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 ZZ mov     edx, offset aSInputFileSIsN; "%s: Input file %s is not a normal file."... 
-            403be3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403be3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403be3      5 INSTR BELONGTO 403480 
             403be3      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 ZZ mov     esi, 1 
             403be8      2 INSTR BELONGTO 403480 
             403be8      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            403be8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403be8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403bea     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             403bea      5 INSTR BELONGTO 403480 
             403bea      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    ___fprintf_chk 
@@ -5950,7 +5950,7 @@
             403c6a      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp        ; stat_buf
             403c6d      5 INSTR BELONGTO 403c00 
             403c6d      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset dest; filename 
-            403c72     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            403c72     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             403c72      5 INSTR BELONGTO 403c00 
             403c72      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 1          ; ver 
             403c77     -1 INSTR LOCAL NoMetaUpdate call    ___xstat64 
@@ -6001,12 +6001,12 @@
             403cdc      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ mov     ecx, offset dest 
             403ce1      5 INSTR BELONGTO 403c00 
             403ce1      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aS  ; "  %s: " 
-            403ce6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403ce6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403ce6      5 INSTR BELONGTO 403c00 
             403ce6      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             403ceb      2 INSTR BELONGTO 403c00 
             403ceb      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            403ceb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403ceb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403ced     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             403ced      5 INSTR BELONGTO 403c00 
             403ced      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -6037,10 +6037,10 @@
             403d26      2 INSTR BELONGTO 403c00 
             403d28      7 INSTR BELONGTO 403c00 
             403d28      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     rcx, cs:stderr  ; s 
-            403d2f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3          ; n 
+            403d2f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3          ; n 
             403d2f      5 INSTR BELONGTO 403c00 
             403d2f      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 3          ; n 
-            403d34     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            403d34     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             403d34      5 INSTR BELONGTO 403c00 
             403d34      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 1          ; size 
             403d39      5 INSTR BELONGTO 403c00 
@@ -6089,12 +6089,12 @@
             403d95      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     rdi, cs:stderr 
             403d9c      5 INSTR BELONGTO 403c00 
             403d9c      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     edx, offset aSIWonTReadComp; "%s: I won't read compressed data from a"... 
-            403da1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403da1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403da1      5 INSTR BELONGTO 403c00 
             403da1      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 1 
             403da6      2 INSTR BELONGTO 403c00 
             403da6      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            403da6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403da6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403da8     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             403da8      5 INSTR BELONGTO 403c00 
             403da8      5 INSTR DEADREGS  EFLAGS RBX ZZ call    ___fprintf_chk 
@@ -6108,8 +6108,8 @@
             403dbc      7 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     rdi, cs:stderr 
             403dc3      2 INSTR BELONGTO 403c00 
             403dc3      2 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ xor     eax, eax 
-            403dc3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            403dc5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403dc3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            403dc5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403dc5      5 INSTR BELONGTO 403c00 
             403dc5      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             403dca     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -6178,8 +6178,8 @@
             403e71      7 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     rdi, cs:stderr 
             403e78      2 INSTR BELONGTO 403c00 
             403e78      2 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ xor     eax, eax 
-            403e78     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            403e7a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403e78     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            403e7a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403e7a      5 INSTR BELONGTO 403c00 
             403e7a      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             403e7f     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -6331,7 +6331,7 @@
             403fb5     -1 INSTR LOCAL NoMetaUpdate call    sub_403080 
             403fb5      5 INSTR BELONGTO 403ef0 
             403fb5      5 INSTR DEADREGS  EFLAGS RBX ZZ call    sub_403080 
-            403fba     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40Ah 
+            403fba     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40Ah 
             403fba      5 INSTR BELONGTO 403ef0 
             403fba      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 40Ah 
             403fbf      5 INSTR BELONGTO 403ef0 
@@ -6374,10 +6374,10 @@
             40400c      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 ZZ mov     r8d, offset dest 
             404012      2 INSTR BELONGTO 403ef0 
             404012      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ xor     eax, eax 
-            404012     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404012     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404014      5 INSTR BELONGTO 403ef0 
             404014      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, offset aSCanTOpenInput; "%s: Can't open input file %s: %s.\n" 
-            404019     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            404019     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             404019      5 INSTR BELONGTO 403ef0 
             404019      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             40401e     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -6453,12 +6453,12 @@
             4040c0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ mov     ecx, offset dest 
             4040c5      5 INSTR BELONGTO 403ef0 
             4040c5      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aS  ; "  %s: " 
-            4040ca     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4040ca     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4040ca      5 INSTR BELONGTO 403ef0 
             4040ca      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             4040cf      2 INSTR BELONGTO 403ef0 
             4040cf      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4040cf     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4040cf     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4040d1     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4040d1      5 INSTR BELONGTO 403ef0 
             4040d1      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -6537,12 +6537,12 @@
             404179      6 INSTR DEADREGS  EFLAGS RAX RDX RSI R8 ZZ mov     r8d, offset dest 
             40417f      5 INSTR BELONGTO 403ef0 
             40417f      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSCanTOpenInput; "%s: Can't open input file %s: %s.\n" 
-            404184     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            404184     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             404184      5 INSTR BELONGTO 403ef0 
             404184      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             404189      2 INSTR BELONGTO 403ef0 
             404189      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            404189     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404189     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40418b     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40418b      5 INSTR BELONGTO 403ef0 
             40418b      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -6610,7 +6610,7 @@
             404210      5 PTRIMMEDESP STACK 16 displ lea     rdx, [rsp+148h+stat_buf]; stat_buf
             404215      5 INSTR BELONGTO 403ef0 
             404215      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset dest; filename 
-            40421a     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            40421a     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             40421a      5 INSTR BELONGTO 403ef0 
             40421a      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 1          ; ver 
             40421f     -1 INSTR LOCAL NoMetaUpdate call    ___xstat64 
@@ -6679,12 +6679,12 @@
             4042b8      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 ZZ mov     r8d, offset dest 
             4042be      5 INSTR BELONGTO 403ef0 
             4042be      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     edx, offset aSInputFileSIsN; "%s: Input file %s is not a normal file."... 
-            4042c3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4042c3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4042c3      5 INSTR BELONGTO 403ef0 
             4042c3      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 1 
             4042c8      2 INSTR BELONGTO 403ef0 
             4042c8      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            4042c8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4042c8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4042ca     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4042ca      5 INSTR BELONGTO 403ef0 
             4042ca      5 INSTR DEADREGS  EFLAGS RBX ZZ call    ___fprintf_chk 
@@ -6695,7 +6695,7 @@
             4042d8      8 PTRIMMEDESP STACK 160 displ lea     rdx, [rsp+148h+var_A8]; stat_buf
             4042e0      5 INSTR BELONGTO 403ef0 
             4042e0      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset dest; filename 
-            4042e5     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            4042e5     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             4042e5      5 INSTR BELONGTO 403ef0 
             4042e5      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 1          ; ver 
             4042ea     -1 INSTR LOCAL NoMetaUpdate call    ___lxstat64 
@@ -6733,10 +6733,10 @@
             404330      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 ZZ mov     r8d, offset dest 
             404336      2 INSTR BELONGTO 403ef0 
             404336      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ xor     eax, eax 
-            404336     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404336     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404338      5 INSTR BELONGTO 403ef0 
             404338      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, offset aSInputFileSHas; "%s: Input file %s has %d other link%s.\"... 
-            40433d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40433d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40433d      5 INSTR BELONGTO 403ef0 
             40433d      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             404342     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -6805,12 +6805,12 @@
             4043e7      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     rdi, cs:stderr 
             4043ee      5 INSTR BELONGTO 403ef0 
             4043ee      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     edx, offset aSIWonTWriteCom; "%s: I won't write compressed data to a "... 
-            4043f3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4043f3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4043f3      5 INSTR BELONGTO 403ef0 
             4043f3      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 1 
             4043f8      2 INSTR BELONGTO 403ef0 
             4043f8      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            4043f8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4043f8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4043fa     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4043fa      5 INSTR BELONGTO 403ef0 
             4043fa      5 INSTR DEADREGS  EFLAGS RBX ZZ call    ___fprintf_chk 
@@ -6824,8 +6824,8 @@
             40440e      7 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     rdi, cs:stderr 
             404415      2 INSTR BELONGTO 403ef0 
             404415      2 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ xor     eax, eax 
-            404415     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            404417     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            404415     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            404417     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             404417      5 INSTR BELONGTO 403ef0 
             404417      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             40441c     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -6845,12 +6845,12 @@
             40443f      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     rdi, cs:stderr 
             404446      5 INSTR BELONGTO 403ef0 
             404446      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     edx, offset aSIWonTWriteCom; "%s: I won't write compressed data to a "... 
-            40444b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40444b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40444b      5 INSTR BELONGTO 403ef0 
             40444b      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 1 
             404450      2 INSTR BELONGTO 403ef0 
             404450      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            404450     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404450     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404452     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             404452      5 INSTR BELONGTO 403ef0 
             404452      5 INSTR DEADREGS  EFLAGS RBX ZZ call    ___fprintf_chk 
@@ -6860,7 +6860,7 @@
             40445e      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 ZZ mov     rdi, cs:stderr 
             404465      2 INSTR BELONGTO 403ef0 
             404465      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 ZZ xor     eax, eax 
-            404465     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404465     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404467      5 INSTR BELONGTO 403ef0 
             404467      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R8 ZZ mov     edx, offset aSForHelpTypeSH; "%s: For help, type: `%s --help'.\n" 
             40446c     -1 INSTR LOCAL MetadataRedundant mov     esi, 1 
@@ -6891,12 +6891,12 @@
             4044a1      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 ZZ mov     r8d, offset dest 
             4044a7      5 INSTR BELONGTO 403ef0 
             4044a7      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     edx, offset aSInputFileSAlr; "%s: Input file %s already has %s suffix"... 
-            4044ac     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4044ac     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4044ac      5 INSTR BELONGTO 403ef0 
             4044ac      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 1 
             4044b1      2 INSTR BELONGTO 403ef0 
             4044b1      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            4044b1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4044b1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4044b3     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4044b3      5 INSTR BELONGTO 403ef0 
             4044b3      5 INSTR DEADREGS  EFLAGS RBX ZZ call    ___fprintf_chk 
@@ -6936,10 +6936,10 @@
             404508      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 ZZ mov     r8d, offset file 
             40450e      2 INSTR BELONGTO 403ef0 
             40450e      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ xor     eax, eax 
-            40450e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40450e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404510      5 INSTR BELONGTO 403ef0 
             404510      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, offset aSCanTCreateOut; "%s: Can't create output file %s: %s.\n" 
-            404515     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            404515     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             404515      5 INSTR BELONGTO 403ef0 
             404515      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             40451a     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -7004,7 +7004,7 @@
             404588      2 INSTR BELONGTO 404540 
             40458a      2 INSTR BELONGTO 404540 
             40458a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            40458a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40458a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40458c      4 INSTR BELONGTO 404540 
             404590      3 INSTR BELONGTO 404540 
             404590      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
diff --git a/tests/commit/trimmed-sorted-save-destripe.psexe.annot b/tests/commit/trimmed-sorted-save-destripe.psexe.annot
index ab6d1961..44f6164a 100644
--- a/tests/commit/trimmed-sorted-save-destripe.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-destripe.psexe.annot
@@ -654,7 +654,7 @@
             401c89      3 INSTR BELONGTO 401c80 
             401c8c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401CA0 
             401c8c      2 INSTR BELONGTO 401c80 
-            401c8e     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            401c8e     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             401c8e      5 INSTR BELONGTO 401c80 
             401c93     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             401c93      3 INSTR BELONGTO 401c80 
@@ -823,7 +823,7 @@
             401d96      3 PTRIMMEDEBP STACK -24 displ mov     [rbp+var_18], eax
             401d99     10 INSTR BELONGTO 401d41 
             401d99     10 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     cs:values_52902, 15h 
-            401da3     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rbp+var_14] 
+            401da3     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rbp+var_14] 
             401da3      3 INSTR BELONGTO 401d41 
             401da3      3 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     eax, [rbp+var_14] 
             401da3      3 PTRIMMEDEBP STACK -20 displ mov     eax, [rbp+var_14]
@@ -967,7 +967,7 @@
             401e7f      5 INSTR DEADREGS  EFLAGS ZZ call    _gimp_tile_width 
             401e84      2 INSTR BELONGTO 401d41 
             401e84      2 INSTR DEADREGS  EFLAGS ZZ add     eax, ebx 
-            401e86     -2 INSTR LOCAL n EBX ZZ  NumericDEFs lea     ebx, [rax-1] 
+            401e86     -2 INSTR LOCAL n RBX ZZ  NumericDEFs lea     ebx, [rax-1] 
             401e86      3 INSTR BELONGTO 401d41 
             401e86      3 INSTR DEADREGS  EFLAGS RBX ZZ lea     ebx, [rax-1] 
             401e89     -1 INSTR LOCAL NoMetaUpdate call    _gimp_tile_width 
@@ -978,7 +978,7 @@
             401e8e      3 PTRIMMEDEBP STACK -76 displ mov     [rbp+var_4C], eax
             401e91     -1 INSTR LOCAL MetadataRedundant mov     eax, ebx 
             401e91      2 INSTR BELONGTO 401d41 
-            401e93     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0 
+            401e93     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0 
             401e93      5 INSTR BELONGTO 401d41 
             401e93      5 INSTR DEADREGS  EFLAGS RDX RBX RDI ZZ mov     edx, 0 
             401e98     -1 INSTR LOCAL MetadataRedundant div     [rbp+var_4C] 
@@ -994,7 +994,7 @@
             401ea5      4 INSTR BELONGTO 401d41 
             401ea5      4 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     rax, [rbp+var_20] 
             401ea5      4 PTRIMMEDEBP STACK -32 displ mov     rax, [rbp+var_20]
-            401ea9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
+            401ea9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
             401ea9      5 INSTR BELONGTO 401d41 
             401ea9      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 0 
             401eae      3 INSTR BELONGTO 401d41 
@@ -1015,7 +1015,7 @@
             401ec1      4 PTRIMMEDEBP STACK -24 displ cmp     [rbp+var_18], 0
             401ec5     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401EE4 
             401ec5      2 INSTR BELONGTO 401d41 
-            401ec7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0Ch 
+            401ec7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0Ch 
             401ec7      5 INSTR BELONGTO 401d41 
             401ec7      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 0Ch 
             401ecc      5 INSTR BELONGTO 401d41 
@@ -1030,7 +1030,7 @@
             401edd      7 INSTR BELONGTO 401d41 
             401edd      7 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     [rbp+var_14], 0 
             401edd      7 PTRIMMEDEBP STACK -20 displ mov     [rbp+var_14], 0
-            401ee4     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rbp+var_14] 
+            401ee4     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rbp+var_14] 
             401ee4      3 INSTR BELONGTO 401d41 
             401ee4      3 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     eax, [rbp+var_14] 
             401ee4      3 PTRIMMEDEBP STACK -20 displ mov     eax, [rbp+var_14]
@@ -1244,10 +1244,10 @@
             40205d     -1 INSTR LOCAL NoMetaUpdate cmp     [rbp+var_130], 0 
             40205d      8 INSTR BELONGTO 401f00 
             40205d      8 PTRIMMEDEBP STACK -304 displ cmp     [rbp+var_130], 0
-            402065     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setz    al 
+            402065     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setz    al 
             402065      3 INSTR BELONGTO 401f00 
             402065      3 INSTR DEADREGS  RAX RCX RDX RSI RDI R8 R9 XMM1 ZZ setz    al 
-            402068     -2 INSTR LOCAL n EDI ZZ  NumericDEFs movzx   edi, al 
+            402068     -2 INSTR LOCAL n RDI ZZ  NumericDEFs movzx   edi, al 
             402068      3 INSTR BELONGTO 401f00 
             402068      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 XMM1 ZZ movzx   edi, al 
             40206b      7 INSTR BELONGTO 401f00 
@@ -1277,7 +1277,7 @@
             4020a1     -1 INSTR LOCAL NoMetaUpdate call    _gimp_pixel_rgn_init 
             4020a1      5 INSTR BELONGTO 401f00 
             4020a1      5 INSTR DEADREGS  EFLAGS XMM1 ZZ call    _gimp_pixel_rgn_init 
-            4020a6     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rbp+var_11C] 
+            4020a6     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rbp+var_11C] 
             4020a6      6 INSTR BELONGTO 401f00 
             4020a6      6 INSTR DEADREGS  EFLAGS RAX RSI RDI XMM1 ZZ mov     eax, [rbp+var_11C] 
             4020a6      6 PTRIMMEDEBP STACK -284 displ mov     eax, [rbp+var_11C]
@@ -1285,7 +1285,7 @@
             4020ac      4 INSTR BELONGTO 401f00 
             4020b0     -1 INSTR LOCAL MetadataRedundant cdqe 
             4020b0      2 INSTR BELONGTO 401f00 
-            4020b2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            4020b2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             4020b2      5 INSTR BELONGTO 401f00 
             4020b2      5 INSTR DEADREGS  EFLAGS RSI RDI XMM1 ZZ mov     esi, 8 
             4020b7     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, rax 
@@ -1297,7 +1297,7 @@
             4020bf      4 INSTR BELONGTO 401f00 
             4020bf      4 INSTR DEADREGS  EFLAGS RSI RDI XMM1 ZZ mov     [rbp+s], rax 
             4020bf      4 PTRIMMEDEBP STACK -128 displ mov     [rbp+s], rax
-            4020c3     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rbp+var_11C] 
+            4020c3     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rbp+var_11C] 
             4020c3      6 INSTR BELONGTO 401f00 
             4020c3      6 INSTR DEADREGS  EFLAGS RAX RSI RDI XMM1 ZZ mov     eax, [rbp+var_11C] 
             4020c3      6 PTRIMMEDEBP STACK -284 displ mov     eax, [rbp+var_11C]
@@ -1315,7 +1315,7 @@
             4020dc      7 INSTR BELONGTO 401f00 
             4020dc      7 INSTR DEADREGS  EFLAGS RSI RDI XMM1 ZZ mov     [rbp+var_88], rax 
             4020dc      7 PTRIMMEDEBP STACK -136 displ mov     [rbp+var_88], rax
-            4020e3     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rbp+var_120] 
+            4020e3     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rbp+var_120] 
             4020e3      6 INSTR BELONGTO 401f00 
             4020e3      6 INSTR DEADREGS  EFLAGS RAX RSI RDI XMM1 ZZ mov     eax, [rbp+var_120] 
             4020e3      6 PTRIMMEDEBP STACK -288 displ mov     eax, [rbp+var_120]
@@ -1335,7 +1335,7 @@
             402100      7 INSTR BELONGTO 401f00 
             402100      7 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM1 ZZ mov     [rbp+var_90], rax 
             402100      7 PTRIMMEDEBP STACK -144 displ mov     [rbp+var_90], rax
-            402107     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rbp+var_11C] 
+            402107     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rbp+var_11C] 
             402107      6 INSTR BELONGTO 401f00 
             402107      6 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI XMM1 ZZ mov     eax, [rbp+var_11C] 
             402107      6 PTRIMMEDEBP STACK -284 displ mov     eax, [rbp+var_11C]
@@ -1441,7 +1441,7 @@
             4021a2      2 INSTR DEADREGS  EFLAGS XMM1 ZZ sub     ecx, eax 
             4021a4      2 INSTR BELONGTO 401f00 
             4021a4      2 INSTR DEADREGS  EFLAGS RAX XMM1 ZZ mov     eax, ecx 
-            4021a4     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ecx 
+            4021a4     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ecx 
             4021a6     -1 INSTR LOCAL MetadataRedundant imul    eax, [rbp+var_70] 
             4021a6      4 INSTR BELONGTO 401f00 
             4021aa     -1 INSTR LOCAL MetadataRedundant cdqe 
@@ -1473,7 +1473,7 @@
             4021d2      3 INSTR DEADREGS  EFLAGS RCX RDX XMM1 ZZ mov     rcx, [rax] 
             4021d5     -1 INSTR LOCAL MetadataUnused mov     rdx, [rbp+var_30] 
             4021d5      4 INSTR BELONGTO 401f00 
-            4021d9     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [rdx] 
+            4021d9     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [rdx] 
             4021d9      3 INSTR BELONGTO 401f00 
             4021d9      3 INSTR DEADREGS  EFLAGS XMM1 ZZ movzx   edx, byte ptr [rdx] 
             4021dc     -1 INSTR LOCAL MetadataRedundant movzx   edx, dl 
@@ -1534,12 +1534,12 @@
             402237      3 PTRIMMEDEBP STACK -116 displ cmp     eax, [rbp+var_74]
             40223a     -1 INSTR LOCAL NoMetaUpdate jl      loc_40213A 
             40223a      6 INSTR BELONGTO 401f00 
-            402240     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, cs:dword_60421C 
+            402240     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, cs:dword_60421C 
             402240      6 INSTR BELONGTO 401f00 
             402240      6 INSTR DEADREGS  EFLAGS RAX RDX RDI XMM1 ZZ mov     eax, cs:dword_60421C 
             402246      2 INSTR BELONGTO 401f00 
             402246      2 INSTR DEADREGS  EFLAGS RDX RDI XMM1 ZZ mov     edx, eax 
-            402246     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, eax 
+            402246     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, eax 
             402248     -1 INSTR LOCAL MetadataRedundant shr     edx, 1Fh 
             402248      3 INSTR BELONGTO 401f00 
             40224b     -1 INSTR LOCAL MetadataRedundant add     eax, edx 
@@ -1576,7 +1576,7 @@
             402280      4 INSTR BELONGTO 401f00 
             402284     -1 INSTR LOCAL MetadataUnused mov     [rbp+var_40], rax 
             402284      4 INSTR BELONGTO 401f00 
-            402288     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rbp+var_14] 
+            402288     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rbp+var_14] 
             402288      3 INSTR BELONGTO 401f00 
             402288      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI XMM1 ZZ mov     eax, [rbp+var_14] 
             402288      3 PTRIMMEDEBP STACK -20 displ mov     eax, [rbp+var_14]
@@ -1608,7 +1608,7 @@
             4022b6      7 INSTR BELONGTO 401f00 
             4022b6      7 INSTR DEADREGS  EFLAGS RAX RDI XMM1 ZZ mov     [rbp+var_54], 0 
             4022b6      7 PTRIMMEDEBP STACK -84 displ mov     [rbp+var_54], 0
-            4022bd     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rbp+var_9C] 
+            4022bd     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rbp+var_9C] 
             4022bd      6 INSTR BELONGTO 401f00 
             4022bd      6 INSTR DEADREGS  EFLAGS RAX RDI XMM1 ZZ mov     eax, [rbp+var_9C] 
             4022bd      6 PTRIMMEDEBP STACK -156 displ mov     eax, [rbp+var_9C]
@@ -1649,17 +1649,17 @@
             4022fd      4 INSTR BELONGTO 401f00 
             4022fd      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI XMM1 ZZ add     [rbp+var_54], 1 
             4022fd      4 PTRIMMEDEBP STACK -84 displ add     [rbp+var_54], 1
-            402301     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rbp+var_9C] 
+            402301     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rbp+var_9C] 
             402301      6 INSTR BELONGTO 401f00 
             402301      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI XMM1 ZZ mov     eax, [rbp+var_9C] 
             402301      6 PTRIMMEDEBP STACK -156 displ mov     eax, [rbp+var_9C]
-            402307     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, [rbp+var_18] 
+            402307     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, [rbp+var_18] 
             402307      3 INSTR BELONGTO 401f00 
             402307      3 INSTR DEADREGS  EFLAGS RCX RDX RDI XMM1 ZZ mov     edx, [rbp+var_18] 
             402307      3 PTRIMMEDEBP STACK -24 displ mov     edx, [rbp+var_18]
             40230a      2 INSTR BELONGTO 401f00 
             40230a      2 INSTR DEADREGS  EFLAGS RCX RDI XMM1 ZZ mov     ecx, edx 
-            40230a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, edx 
+            40230a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, edx 
             40230c     -1 INSTR LOCAL MetadataRedundant sub     ecx, eax 
             40230c      2 INSTR BELONGTO 401f00 
             40230e     -1 INSTR LOCAL MetadataUnused mov     eax, ecx 
@@ -1699,7 +1699,7 @@
             40233e      3 INSTR BELONGTO 401f00 
             402341     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4023A6 
             402341      2 INSTR BELONGTO 401f00 
-            402343     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rbp+var_54] 
+            402343     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rbp+var_54] 
             402343      3 INSTR BELONGTO 401f00 
             402343      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI XMM1 ZZ mov     eax, [rbp+var_54] 
             402343      3 PTRIMMEDEBP STACK -84 displ mov     eax, [rbp+var_54]
@@ -1771,7 +1771,7 @@
             4023b6      4 INSTR BELONGTO 401f00 
             4023ba     -1 INSTR LOCAL MetadataUnused add     [rbp+var_40], rax 
             4023ba      4 INSTR BELONGTO 401f00 
-            4023be     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rbp+var_70] 
+            4023be     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rbp+var_70] 
             4023be      3 INSTR BELONGTO 401f00 
             4023be      3 INSTR DEADREGS  EFLAGS RAX RDI XMM1 ZZ mov     eax, [rbp+var_70] 
             4023be      3 PTRIMMEDEBP STACK -112 displ mov     eax, [rbp+var_70]
@@ -1962,10 +1962,10 @@
             4024fa      2 INSTR BELONGTO 401f00 
             4024fc     -1 INSTR LOCAL MetadataUnused mov     rax, [rbp+var_60] 
             4024fc      4 INSTR BELONGTO 401f00 
-            402500     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rax] 
+            402500     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rax] 
             402500      3 INSTR BELONGTO 401f00 
             402500      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 XMM1 ZZ movzx   eax, byte ptr [rax] 
-            402503     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, al 
+            402503     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, al 
             402503      3 INSTR BELONGTO 401f00 
             402503      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 XMM1 ZZ movzx   edx, al 
             402506     -1 INSTR LOCAL MetadataUnused mov     rax, [rbp+var_68] 
@@ -1986,7 +1986,7 @@
             402521      4 INSTR BELONGTO 401f00 
             402525     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40252C 
             402525      2 INSTR BELONGTO 401f00 
-            402527     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
+            402527     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
             402527      5 INSTR BELONGTO 401f00 
             402527      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 XMM1 ZZ mov     eax, 0FFFFFFFFh 
             40252c      4 INSTR BELONGTO 401f00 
@@ -2036,17 +2036,17 @@
             40257a      2 INSTR BELONGTO 401f00 
             40257c     -1 INSTR LOCAL MetadataUnused mov     rax, [rbp+var_60] 
             40257c      4 INSTR BELONGTO 401f00 
-            402580     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rax] 
+            402580     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rax] 
             402580      3 INSTR BELONGTO 401f00 
             402580      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 XMM1 ZZ movzx   eax, byte ptr [rax] 
-            402583     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, al 
+            402583     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, al 
             402583      3 INSTR BELONGTO 401f00 
             402583      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 XMM1 ZZ movzx   edx, al 
             402586     -1 INSTR LOCAL MetadataUnused mov     rax, [rbp+var_60] 
             402586      4 INSTR BELONGTO 401f00 
             40258a     -1 INSTR LOCAL MetadataRedundant movzx   eax, byte ptr [rax] 
             40258a      3 INSTR BELONGTO 401f00 
-            40258d     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movzx   ecx, al 
+            40258d     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movzx   ecx, al 
             40258d      3 INSTR BELONGTO 401f00 
             40258d      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 XMM1 ZZ movzx   ecx, al 
             402590     -1 INSTR LOCAL MetadataUnused mov     rax, [rbp+var_68] 
@@ -2067,7 +2067,7 @@
             4025aa      4 INSTR BELONGTO 401f00 
             4025ae     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4025B5 
             4025ae      2 INSTR BELONGTO 401f00 
-            4025b0     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
+            4025b0     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
             4025b0      5 INSTR BELONGTO 401f00 
             4025b0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 XMM1 ZZ mov     eax, 0FFFFFFFFh 
             4025b5      4 INSTR BELONGTO 401f00 
@@ -2212,7 +2212,7 @@
             4026b0      7 INSTR BELONGTO 401f00 
             4026b7      2 INSTR BELONGTO 401f00 
             4026b7      2 INSTR DEADREGS  EFLAGS RSI RDI XMM0 XMM1 ZZ mov     eax, [rax] 
-            4026b9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4026b9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4026b9      5 INSTR BELONGTO 401f00 
             4026b9      5 INSTR DEADREGS  EFLAGS RSI RDI XMM0 XMM1 ZZ mov     esi, 1 
             4026be      2 INSTR BELONGTO 401f00 
@@ -2287,7 +2287,7 @@
             40271c      4 INSTR BELONGTO 402710 
             40271c      4 INSTR DEADREGS  EFLAGS RBX RSI XMM4 ZZ mov     [rbp+var_58], rdi 
             40271c      4 PTRIMMEDEBP STACK -88 displ mov     [rbp+var_58], rdi
-            402720     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402720     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402720      5 INSTR BELONGTO 402710 
             402720      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM4 ZZ mov     esi, 1 
             402725      5 INSTR BELONGTO 402710 
@@ -2317,17 +2317,17 @@
             402769     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8d, offset _gimp_standard_help_func 
             402769      6 INSTR BELONGTO 402710 
             402769      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 XMM4 ZZ mov     r8d, offset _gimp_standard_help_func 
-            40276f     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0 
+            40276f     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0 
             40276f      5 INSTR BELONGTO 402710 
             40276f      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI XMM4 ZZ mov     ecx, 0 
-            402774     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0 
+            402774     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0 
             402774      5 INSTR BELONGTO 402710 
             402774      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI XMM4 ZZ mov     edx, 0 
             402779      5 INSTR BELONGTO 402710 
             402779      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM4 ZZ mov     esi, offset aGimpDestripe; "gimp-destripe" 
             40277e      3 INSTR BELONGTO 402710 
             40277e      3 INSTR DEADREGS  EFLAGS RBX RDI XMM4 ZZ mov     rdi, rax 
-            402781     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            402781     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             402781      5 INSTR BELONGTO 402710 
             402781      5 INSTR DEADREGS  EFLAGS RAX RBX XMM4 ZZ mov     eax, 0 
             402786     -1 INSTR LOCAL NoMetaUpdate call    _gimp_dialog_new 
@@ -2351,18 +2351,18 @@
             4027a1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4027a1      5 INSTR BELONGTO 402710 
             4027a1      5 INSTR DEADREGS  EFLAGS RBX XMM4 ZZ call    _g_type_check_instance_cast 
-            4027a6     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFFh 
+            4027a6     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFFh 
             4027a6      5 INSTR BELONGTO 402710 
             4027a6      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI XMM4 ZZ mov     ecx, 0FFFFFFFFh 
-            4027ab     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFAh 
+            4027ab     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFAh 
             4027ab      5 INSTR BELONGTO 402710 
             4027ab      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI XMM4 ZZ mov     edx, 0FFFFFFFAh 
-            4027b0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFBh 
+            4027b0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFBh 
             4027b0      5 INSTR BELONGTO 402710 
             4027b0      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM4 ZZ mov     esi, 0FFFFFFFBh 
             4027b5      3 INSTR BELONGTO 402710 
             4027b5      3 INSTR DEADREGS  EFLAGS RBX RDI XMM4 ZZ mov     rdi, rax 
-            4027b8     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            4027b8     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             4027b8      5 INSTR BELONGTO 402710 
             4027b8      5 INSTR DEADREGS  EFLAGS RAX RBX XMM4 ZZ mov     eax, 0 
             4027bd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_set_alternative_button_order 
@@ -2388,10 +2388,10 @@
             4027dc     -1 INSTR LOCAL NoMetaUpdate call    _gimp_window_set_transient 
             4027dc      5 INSTR BELONGTO 402710 
             4027dc      5 INSTR DEADREGS  EFLAGS RBX XMM4 ZZ call    _gimp_window_set_transient 
-            4027e1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            4027e1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             4027e1      5 INSTR BELONGTO 402710 
             4027e1      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM4 ZZ mov     esi, 0Ch 
-            4027e6     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            4027e6     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             4027e6      5 INSTR BELONGTO 402710 
             4027e6      5 INSTR DEADREGS  EFLAGS RBX RDI XMM4 ZZ mov     edi, 1 
             4027eb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
@@ -2415,7 +2415,7 @@
             402806     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             402806      5 INSTR BELONGTO 402710 
             402806      5 INSTR DEADREGS  EFLAGS RBX XMM4 ZZ call    _g_type_check_instance_cast 
-            40280b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            40280b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             40280b      5 INSTR BELONGTO 402710 
             40280b      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM4 ZZ mov     esi, 0Ch 
             402810      3 INSTR BELONGTO 402710 
@@ -2461,10 +2461,10 @@
             40284e     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0 
             40284e      6 INSTR BELONGTO 402710 
             40284e      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI R8 XMM4 ZZ mov     r8d, 0 
-            402854     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            402854     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             402854      5 INSTR BELONGTO 402710 
             402854      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI XMM4 ZZ mov     ecx, 1 
-            402859     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            402859     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             402859      5 INSTR BELONGTO 402710 
             402859      5 INSTR DEADREGS  EFLAGS RDX RBX RDI XMM4 ZZ mov     edx, 1 
             40285e      3 INSTR BELONGTO 402710 
@@ -2483,7 +2483,7 @@
             402872      4 INSTR BELONGTO 402710 
             402872      4 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI XMM4 ZZ mov     rax, [rbp+var_58] 
             402872      4 PTRIMMEDEBP STACK -88 displ mov     rax, [rbp+var_58]
-            402876     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
+            402876     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
             402876      5 INSTR BELONGTO 402710 
             402876      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM4 ZZ mov     esi, 0 
             40287b      3 INSTR BELONGTO 402710 
@@ -2515,10 +2515,10 @@
             4028a2     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0 
             4028a2      6 INSTR BELONGTO 402710 
             4028a2      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI R8 XMM4 ZZ mov     r8d, 0 
-            4028a8     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            4028a8     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             4028a8      5 INSTR BELONGTO 402710 
             4028a8      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI XMM4 ZZ mov     ecx, 1 
-            4028ad     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4028ad     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4028ad      5 INSTR BELONGTO 402710 
             4028ad      5 INSTR DEADREGS  EFLAGS RDX RBX RDI XMM4 ZZ mov     edx, 1 
             4028b2      3 INSTR BELONGTO 402710 
@@ -2534,7 +2534,7 @@
             4028c1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             4028c1      5 INSTR BELONGTO 402710 
             4028c1      5 INSTR DEADREGS  EFLAGS RBX XMM4 ZZ call    _gtk_widget_show 
-            4028c6     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset destripe 
+            4028c6     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset destripe 
             4028c6      5 INSTR BELONGTO 402710 
             4028c6      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 XMM4 ZZ mov     edx, offset destripe 
             4028cb      4 INSTR BELONGTO 402710 
@@ -2556,13 +2556,13 @@
             4028e7     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             4028e7      5 INSTR BELONGTO 402710 
             4028e7      5 INSTR DEADREGS  EFLAGS RBX XMM4 ZZ call    _g_signal_connect_data 
-            4028ec     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0 
+            4028ec     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0 
             4028ec      5 INSTR BELONGTO 402710 
             4028ec      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI XMM4 ZZ mov     edx, 0 
-            4028f1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            4028f1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             4028f1      5 INSTR BELONGTO 402710 
             4028f1      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM4 ZZ mov     esi, 3 
-            4028f6     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            4028f6     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             4028f6      5 INSTR BELONGTO 402710 
             4028f6      5 INSTR DEADREGS  EFLAGS RBX RDI XMM4 ZZ mov     edi, 1 
             4028fb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_table_new 
@@ -2586,7 +2586,7 @@
             402916     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             402916      5 INSTR BELONGTO 402710 
             402916      5 INSTR DEADREGS  EFLAGS RBX XMM4 ZZ call    _g_type_check_instance_cast 
-            40291b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            40291b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             40291b      5 INSTR BELONGTO 402710 
             40291b      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM4 ZZ mov     esi, 6 
             402920      3 INSTR BELONGTO 402710 
@@ -2615,10 +2615,10 @@
             402943     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0 
             402943      6 INSTR BELONGTO 402710 
             402943      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI R8 XMM4 ZZ mov     r8d, 0 
-            402949     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0 
+            402949     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0 
             402949      5 INSTR BELONGTO 402710 
             402949      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI XMM4 ZZ mov     ecx, 0 
-            40294e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0 
+            40294e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0 
             40294e      5 INSTR BELONGTO 402710 
             40294e      5 INSTR DEADREGS  EFLAGS RDX RBX RDI XMM4 ZZ mov     edx, 0 
             402953      3 INSTR BELONGTO 402710 
@@ -2699,10 +2699,10 @@
             4029fa      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ mov     r8d, 8Ch 
             402a00      3 INSTR BELONGTO 402710 
             402a00      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ mov     rcx, rbx 
-            402a03     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            402a03     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             402a03      5 INSTR BELONGTO 402710 
             402a03      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ mov     edx, 1 
-            402a08     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
+            402a08     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
             402a08      5 INSTR BELONGTO 402710 
             402a08      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ mov     esi, 0 
             402a0d      3 INSTR BELONGTO 402710 
@@ -2713,7 +2713,7 @@
             402a15      4 INSTR BELONGTO 402710 
             402a15      4 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ mov     [rbp+var_38], rax 
             402a15      4 PTRIMMEDEBP STACK -56 displ mov     [rbp+var_38], rax
-            402a19     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset _gimp_int_adjustment_update 
+            402a19     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset _gimp_int_adjustment_update 
             402a19      5 INSTR BELONGTO 402710 
             402a19      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ mov     edx, offset _gimp_int_adjustment_update 
             402a1e      4 INSTR BELONGTO 402710 
@@ -2732,7 +2732,7 @@
             402a3b     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             402a3b      5 INSTR BELONGTO 402710 
             402a3b      5 INSTR DEADREGS  EFLAGS RBX XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ call    _g_signal_connect_data 
-            402a40     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset _gimp_preview_invalidate 
+            402a40     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset _gimp_preview_invalidate 
             402a40      5 INSTR BELONGTO 402710 
             402a40      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ mov     edx, offset _gimp_preview_invalidate 
             402a45      4 INSTR BELONGTO 402710 
@@ -2786,10 +2786,10 @@
             402a97     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0 
             402a97      6 INSTR BELONGTO 402710 
             402a97      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI R8 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ mov     r8d, 0 
-            402a9d     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0 
+            402a9d     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0 
             402a9d      5 INSTR BELONGTO 402710 
             402a9d      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ mov     ecx, 0 
-            402aa2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0 
+            402aa2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0 
             402aa2      5 INSTR BELONGTO 402710 
             402aa2      5 INSTR DEADREGS  EFLAGS RDX RBX RDI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ mov     edx, 0 
             402aa7      3 INSTR BELONGTO 402710 
@@ -2829,7 +2829,7 @@
             402add     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             402add      5 INSTR BELONGTO 402710 
             402add      5 INSTR DEADREGS  EFLAGS RBX XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ call    _gtk_widget_show 
-            402ae2     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset _gimp_toggle_button_update 
+            402ae2     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset _gimp_toggle_button_update 
             402ae2      5 INSTR BELONGTO 402710 
             402ae2      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ mov     edx, offset _gimp_toggle_button_update 
             402ae7      4 INSTR BELONGTO 402710 
@@ -2850,7 +2850,7 @@
             402b04     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             402b04      5 INSTR BELONGTO 402710 
             402b04      5 INSTR DEADREGS  EFLAGS RBX XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ call    _g_signal_connect_data 
-            402b09     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset _gimp_preview_invalidate 
+            402b09     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset _gimp_preview_invalidate 
             402b09      5 INSTR BELONGTO 402710 
             402b09      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ mov     edx, offset _gimp_preview_invalidate 
             402b0e      4 INSTR BELONGTO 402710 
@@ -2915,7 +2915,7 @@
             402b6d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_destroy 
             402b6d      5 INSTR BELONGTO 402710 
             402b6d      5 INSTR DEADREGS  EFLAGS RBX XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ call    _gtk_widget_destroy 
-            402b72     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rbp+var_44] 
+            402b72     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rbp+var_44] 
             402b72      3 INSTR BELONGTO 402710 
             402b72      3 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 ZZ mov     eax, [rbp+var_44] 
             402b72      3 PTRIMMEDEBP STACK -68 displ mov     eax, [rbp+var_44]
@@ -2976,7 +2976,7 @@
             402bc8      2 INSTR BELONGTO 402b80 
             402bca      2 INSTR BELONGTO 402b80 
             402bca      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            402bca     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            402bca     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             402bcc      4 INSTR BELONGTO 402b80 
             402bd0      3 INSTR BELONGTO 402b80 
             402bd0      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 259afcf6..66fa65bf 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 @@
-055a8b05adde551c27d138bcf6db868013b85320
\ No newline at end of file
+cca5a06f533d5be15cc392a41d1b6632da134bda
\ 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 898a0655..6ef24ab7 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 @@
-3f0728ae0c374c01f26b9b0b1a09321961a834d9
\ No newline at end of file
+4376ecf5727dcfdd40f4301a5bd643649804dcde
\ 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 59e5a6dd..c2eba9a7 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 @@
-ce60bf4b088a3108cddc09987a744ffc6ae40cc0
\ No newline at end of file
+aa9f6fafd06c489074e3ff91a83f5d07c0b28a49
\ 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 7e1df006..78d399e9 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 @@
-41bb609e7bd0b3701f58ae64e8d365f18d66e4d9
\ No newline at end of file
+a302870b39df70affe3181870555860f054d30bc
\ 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 a71bd2d0..c7db4ff3 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 @@
-293789725b99ef1b95f83b6baf2a68cba5bae1b1
\ No newline at end of file
+b022d794ff6109eee9e2d8f9413acf0c4aeef019
\ 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 d97c63dd..61ad5aa8 100644
--- a/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
@@ -2415,8 +2415,8 @@
             406ce0    587 FUNC GLOBAL main FUNC_UNSAFE NOFP RET             406f2a 
             406ce2      2 INSTR BELONGTO 406ce0 
             406ce2      2 INSTR DEADREGS  EFLAGS RAX RCX R13 ZZ xor     eax, eax 
-            406ce2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            406ce4     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 12h 
+            406ce2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            406ce4     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 12h 
             406ce4      5 INSTR BELONGTO 406ce0 
             406ce4      5 INSTR DEADREGS  EFLAGS RCX R13 ZZ mov     ecx, 12h 
             406ce9      2 INSTR BELONGTO 406ce0 
@@ -2528,14 +2528,14 @@
             406dc5      2 INSTR BELONGTO 406ce0 
             406dc7     -1 INSTR LOCAL NoMetaUpdate jz      loc_406EFC 
             406dc7      6 INSTR BELONGTO 406ce0 
-            406dcd     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406dcd     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406dcd      5 INSTR BELONGTO 406ce0 
             406dcd      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 ZZ mov     edx, 5          ; category 
             406dd2      5 INSTR BELONGTO 406ce0 
             406dd2      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, offset msgid; "Character Map" 
             406dd7      2 INSTR BELONGTO 406ce0 
             406dd7      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ xor     edi, edi        ; domainname 
-            406dd7     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406dd7     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406dd9     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             406dd9      5 INSTR BELONGTO 406ce0 
             406dd9      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _dcgettext 
@@ -2560,8 +2560,8 @@
             406df8      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 R13 ZZ xor     r8d, r8d 
             406dfb      2 INSTR BELONGTO 406ce0 
             406dfb      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R13 ZZ xor     ecx, ecx 
-            406dfb     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            406dfd     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset _gtk_main_quit 
+            406dfb     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            406dfd     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset _gtk_main_quit 
             406dfd      5 INSTR BELONGTO 406ce0 
             406dfd      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 ZZ mov     edx, offset _gtk_main_quit 
             406e02      3 INSTR BELONGTO 406ce0 
@@ -2592,10 +2592,10 @@
             406e28      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _gtk_window_get_screen 
             406e2d      2 INSTR BELONGTO 406ce0 
             406e2d      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ xor     edx, edx 
-            406e2d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            406e2d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             406e2f      2 INSTR BELONGTO 406ce0 
             406e2f      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ xor     esi, esi 
-            406e2f     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            406e2f     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             406e31      3 INSTR BELONGTO 406ce0 
             406e31      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rax 
             406e34      3 INSTR BELONGTO 406ce0 
@@ -2628,7 +2628,7 @@
             406e64      5 INSTR BELONGTO 406ce0 
             406e69     -1 INSTR LOCAL NoMetaUpdate lea     r12d, [r12+r12*8] 
             406e69      4 INSTR BELONGTO 406ce0 
-            406e6d     -2 INSTR LOCAL n EAX ZZ  NumericDEFs lea     eax, [r13+0Fh] 
+            406e6d     -2 INSTR LOCAL n RAX ZZ  NumericDEFs lea     eax, [r13+0Fh] 
             406e6d      4 INSTR BELONGTO 406ce0 
             406e6d      4 INSTR DEADREGS  EFLAGS RAX ZZ lea     eax, [r13+0Fh] 
             406e71     -1 INSTR LOCAL NoMetaUpdate test    r13d, r13d 
@@ -2647,10 +2647,10 @@
             406e8c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             406e8c      5 INSTR BELONGTO 406ce0 
             406e8c      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-            406e91     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, r12d 
+            406e91     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, r12d 
             406e91      3 INSTR BELONGTO 406ce0 
             406e91      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     esi, r12d 
-            406e94     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, r13d 
+            406e94     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, r13d 
             406e94      3 INSTR BELONGTO 406ce0 
             406e94      3 INSTR DEADREGS  EFLAGS RDX RDI R12 ZZ mov     edx, r13d 
             406e97      3 INSTR BELONGTO 406ce0 
@@ -2709,7 +2709,7 @@
             406ef3    200 DEALLOC STACK esp - 200 xor     eax, eax
             406ef3      2 INSTR BELONGTO 406ce0 
             406ef3      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ xor     eax, eax 
-            406ef3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406ef3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406ef5      1 INSTR BELONGTO 406ce0 
             406ef5      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 ZZ pop     rbx 
             406ef6      1 INSTR BELONGTO 406ce0 
@@ -2728,7 +2728,7 @@
             406f09      4 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 ZZ mov     rsi, [rax+8] 
             406f0d      2 INSTR BELONGTO 406ce0 
             406f0d      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-            406f0d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406f0d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406f0f     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             406f0f      5 INSTR BELONGTO 406ce0 
             406f0f      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_printerr 
@@ -2870,7 +2870,7 @@
             406fe9      3 INSTR BELONGTO 406fe0 
             406fec     -1 INSTR LOCAL NoMetaUpdate jz      short loc_407000 
             406fec      2 INSTR BELONGTO 406fe0 
-            406fee     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            406fee     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             406fee      5 INSTR BELONGTO 406fe0 
             406ff3     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             406ff3      3 INSTR BELONGTO 406fe0 
@@ -2888,7 +2888,7 @@
             407010      1 INSTR BELONGTO 407010 
             407010      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbp 
             407010     -3 INSTR LOCAL NoWarn push    rbp 
-            407011     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 5 
+            407011     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 5 
             407011      5 INSTR BELONGTO 407010 
             407011      5 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, 5 
             407016      3 INSTR BELONGTO 407010 
@@ -2896,7 +2896,7 @@
             407019      1 INSTR BELONGTO 407010 
             407019      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             407019     -3 INSTR LOCAL NoWarn push    rbx 
-            40701a     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 190h 
+            40701a     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 190h 
             40701a      5 INSTR BELONGTO 407010 
             40701a      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, 190h 
             40701f     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
@@ -2914,7 +2914,7 @@
             407032      3 INSTR BELONGTO 407010 
             407035      2 INSTR BELONGTO 407010 
             407035      2 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, ebx 
-            407035     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, ebx 
+            407035     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, ebx 
             407037     -1 INSTR LOCAL MetadataRedundant shl     esi, 0Ah 
             407037      3 INSTR BELONGTO 407010 
             40703a     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_set_size 
@@ -2939,7 +2939,7 @@
             407057      5 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ call    _gtk_adjustment_set_value 
             40705c      3 INSTR BELONGTO 407010 
             40705c      3 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM0 ZZ mov     rdi, rbp 
-            40705f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40705f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40705f      5 INSTR BELONGTO 407010 
             40705f      5 INSTR DEADREGS  EFLAGS RBX RSI XMM0 ZZ mov     esi, 50h 
             407064     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -2973,7 +2973,7 @@
             407084      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
             407089      3 INSTR BELONGTO 407080 
             407089      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            40708c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40708c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40708c      5 INSTR BELONGTO 407080 
             40708c      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             407091      7 INSTR BELONGTO 407080 
@@ -2994,10 +2994,10 @@
             4070b8      5 INSTR DEADREGS  EFLAGS ZZ call    _pango_font_description_get_type 
             4070bd      2 INSTR BELONGTO 407080 
             4070bd      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     edx, edx 
-            4070bd     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4070bd     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4070bf      2 INSTR BELONGTO 407080 
             4070bf      2 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 ZZ xor     esi, esi 
-            4070bf     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4070bf     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4070c1      5 INSTR BELONGTO 407080 
             4070c1      5 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     edi, offset aFontDesc; "font-desc" 
             4070c6     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0E3h 
@@ -3045,20 +3045,20 @@
             4071a2     -1 INSTR LOCAL NoMetaUpdate call    _atk_object_set_name 
             4071a7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_get_type 
             4071b5     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4071ba     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            4071ba     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             4071c2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_set_spacing 
             4071c7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_new 
             4071d0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_text_new 
             4071d8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_get_type 
             4071e7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4071ec     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4071ec     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4071f1      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             4071f7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_pack_start 
             407203     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407208     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40720b     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40720b     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             407212      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
-            407218     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407218     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40721a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_set_attributes 
             407223     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40722c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_accessible 
@@ -3069,7 +3069,7 @@
             40725f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_get_type 
             407264      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40726d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            407272     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            407272     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40727a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_set_use_stock 
             407283     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40728c     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
@@ -3077,7 +3077,7 @@
             40729f     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             4072a9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_new_with_mnemonic 
             4072b8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4072bd     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4072bd     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4072c5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_set_use_stock 
             4072ce     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             4072d7     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
@@ -3086,7 +3086,7 @@
             4072ef     -1 INSTR LOCAL NoMetaUpdate call    _gtk_adjustment_get_type 
             4072fb     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407300     -1 INSTR LOCAL NoMetaUpdate xorpd   xmm0, xmm0 
-            407304     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407304     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407309     -1 INSTR LOCAL NoMetaUpdate call    _gtk_spin_button_new 
             407315     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40731e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_accessible 
@@ -3099,10 +3099,10 @@
             40735c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_get_type 
             407368      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
             40736c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            407371     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
+            407371     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
             407376      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-            40737b     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
-            407380     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40737b     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            407380     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407382     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_new 
             407391     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407399     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_pango_context 
@@ -3112,7 +3112,7 @@
             4073b0      4 PTRIMMEDESP STACK 60 displ mov     eax, [rsp+3Ch]
             4073b4     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             4073b6     -1 INSTR LOCAL NoMetaUpdate jle     short loc_4073FB 
-            4073b8     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            4073b8     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             4073ba     -2 INSTR LOCAL n R12 ZZ  AlwaysNUM xor     r12d, r12d 
             4073c0      5 PTRIMMEDESP STACK 48 displ mov     rax, [rsp+30h]
             4073c5     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     r12d, 1 
@@ -3121,8 +3121,8 @@
             4073d1     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_family_get_name 
             4073da     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 0FFFFFFFFh 
             4073e0      5 PTRIMMEDESP STACK 16 displ lea     rsi, [rsp+10h]
-            4073e8     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4073ea     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4073e8     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4073ea     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4073ef     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_insert_with_values 
             4073f4     -1 INSTR LOCAL NoMetaUpdate cmp     r12d, [rsp+3Ch] 
             4073f4      5 PTRIMMEDESP STACK 60 displ cmp     r12d, [rsp+3Ch]
@@ -3131,8 +3131,8 @@
             407400     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             407405     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_sortable_get_type 
             407411     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            407416     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            407418     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407416     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            407418     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40741d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_sortable_set_sort_column_id 
             407422     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get_type 
             40742e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -3141,48 +3141,48 @@
             407444     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             40744d      4 PTRIMMEDESP STACK 0 displ mov     rsi, [rsp]
             407451     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            407456     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
+            407456     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
             40745e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_set_active 
             407467     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40746a     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40747a     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             407489     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40748e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            407491     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            407493     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407491     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            407493     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407495      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40749b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             4074aa     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4074af     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4074b2     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4074b4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4074b2     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4074b4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4074b6      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             4074bc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             4074cb     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4074d0     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4074d3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4074d5     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4074d3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4074d5     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4074d7      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             4074dd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             4074ec     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4074f1     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4074f4     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4074f9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4074f4     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4074f9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4074fb      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             4074fe     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             407507      4 PTRIMMEDESP STACK 0 displ mov     rsi, [rsp]
             40750b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            407510     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407510     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407515     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_set_focus_on_click 
             407521     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            407526     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407526     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40752b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_set_focus_on_click 
             407537     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40753c     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40753c     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407541     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_set_focus_on_click 
             407546     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_get_type 
             407551     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            407556     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            407556     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             40755e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_set_border_width 
             407569     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407571     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show_all 
@@ -3231,7 +3231,7 @@
             4075c1      5 PTRIMMEDESP STACK 40 displ lea     rcx, [rsp+38h+var_10]
             4075c6      2 INSTR BELONGTO 407590 
             4075c6      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 ZZ xor     edx, edx 
-            4075c6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4075c6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4075c8      3 INSTR BELONGTO 407590 
             4075c8      3 INSTR DEADREGS  EFLAGS RSI RDI R8 ZZ mov     rsi, rsp 
             4075c8      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
@@ -3242,7 +3242,7 @@
             4075ce      6 INSTR DEADREGS  EFLAGS RAX R8 ZZ mov     r8d, 0FFFFFFFFh 
             4075d4      2 INSTR BELONGTO 407590 
             4075d4      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4075d4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4075d4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4075d6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             4075d6      5 INSTR BELONGTO 407590 
             4075d6      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_tree_model_get 
@@ -3266,7 +3266,7 @@
             4075f3      5 INSTR DEADREGS  EFLAGS ZZ call    _g_free 
             4075f8      3 INSTR BELONGTO 407590 
             4075f8      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            4075fb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4075fb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4075fb      5 INSTR BELONGTO 407590 
             4075fb      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             407600     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -3289,10 +3289,10 @@
             407620      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbx
             407625      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], rbp
             407631     -1 INSTR LOCAL NoMetaUpdate call    _gtk_adjustment_get_value 
-            407636     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM cvttsd2si ebp, xmm0 
+            407636     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM cvttsd2si ebp, xmm0 
             40763e     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_get_size 
             407643     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     eax, 200h 
-            407648     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM sar     eax, 0Ah 
+            407648     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM sar     eax, 0Ah 
             40764b     -1 INSTR LOCAL NoMetaUpdate cmp     ebp, eax 
             40764d     -1 INSTR LOCAL NoMetaUpdate jz      short loc_407670 
             40764f      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
@@ -3323,13 +3323,13 @@
             40768f      2 INSTR BELONGTO 407680 
             407691      2 INSTR BELONGTO 407680 
             407691      2 INSTR DEADREGS  EFLAGS RSI ZZ xor     esi, esi 
-            407691     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407691     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407693     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_set_style 
             407693      5 INSTR BELONGTO 407680 
             407693      5 INSTR DEADREGS  EFLAGS ZZ call    _pango_font_description_set_style 
             407698      3 INSTR BELONGTO 407680 
             407698      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            40769b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40769b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40769b      5 INSTR BELONGTO 407680 
             40769b      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             4076a0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -3344,7 +3344,7 @@
             4076ae     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_notify 
             4076ae      5 INSTR BELONGTO 407680 
             4076ae      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_object_notify 
-            4076b8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            4076b8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             4076b8      5 INSTR BELONGTO 407680 
             4076b8      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 2 
             4076bd     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_set_style 
@@ -3370,7 +3370,7 @@
             4076db      4 INSTR DEADREGS  RSI RDI ZZ mov     rdi, [rbx+60h] 
             4076df     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_407710 
             4076df      2 INSTR BELONGTO 4076d0 
-            4076e1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 190h 
+            4076e1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 190h 
             4076e1      5 INSTR BELONGTO 4076d0 
             4076e1      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 190h 
             4076e6     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_set_weight 
@@ -3378,7 +3378,7 @@
             4076e6      5 INSTR DEADREGS  EFLAGS ZZ call    _pango_font_description_set_weight 
             4076eb      3 INSTR BELONGTO 4076d0 
             4076eb      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            4076ee     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4076ee     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4076ee      5 INSTR BELONGTO 4076d0 
             4076ee      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             4076f3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -3393,7 +3393,7 @@
             407701     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_notify 
             407701      5 INSTR BELONGTO 4076d0 
             407701      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_object_notify 
-            407710     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2BCh 
+            407710     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2BCh 
             407710      5 INSTR BELONGTO 4076d0 
             407710      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 2BCh 
             407715     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_set_weight 
@@ -3459,10 +3459,10 @@
             407774     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 70h 
             407774      6 INSTR BELONGTO 407720 
             407774      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 70h 
-            40777a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_407080 
+            40777a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_407080 
             40777a      5 INSTR BELONGTO 407720 
             40777a      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset sub_407080 
-            40777f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3F0h 
+            40777f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3F0h 
             40777f      5 INSTR BELONGTO 407720 
             40777f      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 3F0h 
             407784      7 INSTR BELONGTO 407720 
@@ -3497,7 +3497,7 @@
             4077b8     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_free 
             4077b8      5 INSTR BELONGTO 4077a0 
             4077bd      7 INSTR BELONGTO 4077a0 
-            4077c4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4077c4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4077c4      5 INSTR BELONGTO 4077a0 
             4077c9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             4077c9      5 INSTR BELONGTO 4077a0 
@@ -3523,12 +3523,12 @@
             4077e9      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_407720 
             4077ee      2 INSTR BELONGTO 4077e0 
             4077ee      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            4077ee     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4077ee     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4077f0      3 INSTR BELONGTO 4077e0 
             4077f0      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             4077f3      2 INSTR BELONGTO 4077e0 
             4077f3      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4077f3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4077f3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4077f5     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             4077f5      5 INSTR BELONGTO 4077e0 
             4077f5      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_new 
@@ -3558,7 +3558,7 @@
             407816     -3 INSTR LOCAL NoWarn push    rbp 
             407817      3 INSTR BELONGTO 407810 
             407817      3 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ mov     rbp, rsi 
-            40781a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40781a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40781a      5 INSTR BELONGTO 407810 
             40781a      5 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 ZZ mov     esi, 50h 
             40781f      1 INSTR BELONGTO 407810 
@@ -3610,7 +3610,7 @@
             40785a      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 XMM0 ZZ mov     esi, offset aGucharmap_mini; "gucharmap_mini_font_selection_set_font_"... 
             40785f      2 INSTR BELONGTO 407810 
             40785f      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 XMM0 ZZ xor     edi, edi 
-            40785f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40785f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407861     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             407861      5 INSTR BELONGTO 407810 
             407861      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 XMM0 ZZ call    _g_return_if_fail_warning 
@@ -3686,7 +3686,7 @@
             4078d4      2 INSTR BELONGTO 407810 
             4078d6     -1 INSTR LOCAL NoMetaUpdate jle     short loc_4078DE 
             4078d6      2 INSTR BELONGTO 407810 
-            4078d8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM sar     eax, 0Ah 
+            4078d8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM sar     eax, 0Ah 
             4078d8      3 INSTR BELONGTO 407810 
             4078d8      3 INSTR DEADREGS  EFLAGS R14 ZZ sar     eax, 0Ah 
             4078db      3 INSTR BELONGTO 407810 
@@ -3734,7 +3734,7 @@
             407925     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407925      5 INSTR BELONGTO 407810 
             407925      5 INSTR DEADREGS  EFLAGS R12 R14 ZZ call    _g_type_check_instance_cast 
-            40792a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
+            40792a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
             40792a      5 INSTR BELONGTO 407810 
             40792a      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 ZZ mov     esi, 0FFFFFFFFh 
             40792f      3 INSTR BELONGTO 407810 
@@ -3773,7 +3773,7 @@
             407964     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407964      5 INSTR BELONGTO 407810 
             407964      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _g_type_check_instance_cast 
-            407969     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, r12d 
+            407969     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, r12d 
             407969      3 INSTR BELONGTO 407810 
             407969      3 INSTR DEADREGS  EFLAGS RSI RDI R14 ZZ mov     esi, r12d 
             40796c      3 INSTR BELONGTO 407810 
@@ -3801,7 +3801,7 @@
             40798e      7 INSTR BELONGTO 407810 
             407995      3 INSTR BELONGTO 407810 
             407995      3 INSTR DEADREGS  RSI RDI R12 R14 ZZ mov     rdi, rax 
-            407998     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setnbe  sil 
+            407998     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setnbe  sil 
             407998      4 INSTR BELONGTO 407810 
             407998      4 INSTR DEADREGS  RSI R12 R14 ZZ setnbe  sil 
             40799c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_set_active 
@@ -3841,7 +3841,7 @@
             4079d2      5 INSTR DEADREGS  EFLAGS R12 R14 XMM0 ZZ call    _gtk_adjustment_set_value 
             4079d7      3 INSTR BELONGTO 407810 
             4079d7      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 XMM0 ZZ mov     rdi, rbx 
-            4079da     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4079da     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4079da      5 INSTR BELONGTO 407810 
             4079da      5 INSTR DEADREGS  EFLAGS RBX RSI R12 R14 XMM0 ZZ mov     esi, 50h 
             4079df     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -3898,10 +3898,10 @@
             407a33      5 PTRIMMEDESP STACK 40 displ lea     rcx, [rsp+58h+s1]
             407a38      2 INSTR BELONGTO 407810 
             407a38      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R8 R14 ZZ xor     edx, edx 
-            407a38     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407a38     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407a3a      2 INSTR BELONGTO 407810 
             407a3a      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R14 ZZ xor     eax, eax 
-            407a3a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407a3a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407a3c     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
             407a3c      6 INSTR BELONGTO 407810 
             407a3c      6 INSTR DEADREGS  EFLAGS RSI RDI R8 R14 ZZ mov     r8d, 0FFFFFFFFh 
@@ -3981,7 +3981,7 @@
             407ab5      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 XMM0 ZZ mov     esi, offset aGucharmap_mini; "gucharmap_mini_font_selection_set_font_"... 
             407aba      2 INSTR BELONGTO 407810 
             407aba      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 XMM0 ZZ xor     edi, edi 
-            407aba     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407aba     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407abc     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             407abc      5 INSTR BELONGTO 407810 
             407abc      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 XMM0 ZZ call    _g_return_if_fail_warning 
@@ -4017,11 +4017,11 @@
             407b37     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             407b46     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             407b4b      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-            407b67     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            407b6c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407b67     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            407b6c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407b6e      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
             407b73      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-            407b77     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407b77     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407b79     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             407b7e      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
             407b83      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -4080,13 +4080,13 @@
             407bff      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGucharmap_mi_0; "gucharmap_mini_font_selection_get_font_"... 
             407c04      2 INSTR BELONGTO 407bd0 
             407c04      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            407c04     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407c04     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407c06     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             407c06      5 INSTR BELONGTO 407bd0 
             407c06      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             407c0b      2 INSTR BELONGTO 407bd0 
             407c0b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            407c0b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407c0b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407c0d      1 INSTR BELONGTO 407bd0 
             407c0d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             407c0e      1 INSTR BELONGTO 407bd0 
@@ -4110,11 +4110,11 @@
             407c5f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             407c6e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             407c73      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-            407c8f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            407c94     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407c8f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            407c94     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407c96      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
             407c9b      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-            407c9f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407c9f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407ca1     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             407ca6      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
             407cab      5 PTRIMMEDESP STACK 48 displ mov     rbp, [rsp+30h]
@@ -4290,7 +4290,7 @@
             407e20      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             407e21      3 INSTR BELONGTO 407e20 
             407e24      7 INSTR BELONGTO 407e20 
-            407e2b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            407e2b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             407e2b      5 INSTR BELONGTO 407e20 
             407e30     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             407e30      5 INSTR BELONGTO 407e20 
@@ -4320,7 +4320,7 @@
             407e49      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_class_peek_parent 
             407e4e      3 INSTR BELONGTO 407e40 
             407e4e      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
-            407e51     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            407e51     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             407e51      5 INSTR BELONGTO 407e40 
             407e51      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             407e56      7 INSTR BELONGTO 407e40 
@@ -4366,10 +4366,10 @@
             407ecf      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, rax 
             407ed2      2 INSTR BELONGTO 407e40 
             407ed2      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            407ed2     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407ed2     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407ed4      2 INSTR BELONGTO 407e40 
             407ed4      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            407ed4     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407ed4     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407ed6      5 INSTR BELONGTO 407e40 
             407ed6      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, offset aCodepointList; "codepoint-list" 
             407edb     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_object 
@@ -4394,10 +4394,10 @@
             407efb      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, rax 
             407efe      2 INSTR BELONGTO 407e40 
             407efe      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            407efe     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407efe     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407f00      2 INSTR BELONGTO 407e40 
             407f00      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            407f00     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407f00     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407f02      5 INSTR BELONGTO 407e40 
             407f02      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, offset aFontDesc; "font-desc" 
             407f07     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_boxed 
@@ -4484,10 +4484,10 @@
             407f84     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 28h 
             407f84      6 INSTR BELONGTO 407f30 
             407f84      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 28h 
-            407f8a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_407E40 
+            407f8a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_407E40 
             407f8a      5 INSTR BELONGTO 407f30 
             407f8a      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset sub_407E40 
-            407f8f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 120h 
+            407f8f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 120h 
             407f8f      5 INSTR BELONGTO 407f30 
             407f8f      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 120h 
             407f94      7 INSTR BELONGTO 407f30 
@@ -4551,11 +4551,11 @@
             407ffb     -3 INSTR LOCAL NoWarn push    rbp 
             407ffe     -3 INSTR LOCAL NoWarn push    rbx 
             40800f      5 PTRIMMEDESP STACK 72 displ mov     [rsp+48h], rax
-            408014     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408014     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408016     -1 INSTR LOCAL NoMetaUpdate call    sub_407F30 
             408021     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            408038     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM imul    eax, [r14+24h] 
-            40803d     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM imul    ebp, eax 
+            408038     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM imul    eax, [r14+24h] 
+            40803d     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM imul    ebp, eax 
             408040      4 PTRIMMEDEBP STACK -1 displ lea     eax, [rax+rbp-1]
             408044     -1 INSTR LOCAL NoMetaUpdate cmp     eax, edx 
             408049      4 PTRIMMEDESP STACK 40 displ mov     [rsp+28h], edx
@@ -4586,7 +4586,7 @@
             4080c2      5 PTRIMMEDESP STACK 64 displ lea     rsi, [rsp+40h]
             4080c9     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_set_text 
             4080d2      5 PTRIMMEDESP STACK 48 displ lea     rsi, [rsp+30h]
-            4080d7     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4080d7     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4080d9     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_get_extents 
             4080de     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm4, dword ptr [rsp+2Ch] 
             4080de      6 PTRIMMEDESP STACK 44 displ cvtsi2sd xmm4, dword ptr [rsp+2Ch]
@@ -4636,11 +4636,11 @@
             4081d0     -1 INSTR LOCAL NoMetaUpdate call    sub_407F30 
             4081db     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4081e7     -1 INSTR LOCAL NoMetaUpdate call    _gucharmap_codepoint_list_get_last_index 
-            4081f6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4081f6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4081f8     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             408200     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             408202     -1 INSTR LOCAL NoMetaUpdate js      loc_408360 
-            408208     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            408208     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             408210     -1 INSTR LOCAL NoMetaUpdate call    _gtk_print_operation_set_unit 
             408215      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             408218     -1 INSTR LOCAL NoMetaUpdate call    _gtk_print_context_get_width 
@@ -4655,18 +4655,18 @@
             40828b     -1 INSTR LOCAL NUMViaFPRegDest movapd  xmm3, xmm1 
             408294     -1 INSTR LOCAL NoMetaUpdate subsd   xmm3, xmm2 
             4082a2     -1 INSTR LOCAL NoMetaUpdate subsd   xmm3, xmm2 
-            4082b0     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM cvttsd2si ecx, xmm0 
-            4082b7     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM shl     ecx, 3 
-            4082c3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM sar     edx, 1Fh 
-            4082c6     -2 INSTR LOCAL n EAX EDX ZZ  AlwaysNUM idiv    ecx 
+            4082b0     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM cvttsd2si ecx, xmm0 
+            4082b7     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM shl     ecx, 3 
+            4082c3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM sar     edx, 1Fh 
+            4082c6     -2 INSTR LOCAL n RAX RDX ZZ  AlwaysNUM idiv    ecx 
             4082cd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_print_operation_set_n_pages 
-            4082e0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4082e0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4082e2     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             4082e7      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4082ea     -1 INSTR LOCAL NoMetaUpdate call    _gtk_print_context_create_pango_layout 
             4082fa     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_set_font_description 
             4082ff     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm0, qword ptr [rbx+40h] 
-            408308     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM cvttsd2si esi, xmm0 
+            408308     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM cvttsd2si esi, xmm0 
             40830c     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_set_width 
             408311      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             408314     -1 INSTR LOCAL NoMetaUpdate call    _gtk_print_context_create_pango_layout 
@@ -4676,7 +4676,7 @@
             408339     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_free 
             40833e     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm1, qword ptr [rbx+68h] 
             408347     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
-            40834b     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM cvttsd2si esi, xmm1 
+            40834b     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM cvttsd2si esi, xmm1 
             408355     -1 INSTR LOCAL NoMetaUpdate jmp     _pango_layout_set_width 
             408360     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             40836d     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_print_operation_cancel 
@@ -4696,11 +4696,11 @@
             4083d1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             4083e0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             4083e5      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-            408401     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            408406     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408401     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            408406     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408408      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
             40840d      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-            408411     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408411     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408413     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             408418      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
             40841d      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -4715,7 +4715,7 @@
             408460      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
             408465      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
             40846d      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
-            408482     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            408482     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             408487     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             408492      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
             408494     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [rax+10h] 
@@ -4729,11 +4729,11 @@
             4084c3      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
             4084c7      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
             4084cc     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
-            4084e3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 12Ah 
-            4084ed     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4084e3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 12Ah 
+            4084ed     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4084ef     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
-            408503     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 12Bh 
-            40850d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408503     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 12Bh 
+            40850d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40850f     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             408520      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             408520      0 FUNC MMSAFENESS SAFE
@@ -4767,7 +4767,7 @@
             40855f      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             408564      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             40856c     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
-            408579     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408579     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40857b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             40857f     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
             408590      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -24 0 4 0 8 5 -16 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 -8 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -4833,7 +4833,7 @@
             4085d9      3 INSTR BELONGTO 408590 
             4085dc      1 INSTR BELONGTO 408590 
             4085dc      1 INSTR DEADREGS  RAX R8 R9 R10 R11 R12 ZZ pop     rbp 
-            4085dd     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setz    al 
+            4085dd     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setz    al 
             4085dd      3 INSTR BELONGTO 408590 
             4085dd      3 INSTR DEADREGS  RAX R8 R9 R10 R11 R12 ZZ setz    al 
             4085e0      2 INSTR BELONGTO 408590 
@@ -4844,7 +4844,7 @@
             4085e8      1 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
             4085e9      1 INSTR BELONGTO 408590 
             4085e9      1 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ pop     rbp 
-            4085ea     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4085ea     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4085ea      5 INSTR BELONGTO 408590 
             4085ea      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ mov     eax, 1 
             4085ef      2 INSTR BELONGTO 408590 
@@ -4968,7 +4968,7 @@
             4086a6      4 INSTR BELONGTO 408630 
             4086a6      4 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R15 ZZ mov     rax, [rsp+68h+var_68] 
             4086a6      4 PTRIMMEDESP STACK 0 displ mov     rax, [rsp+68h+var_68]
-            4086aa     -2 INSTR LOCAL n EDI ZZ  NumericDEFs movsx   edi, byte ptr [rax-1] 
+            4086aa     -2 INSTR LOCAL n RDI ZZ  NumericDEFs movsx   edi, byte ptr [rax-1] 
             4086aa      4 INSTR BELONGTO 408630 
             4086aa      4 INSTR DEADREGS  EFLAGS RDI R12 R13 R15 ZZ movsx   edi, byte ptr [rax-1] 
             4086ae     -1 INSTR LOCAL NoMetaUpdate call    _g_unichar_isspace 
@@ -5086,14 +5086,14 @@
             408776      2 INSTR BELONGTO 408630 
             408778     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4087AA 
             408778      2 INSTR BELONGTO 408630 
-            40877a     -2 INSTR LOCAL n EDI ZZ  NumericDEFs movzx   edi, byte ptr [r12] 
+            40877a     -2 INSTR LOCAL n RDI ZZ  NumericDEFs movzx   edi, byte ptr [r12] 
             40877a      5 INSTR BELONGTO 408630 
             40877a      5 INSTR DEADREGS  EFLAGS RDI R13 R15 ZZ movzx   edi, byte ptr [r12] 
             40877f     -1 INSTR LOCAL NoMetaUpdate test    dil, dil 
             40877f      3 INSTR BELONGTO 408630 
             408782     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4087AA 
             408782      2 INSTR BELONGTO 408630 
-            408784     -2 INSTR LOCAL n EDI ZZ  NumericDEFs movsx   edi, dil 
+            408784     -2 INSTR LOCAL n RDI ZZ  NumericDEFs movsx   edi, dil 
             408784      4 INSTR BELONGTO 408630 
             408784      4 INSTR DEADREGS  EFLAGS R12 R13 R15 ZZ movsx   edi, dil 
             408788     -1 INSTR LOCAL NoMetaUpdate call    _g_unichar_isspace 
@@ -5152,7 +5152,7 @@
             4087dd      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4087e1      3 INSTR BELONGTO 4087d0 
             4087e1      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rsi 
-            4087e4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            4087e4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             4087e4      5 INSTR BELONGTO 4087d0 
             4087e4      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 4 
             4087e9      3 INSTR BELONGTO 4087d0 
@@ -5246,10 +5246,10 @@
             408884     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 40h 
             408884      6 INSTR BELONGTO 408830 
             408884      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 40h 
-            40888a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_409680 
+            40888a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_409680 
             40888a      5 INSTR BELONGTO 408830 
             40888a      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset sub_409680 
-            40888f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 470h 
+            40888f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 470h 
             40888f      5 INSTR BELONGTO 408830 
             40888f      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 470h 
             408894      7 INSTR BELONGTO 408830 
@@ -5338,7 +5338,7 @@
             408901     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_display 
             408901      5 INSTR BELONGTO 4088b0 
             408901      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _gtk_widget_get_display 
-            408906     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 96h 
+            408906     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 96h 
             408906      5 INSTR BELONGTO 4088b0 
             408906      5 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     esi, 96h 
             40890b      3 INSTR BELONGTO 4088b0 
@@ -5484,7 +5484,7 @@
             4089f3      4 INSTR BELONGTO 4088b0 
             4089f7     -1 INSTR LOCAL NoMetaUpdate jnz     loc_408CE0 
             4089f7      6 INSTR BELONGTO 4088b0 
-            4089fd     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 78h 
+            4089fd     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 78h 
             4089fd      5 INSTR BELONGTO 4088b0 
             4089fd      5 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     edi, 78h 
             408a02     -1 INSTR LOCAL NoMetaUpdate call    _g_slice_alloc 
@@ -5519,7 +5519,7 @@
             408a30      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+68h+var_60]
             408a35      2 INSTR BELONGTO 4088b0 
             408a35      2 INSTR DEADREGS  EFLAGS RDX RSI ZZ xor     edx, edx 
-            408a35     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            408a35     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408a37      5 INSTR BELONGTO 4088b0 
             408a37      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     [r12+8], rax 
             408a3c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -5709,7 +5709,7 @@
             408b8d      9 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 R15 ZZ mov     dword ptr [r12+24h], 0FFFFFFFFh 
             408b96      5 INSTR BELONGTO 4088b0 
             408b96      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 R15 ZZ mov     rdi, [r12+18h] 
-            408b9b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            408b9b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             408b9b      5 INSTR BELONGTO 4088b0 
             408b9b      5 INSTR DEADREGS  EFLAGS RDX RSI R14 R15 ZZ mov     edx, 1 
             408ba0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -5741,7 +5741,7 @@
             408bda      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R14 R15 ZZ mov     r14, [r12+18h] 
             408bdf      4 INSTR BELONGTO 4088b0 
             408bdf      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R15 ZZ mov     rax, [r12] 
-            408be3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            408be3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             408be3      5 INSTR BELONGTO 4088b0 
             408be3      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     edx, 2 
             408be8      5 INSTR BELONGTO 4088b0 
@@ -5767,7 +5767,7 @@
             408c0a      5 PTRIMMEDESP STACK 40 displ lea     r15, [rsp+68h+endptr]
             408c0f     -1 INSTR LOCAL NoMetaUpdate jz      loc_408D60 
             408c0f      6 INSTR BELONGTO 4088b0 
-            408c15     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            408c15     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             408c15      5 INSTR BELONGTO 4088b0 
             408c15      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 3 
             408c1a      5 INSTR BELONGTO 4088b0 
@@ -5789,7 +5789,7 @@
             408c36      6 INSTR BELONGTO 4088b0 
             408c3c      3 INSTR BELONGTO 4088b0 
             408c3c      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rcx        ; nptr 
-            408c3f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 10h        ; base 
+            408c3f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 10h        ; base 
             408c3f      5 INSTR BELONGTO 4088b0 
             408c3f      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 10h        ; base 
             408c44      3 INSTR BELONGTO 4088b0 
@@ -5813,7 +5813,7 @@
             408c5f      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+68h+var_60]
             408c64      2 INSTR BELONGTO 4088b0 
             408c64      2 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, eax 
-            408c64     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, eax 
+            408c64     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, eax 
             408c66     -1 INSTR LOCAL NoMetaUpdate call    _gucharmap_codepoint_list_get_index 
             408c66      5 INSTR BELONGTO 4088b0 
             408c66      5 INSTR DEADREGS  EFLAGS ZZ call    _gucharmap_codepoint_list_get_index 
@@ -5827,15 +5827,15 @@
             408c79      9 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 R15 ZZ mov     dword ptr [r12+6Ch], 0 
             408c82      4 INSTR BELONGTO 4088b0 
             408c82      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 R15 ZZ mov     [r13+20h], r12 
-            408c86     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_408F30 
+            408c86     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_408F30 
             408c86      5 INSTR BELONGTO 4088b0 
             408c86      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 ZZ mov     ecx, offset sub_408F30 
             408c8b      3 INSTR BELONGTO 4088b0 
             408c8b      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 ZZ mov     rdx, rbx 
-            408c8e     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_409150 
+            408c8e     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_409150 
             408c8e      5 INSTR BELONGTO 4088b0 
             408c8e      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ mov     esi, offset sub_409150 
-            408c93     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0C8h 
+            408c93     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0C8h 
             408c93      5 INSTR BELONGTO 4088b0 
             408c93      5 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 ZZ mov     edi, 0C8h 
             408c98      9 INSTR BELONGTO 4088b0 
@@ -5851,10 +5851,10 @@
             408cb5      3 INSTR DEADREGS  EFLAGS RAX RDX RDI R12 R13 R14 R15 ZZ mov     rdi, rbx 
             408cb8      2 INSTR BELONGTO 4088b0 
             408cb8      2 INSTR DEADREGS  EFLAGS RAX RDX RBX R12 R13 R14 R15 ZZ xor     edx, edx 
-            408cb8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            408cb8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408cba      2 INSTR BELONGTO 4088b0 
             408cba      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 R14 R15 ZZ xor     eax, eax 
-            408cba     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408cba     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408cbc     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
             408cbc      5 INSTR BELONGTO 4088b0 
             408cbc      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_signal_emit 
@@ -5884,18 +5884,18 @@
             408ce0      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aDirectionGucha; "direction == GUCHARMAP_DIRECTION_BACKWA"... 
             408ce6      5 INSTR BELONGTO 4088b0 
             408ce6      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGucharmap_sear; "gucharmap_search_state_new" 
-            408ceb     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1E9h 
+            408ceb     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1E9h 
             408ceb      5 INSTR BELONGTO 4088b0 
             408ceb      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 1E9h 
             408cf0      5 INSTR BELONGTO 4088b0 
             408cf0      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGucharmapSearc; "gucharmap-search-dialog.c" 
             408cf5      2 INSTR BELONGTO 4088b0 
             408cf5      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            408cf5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408cf5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408cf7     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             408cf7      5 INSTR BELONGTO 4088b0 
             408cf7      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
-            408cfc     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            408cfc     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             408cfc      5 INSTR BELONGTO 4088b0 
             408cfc      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 2 
             408d01      5 INSTR BELONGTO 4088b0 
@@ -5910,7 +5910,7 @@
             408d10     -1 INSTR LOCAL NoMetaUpdate jz      loc_408DCA 
             408d10      6 INSTR BELONGTO 4088b0 
             408d16     10 INSTR BELONGTO 4088b0 
-            408d20     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 10h        ; base 
+            408d20     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 10h        ; base 
             408d20      5 INSTR BELONGTO 4088b0 
             408d20      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 10h        ; base 
             408d25      3 INSTR BELONGTO 4088b0 
@@ -5953,7 +5953,7 @@
             408d6c      6 INSTR BELONGTO 4088b0 
             408d72      3 INSTR BELONGTO 4088b0 
             408d72      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rcx        ; nptr 
-            408d75     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0Ah        ; base 
+            408d75     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0Ah        ; base 
             408d75      5 INSTR BELONGTO 4088b0 
             408d75      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 0Ah        ; base 
             408d7a      3 INSTR BELONGTO 4088b0 
@@ -5977,7 +5977,7 @@
             408d95      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+68h+var_60]
             408d9a      2 INSTR BELONGTO 4088b0 
             408d9a      2 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, eax 
-            408d9a     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, eax 
+            408d9a     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, eax 
             408d9c     -1 INSTR LOCAL NoMetaUpdate call    _gucharmap_codepoint_list_get_index 
             408d9c      5 INSTR BELONGTO 4088b0 
             408d9c      5 INSTR DEADREGS  EFLAGS ZZ call    _gucharmap_codepoint_list_get_index 
@@ -5987,7 +5987,7 @@
             408da4      6 INSTR BELONGTO 4088b0 
             408daa     -1 INSTR LOCAL NoMetaUpdate jmp     loc_408C15 
             408daa      5 INSTR BELONGTO 4088b0 
-            408db0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            408db0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             408db0      5 INSTR BELONGTO 4088b0 
             408db0      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 2 
             408db5      5 INSTR BELONGTO 4088b0 
@@ -6011,7 +6011,7 @@
             408ddd      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 ZZ mov     esi, offset aGucharmap_sear; "gucharmap_search_state_new" 
             408de2      2 INSTR BELONGTO 4088b0 
             408de2      2 INSTR DEADREGS  EFLAGS RDI R12 R14 R15 ZZ xor     edi, edi 
-            408de2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408de2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408de4     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             408de4      5 INSTR BELONGTO 4088b0 
             408de4      5 INSTR DEADREGS  EFLAGS R12 R14 R15 ZZ call    _g_return_if_fail_warning 
@@ -6251,7 +6251,7 @@
             408f82      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 ZZ mov     esi, cs:dword_60F984 
             408f88      2 INSTR BELONGTO 408f30 
             408f88      2 INSTR DEADREGS  EFLAGS RCX RDX RDI R13 R14 R15 ZZ xor     edx, edx 
-            408f88     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            408f88     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408f8a      3 INSTR BELONGTO 408f30 
             408f8a      3 INSTR DEADREGS  EFLAGS RCX RDI R13 R14 R15 ZZ mov     ecx, r12d 
             408f8d      3 INSTR BELONGTO 408f30 
@@ -6260,7 +6260,7 @@
             408f90      7 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ mov     dword ptr [rax+6Ch], 0 
             408f97      2 INSTR BELONGTO 408f30 
             408f97      2 INSTR DEADREGS  EFLAGS RAX R13 R14 R15 ZZ xor     eax, eax 
-            408f97     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408f97     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408f99     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
             408f99      5 INSTR BELONGTO 408f30 
             408f99      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_signal_emit 
@@ -6311,17 +6311,17 @@
             408ff0      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 R15 ZZ mov     esi, cs:dword_60F984 
             408ff6      7 INSTR BELONGTO 408f30 
             408ff6      7 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 R13 R14 R15 ZZ mov     dword ptr [rax+6Ch], 0 
-            408ffd     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFFh 
+            408ffd     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFFh 
             408ffd      5 INSTR BELONGTO 408f30 
             408ffd      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R12 R13 R14 R15 ZZ mov     ecx, 0FFFFFFFFh 
             409002      2 INSTR BELONGTO 408f30 
             409002      2 INSTR DEADREGS  EFLAGS RAX RDX RDI R12 R13 R14 R15 ZZ xor     edx, edx 
-            409002     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409002     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409004      3 INSTR BELONGTO 408f30 
             409004      3 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 ZZ mov     rdi, rbp 
             409007      2 INSTR BELONGTO 408f30 
             409007      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 ZZ xor     eax, eax 
-            409007     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409007     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409009     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
             409009      5 INSTR BELONGTO 408f30 
             409009      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_signal_emit 
@@ -6385,18 +6385,18 @@
             40906c      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R15 ZZ mov     r9, r13 
             40906f      2 INSTR BELONGTO 408f30 
             40906f      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R13 R15 ZZ xor     edx, edx 
-            40906f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40906f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409071      6 INSTR BELONGTO 408f30 
             409071      6 INSTR DEADREGS  EFLAGS RAX RCX RSI R8 R13 R15 ZZ mov     r8d, offset aS  ; "%s" 
-            409077     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            409077     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             409077      5 INSTR BELONGTO 408f30 
             409077      5 INSTR DEADREGS  EFLAGS RAX RCX RSI R13 R15 ZZ mov     ecx, 1 
-            40907c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            40907c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             40907c      5 INSTR BELONGTO 408f30 
             40907c      5 INSTR DEADREGS  EFLAGS RAX RSI R13 R15 ZZ mov     esi, 3 
             409081      2 INSTR BELONGTO 408f30 
             409081      2 INSTR DEADREGS  EFLAGS RAX R13 R15 ZZ xor     eax, eax 
-            409081     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409081     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409083     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             409083      5 INSTR BELONGTO 408f30 
             409083      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    _gtk_message_dialog_new 
@@ -6448,7 +6448,7 @@
             4090d1      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _g_type_check_instance_cast 
             4090d6      2 INSTR BELONGTO 408f30 
             4090d6      2 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ xor     esi, esi 
-            4090d6     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4090d6     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4090d8      3 INSTR BELONGTO 408f30 
             4090d8      3 INSTR DEADREGS  EFLAGS RDI R15 ZZ mov     rdi, rax 
             4090db     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_resizable 
@@ -6462,8 +6462,8 @@
             4090e3      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 ZZ xor     r8d, r8d 
             4090e6      2 INSTR BELONGTO 408f30 
             4090e6      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ xor     ecx, ecx 
-            4090e6     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4090e8     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset _gtk_widget_destroy 
+            4090e6     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4090e8     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset _gtk_widget_destroy 
             4090e8      5 INSTR BELONGTO 408f30 
             4090e8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     edx, offset _gtk_widget_destroy 
             4090ed      3 INSTR BELONGTO 408f30 
@@ -6489,7 +6489,7 @@
             40910d      4 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ mov     rdi, [rbx+28h] 
             409111      2 INSTR BELONGTO 408f30 
             409111      2 INSTR DEADREGS  EFLAGS RSI R13 R14 R15 ZZ xor     esi, esi 
-            409111     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409111     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409113     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
             409113      5 INSTR BELONGTO 408f30 
             409113      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _gtk_widget_set_sensitive 
@@ -6564,7 +6564,7 @@
             409179      3 INSTR BELONGTO 409150 
             40917c      2 INSTR BELONGTO 409150 
             40917c      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R12 R13 R14 R15 ZZ xor     eax, eax 
-            40917c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40917c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40917e      4 INSTR BELONGTO 409150 
             40917e      4 INSTR DEADREGS  EFLAGS RBX R8 R9 R12 R13 R14 R15 ZZ mov     r9d, [rdx+54h] 
             409182     -1 INSTR LOCAL NoMetaUpdate test    r9d, r9d 
@@ -6616,7 +6616,7 @@
             4091e9      5 INSTR BELONGTO 409150 
             4091e9      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     [rsp+58h+var_48], rax 
             4091e9      5 PTRIMMEDESP STACK 16 displ mov     [rsp+58h+var_48], rax
-            4091ee     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rcx+40h] 
+            4091ee     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rcx+40h] 
             4091ee      3 INSTR BELONGTO 409150 
             4091ee      3 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     eax, [rcx+40h] 
             4091f1     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_409208 
@@ -6631,14 +6631,14 @@
             409202      6 INSTR BELONGTO 409150 
             409208     -1 INSTR LOCAL 2ndSrcNumeric add     eax, [rcx+44h] 
             409208      3 INSTR BELONGTO 409150 
-            40920b     -2 INSTR LOCAL n EDI ZZ  NumericDEFs mov     edi, [rcx+68h] 
+            40920b     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     edi, [rcx+68h] 
             40920b      3 INSTR BELONGTO 409150 
             40920b      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     edi, [rcx+68h] 
             40920e     -1 INSTR LOCAL MetadataRedundant add     eax, edi 
             40920e      2 INSTR BELONGTO 409150 
             409210      2 INSTR BELONGTO 409150 
             409210      2 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R14 R15 ZZ mov     edx, eax 
-            409210     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, eax 
+            409210     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, eax 
             409212     -1 INSTR LOCAL MetadataRedundant sar     edx, 1Fh 
             409212      3 INSTR BELONGTO 409150 
             409215     -1 INSTR LOCAL MetadataRedundant idiv    edi 
@@ -6647,7 +6647,7 @@
             409217      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     rdi, [rcx] 
             40921a      2 INSTR BELONGTO 409150 
             40921a      2 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 R14 R15 ZZ mov     esi, edx 
-            40921a     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, edx 
+            40921a     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, edx 
             40921c      3 INSTR BELONGTO 409150 
             40921c      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     [rcx+40h], edx 
             40921f     -1 INSTR LOCAL NoMetaUpdate call    _gucharmap_codepoint_list_get_char 
@@ -6745,7 +6745,7 @@
             4092ac      5 PTRIMMEDESP STACK 16 displ mov     rdi, [rsp+58h+var_48]
             4092b1      2 INSTR BELONGTO 409150 
             4092b1      2 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 R14 R15 ZZ xor     esi, esi 
-            4092b1     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4092b1     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4092b3     -1 INSTR LOCAL NoMetaUpdate call    _g_timer_elapsed 
             4092b3      5 INSTR BELONGTO 409150 
             4092b3      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_timer_elapsed 
@@ -6759,7 +6759,7 @@
             4092cb     -1 INSTR LOCAL NoMetaUpdate call    _g_timer_destroy 
             4092cb      5 INSTR BELONGTO 409150 
             4092cb      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 ZZ call    _g_timer_destroy 
-            4092d0     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4092d0     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4092d0      5 INSTR BELONGTO 409150 
             4092d0      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ mov     eax, 1 
             4092d5      3 INSTR BELONGTO 409150 
@@ -6801,7 +6801,7 @@
             40930e      4 INSTR DEADREGS  EFLAGS R14 R15 ZZ add     dword ptr [rdx+70h], 1 
             409312      2 INSTR BELONGTO 409150 
             409312      2 INSTR DEADREGS  EFLAGS RDX R14 R15 ZZ xor     edx, edx 
-            409312     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409312     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409314     -1 INSTR LOCAL NoMetaUpdate call    _g_utf8_normalize 
             409314      5 INSTR BELONGTO 409150 
             409314      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _g_utf8_normalize 
@@ -6845,7 +6845,7 @@
             409352      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 ZZ call    _g_timer_destroy 
             409357      2 INSTR BELONGTO 409150 
             409357      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ xor     eax, eax 
-            409357     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409357     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409359     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4092D8 
             409359      5 INSTR BELONGTO 409150 
             409360      5 INSTR BELONGTO 409150 
@@ -6864,7 +6864,7 @@
             409373      2 INSTR BELONGTO 409150 
             409375      4 INSTR BELONGTO 409150 
             409375      4 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 XMM0 ZZ mov     rdi, [rbx+18h] 
-            409379     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
+            409379     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
             409379      3 INSTR BELONGTO 409150 
             409379      3 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 XMM0 ZZ movzx   eax, byte ptr [rdi] 
             40937c     -1 INSTR LOCAL MetadataRedundant sub     eax, 20h 
@@ -6879,7 +6879,7 @@
             40938e      4 INSTR BELONGTO 409150 
             409392      2 INSTR BELONGTO 409150 
             409392      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ xor     eax, eax 
-            409392     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409392     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409394      1 INSTR BELONGTO 409150 
             409394      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ pop     rbx 
             409395      1 INSTR BELONGTO 409150 
@@ -6928,7 +6928,7 @@
             4093dc      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R14 ZZ mov     rax, [r12+20h] 
             4093e1      2 INSTR BELONGTO 409150 
             4093e1      2 INSTR DEADREGS  EFLAGS RDX RSI R14 ZZ xor     edx, edx 
-            4093e1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4093e1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4093e3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             4093e3      7 INSTR BELONGTO 409150 
             4093e3      7 INSTR DEADREGS  EFLAGS RSI R14 ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -7043,7 +7043,7 @@
             4094a0      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R14 ZZ mov     rax, [r12+20h] 
             4094a5      2 INSTR BELONGTO 409150 
             4094a5      2 INSTR DEADREGS  EFLAGS RDX RSI R14 ZZ xor     edx, edx 
-            4094a5     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4094a5     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4094a7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             4094a7      7 INSTR BELONGTO 409150 
             4094a7      7 INSTR DEADREGS  EFLAGS RSI R14 ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -7088,7 +7088,7 @@
             4094ec      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aQuick_checks_b; "quick_checks_before" 
             4094f1      2 INSTR BELONGTO 409150 
             4094f1      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            4094f1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4094f1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4094f3     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             4094f3      5 INSTR BELONGTO 409150 
             4094f3      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_return_if_fail_warning 
@@ -7100,7 +7100,7 @@
             409502      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aQuick_checks_b; "quick_checks_before" 
             409507      2 INSTR BELONGTO 409150 
             409507      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            409507     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409507     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409509     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             409509      5 INSTR BELONGTO 409150 
             409509      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_return_if_fail_warning 
@@ -7118,7 +7118,7 @@
             409522      3 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ mov     [rdx+50h], eax 
             409525      2 INSTR BELONGTO 409150 
             409525      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ xor     eax, eax 
-            409525     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409525     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409527      7 INSTR BELONGTO 409150 
             409527      7 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ mov     dword ptr [rdx+54h], 1 
             40952e     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4092D8 
@@ -7143,7 +7143,7 @@
             40954e      7 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ mov     dword ptr [rbx+54h], 1 
             409555      2 INSTR BELONGTO 409150 
             409555      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ xor     eax, eax 
-            409555     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409555     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409557     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4092D8 
             409557      5 INSTR BELONGTO 409150 
             40955c      5 INSTR BELONGTO 409150 
@@ -7186,7 +7186,7 @@
             409594      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R14 ZZ mov     rax, [r12+20h] 
             409599      2 INSTR BELONGTO 409150 
             409599      2 INSTR DEADREGS  EFLAGS RDX RSI R14 ZZ xor     edx, edx 
-            409599     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409599     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40959b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             40959b      7 INSTR BELONGTO 409150 
             40959b      7 INSTR DEADREGS  EFLAGS RSI R14 ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -7264,7 +7264,7 @@
             409614      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R14 ZZ mov     rax, [r12+20h] 
             409619      2 INSTR BELONGTO 409150 
             409619      2 INSTR DEADREGS  EFLAGS RDX RSI R14 ZZ xor     edx, edx 
-            409619     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409619     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40961b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             40961b      7 INSTR BELONGTO 409150 
             40961b      7 INSTR DEADREGS  EFLAGS RSI R14 ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -7338,7 +7338,7 @@
             409688      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
             40968d      3 INSTR BELONGTO 409680 
             40968d      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            409690     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 38h 
+            409690     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 38h 
             409690      5 INSTR BELONGTO 409680 
             409690      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 38h 
             409695      7 INSTR BELONGTO 409680 
@@ -7377,17 +7377,17 @@
             4096e4     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             4096e4      3 INSTR BELONGTO 409680 
             4096e4      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI R8 ZZ xor     r8d, r8d 
-            4096e7     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 460h 
+            4096e7     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 460h 
             4096e7      5 INSTR BELONGTO 409680 
             4096e7      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI ZZ mov     ecx, 460h 
-            4096ec     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4096ec     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4096ec      5 INSTR BELONGTO 409680 
             4096ec      5 INSTR DEADREGS  EFLAGS RDX RBX RDI ZZ mov     edx, 1 
             4096f1      3 INSTR BELONGTO 409680 
             4096f1      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
             4096f4      2 INSTR BELONGTO 409680 
             4096f4      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            4096f4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4096f4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4096f6      8 INSTR BELONGTO 409680 
             4096f6      8 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+28h+var_18], 0 
             4096f6      8 PTRIMMEDESP STACK 16 displ mov     [rsp+28h+var_18], 0
@@ -7422,15 +7422,15 @@
             409735     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             409735      3 INSTR BELONGTO 409680 
             409735      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 ZZ xor     r8d, r8d 
-            409738     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 468h 
+            409738     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 468h 
             409738      5 INSTR BELONGTO 409680 
             409738      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX ZZ mov     ecx, 468h 
-            40973d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40973d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40973d      5 INSTR BELONGTO 409680 
             40973d      5 INSTR DEADREGS  EFLAGS RAX RDX RBX ZZ mov     edx, 1 
             409742      2 INSTR BELONGTO 409680 
             409742      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            409742     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409742     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409744     -1 INSTR LOCAL MetadataUnused mov     [rsp+28h+var_10], 1Ch 
             409744      9 INSTR BELONGTO 409680 
             40974d     -1 INSTR LOCAL MetadataRedundant mov     [rsp+28h+var_18], 1 
@@ -7484,7 +7484,7 @@
             4097b5     -1 INSTR LOCAL NoMetaUpdate call    sub_408600 
             4097b5      5 INSTR BELONGTO 409780 
             4097ba      7 INSTR BELONGTO 409780 
-            4097c1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4097c1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4097c1      5 INSTR BELONGTO 409780 
             4097c6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             4097c6      5 INSTR BELONGTO 409780 
@@ -7519,31 +7519,31 @@
             409857      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40985d      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
             409862     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409867     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            409867     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             40986f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_set_border_width 
             409877      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40987a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40987f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40987f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             409887     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_destroy_with_parent 
             40988c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_get_type 
             40989a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40989f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            40989f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             4098a7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_set_spacing 
             4098af      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4098b2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4098b7     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4098b7     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4098bc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_resizable 
             4098c1     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             4098c4     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4098c7     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4098c7     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4098ce      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4098d6     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             4098de      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4098e1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4098e6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF9h 
+            4098e6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF9h 
             4098f3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_button 
             4098f8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_new 
-            4098fd     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4098fd     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             409909     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_can_default 
             409918     -1 INSTR LOCAL NoMetaUpdate call    _g_dgettext 
             40991d      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rax
@@ -7555,11 +7555,11 @@
             409952      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], rax
             409957     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40995c      5 PTRIMMEDESP STACK 24 displ mov     rsi, [rsp+18h]
-            409961     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409961     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409966     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_action_widget 
             40996f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             409974     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_new 
-            409979     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            409979     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             409985     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_can_default 
             40998e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40999d     -1 INSTR LOCAL NoMetaUpdate call    _g_dgettext 
@@ -7569,35 +7569,35 @@
             4099c0     -1 INSTR LOCAL NoMetaUpdate call    sub_4087D0 
             4099cc      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4099cf     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4099d4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4099d4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4099df     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_action_widget 
             4099e7      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4099ea     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4099ef     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4099ef     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4099f7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_set_default_response 
             4099ff      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             409a02     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409a07     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            409a0d     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFF9h 
-            409a12     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            409a17     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            409a1c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409a0d     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFF9h 
+            409a12     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            409a17     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            409a1c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409a1e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_set_alternative_button_order 
             409a23     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grid_new 
             409a2b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grid_get_type 
             409a36      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], rax
             409a3b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409a40     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            409a40     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             409a48     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grid_set_column_spacing 
             409a50     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             409a55      5 PTRIMMEDESP STACK 8 displ mov     r10, [rsp+8]
             409a60     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409a65     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            409a65     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             409a6d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_set_border_width 
             409a78     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409a7d     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            409a80     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            409a82     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409a80     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            409a82     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409a8a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             409a99     -1 INSTR LOCAL NoMetaUpdate call    _g_dgettext 
             409aa1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new_with_mnemonic 
@@ -7606,27 +7606,27 @@
             409ab3      5 PTRIMMEDESP STACK 24 displ mov     rsi, [rsp+18h]
             409abb     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409ac0      5 PTRIMMEDESP STACK 32 displ mov     rsi, [rsp+20h]
-            409ac5     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            409ac7     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409ac5     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            409ac7     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409ac9     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 1 
             409acf     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
             409ad8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grid_attach 
             409add     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_new 
             409ae9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-            409af2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            409af2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             409af7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_hexpand 
             409afc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_get_type 
             409b08     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409b0d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            409b0d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             409b15     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_set_activates_default 
             409b1e      5 PTRIMMEDESP STACK 24 displ mov     rsi, [rsp+18h]
             409b26      5 PTRIMMEDESP STACK 40 displ mov     [rsp+28h], rax
             409b2b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409b30      5 PTRIMMEDESP STACK 40 displ mov     rsi, [rsp+28h]
-            409b35     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            409b35     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             409b3a     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 1 
             409b40     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-            409b46     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            409b46     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             409b4b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grid_attach 
             409b54     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             409b57     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -7637,8 +7637,8 @@
             409b8a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             409b99     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409b9e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            409ba1     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            409ba3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409ba1     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            409ba3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409bab     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             409bb4     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             409bb7     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -7649,8 +7649,8 @@
             409bea     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             409bf9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409bfe     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            409c01     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            409c06     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409c01     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            409c06     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409c0b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             409c14      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
             409c17     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
@@ -7660,16 +7660,16 @@
             409c35      5 PTRIMMEDESP STACK 32 displ mov     rdi, [rsp+20h]
             409c3d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409c48     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_set_mnemonic_widget 
-            409c51     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409c51     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409c53     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
-            409c5c     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409c5c     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409c5e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
             409c66      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             409c78     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409c7d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
             409c81     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             409c84     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            409c91     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            409c91     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             409ca0     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_connect_data 
             409cb0      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
             409cb5      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
@@ -7680,15 +7680,15 @@
             409ce6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_instance_get_private 
             409ceb     -1 INSTR LOCAL NoMetaUpdate test    ebp, ebp 
             409cf0     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_409D38 
-            409cf2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
+            409cf2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
             409cfa     -1 INSTR LOCAL NoMetaUpdate call    sub_4088B0 
             409cff     -1 INSTR LOCAL NoMetaUpdate call    _gtk_editable_get_type 
             409d0c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409d11      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
             409d15      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
-            409d1a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            409d1a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             409d1f      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
-            409d24     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409d24     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409d29     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             409d2d     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_editable_select_region 
             409d38     -1 INSTR LOCAL NoMetaUpdate cmp     ebp, 1 
@@ -7697,7 +7697,7 @@
             409d48     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409d50     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_hide 
             409d55     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_409CFF 
-            409d60     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            409d60     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             409d68     -1 INSTR LOCAL NoMetaUpdate call    sub_4088B0 
             409d6d     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_409CFF 
             409d70      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -16 0 4 0 0 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -7749,12 +7749,12 @@
             409da7      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, [rbx+28h] 
             409dab     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             409dab      2 INSTR BELONGTO 409d70 
-            409dad     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM setz    bpl 
+            409dad     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM setz    bpl 
             409dad      4 INSTR BELONGTO 409d70 
             409dad      4 INSTR DEADREGS  RSI ZZ setz    bpl 
             409db1      2 INSTR BELONGTO 409d70 
             409db1      2 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, ebp 
-            409db1     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, ebp 
+            409db1     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, ebp 
             409db3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
             409db3      5 INSTR BELONGTO 409d70 
             409db3      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_widget_set_sensitive 
@@ -7883,12 +7883,12 @@
             409e8b      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ call    sub_408830 
             409e90      2 INSTR BELONGTO 409e70 
             409e90      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ xor     esi, esi 
-            409e90     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409e90     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409e92      3 INSTR BELONGTO 409e70 
             409e92      3 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     rdi, rax 
             409e95      2 INSTR BELONGTO 409e70 
             409e95      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-            409e95     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409e95     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409e97     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             409e97      5 INSTR BELONGTO 409e70 
             409e97      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_object_new 
@@ -8061,7 +8061,7 @@
             40a003      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, offset aSize; "size" 
             40a008      2 INSTR BELONGTO 409ff0 
             40a008      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40a008     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a008     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a00a     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_set 
             40a00a      5 INSTR BELONGTO 409ff0 
             40a00a      5 INSTR DEADREGS  EFLAGS ZZ call    _g_settings_set 
@@ -8069,7 +8069,7 @@
             40a00f      7 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     dword ptr [rbx+8], 0 
             40a016      2 INSTR BELONGTO 409ff0 
             40a016      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40a016     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a016     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a018      1 INSTR BELONGTO 409ff0 
             40a018      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40a019      1 INSTR BELONGTO 409ff0 
@@ -8119,14 +8119,14 @@
             40a06d     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40A095 
             40a06f     -1 INSTR LOCAL NoMetaUpdate test    byte ptr [rbp+18h], 10h 
             40a06f      4 PTRIMMEDEBP STACK 24 displ test    byte ptr [rbp+18h], 10h
-            40a07f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setnz   dl 
+            40a07f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setnz   dl 
             40a090     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_set_boolean 
-            40a095     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a095     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a097      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             40a09c      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             40a0a1     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             40a0b0     -1 INSTR LOCAL NoMetaUpdate test    byte ptr [rsi+18h], 4 
-            40a0c0     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setnz   dl 
+            40a0c0     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setnz   dl 
             40a0ce     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_set_boolean 
             40a0d3      3 PTRIMMEDEBP STACK 20 displ mov     eax, [rbp+14h]
             40a0d6     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40A06B 
@@ -8163,17 +8163,17 @@
             40a100      2 INSTR BELONGTO 40a0e0 
             40a102      2 INSTR BELONGTO 40a0e0 
             40a102      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40a102     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a102     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a104      1 INSTR BELONGTO 40a0e0 
             40a104      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40a105      1 INSTR BELONGTO 40a0e0 
             40a105      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             40a110      3 INSTR BELONGTO 40a0e0 
             40a110      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, rbx 
-            40a113     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_409FF0 
+            40a113     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_409FF0 
             40a113      5 INSTR BELONGTO 40a0e0 
             40a113      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset sub_409FF0 
-            40a118     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40a118     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40a118      5 INSTR BELONGTO 40a0e0 
             40a118      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 1 
             40a11d     -1 INSTR LOCAL NoMetaUpdate call    _g_timeout_add_seconds 
@@ -8183,7 +8183,7 @@
             40a122      3 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ mov     [rbx+8], eax 
             40a125      2 INSTR BELONGTO 40a0e0 
             40a125      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40a125     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a125     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a127      1 INSTR BELONGTO 40a0e0 
             40a127      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40a128      1 INSTR BELONGTO 40a0e0 
@@ -8267,7 +8267,7 @@
             40a1a3      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aGucharmap_sett; "gucharmap_settings_add_window" 
             40a1a8      2 INSTR BELONGTO 40a150 
             40a1a8      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            40a1a8     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a1a8     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a1aa     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40a1aa      5 INSTR BELONGTO 40a150 
             40a1aa      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_return_if_fail_warning 
@@ -8309,7 +8309,7 @@
             40a1f0      2 INSTR BELONGTO 40a150 
             40a1f2     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40A300 
             40a1f2      6 INSTR BELONGTO 40a150 
-            40a1f8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
+            40a1f8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
             40a1f8      5 INSTR BELONGTO 40a150 
             40a1f8      5 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 ZZ mov     edi, 18h 
             40a1fd     -1 INSTR LOCAL NoMetaUpdate call    _g_slice_alloc0 
@@ -8322,7 +8322,7 @@
             40a20a     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_new 
             40a20a      5 INSTR BELONGTO 40a150 
             40a20a      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_settings_new 
-            40a20f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40a20f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40a20f      5 INSTR BELONGTO 40a150 
             40a20f      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ mov     esi, 50h 
             40a214      4 INSTR BELONGTO 40a150 
@@ -8336,7 +8336,7 @@
             40a220      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 ZZ mov     rdx, rbp 
             40a223      3 INSTR BELONGTO 40a150 
             40a223      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R13 R14 R15 ZZ mov     rdi, rax 
-            40a226     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_40A020 
+            40a226     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_40A020 
             40a226      5 INSTR BELONGTO 40a150 
             40a226      5 INSTR DEADREGS  EFLAGS RCX RSI R13 R14 R15 ZZ mov     ecx, offset sub_40A020 
             40a22b      5 INSTR BELONGTO 40a150 
@@ -8352,7 +8352,7 @@
             40a238      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R14 R15 ZZ xor     r8d, r8d 
             40a23b      3 INSTR BELONGTO 40a150 
             40a23b      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 ZZ mov     rcx, rbp 
-            40a23e     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40A0E0 
+            40a23e     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40A0E0 
             40a23e      5 INSTR BELONGTO 40a150 
             40a23e      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 ZZ mov     edx, offset sub_40A0E0 
             40a243      5 INSTR BELONGTO 40a150 
@@ -8368,7 +8368,7 @@
             40a253      3 INSTR BELONGTO 40a150 
             40a256      3 INSTR BELONGTO 40a150 
             40a256      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 ZZ mov     rcx, rbp 
-            40a259     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40A050 
+            40a259     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40A050 
             40a259      5 INSTR BELONGTO 40a150 
             40a259      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 ZZ mov     edx, offset loc_40A050 
             40a25e      5 INSTR BELONGTO 40a150 
@@ -8471,7 +8471,7 @@
             40a305      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aGucharmap_sett; "gucharmap_settings_add_window" 
             40a30a      2 INSTR BELONGTO 40a150 
             40a30a      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            40a30a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a30a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a30c     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40a30c      5 INSTR BELONGTO 40a150 
             40a30c      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_return_if_fail_warning 
@@ -8505,7 +8505,7 @@
             40a344      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
             40a349      3 INSTR BELONGTO 40a340 
             40a349      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            40a34c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40a34c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40a34c      5 INSTR BELONGTO 40a340 
             40a34c      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             40a351      7 INSTR BELONGTO 40a340 
@@ -8545,7 +8545,7 @@
             40a395     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
             40a395      5 INSTR BELONGTO 40a370 
             40a395      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_action_group_get_action 
-            40a39a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40a39a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40a39a      5 INSTR BELONGTO 40a370 
             40a39a      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 50h 
             40a39f      3 INSTR BELONGTO 40a370 
@@ -8557,14 +8557,14 @@
             40a3a7      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rdx, r12 
             40a3aa      2 INSTR BELONGTO 40a370 
             40a3aa      2 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 ZZ xor     ecx, ecx 
-            40a3aa     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a3aa     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40a3ac      3 INSTR BELONGTO 40a370 
             40a3ac      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     rdi, rax 
             40a3af      5 INSTR BELONGTO 40a370 
             40a3af      5 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ mov     esi, offset aLabel; "label" 
             40a3b4      2 INSTR BELONGTO 40a370 
             40a3b4      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            40a3b4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a3b4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a3b6     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             40a3b6      5 INSTR BELONGTO 40a370 
             40a3b6      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_object_set 
@@ -8575,7 +8575,7 @@
             40a3c4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
             40a3c4      5 INSTR BELONGTO 40a370 
             40a3c4      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _gtk_action_group_get_action 
-            40a3c9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40a3c9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40a3c9      5 INSTR BELONGTO 40a370 
             40a3c9      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 50h 
             40a3ce      3 INSTR BELONGTO 40a370 
@@ -8595,12 +8595,12 @@
             40a3e7      3 INSTR BELONGTO 40a370 
             40a3ea      2 INSTR BELONGTO 40a370 
             40a3ea      2 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     ecx, ecx 
-            40a3ea     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a3ea     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40a3ec     -1 INSTR LOCAL MetadataUnused mov     esi, offset aLabel; "label" 
             40a3ec      5 INSTR BELONGTO 40a370 
             40a3f1      2 INSTR BELONGTO 40a370 
             40a3f1      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            40a3f1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a3f1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a3f3     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             40a3f3      4 INSTR BELONGTO 40a370 
             40a3f7     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_set 
@@ -8706,7 +8706,7 @@
             40a4db      3 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     rdi, rax 
             40a4de      2 INSTR BELONGTO 40a400 
             40a4de      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            40a4de     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a4de     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a4e0      5 INSTR BELONGTO 40a400 
             40a4e0      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     [rsp+108h+var_F8], r14 
             40a4e0      5 PTRIMMEDESP STACK 16 displ mov     [rsp+108h+var_F8], r14
@@ -8793,7 +8793,7 @@
             40a58d      5 PTRIMMEDESP STACK 32 displ mov     [rsp+108h+var_E8], rax
             40a592      2 INSTR BELONGTO 40a400 
             40a592      2 INSTR DEADREGS  EFLAGS RAX R12 R14 ZZ xor     eax, eax 
-            40a592     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a592     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a594      4 INSTR BELONGTO 40a400 
             40a594      4 INSTR DEADREGS  EFLAGS R12 R14 ZZ mov     [rsp+108h+var_108], r13 
             40a594      4 PTRIMMEDESP STACK 0 displ mov     [rsp+108h+var_108], r13
@@ -8902,7 +8902,7 @@
             40a65f      2 INSTR BELONGTO 40a640 
             40a661      2 INSTR BELONGTO 40a640 
             40a661      2 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 ZZ xor     ebp, ebp 
-            40a661     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40a661     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40a663     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40A676 
             40a663      2 INSTR BELONGTO 40a640 
             40a668     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     ebp, 1 
@@ -8915,7 +8915,7 @@
             40a671      3 INSTR BELONGTO 40a640 
             40a674     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40A6D0 
             40a674      2 INSTR BELONGTO 40a640 
-            40a676     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2Eh        ; c 
+            40a676     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2Eh        ; c 
             40a676      5 INSTR BELONGTO 40a640 
             40a676      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 ZZ mov     esi, 2Eh        ; c 
             40a67b      3 INSTR BELONGTO 40a640 
@@ -8941,7 +8941,7 @@
             40a69d     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40a69d      5 INSTR BELONGTO 40a640 
             40a69d      5 INSTR DEADREGS  EFLAGS RBX R13 R15 ZZ call    _g_build_filename 
-            40a6a2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40a6a2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40a6a2      5 INSTR BELONGTO 40a640 
             40a6a2      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 R15 ZZ mov     esi, 10h 
             40a6a7      3 INSTR BELONGTO 40a640 
@@ -8993,14 +8993,14 @@
             40a6e2      2 INSTR BELONGTO 40a640 
             40a6e4      2 INSTR BELONGTO 40a640 
             40a6e4      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 R15 ZZ xor     edx, edx 
-            40a6e4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a6e4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a6e6      3 INSTR BELONGTO 40a640 
             40a6e6      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 R15 ZZ mov     rsi, rbx 
             40a6e9      5 INSTR BELONGTO 40a640 
             40a6e9      5 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R15 ZZ mov     edi, offset aGhelp; "ghelp://" 
             40a6ee      2 INSTR BELONGTO 40a640 
             40a6ee      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R15 ZZ xor     eax, eax 
-            40a6ee     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a6ee     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a6f0     -1 INSTR LOCAL NoMetaUpdate call    _g_strconcat 
             40a6f0      5 INSTR BELONGTO 40a640 
             40a6f0      5 INSTR DEADREGS  EFLAGS R12 R13 R15 ZZ call    _g_strconcat 
@@ -9069,20 +9069,20 @@
             40a75c      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R14 R15 ZZ mov     rdi, rbp 
             40a75f      6 INSTR BELONGTO 40a640 
             40a75f      6 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R9 R14 R15 ZZ mov     r8d, offset aS  ; "%s" 
-            40a765     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40a765     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40a765      5 INSTR BELONGTO 40a640 
             40a765      5 INSTR DEADREGS  EFLAGS RCX RDX RSI R9 R14 R15 ZZ mov     ecx, 1 
-            40a76a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            40a76a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             40a76a      5 INSTR BELONGTO 40a640 
             40a76a      5 INSTR DEADREGS  EFLAGS RDX RSI R9 R14 R15 ZZ mov     edx, 3 
-            40a76f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            40a76f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             40a76f      5 INSTR BELONGTO 40a640 
             40a76f      5 INSTR DEADREGS  EFLAGS RSI R9 R14 R15 ZZ mov     esi, 3 
             40a774      4 INSTR BELONGTO 40a640 
             40a774      4 INSTR DEADREGS  EFLAGS R9 R14 R15 ZZ mov     r9, [rax+8] 
             40a778      2 INSTR BELONGTO 40a640 
             40a778      2 INSTR DEADREGS  EFLAGS RAX R14 R15 ZZ xor     eax, eax 
-            40a778     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a778     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a77a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             40a77a      5 INSTR BELONGTO 40a640 
             40a77a      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _gtk_message_dialog_new 
@@ -9094,8 +9094,8 @@
             40a782      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R14 R15 ZZ xor     r8d, r8d 
             40a785      2 INSTR BELONGTO 40a640 
             40a785      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 R15 ZZ xor     ecx, ecx 
-            40a785     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40a787     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset _gtk_widget_destroy 
+            40a785     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a787     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset _gtk_widget_destroy 
             40a787      5 INSTR BELONGTO 40a640 
             40a787      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 R15 ZZ mov     edx, offset _gtk_widget_destroy 
             40a78c      3 INSTR BELONGTO 40a640 
@@ -9198,7 +9198,7 @@
             40a82b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_get_name 
             40a82b      5 INSTR BELONGTO 40a810 
             40a82b      5 INSTR DEADREGS  R12 ZZ call    _gtk_action_get_name 
-            40a830     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Eh 
+            40a830     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Eh 
             40a830      5 INSTR BELONGTO 40a810 
             40a830      5 INSTR DEADREGS  RCX RDX RSI RDI R12 ZZ mov     ecx, 0Eh 
             40a835      5 INSTR BELONGTO 40a810 
@@ -9209,7 +9209,7 @@
             40a83d      2 INSTR BELONGTO 40a810 
             40a83f     -1 INSTR LOCAL MetadataRedundant setnbe  cl 
             40a83f      3 INSTR BELONGTO 40a810 
-            40a842     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setb    dl 
+            40a842     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setb    dl 
             40a842      3 INSTR BELONGTO 40a810 
             40a842      3 INSTR DEADREGS  RDX RDI R12 ZZ setb    dl 
             40a845     -1 INSTR LOCAL NoMetaUpdate cmp     cl, dl 
@@ -9220,15 +9220,15 @@
             40a849      3 INSTR DEADREGS  RCX RDX RSI RDI R12 ZZ mov     rsi, rax 
             40a84c      5 INSTR BELONGTO 40a810 
             40a84c      5 INSTR DEADREGS  RAX RCX RDX RDI R12 ZZ mov     edi, offset aPreviouscharac; "PreviousCharacter" 
-            40a851     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 12h 
+            40a851     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 12h 
             40a851      5 INSTR BELONGTO 40a810 
             40a851      5 INSTR DEADREGS  RAX RCX RDX R12 ZZ mov     ecx, 12h 
             40a856     -1 INSTR LOCAL NoMetaUpdate repe cmpsb 
             40a856      2 INSTR BELONGTO 40a810 
-            40a858     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setnbe  al 
+            40a858     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setnbe  al 
             40a858      3 INSTR BELONGTO 40a810 
             40a858      3 INSTR DEADREGS  RAX RDX RDI R12 ZZ setnbe  al 
-            40a85b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setb    dl 
+            40a85b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setb    dl 
             40a85b      3 INSTR BELONGTO 40a810 
             40a85b      3 INSTR DEADREGS  RDX RDI R12 ZZ setb    dl 
             40a85e     -1 INSTR LOCAL MetadataRedundant sub     al, dl 
@@ -9248,7 +9248,7 @@
             40a872      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _gucharmap_charmap_get_chartable 
             40a877      3 INSTR BELONGTO 40a810 
             40a877      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     rbp, [rax] 
-            40a87a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40a87a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40a87a      5 INSTR BELONGTO 40a810 
             40a87a      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 50h 
             40a87f      3 INSTR BELONGTO 40a810 
@@ -9277,7 +9277,7 @@
             40a8a5      3 INSTR BELONGTO 40a810 
             40a8a8      2 INSTR BELONGTO 40a810 
             40a8a8      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     edx, edx 
-            40a8a8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a8a8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a8aa     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             40a8aa      4 INSTR BELONGTO 40a810 
             40a8ae     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_binding_set_activate 
@@ -9291,16 +9291,16 @@
             40a8d2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
             40a8dd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a8e5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_window 
-            40a8ea     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a8ea     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a8ef     -1 INSTR LOCAL NoMetaUpdate call    _gdk_window_set_cursor 
             40a8fd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
-            40a902     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40a902     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40a90a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_set_sensitive 
             40a918     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
-            40a91d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40a91d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40a925     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_set_sensitive 
             40a933     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
-            40a939     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40a939     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40a941     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_action_set_sensitive 
             40a950     -3 INSTR LOCAL NoWarn push    r12 
             40a952     -3 INSTR LOCAL NoWarn push    rbp 
@@ -9308,7 +9308,7 @@
             40a957     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
             40a965     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a96d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_display 
-            40a972     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 96h 
+            40a972     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 96h 
             40a97a     -1 INSTR LOCAL NoMetaUpdate call    _gdk_cursor_new_for_display 
             40a988     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a990     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_window 
@@ -9317,13 +9317,13 @@
             40a9a0      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40a9a3     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             40a9b1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
-            40a9b6     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a9b6     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a9bb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_set_sensitive 
             40a9c9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
-            40a9ce     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a9ce     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a9d3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_set_sensitive 
             40a9e1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
-            40a9ea     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a9ea     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a9ef     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_action_set_sensitive 
             40aa00      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 -8 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             40aa00      0 FUNC MMSAFENESS SAFE
@@ -9486,14 +9486,14 @@
             40ab05      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 ZZ xor     r8d, r8d 
             40ab08      5 INSTR BELONGTO 40aa80 
             40ab08      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     ecx, offset aGucharmap_wind; "gucharmap_window_set_chapters_model" 
-            40ab0d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 206h 
+            40ab0d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 206h 
             40ab0d      5 INSTR BELONGTO 40aa80 
             40ab0d      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 206h 
             40ab12      5 INSTR BELONGTO 40aa80 
             40ab12      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aGucharmapWindo; "gucharmap-window.c" 
             40ab17      2 INSTR BELONGTO 40aa80 
             40ab17      2 INSTR DEADREGS  EFLAGS RDI R12 ZZ xor     edi, edi 
-            40ab17     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40ab17     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40ab19     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message 
             40ab19      5 INSTR BELONGTO 40aa80 
             40ab19      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_assertion_message 
@@ -9554,7 +9554,7 @@
             40abcc      5 PTRIMMEDESP STACK 24 displ mov     [rsp+28h+var_10], rax
             40abd1      2 INSTR BELONGTO 40abb0 
             40abd1      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40abd1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40abd1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40abd3     -1 INSTR LOCAL NoMetaUpdate call    _gucharmap_charmap_get_active_character 
             40abd3      5 INSTR BELONGTO 40abb0 
             40abd3      5 INSTR DEADREGS  EFLAGS ZZ call    _gucharmap_charmap_get_active_character 
@@ -9583,7 +9583,7 @@
             40abf4      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_settings_set_string 
             40abf9      2 INSTR BELONGTO 40abb0 
             40abf9      2 INSTR DEADREGS  EFLAGS RAX RDX RBX ZZ xor     eax, eax 
-            40abf9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40abf9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40abfb     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     rdx, [rsp+28h+var_10] 
             40abfb      5 INSTR BELONGTO 40abb0 
             40abfb      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     rdx, [rsp+28h+var_10] 
@@ -9604,15 +9604,15 @@
             40ac11      5 INSTR DEADREGS  EFLAGS RBX ZZ call    ___stack_chk_fail 
             40ac20      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbx
             40ac25      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], rbp
-            40ac31     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40ac31     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40ac33     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_get_string 
             40ac38     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             40ac45     -1 INSTR LOCAL NoMetaUpdate call    _g_utf8_strlen 
-            40ac4a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ac4a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ac4c     -1 INSTR LOCAL NoMetaUpdate cmp     rax, 1 
             40ac50     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40AC65 
             40ac55     -1 INSTR LOCAL NoMetaUpdate call    _g_utf8_get_char 
-            40ac5c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40ac5c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40ac61      4 PTRIMMEDEBP STACK 0 displ mov     [rbp+0], rax
             40ac67      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             40ac6c      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
@@ -9622,7 +9622,7 @@
             40ac8d      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
             40ac99     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_get_type 
             40aca9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40acae     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40acae     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40acb3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_pop 
             40acb8     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
             40acbb     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40ACF0 
@@ -9631,7 +9631,7 @@
             40accd      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
             40acd2      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
             40acd6      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
-            40acdb     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40acdb     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40ace0     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             40ace4     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_statusbar_push 
             40acf0      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
@@ -9664,7 +9664,7 @@
             40ad24      4 PTRIMMEDESP STACK 12 displ mov     edx, [rsp+18h+var_C]
             40ad28      4 INSTR BELONGTO 40ad10 
             40ad28      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, [rbx+48h] 
-            40ad2c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
+            40ad2c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
             40ad2c      5 INSTR BELONGTO 40ad10 
             40ad2c      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 0FFFFFFFFh 
             40ad31     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     edx, 9 
@@ -9683,7 +9683,7 @@
             40ad45      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
             40ad4d      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
             40ad5f      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], rax
-            40ad64     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ad64     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ad66      8 PTRIMMEDESP STACK 12 displ mov     dword ptr [rsp+0Ch], 0FFFFFFFFh
             40ad6e     -1 INSTR LOCAL NoMetaUpdate call    _gucharmap_chartable_get_active_character 
             40ad77     -1 INSTR LOCAL NoMetaUpdate call    _gucharmap_unichar_validate 
@@ -9705,7 +9705,7 @@
             40add2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40add7      5 PTRIMMEDESP STACK 12 displ lea     rcx, [rsp+0Ch]
             40addc      5 PTRIMMEDESP STACK 16 displ lea     rsi, [rsp+10h]
-            40ade4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            40ade4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             40ade9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_editable_insert_text 
             40adee      5 PTRIMMEDESP STACK 12 displ mov     r12d, [rsp+0Ch]
             40adf7      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
@@ -9725,11 +9725,11 @@
             40ae59      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40ae5f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40ae67     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_get_text 
-            40ae6c     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40ae6c     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40ae6e     -1 INSTR LOCAL NoMetaUpdate cmp     byte ptr [rax], 0 
             40ae74      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             40ae79      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
-            40ae7e     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setnz   sil 
+            40ae7e     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setnz   sil 
             40ae82     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             40ae86     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_widget_set_sensitive 
             40ae90      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -16 0 4 0 0 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -9762,10 +9762,10 @@
             40aea8      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
             40aead      2 INSTR BELONGTO 40ae90 
             40aead      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            40aead     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40aead     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40aeaf      2 INSTR BELONGTO 40ae90 
             40aeaf      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            40aeaf     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40aeaf     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40aeb1      3 INSTR BELONGTO 40ae90 
             40aeb1      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             40aeb4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_editable_get_selection_bounds 
@@ -9782,12 +9782,12 @@
             40aec4     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40aec4      5 INSTR BELONGTO 40ae90 
             40aec4      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-            40aec9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            40aec9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             40aec9      5 INSTR BELONGTO 40ae90 
             40aec9      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 0FFFFFFFFh 
             40aece      2 INSTR BELONGTO 40ae90 
             40aece      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            40aece     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40aece     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40aed0      3 INSTR BELONGTO 40ae90 
             40aed0      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             40aed3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_editable_select_region 
@@ -9819,10 +9819,10 @@
             40af1f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40af27     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_action_get_active 
             40af30      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
-            40af35     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40af35     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40af37      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             40af3c     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
-            40af3e     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setz    sil 
+            40af3e     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setz    sil 
             40af42     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             40af46     -1 INSTR LOCAL NoMetaUpdate jmp     _gucharmap_charmap_set_font_fallback 
             40af50      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], rbp
@@ -9839,7 +9839,7 @@
             40af9b      7 PTRIMMEDEBP STACK 144 displ and     byte ptr [rbp+90h], 0FEh
             40afa5     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_to_string 
             40afaa      4 PTRIMMEDEBP STACK 56 displ mov     rdi, [rbp+38h]
-            40afbe     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40afbe     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40afc0     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_set 
             40afc8      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             40afcd      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
@@ -9863,19 +9863,19 @@
             40b066     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             40b070      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbx
             40b075      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], rbp
-            40b084     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40b084     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40b086     -1 INSTR LOCAL NoMetaUpdate call    _gtk_radio_action_get_current_value 
-            40b08b     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40b08b     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40b08d     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40b08f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40B0BA 
             40b091     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 1 
             40b094     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40B0B0 
             40b096     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40b09e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 21Fh 
-            40b0a8     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b09e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 21Fh 
+            40b0a8     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b0aa     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message 
-            40b0b0     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
-            40b0b5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40b0b0     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            40b0b5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40b0bd     -1 INSTR LOCAL NoMetaUpdate call    sub_40AA80 
             40b0c6      2 PTRIMMEDEBP STACK 0 displ mov     edx, ebp
             40b0c8      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
@@ -9940,10 +9940,10 @@
             40b134     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 98h 
             40b134      6 INSTR BELONGTO 40b0e0 
             40b134      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 98h 
-            40b13a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_40A340 
+            40b13a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_40A340 
             40b13a      5 INSTR BELONGTO 40b0e0 
             40b13a      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset sub_40A340 
-            40b13f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 430h 
+            40b13f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 430h 
             40b13f      5 INSTR BELONGTO 40b0e0 
             40b13f      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 430h 
             40b144      7 INSTR BELONGTO 40b0e0 
@@ -10000,7 +10000,7 @@
             40b1a0     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             40b1a0      5 INSTR BELONGTO 40b160 
             40b1a5      7 INSTR BELONGTO 40b160 
-            40b1ac     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40b1ac     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40b1ac      5 INSTR BELONGTO 40b160 
             40b1b1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             40b1b1      5 INSTR BELONGTO 40b160 
@@ -10058,14 +10058,14 @@
             40b1fa      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGucharmap_is_w; "GUCHARMAP_IS_WINDOW (guw)" 
             40b200      5 INSTR BELONGTO 40b1d0 
             40b200      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aSearch_find; "search_find" 
-            40b205     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0C6h 
+            40b205     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0C6h 
             40b205      5 INSTR BELONGTO 40b1d0 
             40b205      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 0C6h 
             40b20a      5 INSTR BELONGTO 40b1d0 
             40b20a      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGucharmapWindo; "gucharmap-window.c" 
             40b20f      2 INSTR BELONGTO 40b1d0 
             40b20f      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40b20f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b20f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b211     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40b211      5 INSTR BELONGTO 40b1d0 
             40b211      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -10106,7 +10106,7 @@
             40b256      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, rbx 
             40b259      4 INSTR BELONGTO 40b1d0 
             40b259      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     [rbx+70h], rax 
-            40b25d     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40A950 
+            40b25d     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40A950 
             40b25d      5 INSTR BELONGTO 40b1d0 
             40b25d      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset loc_40A950 
             40b262      5 INSTR BELONGTO 40b1d0 
@@ -10124,7 +10124,7 @@
             40b276      3 INSTR BELONGTO 40b1d0 
             40b279      3 INSTR BELONGTO 40b1d0 
             40b279      3 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ mov     rcx, rbx 
-            40b27c     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40A8C0 
+            40b27c     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40A8C0 
             40b27c      5 INSTR BELONGTO 40b1d0 
             40b27c      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, offset loc_40A8C0 
             40b281      5 INSTR BELONGTO 40b1d0 
@@ -10225,12 +10225,12 @@
             40b319      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_40B0E0 
             40b31e      2 INSTR BELONGTO 40b310 
             40b31e      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            40b31e     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40b31e     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40b320      3 INSTR BELONGTO 40b310 
             40b320      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             40b323      2 INSTR BELONGTO 40b310 
             40b323      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40b323     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b323     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b325     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             40b325      5 INSTR BELONGTO 40b310 
             40b325      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_new 
@@ -10357,14 +10357,14 @@
             40b3e0      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 ZZ mov     r8d, offset aGtk_widget_g_0; "!gtk_widget_get_realized (GTK_WIDGET (g"... 
             40b3e6      5 INSTR BELONGTO 40b340 
             40b3e6      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     ecx, offset aGucharmap_wi_0; "gucharmap_window_set_font" 
-            40b3eb     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3F5h 
+            40b3eb     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3F5h 
             40b3eb      5 INSTR BELONGTO 40b340 
             40b3eb      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 3F5h 
             40b3f0      5 INSTR BELONGTO 40b340 
             40b3f0      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGucharmapWindo; "gucharmap-window.c" 
             40b3f5      2 INSTR BELONGTO 40b340 
             40b3f5      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            40b3f5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b3f5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b3f7     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40b3f7      5 INSTR BELONGTO 40b340 
             40b3f7      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_assertion_message_expr 
@@ -10384,7 +10384,7 @@
             40b400     -3 INSTR LOCAL NoWarn push    r15 
             40b402      5 INSTR BELONGTO 40b400 
             40b402      5 INSTR DEADREGS  EFLAGS RCX RSI R15 ZZ mov     esi, offset off_40CDE0 
-            40b407     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 6Ch 
+            40b407     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 6Ch 
             40b407      5 INSTR BELONGTO 40b400 
             40b407      5 INSTR DEADREGS  EFLAGS RCX R15 ZZ mov     ecx, 6Ch 
             40b40c      2 INSTR BELONGTO 40b400 
@@ -10588,7 +10588,7 @@
             40b5f9      5 PTRIMMEDESP STACK 16 displ lea     rsi, [rsp+488h+var_478]
             40b5fe      3 INSTR BELONGTO 40b400 
             40b5fe      3 INSTR DEADREGS  EFLAGS RCX RDX R12 R13 R15 ZZ mov     rcx, rbx 
-            40b601     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 12h 
+            40b601     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 12h 
             40b601      5 INSTR BELONGTO 40b400 
             40b601      5 INSTR DEADREGS  EFLAGS RDX R12 R13 R15 ZZ mov     edx, 12h 
             40b606     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_add_actions 
@@ -10613,7 +10613,7 @@
             40b628      6 INSTR DEADREGS  EFLAGS RCX RDX R8 R12 R13 R15 ZZ mov     r8d, offset loc_40B070 
             40b62e      2 INSTR BELONGTO 40b400 
             40b62e      2 INSTR DEADREGS  EFLAGS RCX RDX R12 R13 R15 ZZ mov     ecx, eax 
-            40b630     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40b630     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40b630      5 INSTR BELONGTO 40b400 
             40b630      5 INSTR DEADREGS  EFLAGS RDX R12 R13 R15 ZZ mov     edx, 2 
             40b635     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_add_radio_actions 
@@ -10626,7 +10626,7 @@
             40b63e      8 PTRIMMEDESP STACK 880 displ lea     rsi, [rsp+488h+var_118]
             40b646      3 INSTR BELONGTO 40b400 
             40b646      3 INSTR DEADREGS  EFLAGS RCX RDX R12 R13 R15 ZZ mov     rcx, rbx 
-            40b649     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40b649     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40b649      5 INSTR BELONGTO 40b400 
             40b649      5 INSTR DEADREGS  EFLAGS RDX R12 R13 R15 ZZ mov     edx, 2 
             40b64e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_add_toggle_actions 
@@ -10638,7 +10638,7 @@
             40b657      4 INSTR DEADREGS  EFLAGS RDX RDI R12 R13 R15 ZZ mov     rdi, [rbx+60h] 
             40b65b      2 INSTR BELONGTO 40b400 
             40b65b      2 INSTR DEADREGS  EFLAGS RDX R12 R13 R15 ZZ xor     edx, edx 
-            40b65b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b65b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b65d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_insert_action_group 
             40b65d      5 INSTR BELONGTO 40b400 
             40b65d      5 INSTR DEADREGS  EFLAGS R12 R13 R15 ZZ call    _gtk_ui_manager_insert_action_group 
@@ -10651,8 +10651,8 @@
             40b66b      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R15 ZZ mov     rdi, [rbx+60h] 
             40b66f      2 INSTR BELONGTO 40b400 
             40b66f      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R13 R15 ZZ xor     ecx, ecx 
-            40b66f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40b671     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 31Dh 
+            40b66f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b671     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 31Dh 
             40b671      5 INSTR BELONGTO 40b400 
             40b671      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R15 ZZ mov     edx, 31Dh 
             40b676      5 INSTR BELONGTO 40b400 
@@ -10718,10 +10718,10 @@
             40b6db      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 ZZ mov     r8d, 3 
             40b6e1      2 INSTR BELONGTO 40b400 
             40b6e1      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ xor     ecx, ecx 
-            40b6e1     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b6e1     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b6e3      2 INSTR BELONGTO 40b400 
             40b6e3      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ xor     edx, edx 
-            40b6e3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b6e3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b6e5      3 INSTR BELONGTO 40b400 
             40b6e5      3 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     rsi, r12 
             40b6e8      3 INSTR BELONGTO 40b400 
@@ -10745,14 +10745,14 @@
             40b702      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _g_type_check_instance_cast 
             40b707      2 INSTR BELONGTO 40b400 
             40b707      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R15 ZZ xor     edx, edx 
-            40b707     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b707     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b709     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 1 
             40b709      6 INSTR BELONGTO 40b400 
             40b709      6 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 R15 ZZ mov     r9d, 1 
             40b70f     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 3 
             40b70f      6 INSTR BELONGTO 40b400 
             40b70f      6 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R15 ZZ mov     r8d, 3 
-            40b715     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40b715     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40b715      5 INSTR BELONGTO 40b400 
             40b715      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R15 ZZ mov     ecx, 1 
             40b71a      3 INSTR BELONGTO 40b400 
@@ -10803,7 +10803,7 @@
             40b75d      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R15 ZZ xor     r8d, r8d 
             40b760      3 INSTR BELONGTO 40b400 
             40b760      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R15 ZZ mov     rcx, rbx 
-            40b763     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40B010 
+            40b763     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40B010 
             40b763      5 INSTR BELONGTO 40b400 
             40b763      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R15 ZZ mov     edx, offset loc_40B010 
             40b768      5 INSTR BELONGTO 40b400 
@@ -10840,8 +10840,8 @@
             40b79a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 ZZ mov     r8d, 3 
             40b7a0      2 INSTR BELONGTO 40b400 
             40b7a0      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ xor     edx, edx 
-            40b7a0     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40b7a2     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            40b7a0     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40b7a2     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             40b7a2      5 INSTR BELONGTO 40b400 
             40b7a2      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R15 ZZ mov     ecx, 2 
             40b7a7      3 INSTR BELONGTO 40b400 
@@ -10878,10 +10878,10 @@
             40b7d9      5 INSTR DEADREGS  EFLAGS R12 R15 ZZ call    _gtk_label_new_with_mnemonic 
             40b7de      2 INSTR BELONGTO 40b400 
             40b7de      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R15 ZZ xor     ecx, ecx 
-            40b7de     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b7de     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b7e0      3 INSTR BELONGTO 40b400 
             40b7e0      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R15 ZZ mov     r15, rax 
-            40b7e3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6 
+            40b7e3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6 
             40b7e3      5 INSTR BELONGTO 40b400 
             40b7e3      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 6 
             40b7e8      3 INSTR BELONGTO 40b400 
@@ -10890,7 +10890,7 @@
             40b7eb      5 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ mov     esi, offset aMargin; "margin" 
             40b7f0      2 INSTR BELONGTO 40b400 
             40b7f0      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            40b7f0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b7f0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b7f2     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             40b7f2      5 INSTR BELONGTO 40b400 
             40b7f2      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_object_set 
@@ -10909,8 +10909,8 @@
             40b808      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 ZZ mov     r8d, 1 
             40b80e      2 INSTR BELONGTO 40b400 
             40b80e      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ xor     edx, edx 
-            40b80e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40b810     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
+            40b80e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40b810     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
             40b810      5 INSTR BELONGTO 40b400 
             40b810      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 ZZ mov     ecx, 3 
             40b815      3 INSTR BELONGTO 40b400 
@@ -10932,10 +10932,10 @@
             40b82d      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _gtk_button_new_from_stock 
             40b832      2 INSTR BELONGTO 40b400 
             40b832      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ xor     ecx, ecx 
-            40b832     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b832     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b834      3 INSTR BELONGTO 40b400 
             40b834      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     r12, rax 
-            40b837     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6 
+            40b837     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6 
             40b837      5 INSTR BELONGTO 40b400 
             40b837      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 6 
             40b83c      3 INSTR BELONGTO 40b400 
@@ -10944,7 +10944,7 @@
             40b83f      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, offset aMargin; "margin" 
             40b844      2 INSTR BELONGTO 40b400 
             40b844      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40b844     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b844     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b846     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             40b846      5 INSTR BELONGTO 40b400 
             40b846      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_set 
@@ -10964,7 +10964,7 @@
             40b860      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_widget_set_tooltip_text 
             40b865      3 INSTR BELONGTO 40b400 
             40b865      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, r12 
-            40b868     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40b868     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40b868      5 INSTR BELONGTO 40b400 
             40b868      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             40b86d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -10978,7 +10978,7 @@
             40b875      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             40b878      3 INSTR BELONGTO 40b400 
             40b878      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, rbx 
-            40b87b     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40AE90 
+            40b87b     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40AE90 
             40b87b      5 INSTR BELONGTO 40b400 
             40b87b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset sub_40AE90 
             40b880      5 INSTR BELONGTO 40b400 
@@ -11001,10 +11001,10 @@
             40b89e     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
             40b89e      6 INSTR BELONGTO 40b400 
             40b89e      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 1 
-            40b8a4     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
+            40b8a4     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
             40b8a4      5 INSTR BELONGTO 40b400 
             40b8a4      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, 3 
-            40b8a9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40b8a9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40b8a9      5 INSTR BELONGTO 40b400 
             40b8a9      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 2 
             40b8ae      3 INSTR BELONGTO 40b400 
@@ -11021,7 +11021,7 @@
             40b8bc      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_widget_show 
             40b8c1      2 INSTR BELONGTO 40b400 
             40b8c1      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            40b8c1     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40b8c1     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40b8c3      3 INSTR BELONGTO 40b400 
             40b8c3      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, r12 
             40b8c6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
@@ -11032,8 +11032,8 @@
             40b8cb      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_entry_new 
             40b8d0      2 INSTR BELONGTO 40b400 
             40b8d0      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            40b8d0     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40b8d2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6 
+            40b8d0     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b8d2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6 
             40b8d2      5 INSTR BELONGTO 40b400 
             40b8d2      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 6 
             40b8d7      3 INSTR BELONGTO 40b400 
@@ -11044,13 +11044,13 @@
             40b8de      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, offset aMargin; "margin" 
             40b8e3      2 INSTR BELONGTO 40b400 
             40b8e3      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40b8e3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b8e3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b8e5     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             40b8e5      5 INSTR BELONGTO 40b400 
             40b8e5      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_set 
             40b8ea      4 INSTR BELONGTO 40b400 
             40b8ea      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, [rbx+58h] 
-            40b8ee     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40b8ee     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40b8ee      5 INSTR BELONGTO 40b400 
             40b8ee      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
             40b8f3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_hexpand 
@@ -11081,7 +11081,7 @@
             40b919      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _gtk_label_set_mnemonic_widget 
             40b91e      4 INSTR BELONGTO 40b400 
             40b91e      4 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     rdi, [rbx+58h] 
-            40b922     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40b922     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40b922      5 INSTR BELONGTO 40b400 
             40b922      5 INSTR DEADREGS  EFLAGS RSI R15 ZZ mov     esi, 50h 
             40b927     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -11095,7 +11095,7 @@
             40b92f      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 ZZ xor     r8d, r8d 
             40b932      3 INSTR BELONGTO 40b400 
             40b932      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ mov     rcx, r12 
-            40b935     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40AE40 
+            40b935     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40AE40 
             40b935      5 INSTR BELONGTO 40b400 
             40b935      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R15 ZZ mov     edx, offset loc_40AE40 
             40b93a      5 INSTR BELONGTO 40b400 
@@ -11120,12 +11120,12 @@
             40b95c     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
             40b95c      6 INSTR BELONGTO 40b400 
             40b95c      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 ZZ mov     r8d, 1 
-            40b962     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
+            40b962     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
             40b962      5 INSTR BELONGTO 40b400 
             40b962      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ mov     ecx, 3 
             40b967      3 INSTR BELONGTO 40b400 
             40b967      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     rsi, r12 
-            40b96a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b96a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40b96a      5 INSTR BELONGTO 40b400 
             40b96a      5 INSTR DEADREGS  EFLAGS RDX RDI R12 R15 ZZ mov     edx, 1 
             40b96f      3 INSTR BELONGTO 40b400 
@@ -11151,7 +11151,7 @@
             40b98c      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R15 ZZ xor     r8d, r8d 
             40b98f      3 INSTR BELONGTO 40b400 
             40b98f      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R15 ZZ mov     rcx, rbx 
-            40b992     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40AD40 
+            40b992     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40AD40 
             40b992      5 INSTR BELONGTO 40b400 
             40b992      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R15 ZZ mov     edx, offset loc_40AD40 
             40b997      5 INSTR BELONGTO 40b400 
@@ -11183,12 +11183,12 @@
             40b9c4     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 3 
             40b9c4      6 INSTR BELONGTO 40b400 
             40b9c4      6 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R13 R15 ZZ mov     r8d, 3 
-            40b9ca     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 4 
+            40b9ca     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 4 
             40b9ca      5 INSTR BELONGTO 40b400 
             40b9ca      5 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 R15 ZZ mov     ecx, 4 
             40b9cf      2 INSTR BELONGTO 40b400 
             40b9cf      2 INSTR DEADREGS  EFLAGS RDX RSI R13 R15 ZZ xor     edx, edx 
-            40b9cf     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b9cf     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b9d1      3 INSTR BELONGTO 40b400 
             40b9d1      3 INSTR DEADREGS  EFLAGS RSI R13 R15 ZZ mov     rsi, r12 
             40b9d4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grid_attach 
@@ -11209,7 +11209,7 @@
             40b9e9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R12 R13 R15 ZZ xor     r8d, r8d 
             40b9ec      3 INSTR BELONGTO 40b400 
             40b9ec      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R13 R15 ZZ mov     rcx, rbx 
-            40b9ef     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40AD10 
+            40b9ef     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40AD10 
             40b9ef      5 INSTR BELONGTO 40b400 
             40b9ef      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R15 ZZ mov     edx, offset sub_40AD10 
             40b9f4      5 INSTR BELONGTO 40b400 
@@ -11225,7 +11225,7 @@
             40ba05      3 INSTR BELONGTO 40b400 
             40ba08      3 INSTR BELONGTO 40b400 
             40ba08      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R13 R15 ZZ mov     rcx, rbx 
-            40ba0b     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40AC80 
+            40ba0b     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40AC80 
             40ba0b      5 INSTR BELONGTO 40b400 
             40ba0b      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R15 ZZ mov     edx, offset loc_40AC80 
             40ba10      5 INSTR BELONGTO 40b400 
@@ -11263,7 +11263,7 @@
             40ba45     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40ba45      5 INSTR BELONGTO 40b400 
             40ba45      5 INSTR DEADREGS  EFLAGS R12 R13 R15 ZZ call    _g_type_check_instance_cast 
-            40ba4a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40ba4a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40ba4a      5 INSTR BELONGTO 40b400 
             40ba4a      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 ZZ mov     esi, 1 
             40ba4f      3 INSTR BELONGTO 40b400 
@@ -11280,7 +11280,7 @@
             40ba63      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 R15 ZZ mov     esi, offset aFont; "font" 
             40ba68      2 INSTR BELONGTO 40b400 
             40ba68      2 INSTR DEADREGS  EFLAGS RAX RDX R12 R13 R15 ZZ xor     eax, eax 
-            40ba68     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ba68     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ba6a      5 INSTR BELONGTO 40b400 
             40ba6a      5 INSTR DEADREGS  EFLAGS RDX R12 R13 R15 ZZ mov     edx, (offset aSunMicrosystem+0Eh); "ms" 
             40ba6f     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_get 
@@ -11357,8 +11357,8 @@
             40baeb      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R15 ZZ mov     rdi, [rbx+38h] 
             40baef      2 INSTR BELONGTO 40b400 
             40baef      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R13 R15 ZZ xor     ecx, ecx 
-            40baef     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40baf1     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40AC20 
+            40baef     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40baf1     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40AC20 
             40baf1      5 INSTR BELONGTO 40b400 
             40baf1      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R15 ZZ mov     edx, offset loc_40AC20 
             40baf6      5 INSTR BELONGTO 40b400 
@@ -11395,7 +11395,7 @@
             40bb28     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40bb28      3 INSTR BELONGTO 40b400 
             40bb28      3 INSTR DEADREGS  EFLAGS RDX RSI R8 R12 R13 R14 R15 ZZ xor     r8d, r8d 
-            40bb2b     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40AFE0 
+            40bb2b     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40AFE0 
             40bb2b      5 INSTR BELONGTO 40b400 
             40bb2b      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 ZZ mov     edx, offset loc_40AFE0 
             40bb30      5 INSTR BELONGTO 40b400 
@@ -11411,7 +11411,7 @@
             40bb41      3 INSTR BELONGTO 40b400 
             40bb44     -1 INSTR LOCAL MetadataRedundant xor     r8d, r8d 
             40bb44      3 INSTR BELONGTO 40b400 
-            40bb47     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40AF50 
+            40bb47     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40AF50 
             40bb47      5 INSTR BELONGTO 40b400 
             40bb47      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 ZZ mov     edx, offset loc_40AF50 
             40bb4c      5 INSTR BELONGTO 40b400 
@@ -11427,7 +11427,7 @@
             40bb5c      3 INSTR BELONGTO 40b400 
             40bb5f     -1 INSTR LOCAL MetadataRedundant xor     r8d, r8d 
             40bb5f      3 INSTR BELONGTO 40b400 
-            40bb62     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40AB50 
+            40bb62     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40AB50 
             40bb62      5 INSTR BELONGTO 40b400 
             40bb62      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R14 R15 ZZ mov     edx, offset loc_40AB50 
             40bb67      5 INSTR BELONGTO 40b400 
@@ -11459,14 +11459,14 @@
             40bb90      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ sub     rsp, 8 
             40bb90      8 DATAREF STACK 717 esp + 0 PARENT LocalFrame LOCALFRAME
             40bb90      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            40bb94     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40bb94     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40bb94      5 INSTR BELONGTO 40bb90 
             40bb94      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             40bb99      5 INSTR BELONGTO 40bb90 
             40bb99      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGnome; "GNOME " 
             40bb9e      2 INSTR BELONGTO 40bb90 
             40bb9e      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            40bb9e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40bb9e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40bba0     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40bba0      5 INSTR BELONGTO 40bb90 
             40bba0      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -11478,13 +11478,13 @@
             40bbad      5 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     edx, offset a3_4_1_1; "3.4.1.1" 
             40bbb2      2 INSTR BELONGTO 40bb90 
             40bbb2      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40bbb2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bbb2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bbb4     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             40bbb4      5 INSTR BELONGTO 40bb90 
             40bbb4      5 INSTR DEADREGS  EFLAGS ZZ call    _g_print 
             40bbb9      2 INSTR BELONGTO 40bb90 
             40bbb9      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; status 
-            40bbb9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; status 
+            40bbb9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; status 
             40bbbb     -1 INSTR LOCAL NoMetaUpdate call    _exit 
             40bbbb      5 INSTR BELONGTO 40bb90 
             40bbbb      5 INSTR DEADREGS  EFLAGS ZZ call    _exit 
@@ -11536,7 +11536,7 @@
             40bc08      2 INSTR BELONGTO 40bbc0 
             40bc0a      2 INSTR BELONGTO 40bbc0 
             40bc0a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            40bc0a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40bc0a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40bc0c      4 INSTR BELONGTO 40bbc0 
             40bc10      3 INSTR BELONGTO 40bbc0 
             40bc10      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 872d6ff5..5ebd374f 100644
--- a/tests/commit/trimmed-sorted-save-gnome-control-center.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-control-center.psexe.annot
@@ -2382,10 +2382,10 @@
               7704      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ call    cc_shell_log_init 
               7709      7 INSTR BELONGTO 76b0 
               7709      7 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ lea     rdi, aCcSidebarList; "cc-sidebar-list" 
-              7710     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 18h 
+              7710     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 18h 
               7710      5 INSTR BELONGTO 76b0 
               7710      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 ZZ mov     edx, 18h 
-              7715     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+              7715     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
               7715      5 INSTR BELONGTO 76b0 
               7715      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 18h 
               771a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_size_register 
@@ -2401,7 +2401,7 @@
               772b      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    gnome_control_center_new 
               7730      7 INSTR BELONGTO 76b0 
               7730      7 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ lea     rdi, aOrg_gnome_cont; "org.gnome.ControlCenter" 
-              7737     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+              7737     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
               7737      5 INSTR BELONGTO 76b0 
               7737      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 8 
               773c     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     rbp, rax 
@@ -2656,13 +2656,13 @@
               78e5      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
               78e9      2 INSTR BELONGTO 78d0 
               78e9      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-              78e9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              78e9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               78eb     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
               78eb      5 INSTR BELONGTO 78d0 
               78eb      5 INSTR DEADREGS  EFLAGS ZZ call    _g_print 
               78f0      2 INSTR BELONGTO 78d0 
               78f0      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; status 
-              78f0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; status 
+              78f0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; status 
               78f2     -1 INSTR LOCAL NoMetaUpdate call    _exit 
               78f2      5 INSTR BELONGTO 78d0 
               78f2      5 INSTR DEADREGS  EFLAGS ZZ call    _exit 
@@ -2677,11 +2677,11 @@
               7972     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_add_main_entries 
               797e      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               7981     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_set_translation_domain 
-              7986     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+              7986     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
               798b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_get_option_group 
               7990      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               7996     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_add_group 
-              799b     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              799b     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               799d      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               79a0     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_set_help_enabled 
               79a5      5 PTRIMMEDESP STACK 24 displ lea     rcx, [rsp+18h]
@@ -2691,39 +2691,39 @@
               79b7     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_parse 
               79bc     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               79be     -1 INSTR LOCAL NoMetaUpdate jz      short loc_7A30 
-              79c6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              79c6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               79c8     -1 INSTR LOCAL NoMetaUpdate test    esi, esi 
               79ca     -1 INSTR LOCAL NoMetaUpdate jz      short loc_7A08 
-              79cc     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              79cc     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               79ce      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               79d1     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_get_help 
-              79e3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              79e3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               79e5     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
               79ed     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
               79f2      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               79f5     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_free 
-              79fa     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              79fa     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               79fc     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 30h 
               7a0e     -1 INSTR LOCAL NoMetaUpdate test    ecx, ecx 
               7a10     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_79CC 
               7a18     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
               7a1a     -1 INSTR LOCAL NoMetaUpdate jz      short loc_7A88 
-              7a1c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              7a1c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               7a1e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_get_option_group 
               7a26     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_79CC 
               7a30      5 PTRIMMEDESP STACK 16 displ mov     rax, [rsp+10h]
-              7a3c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-              7a41     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              7a3c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+              7a41     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               7a46      5 PTRIMMEDESP STACK 24 displ mov     rax, [rsp+18h]
               7a4f     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-              7a5a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              7a5a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               7a5f     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
               7a64      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+18h]
               7a69     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
               7a6e      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               7a71     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_free 
               7a76     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 30h 
-              7a7a     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              7a7a     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               7a88      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               7a8b     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_free 
               7a96     -1 INSTR LOCAL NoMetaUpdate call    cc_shell_log_set_debug 
@@ -2732,7 +2732,7 @@
               7ab1     -1 INSTR LOCAL NoMetaUpdate call    gnome_control_center_show 
               7abc     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               7abe     -1 INSTR LOCAL NoMetaUpdate jnz     loc_7BF0 
-              7acb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              7acb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               7acd     -1 INSTR LOCAL NoMetaUpdate test    rdx, rdx 
               7ad0     -1 INSTR LOCAL NoMetaUpdate jz      loc_7B98 
               7ad6     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rdx], 0 
@@ -2740,8 +2740,8 @@
               7ae4      9 PTRIMMEDESP STACK 32 displ mov     qword ptr [rsp+20h], 0
               7af0     -1 INSTR LOCAL NoMetaUpdate test    rcx, rcx 
               7af3     -1 INSTR LOCAL NoMetaUpdate jz      loc_7BFC 
-              7b00     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-              7b05     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              7b00     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              7b05     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               7b07     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               7b13     -1 INSTR LOCAL NoMetaUpdate call    _cc_shell_get_type 
               7b1e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -2749,19 +2749,19 @@
               7b27      5 PTRIMMEDESP STACK 32 displ lea     rcx, [rsp+20h]
               7b2c      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
               7b35     -1 INSTR LOCAL NoMetaUpdate call    _cc_shell_set_active_panel_from_id 
-              7b3c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              7b3c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               7b3e     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
               7b40     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_7B98 
               7b42      5 PTRIMMEDESP STACK 32 displ mov     rax, [rsp+20h]
               7b4e     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
               7b51     -1 INSTR LOCAL NoMetaUpdate jz      short loc_7B57 
-              7b5e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-              7b60     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              7b5e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+              7b60     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               7b62      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-              7b65     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              7b65     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               7b6a     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               7b6f      5 PTRIMMEDESP STACK 32 displ mov     rdi, [rsp+20h]
-              7b74     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              7b74     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               7b79     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
               7b7c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_7B98 
               7b7e      4 PTRIMMEDESP STACK 8 displ mov     [rsp+8], eax
@@ -2780,11 +2780,11 @@
               7bc8      4 PTRIMMEDESP STACK 8 displ mov     eax, [rsp+8]
               7be1     -1 INSTR LOCAL NoMetaUpdate jmp     loc_79FC 
               7bf3     -1 INSTR LOCAL NoMetaUpdate call    gnome_control_center_set_overview_page 
-              7bf8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              7bf8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               7bfa     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_7B98 
-              7c03     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-              7c08     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-              7c0a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              7c03     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              7c08     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+              7c0a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               7c0c     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               7c11     -1 INSTR LOCAL NoMetaUpdate jmp     loc_7B0C 
               7c20     -1 INSTR LOCAL NoMetaUpdate test    cs:dword_211010, esi 
@@ -2823,7 +2823,7 @@
               7c76      2 INSTR BELONGTO 7c50 
               7c78      2 INSTR BELONGTO 7c50 
               7c78      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ xor     eax, eax 
-              7c78     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              7c78     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               7c7a     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
               7c7a      5 INSTR BELONGTO 7c50 
               7c7a      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ jmp     _g_log 
@@ -2841,13 +2841,13 @@
               7c9d      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
               7ca6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
               7cab      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-              7cae     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              7cae     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               7cba     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               7cc2     -1 INSTR LOCAL NoMetaUpdate call    _cc_shell_get_type 
               7cc7      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               7ccd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               7cd2      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-              7cd5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0A8h 
+              7cd5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0A8h 
               7cdd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_add_private 
               7ce9      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
               7d1a      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
@@ -2866,8 +2866,8 @@
               7d57      3 INSTR DEADREGS  EFLAGS RAX RCX RBX ZZ mov     rbx, rdx 
               7d5a      2 INSTR BELONGTO 7d50 
               7d5a      2 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ xor     eax, eax 
-              7d5a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-              7d5c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
+              7d5a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+              7d5c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
               7d5c      5 INSTR BELONGTO 7d50 
               7d5c      5 INSTR DEADREGS  EFLAGS RCX RDX ZZ mov     edx, 4 
               7d61     16 DATAREF STACK 588 esp + 0 PARENT LocalFrame LOCALFRAME
@@ -2901,7 +2901,7 @@
               7d88      2 INSTR BELONGTO 7d50 
               7d8a     -1 INSTR LOCAL NoMetaUpdate test    ebx, ebx 
               7d8a      2 INSTR BELONGTO 7d50 
-              7d8c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setz    al 
+              7d8c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setz    al 
               7d8c      3 INSTR BELONGTO 7d50 
               7d8c      3 INSTR DEADREGS  RAX RBX R8 R9 R10 R11 ZZ setz    al 
               7d8f     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
@@ -3031,7 +3031,7 @@
               7e5a      3 INSTR DEADREGS  EFLAGS RDI R13 XMM0 XMM2 ZZ mov     rdi, rax 
               7e5d      2 INSTR BELONGTO 7da0 
               7e5d      2 INSTR DEADREGS  EFLAGS RAX R13 XMM0 XMM2 ZZ xor     eax, eax 
-              7e5d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              7e5d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               7e5f     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
               7e5f      5 INSTR BELONGTO 7da0 
               7e5f      5 INSTR DEADREGS  EFLAGS R13 XMM0 XMM2 ZZ call    _g_object_new 
@@ -3099,13 +3099,13 @@
               7ecb     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 6 
               7ecb      6 INSTR BELONGTO 7da0 
               7ecb      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 XMM0 XMM1 XMM2 XMM3 ZZ mov     r8d, 6 
-              7ed1     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 6 
+              7ed1     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 6 
               7ed1      5 INSTR BELONGTO 7da0 
               7ed1      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI XMM0 XMM1 XMM2 XMM3 ZZ mov     ecx, 6 
-              7ed6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6 
+              7ed6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6 
               7ed6      5 INSTR BELONGTO 7da0 
               7ed6      5 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 XMM3 ZZ mov     edx, 6 
-              7edb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+              7edb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
               7edb      5 INSTR BELONGTO 7da0 
               7edb      5 INSTR DEADREGS  EFLAGS RSI RDI XMM0 XMM1 XMM2 XMM3 ZZ mov     esi, 6 
               7ee0      3 INSTR BELONGTO 7da0 
@@ -3146,7 +3146,7 @@
               7f16      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 XMM2 XMM3 ZZ call    _g_type_check_instance_cast 
               7f1b      2 INSTR BELONGTO 7da0 
               7f1b      2 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 XMM3 ZZ xor     edx, edx 
-              7f1b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              7f1b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               7f1d      3 INSTR BELONGTO 7da0 
               7f1d      3 INSTR DEADREGS  EFLAGS RSI RDI XMM0 XMM1 XMM2 XMM3 ZZ mov     rsi, r13 
               7f20      3 INSTR BELONGTO 7da0 
@@ -3204,7 +3204,7 @@
               7f72      5 INSTR DEADREGS  EFLAGS R12 R13 XMM0 XMM1 XMM2 XMM3 ZZ call    _g_themed_icon_get_type 
               7f77      2 INSTR BELONGTO 7da0 
               7f77      2 INSTR DEADREGS  EFLAGS RDX R12 R13 XMM0 XMM1 XMM2 XMM3 ZZ xor     edx, edx 
-              7f77     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              7f77     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               7f79     -1 INSTR LOCAL NoMetaUpdate test    r14, r14 
               7f79      3 INSTR BELONGTO 7da0 
               7f7c      3 INSTR BELONGTO 7da0 
@@ -3230,7 +3230,7 @@
               7f94      5 INSTR DEADREGS  EFLAGS R13 XMM1 XMM3 ZZ call    _g_type_check_instance_is_a 
               7f99      2 INSTR BELONGTO 7da0 
               7f99      2 INSTR DEADREGS  EFLAGS RDX R13 XMM1 XMM3 ZZ xor     edx, edx 
-              7f99     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              7f99     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               7f9b     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               7f9b      2 INSTR BELONGTO 7da0 
               7f9d     -1 INSTR LOCAL NoMetaUpdate jz      short loc_7FF5 
@@ -3256,7 +3256,7 @@
               7fba      4 INSTR DEADREGS  EFLAGS RDX RSI R12 R14 XMM1 XMM3 ZZ mov     rsi, [r13+0] 
               7fbe      2 INSTR BELONGTO 7da0 
               7fbe      2 INSTR DEADREGS  EFLAGS RDX R12 R14 XMM1 XMM3 ZZ xor     edx, edx 
-              7fbe     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              7fbe     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               7fc0      3 INSTR BELONGTO 7da0 
               7fc0      3 INSTR DEADREGS  EFLAGS R12 R14 XMM1 XMM3 ZZ mov     r14, rax 
               7fc3     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
@@ -3365,7 +3365,7 @@
               806f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               806f      5 INSTR BELONGTO 7da0 
               806f      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM1 XMM3 ZZ call    _g_type_check_instance_cast 
-              8074     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 12Ch 
+              8074     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 12Ch 
               8074      5 INSTR BELONGTO 7da0 
               8074      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 XMM1 XMM3 ZZ mov     esi, 12Ch 
               8079      3 INSTR BELONGTO 7da0 
@@ -3375,7 +3375,7 @@
               807c      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM1 XMM3 ZZ call    _gtk_scrolled_window_set_min_content_height 
               8081      4 INSTR BELONGTO 7da0 
               8081      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 XMM1 XMM3 ZZ mov     rdi, [rbx+20h] 
-              8085     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+              8085     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
               8085      5 INSTR BELONGTO 7da0 
               8085      5 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 R15 XMM1 XMM3 ZZ mov     edx, 0FFFFFFFFh 
               808a     -1 INSTR LOCAL MetadataRedundant mov     esi, 2E4h 
@@ -3400,7 +3400,7 @@
               80aa      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 XMM1 XMM3 ZZ mov     rdi, rax 
               80ad      2 INSTR BELONGTO 7da0 
               80ad      2 INSTR DEADREGS  EFLAGS RSI R13 R14 R15 XMM1 XMM3 ZZ xor     esi, esi 
-              80ad     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              80ad     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               80af     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_preferred_height 
               80af      5 INSTR BELONGTO 7da0 
               80af      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM1 XMM3 ZZ call    _gtk_widget_get_preferred_height 
@@ -3416,7 +3416,7 @@
               80bf      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM1 XMM3 ZZ call    _g_type_check_instance_cast 
               80c4      2 INSTR BELONGTO 7da0 
               80c4      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 XMM1 XMM3 ZZ mov     edx, ebp 
-              80c6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2E4h 
+              80c6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2E4h 
               80c6      5 INSTR BELONGTO 7da0 
               80c6      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 XMM1 XMM3 ZZ mov     esi, 2E4h 
               80cb      3 INSTR BELONGTO 7da0 
@@ -3445,10 +3445,10 @@
               80e8      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 XMM1 XMM3 ZZ call    _g_key_file_new 
               80ed      2 INSTR BELONGTO 7da0 
               80ed      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R14 R15 XMM1 XMM3 ZZ xor     ecx, ecx 
-              80ed     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              80ed     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               80ef      2 INSTR BELONGTO 7da0 
               80ef      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R14 R15 XMM1 XMM3 ZZ xor     edx, edx 
-              80ef     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              80ef     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               80f1      3 INSTR BELONGTO 7da0 
               80f1      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R14 R15 XMM1 XMM3 ZZ mov     rsi, r13 
               80f4      3 INSTR BELONGTO 7da0 
@@ -3490,7 +3490,7 @@
               8127      7 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 R13 R14 R15 XMM1 XMM3 ZZ lea     rsi, aDesktopEntry; "Desktop Entry" 
               812e      2 INSTR BELONGTO 7da0 
               812e      2 INSTR DEADREGS  EFLAGS RCX RDI R12 R13 R14 R15 XMM1 XMM3 ZZ xor     ecx, ecx 
-              812e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              812e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               8130      3 INSTR BELONGTO 7da0 
               8130      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 XMM1 XMM3 ZZ mov     rdi, rbx 
               8133     -1 INSTR LOCAL NoMetaUpdate call    _g_key_file_get_string 
@@ -3508,7 +3508,7 @@
               8143      2 INSTR BELONGTO 7da0 
               8145      2 INSTR BELONGTO 7da0 
               8145      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 XMM1 XMM3 ZZ xor     esi, esi 
-              8145     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              8145     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               8147      3 INSTR BELONGTO 7da0 
               8147      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 XMM1 XMM3 ZZ mov     rdi, rax 
               814a     -1 INSTR LOCAL NoMetaUpdate call    _g_spawn_command_line_async 
@@ -3523,7 +3523,7 @@
               8157      2 INSTR BELONGTO 7da0 
               8160      2 INSTR BELONGTO 7da0 
               8160      2 INSTR DEADREGS  EFLAGS RDX R12 R13 R14 XMM1 XMM3 ZZ xor     edx, edx 
-              8160     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              8160     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               8162     -1 INSTR LOCAL NoMetaUpdate jmp     loc_7FF5 
               8162      5 INSTR BELONGTO 7da0 
               8170      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -48 0 4 0 8 5 -40 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 -32 0 13 -24 0 14 -16 0 15 -8 0 ZZ
@@ -3587,7 +3587,7 @@
               81b2      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R13 R14 R15 ZZ call    cc_shell_category_view_get_type 
               81b7      2 INSTR BELONGTO 8170 
               81b7      2 INSTR DEADREGS  EFLAGS RBX RDI R13 R14 R15 ZZ xor     ebx, ebx 
-              81b7     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+              81b7     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
               81b9      3 INSTR BELONGTO 8170 
               81b9      3 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 ZZ mov     r15, rax 
               81bc     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+78h+var_70] 
@@ -3692,7 +3692,7 @@
               8254      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ call    _g_list_free 
               8259     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
               8259      4 INSTR BELONGTO 8170 
-              825d     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, r13d 
+              825d     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, r13d 
               825d      3 INSTR BELONGTO 8170 
               825d      3 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R14 R15 ZZ mov     eax, r13d 
               825d     72 DEALLOC STACK esp - 72 mov     eax, r13d
@@ -3728,7 +3728,7 @@
               8286      5 PTRIMMEDESP STACK 56 displ lea     rsi, [rsp+78h+var_40]
               828b      2 INSTR BELONGTO 8170 
               828b      2 INSTR DEADREGS  EFLAGS RDX RDI R12 R13 R14 R15 ZZ xor     edx, edx 
-              828b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              828b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               828d      3 INSTR BELONGTO 8170 
               828d      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ mov     rdi, rbp 
               8290      3 INSTR BELONGTO 8170 
@@ -3770,7 +3770,7 @@
               82c4      5 PTRIMMEDESP STACK 16 displ lea     r13, [rsp+78h+var_68]
               82c9      2 INSTR BELONGTO 8170 
               82c9      2 INSTR DEADREGS  EFLAGS R14 R15 ZZ xor     ebp, ebp 
-              82c9     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+              82c9     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
               82cb     -1 INSTR LOCAL MetadataUnused mov     r15d, 3E8h 
               82cb      6 INSTR BELONGTO 8170 
               82d1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_view_get_item_column 
@@ -3813,7 +3813,7 @@
               830b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_path_free 
               830b      5 INSTR BELONGTO 8170 
               830b      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _gtk_tree_path_free 
-              8310     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rsp+78h+var_78] 
+              8310     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rsp+78h+var_78] 
               8310      3 INSTR BELONGTO 8170 
               8310      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R15 ZZ mov     eax, [rsp+78h+var_78] 
               8310      3 PTRIMMEDESP STACK 0 displ mov     eax, [rsp+78h+var_78]
@@ -3854,7 +3854,7 @@
               8345      4 INSTR BELONGTO 8170 
               8349      2 INSTR BELONGTO 8170 
               8349      2 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edx, eax 
-              8349     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, eax 
+              8349     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, eax 
               834b     -1 INSTR LOCAL MetadataRedundant sar     edx, 1Fh 
               834b      3 INSTR BELONGTO 8170 
               834e     -1 INSTR LOCAL MetadataRedundant xor     eax, edx 
@@ -3886,10 +3886,10 @@
               8370      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 ZZ mov     rdi, r12 
               8373      2 INSTR BELONGTO 8170 
               8373      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 R14 R15 ZZ xor     ecx, ecx 
-              8373     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              8373     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               8375      2 INSTR BELONGTO 8170 
               8375      2 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 R15 ZZ xor     edx, edx 
-              8375     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              8375     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               8377      3 INSTR BELONGTO 8170 
               8377      3 INSTR DEADREGS  EFLAGS RSI R13 R14 R15 ZZ mov     rsi, rbp 
               837a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_view_set_cursor 
@@ -3904,10 +3904,10 @@
               8387      5 INSTR BELONGTO 8170 
               838c      2 INSTR BELONGTO 8170 
               838c      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-              838c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              838c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               838e      2 INSTR BELONGTO 8170 
               838e      2 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ xor     ebx, ebx 
-              838e     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+              838e     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
               8390     -1 INSTR LOCAL NoMetaUpdate call    _g_list_free 
               8390      5 INSTR BELONGTO 8170 
               8390      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_list_free 
@@ -3931,7 +3931,7 @@
               83b4      5 PTRIMMEDESP STACK 56 displ lea     rsi, [rsp+78h+var_40]
               83b9      2 INSTR BELONGTO 8170 
               83b9      2 INSTR DEADREGS  EFLAGS RDX RDI R12 R13 R14 R15 ZZ xor     edx, edx 
-              83b9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              83b9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               83bb      3 INSTR BELONGTO 8170 
               83bb      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ mov     rdi, rbp 
               83be      3 INSTR BELONGTO 8170 
@@ -3953,7 +3953,7 @@
               83d6      5 PTRIMMEDESP STACK 16 displ lea     r13, [rsp+78h+var_68]
               83db      2 INSTR BELONGTO 8170 
               83db      2 INSTR DEADREGS  EFLAGS R14 R15 ZZ xor     ebp, ebp 
-              83db     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+              83db     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
               83dd     -1 INSTR LOCAL MetadataUnused mov     r15d, 3E8h 
               83dd      6 INSTR BELONGTO 8170 
               83e3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_view_get_item_column 
@@ -3996,7 +3996,7 @@
               841b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_path_free 
               841b      5 INSTR BELONGTO 8170 
               841b      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _gtk_tree_path_free 
-              8420     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rsp+78h+var_78] 
+              8420     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rsp+78h+var_78] 
               8420      3 INSTR BELONGTO 8170 
               8420      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R15 ZZ mov     eax, [rsp+78h+var_78] 
               8420      3 PTRIMMEDESP STACK 0 displ mov     eax, [rsp+78h+var_78]
@@ -4037,7 +4037,7 @@
               8459      4 INSTR BELONGTO 8170 
               845d      2 INSTR BELONGTO 8170 
               845d      2 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edx, eax 
-              845d     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, eax 
+              845d     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, eax 
               845f     -1 INSTR LOCAL MetadataRedundant sar     edx, 1Fh 
               845f      3 INSTR BELONGTO 8170 
               8462     -1 INSTR LOCAL MetadataRedundant xor     eax, edx 
@@ -4082,7 +4082,7 @@
               8497      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _gtk_icon_view_unselect_all 
               849c      2 INSTR BELONGTO 8480 
               849c      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              849c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              849c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               849e      1 INSTR BELONGTO 8480 
               849e      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               849f      1 INSTR BELONGTO 8480 
@@ -4121,7 +4121,7 @@
               84c9      5 PTRIMMEDESP STACK 8 displ lea     rsi, [rsp+28h+var_20]
               84ce      2 INSTR BELONGTO 84a0 
               84ce      2 INSTR DEADREGS  EFLAGS RDX RDI R12 ZZ xor     edx, edx 
-              84ce     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              84ce     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               84d0      3 INSTR BELONGTO 84a0 
               84d0      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
               84d3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_view_get_cursor 
@@ -4131,12 +4131,12 @@
               84d8      2 INSTR BELONGTO 84a0 
               84da     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_850A 
               84da      2 INSTR BELONGTO 84a0 
-              84dc     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
+              84dc     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
               84dc      5 INSTR BELONGTO 84a0 
               84dc      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 0FFFFFFFFh 
               84e1      2 INSTR BELONGTO 84a0 
               84e1      2 INSTR DEADREGS  EFLAGS RDI R12 ZZ xor     edi, edi 
-              84e1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              84e1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               84e3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_path_new_from_indices 
               84e3      5 INSTR BELONGTO 84a0 
               84e3      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _gtk_tree_path_new_from_indices 
@@ -4154,10 +4154,10 @@
               84f6      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
               84fb      2 INSTR BELONGTO 84a0 
               84fb      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-              84fb     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              84fb     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               84fd      2 INSTR BELONGTO 84a0 
               84fd      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-              84fd     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              84fd     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               84ff      3 INSTR BELONGTO 84a0 
               84ff      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r12 
               8502      3 INSTR BELONGTO 84a0 
@@ -4190,7 +4190,7 @@
               852a      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _gtk_tree_path_free 
               852f      2 INSTR BELONGTO 84a0 
               852f      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-              852f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              852f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               8531      5 INSTR BELONGTO 84a0 
               8531      5 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+28h+var_18] 
               8531      5 PTRIMMEDESP STACK 16 displ mov     rbx, [rsp+28h+var_18]
@@ -4240,7 +4240,7 @@
               8575      5 PTRIMMEDESP STACK 8 displ lea     rcx, [rsp+28h+var_20]
               857a      2 INSTR BELONGTO 8550 
               857a      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-              857a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              857a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               857c      3 INSTR BELONGTO 8550 
               857c      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rbx 
               857f      3 INSTR BELONGTO 8550 
@@ -4266,15 +4266,15 @@
               8599      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ lea     rdx, aCouldNotActive; "Could not active panel \"%s\": %s" 
               85a0      2 INSTR BELONGTO 8550 
               85a0      2 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ xor     edi, edi 
-              85a0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              85a0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               85a2      3 INSTR BELONGTO 8550 
               85a2      3 INSTR DEADREGS  EFLAGS RAX RCX RSI ZZ mov     rcx, rbx 
-              85a5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              85a5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               85a5      5 INSTR BELONGTO 8550 
               85a5      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 10h 
               85aa      2 INSTR BELONGTO 8550 
               85aa      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-              85aa     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              85aa     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               85ac     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               85ac      5 INSTR BELONGTO 8550 
               85ac      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -4301,10 +4301,10 @@
               8602      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], r12
               8607      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
               8613      4 PTRIMMEDEBP STACK 8 displ mov     rax, [rbp+8]
-              8628     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              862d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              8628     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              862d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               862f      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              8633     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              8633     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               8635     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               863a      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
               863f      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -4319,10 +4319,10 @@
               8682      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], r12
               8687      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
               8693      4 PTRIMMEDEBP STACK 8 displ mov     rax, [rbp+8]
-              86a8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              86ad     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              86a8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              86ad     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               86af      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              86b3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              86b3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               86b5     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               86ba      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
               86bf      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -4334,14 +4334,14 @@
               86da     -3 INSTR LOCAL NoWarn push    r12 
               86dc     -3 INSTR LOCAL NoWarn push    rbp 
               86dd     -3 INSTR LOCAL NoWarn push    rbx 
-              86e1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              86e1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               86e7      5 PTRIMMEDESP STACK 56 displ lea     rax, [rsp+38h]
               86ec      5 PTRIMMEDESP STACK 48 displ lea     r9, [rsp+30h]
               86f1      5 PTRIMMEDESP STACK 40 displ lea     rcx, [rsp+28h]
               86f6      8 PTRIMMEDESP STACK 16 displ mov     dword ptr [rsp+10h], 0FFFFFFFFh
               86fe      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [rsp], 7
               8705      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-              870a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              870a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               870c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
               8715     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
               8718     -1 INSTR LOCAL NoMetaUpdate jz      loc_8860 
@@ -4349,7 +4349,7 @@
               871e      6 PTRIMMEDESP STACK 40 displ cmp     qword ptr [rsp+28h], 0
               8724     -1 INSTR LOCAL NoMetaUpdate jz      loc_8830 
               872a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
-              8731     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+              8731     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
               8736     -1 INSTR LOCAL NoMetaUpdate call    _g_utf8_casefold 
               873b      5 PTRIMMEDESP STACK 40 displ mov     rdi, [rsp+28h]
               8743     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -4368,7 +4368,7 @@
               8795     -1 INSTR LOCAL NoMetaUpdate test    r14, r14 
               8798     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_87F1 
               879a      5 PTRIMMEDESP STACK 56 displ mov     rax, [rsp+38h]
-              879f     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+              879f     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
               87a1     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
               87a4     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_87B5 
               87a6     -1 INSTR LOCAL NoMetaUpdate jmp     loc_8828 
@@ -4383,7 +4383,7 @@
               87e2     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
               87e7     -1 INSTR LOCAL NoMetaUpdate cmp     rbx, r14 
               87ea     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_87B0 
-              87ec     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+              87ec     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
               87f1      5 PTRIMMEDESP STACK 40 displ mov     rdi, [rsp+28h]
               87f6     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
               87fe     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
@@ -4391,12 +4391,12 @@
               880b      5 PTRIMMEDESP STACK 56 displ mov     rdi, [rsp+38h]
               8810     -1 INSTR LOCAL NoMetaUpdate call    _g_strfreev 
               8815     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 40h 
-              8828     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+              8828     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
               882a     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_87F1 
-              8830     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              8830     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               8832     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
               8837      5 PTRIMMEDESP STACK 48 displ mov     rdi, [rsp+30h]
-              883c     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+              883c     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
               883e     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
               8843      5 PTRIMMEDESP STACK 56 displ mov     rdi, [rsp+38h]
               8848     -1 INSTR LOCAL NoMetaUpdate call    _g_strfreev 
@@ -4472,7 +4472,7 @@
               88c1      5 INSTR DEADREGS  EFLAGS RBX R14 ZZ call    _gtk_container_get_type 
               88c6      2 INSTR BELONGTO 8870 
               88c6      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R14 ZZ xor     ebx, ebx 
-              88c6     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+              88c6     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
               88c8      3 INSTR BELONGTO 8870 
               88c8      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 ZZ mov     r14, rax 
               88cb      5 INSTR BELONGTO 8870 
@@ -4480,7 +4480,7 @@
               88d0      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rax, [rbp+0] 
               88d4      2 INSTR BELONGTO 8870 
               88d4      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, ebx 
-              88d4     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, ebx 
+              88d4     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, ebx 
               88d6      3 INSTR BELONGTO 8870 
               88d6      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r14 
               88d9      3 INSTR BELONGTO 8870 
@@ -4551,7 +4551,7 @@
               8926      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_type_check_instance_cast 
               892b      2 INSTR BELONGTO 8910 
               892b      2 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ xor     esi, esi 
-              892b     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              892b     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               892d      3 INSTR BELONGTO 8910 
               892d      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
               8930     -1 INSTR LOCAL NoMetaUpdate call    _gtk_notebook_set_current_page 
@@ -4564,7 +4564,7 @@
               893c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               893c      5 INSTR BELONGTO 8910 
               893c      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_type_check_instance_cast 
-              8941     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+              8941     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
               8941      5 INSTR BELONGTO 8910 
               8941      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 2 
               8946      3 INSTR BELONGTO 8910 
@@ -4618,7 +4618,7 @@
               899c      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_type_check_instance_cast 
               89a1      2 INSTR BELONGTO 8910 
               89a1      2 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ xor     esi, esi 
-              89a1     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              89a1     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               89a3      3 INSTR BELONGTO 8910 
               89a3      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
               89a6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_lock_button_set_permission 
@@ -4638,7 +4638,7 @@
               89ba      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_type_check_instance_cast 
               89bf      2 INSTR BELONGTO 8910 
               89bf      2 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ xor     esi, esi 
-              89bf     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              89bf     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               89c1      3 INSTR BELONGTO 8910 
               89c1      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
               89c4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_role 
@@ -4919,17 +4919,17 @@
               8b90      5 INSTR BELONGTO 8a50 
               8b95      7 INSTR BELONGTO 8a50 
               8b95      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R13 R14 R15 ZZ lea     rdx, aCouldNotLoadCo; "Could not load control center menu: %s" 
-              8b9c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              8b9c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               8b9c      5 INSTR BELONGTO 8a50 
               8b9c      5 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, 10h 
               8ba1      2 INSTR BELONGTO 8a50 
               8ba1      2 INSTR DEADREGS  EFLAGS RCX RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-              8ba1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              8ba1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               8ba3      4 INSTR BELONGTO 8a50 
               8ba3      4 INSTR DEADREGS  EFLAGS RCX RBX R12 R13 R14 R15 ZZ mov     rcx, [rax+8] 
               8ba7      2 INSTR BELONGTO 8a50 
               8ba7      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 R14 R15 ZZ xor     eax, eax 
-              8ba7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              8ba7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               8ba9     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               8ba9      5 INSTR BELONGTO 8a50 
               8ba9      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_log 
@@ -4987,7 +4987,7 @@
               8bf6      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _g_type_check_instance_cast 
               8bfb      2 INSTR BELONGTO 8a50 
               8bfb      2 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ xor     esi, esi 
-              8bfb     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              8bfb     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               8bfd      3 INSTR BELONGTO 8a50 
               8bfd      3 INSTR DEADREGS  EFLAGS RDI R15 ZZ mov     rdi, rax 
               8c00     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_filter_new 
@@ -5052,8 +5052,8 @@
               8c61      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 ZZ xor     r8d, r8d 
               8c64      2 INSTR BELONGTO 8a50 
               8c64      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ xor     edx, edx 
-              8c64     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              8c66     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+              8c64     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              8c66     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
               8c66      5 INSTR BELONGTO 8a50 
               8c66      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R15 ZZ mov     ecx, 1 
               8c6b      3 INSTR BELONGTO 8a50 
@@ -5213,11 +5213,11 @@
               8d69      5 INSTR BELONGTO 8a50 
               8d6e      2 INSTR BELONGTO 8a50 
               8d6e      2 INSTR DEADREGS  EFLAGS RDI R15 ZZ xor     edi, edi 
-              8d6e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              8d6e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               8d70     -1 INSTR LOCAL NoMetaUpdate call    _gtk_separator_new 
               8d70      5 INSTR BELONGTO 8a50 
               8d70      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _gtk_separator_new 
-              8d75     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Bh 
+              8d75     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Bh 
               8d75      5 INSTR BELONGTO 8a50 
               8d75      5 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     esi, 0Bh 
               8d7a      3 INSTR BELONGTO 8a50 
@@ -5257,10 +5257,10 @@
               8db1      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rdi, rax 
               8db4      2 INSTR BELONGTO 8a50 
               8db4      2 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ xor     ecx, ecx 
-              8db4     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              8db4     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               8db6      2 INSTR BELONGTO 8a50 
               8db6      2 INSTR DEADREGS  EFLAGS RDX RSI ZZ xor     edx, edx 
-              8db6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              8db6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               8db8      3 INSTR BELONGTO 8a50 
               8db8      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, r15 
               8dbb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
@@ -5315,7 +5315,7 @@
               8dfe      2 INSTR BELONGTO 8df0 
               8e00      2 INSTR BELONGTO 8df0 
               8e00      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-              8e00     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              8e00     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               8e02     -1 INSTR LOCAL NoMetaUpdate cmp     ecx, 0FF1Bh 
               8e02      6 INSTR BELONGTO 8df0 
               8e08     -1 INSTR LOCAL NoMetaUpdate jz      short loc_8E10 
@@ -5334,7 +5334,7 @@
               8e1c     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
               8e1c      4 INSTR BELONGTO 8df0 
               8e20     16 DEALLOC STACK esp - 16 mov     eax, 1
-              8e20     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              8e20     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               8e20      5 INSTR BELONGTO 8df0 
               8e20      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
               8e25      1 INSTR BELONGTO 8df0 
@@ -5387,7 +5387,7 @@
               8e76     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_path_free 
               8e76      5 INSTR BELONGTO 8df0 
               8e76      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _gtk_tree_path_free 
-              8e7b     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              8e7b     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               8e7b      5 INSTR BELONGTO 8df0 
               8e7b      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
               8e80     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_8E0A 
@@ -5482,10 +5482,10 @@
               8f1c      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ lea     rsi, aSearchString; "search-string" 
               8f23      2 INSTR BELONGTO 8e90 
               8f23      2 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ xor     ecx, ecx 
-              8f23     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              8f23     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               8f25      2 INSTR BELONGTO 8e90 
               8f25      2 INSTR DEADREGS  EFLAGS RAX RDX ZZ xor     eax, eax 
-              8f25     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              8f25     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               8f27      3 INSTR BELONGTO 8e90 
               8f27      3 INSTR DEADREGS  EFLAGS RDX ZZ mov     rdx, r12 
               8f2a      4 INSTR BELONGTO 8e90 
@@ -5529,7 +5529,7 @@
               8f70     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               8f70      5 INSTR BELONGTO 8e90 
               8f70      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_type_check_instance_cast 
-              8f75     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              8f75     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               8f75      5 INSTR BELONGTO 8e90 
               8f75      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 1 
               8f7a      3 INSTR BELONGTO 8e90 
@@ -5559,7 +5559,7 @@
               8fae      6 INSTR DEADREGS  EFLAGS RAX RBX R8 R12 ZZ mov     r8d, 1 
               8fb4      2 INSTR BELONGTO 8e90 
               8fb4      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-              8fb4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              8fb4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               8fb6     -1 INSTR LOCAL MetadataUnused mov     [rsp+28h+var_20], 0 
               8fb6      9 INSTR BELONGTO 8e90 
               8fbf      7 INSTR BELONGTO 8e90 
@@ -5577,7 +5577,7 @@
               8fd3      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    sub_8910 
               8fd8      3 INSTR BELONGTO 8e90 
               8fd8      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     rdi, rbp 
-              8fdb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              8fdb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               8fdb      5 INSTR BELONGTO 8e90 
               8fdb      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 50h 
               8fe0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -5598,7 +5598,7 @@
               9004      3 INSTR DEADREGS  EFLAGS RAX RBX R8 R12 ZZ xor     r8d, r8d 
               9007      2 INSTR BELONGTO 8e90 
               9007      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-              9007     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              9007     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               9009     -1 INSTR LOCAL MetadataUnused mov     [rsp+28h+var_20], 0 
               9009      9 INSTR BELONGTO 8e90 
               9012      7 INSTR BELONGTO 8e90 
@@ -5773,7 +5773,7 @@
               9140     -3 INSTR LOCAL NoWarn push    rbx 
               9141      2 INSTR BELONGTO 9140 
               9141      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     ebx, ebx 
-              9141     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+              9141     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
               9143     16 DATAREF STACK 598 esp + 0 PARENT LocalFrame LOCALFRAME
               9143      4 INSTR BELONGTO 9140 
               9143      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 10h 
@@ -5797,7 +5797,7 @@
               9158      3 INSTR BELONGTO 9140 
               915b     -1 INSTR LOCAL NoMetaUpdate ja      short loc_91B0 
               915b      2 INSTR BELONGTO 9140 
-              915d     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              915d     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               915d      5 INSTR BELONGTO 9140 
               915d      5 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, 1 
               9162     -1 INSTR LOCAL MetadataRedundant shl     rax, cl 
@@ -5825,7 +5825,7 @@
               9194      2 INSTR BELONGTO 9140 
               9196      3 INSTR BELONGTO 9140 
               9196      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rdx 
-              9199     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+              9199     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
               9199      5 INSTR BELONGTO 9140 
               9199      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, 1 
               919e     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
@@ -5837,20 +5837,20 @@
               91ac     16 DEALLOC STACK esp - 16 mov     eax, ebx
               91ac      2 INSTR BELONGTO 9140 
               91ac      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, ebx 
-              91ac     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+              91ac     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
               91ae      1 INSTR BELONGTO 9140 
               91ae      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               91af      1 INSTR BELONGTO 9140 
               91af      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
               91b0      2 INSTR BELONGTO 9140 
               91b0      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     ebx, ebx 
-              91b0     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+              91b0     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
               91b2     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_91A8 
               91b2      2 INSTR BELONGTO 9140 
               91b8      5 INSTR BELONGTO 9140 
               91b8      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+18h+var_10], rdx 
               91b8      5 PTRIMMEDESP STACK 8 displ mov     [rsp+18h+var_10], rdx
-              91bd     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+              91bd     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
               91bd      5 INSTR BELONGTO 9140 
               91bd      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, 1 
               91c2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_notebook_get_type 
@@ -5906,7 +5906,7 @@
               9219      2 INSTR BELONGTO 9140 
               921b      4 INSTR BELONGTO 9140 
               921b      4 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     rax, [rdx+20h] 
-              921f     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+              921f     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
               921f      5 INSTR BELONGTO 9140 
               921f      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     ebx, 1 
               9224      4 INSTR BELONGTO 9140 
@@ -5977,7 +5977,7 @@
               92a0     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 28h 
               92a0      6 INSTR BELONGTO 9240 
               92a0      6 INSTR DEADREGS  EFLAGS RDX RBX R8 ZZ mov     r8d, 28h 
-              92a6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
+              92a6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
               92a6      5 INSTR BELONGTO 9240 
               92a6      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 0A0h 
               92ab      7 INSTR BELONGTO 9240 
@@ -6035,8 +6035,8 @@
               9352     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               9357      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
               935d     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-              9360     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-              9362     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              9360     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+              9362     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               9364     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_end 
               9369      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               936c     -1 INSTR LOCAL NoMetaUpdate call    _g_object_ref 
@@ -6076,9 +6076,9 @@
               945c      5 PTRIMMEDESP STACK 120 displ lea     r9, [rsp+78h]
               9461      5 PTRIMMEDESP STACK 112 displ lea     rcx, [rsp+70h]
               9466      5 PTRIMMEDESP STACK 80 displ lea     rsi, [rsp+50h]
-              946b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              946b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               9470     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-              9476     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              9476     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               9478      8 PTRIMMEDESP STACK 32 displ mov     dword ptr [rsp+20h], 0FFFFFFFFh
               9480      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], r12
               9485      8 PTRIMMEDESP STACK 16 displ mov     dword ptr [rsp+10h], 2
@@ -6115,7 +6115,7 @@
               9532     -1 INSTR LOCAL NoMetaUpdate jz      loc_9601 
               9538     -1 INSTR LOCAL NoMetaUpdate call    _gtk_notebook_get_type 
               9544     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              9549     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+              9549     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
               9551     -1 INSTR LOCAL NoMetaUpdate call    _gtk_notebook_remove_page 
               9556      5 PTRIMMEDESP STACK 64 displ mov     rdi, [rsp+40h]
               955b      5 PTRIMMEDESP STACK 120 displ mov     rbx, [rsp+78h]
@@ -6124,7 +6124,7 @@
               9570     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               9575      5 PTRIMMEDESP STACK 72 displ mov     rdx, [rsp+48h]
               9583      3 PTRIMMEDEBP STACK 0 displ mov     r8, rbp
-              9589     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+              9589     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
               958e     -1 INSTR LOCAL NoMetaUpdate call    sub_7DA0 
               9593      5 PTRIMMEDESP STACK 112 displ mov     rdi, [rsp+70h]
               9598     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
@@ -6146,13 +6146,13 @@
               9614     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rsp+70h], 0 
               9614      6 PTRIMMEDESP STACK 112 displ cmp     qword ptr [rsp+70h], 0
               961a     -1 INSTR LOCAL NoMetaUpdate jnz     loc_9538 
-              962a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              962f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-              9631     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-              9633     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+              962a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              962f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+              9631     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+              9633     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
               9635     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               963a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_95B9 
-              9646     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              9646     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               964b     -1 INSTR LOCAL NoMetaUpdate call    _g_file_test 
               9650     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               9652     -1 INSTR LOCAL NoMetaUpdate jz      short loc_96B0 
@@ -6167,9 +6167,9 @@
               96a3      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               96a6     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
               96ab     -1 INSTR LOCAL NoMetaUpdate jmp     loc_9614 
-              96ba     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              96bf     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-              96c1     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+              96ba     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              96bf     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+              96c1     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
               96c3     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               96c8     -1 INSTR LOCAL NoMetaUpdate jmp     loc_95B9 
               96d0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -16 0 4 0 0 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -6225,10 +6225,10 @@
               974b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
               974b      3 INSTR BELONGTO 96d0 
               974e      2 INSTR BELONGTO 96d0 
-              974e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              974e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               9750      2 INSTR BELONGTO 96d0 
-              9750     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              9752     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+              9750     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              9752     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
               9752      5 INSTR BELONGTO 96d0 
               9757      4 INSTR BELONGTO 96d0 
               9757      4 PTRIMMEDESP STACK 0 displ mov     [rsp+28h+var_28], rbp
@@ -6245,7 +6245,7 @@
               9772     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_destroy 
               9772      5 INSTR BELONGTO 96d0 
               9777      7 INSTR BELONGTO 96d0 
-              977e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              977e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               977e      5 INSTR BELONGTO 96d0 
               9783     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               9783      5 INSTR BELONGTO 96d0 
@@ -6322,7 +6322,7 @@
               983e      5 INSTR BELONGTO 97a0 
               9843      8 INSTR BELONGTO 97a0 
               984b      7 INSTR BELONGTO 97a0 
-              9852     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              9852     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               9852      5 INSTR BELONGTO 97a0 
               9857     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               9857      5 INSTR BELONGTO 97a0 
@@ -6360,10 +6360,10 @@
               98df      5 PTRIMMEDESP STACK 64 displ mov     rdi, [rsp+40h]
               98e4      5 PTRIMMEDESP STACK 32 displ lea     rdx, [rsp+20h]
               98eb     -1 INSTR LOCAL NoMetaUpdate call    _gdk_screen_get_monitor_geometry 
-              98f0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              98f0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               98f2     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rsp+2Ch], 27Ch 
               98f2      8 PTRIMMEDESP STACK 44 displ cmp     dword ptr [rsp+2Ch], 27Ch
-              98fa     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setle   al 
+              98fa     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setle   al 
               9903     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_new 
               9908      5 PTRIMMEDESP STACK 56 displ lea     rdx, [rsp+38h]
               991a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_add_from_file 
@@ -6388,8 +6388,8 @@
               99bf     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               99d2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
               99dd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              99e2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
-              99ee     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2E4h 
+              99e2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+              99ee     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2E4h 
               99f3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_size_request 
               9a02     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
               9a0d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -6402,11 +6402,11 @@
               9a60     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_get_type 
               9a6e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               9a73     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-              9a76     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-              9a78     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              9a76     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+              9a78     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               9a80     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
               9a8f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              9a94     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              9a94     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               9a9c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_reorder_child 
               9aa5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
               9abc     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
@@ -6415,16 +6415,16 @@
               9ac5     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
               9ad1     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_new_with_free_func 
               9ad6      4 PTRIMMEDEBP STACK 32 displ mov     r12, [rbp+20h]
-              9ade     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+              9ade     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
               9ae8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_margin_top 
               9aed      4 PTRIMMEDEBP STACK 32 displ mov     rax, [rbp+20h]
-              9af1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+              9af1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
               9afa     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_margin_bottom 
               9aff      4 PTRIMMEDEBP STACK 32 displ mov     rax, [rbp+20h]
-              9b03     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+              9b03     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
               9b0c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_margin_left 
               9b11      4 PTRIMMEDEBP STACK 32 displ mov     rax, [rbp+20h]
-              9b15     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+              9b15     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
               9b1e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_margin_right 
               9b23     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_get_type 
               9b28      4 PTRIMMEDEBP STACK 32 displ mov     rdx, [rbp+20h]
@@ -6437,9 +6437,9 @@
               9b5a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               9b65     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_set_focus_vadjustment 
               9b6a     -1 INSTR LOCAL NoMetaUpdate call    cc_shell_model_new 
-              9b7d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              9b7d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               9b8b     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_new_full 
-              9b97     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              9b97     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               9b9e     -1 INSTR LOCAL NoMetaUpdate call    _gmenu_tree_new_for_path 
               9ba3      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               9bab     -1 INSTR LOCAL NoMetaUpdate call    sub_8A50 
@@ -6454,44 +6454,44 @@
               9bec     -1 INSTR LOCAL NoMetaUpdate jz      loc_9F90 
               9bf2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get_type 
               9c00     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              9c05     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              9c05     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               9c0a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_filter_new 
               9c17     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_filter_get_type 
               9c22     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              9c2e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              9c2e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               9c36     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_filter_set_visible_func 
               9c3b     -1 INSTR LOCAL NoMetaUpdate call    cc_shell_item_view_new 
               9c48     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_view_get_type 
               9c53      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
               9c58     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              9c5d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              9c5d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               9c62     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_view_set_item_orientation 
               9c67      5 PTRIMMEDESP STACK 8 displ mov     rsi, [rsp+8]
               9c6f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              9c74     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+              9c74     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
               9c7c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_view_set_margin 
               9c81      5 PTRIMMEDESP STACK 8 displ mov     rsi, [rsp+8]
               9c89     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              9c8e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+              9c8e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
               9c96     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_view_set_spacing 
               9ca3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               9ca8      5 PTRIMMEDESP STACK 8 displ mov     rsi, [rsp+8]
               9cb3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               9cbe     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_view_set_model 
               9cc3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_pixbuf_new 
-              9ccf     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-              9cd1     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+              9ccf     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+              9cd1     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
               9cd9      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-              9cde     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              9cde     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               9ce0     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
               9ce5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_get_type 
               9cf3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               9cf8      5 PTRIMMEDESP STACK 8 displ mov     rsi, [rsp+8]
-              9cfd     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              9cfd     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               9d02     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_pack_start 
               9d0d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               9d12      5 PTRIMMEDESP STACK 8 displ mov     rsi, [rsp+8]
-              9d1e     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
+              9d1e     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
               9d26     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_add_attribute 
               9d36     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
               9d41     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -6502,17 +6502,17 @@
               9d6e      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
               9d72     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               9d77      4 PTRIMMEDESP STACK 0 displ mov     rcx, [rsp]
-              9d7b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+              9d7b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
               9d86     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_pack_start 
               9d96      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
               9d9b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               9da0      5 PTRIMMEDESP STACK 8 displ mov     rsi, [rsp+8]
-              9dac     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              9dac     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               9db1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_add_attribute 
               9dc1      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
               9dc6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               9dcb      5 PTRIMMEDESP STACK 8 displ mov     rsi, [rsp+8]
-              9dda     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 5 
+              9dda     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 5 
               9ddf     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_add_attribute 
               9df2     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
               9df5     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -6543,15 +6543,15 @@
               9ee4     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               9eec     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_icon_name 
               9ef4     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
-              9f03     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              9f05     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-              9f07     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              9f03     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              9f05     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+              9f07     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               9f09     -1 INSTR LOCAL NoMetaUpdate call    sub_9050 
               9f0e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 58h 
               9f20      5 PTRIMMEDESP STACK 56 displ mov     rax, [rsp+38h]
-              9f2c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
-              9f31     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-              9f37     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              9f2c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+              9f31     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+              9f37     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               9f39     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               9f3e      5 PTRIMMEDESP STACK 56 displ mov     rdi, [rsp+38h]
               9f43     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
@@ -6559,10 +6559,10 @@
               9f60     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
               9f6b      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rax
               9f70     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              9f75     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              9f75     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               9f7d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_resizable 
               9f86     -1 INSTR LOCAL NoMetaUpdate jmp     loc_9968 
-              9f9e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              9f9e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               9fa0     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               9fa5     -1 INSTR LOCAL NoMetaUpdate jmp     loc_9E93 
               9fb7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_from_name 
@@ -6599,7 +6599,7 @@
               a01e      4 INSTR BELONGTO a010 
               a022      2 INSTR BELONGTO a010 
               a022      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-              a022     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a022     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a022      8 DEALLOC STACK esp - 8 xor     eax, eax
               a024     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
               a024      5 INSTR BELONGTO a010 
@@ -6745,25 +6745,25 @@
               a116     -3 INSTR LOCAL NoWarn push    rbx 
               a117     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
               a11c      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-              a11f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              a11f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               a12b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               a133     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_get_type 
               a138      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               a13e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               a143      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-              a146     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
+              a146     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
               a14e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_add_private 
               a176     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0E3h 
               a1ec     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_string 
-              a1f7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              a1f7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               a1fc     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
               a21d     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0E3h 
               a223     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_string 
-              a22e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+              a22e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
               a233     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
               a254     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0E3h 
               a25a     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_string 
-              a265     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+              a265     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
               a26e     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_class_install_property 
               a280      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
               a280      0 FUNC MMSAFENESS SAFE
@@ -6794,7 +6794,7 @@
               a2b1      4 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     rdi, [rbx+10h] 
               a2b5      2 INSTR BELONGTO a280 
               a2b5      2 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 R15 ZZ xor     ebp, ebp 
-              a2b5     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+              a2b5     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
               a2b7      4 INSTR BELONGTO a280 
               a2b7      4 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 R15 ZZ mov     r14, [rbx+8] 
               a2bb     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
@@ -6830,7 +6830,7 @@
               a2e9      4 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 ZZ mov     rdi, [rbx+18h] 
               a2ed      2 INSTR BELONGTO a280 
               a2ed      2 INSTR DEADREGS  EFLAGS RSI R13 R15 ZZ xor     esi, esi 
-              a2ed     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              a2ed     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               a2ef     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_set_attributes 
               a2ef      5 INSTR BELONGTO a280 
               a2ef      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    _pango_layout_set_attributes 
@@ -6930,7 +6930,7 @@
               a3a0      3 INSTR DEADREGS  EFLAGS RAX R8 R13 ZZ mov     r8, r14 
               a3a3      2 INSTR BELONGTO a280 
               a3a3      2 INSTR DEADREGS  EFLAGS RAX R13 ZZ xor     eax, eax 
-              a3a3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a3a3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a3a5     -1 INSTR LOCAL NoMetaUpdate call    _g_markup_printf_escaped 
               a3a5      5 INSTR BELONGTO a280 
               a3a5      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_markup_printf_escaped 
@@ -6950,7 +6950,7 @@
               a3bd      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 R15 ZZ mov     rdi, [rbx+18h] 
               a3c1      3 INSTR BELONGTO a280 
               a3c1      3 INSTR DEADREGS  EFLAGS RDX RBX RSI R14 R15 ZZ mov     rsi, r13 
-              a3c4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+              a3c4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
               a3c4      5 INSTR BELONGTO a280 
               a3c4      5 INSTR DEADREGS  EFLAGS RDX RBX R14 R15 ZZ mov     edx, 0FFFFFFFFh 
               a3c9     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_set_markup 
@@ -7011,7 +7011,7 @@
               a43b     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_new 
               a43b      5 INSTR BELONGTO a280 
               a43b      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _pango_layout_new 
-              a440     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+              a440     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
               a440      5 INSTR BELONGTO a280 
               a440      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     esi, 3 
               a445      4 INSTR BELONGTO a280 
@@ -7034,10 +7034,10 @@
               a49a      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], r12
               a49f      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
               a4ab      4 PTRIMMEDEBP STACK 8 displ mov     rax, [rbp+8]
-              a4c0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              a4c5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              a4c0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              a4c5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               a4c7      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              a4cb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a4cb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a4cd     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               a4d2      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
               a4d7      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -7104,7 +7104,7 @@
               a550     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 30h 
               a550      6 INSTR BELONGTO a4f0 
               a550      6 INSTR DEADREGS  EFLAGS RDX RBX R8 ZZ mov     r8d, 30h 
-              a556     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 130h 
+              a556     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 130h 
               a556      5 INSTR BELONGTO a4f0 
               a556      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 130h 
               a55b      7 INSTR BELONGTO a4f0 
@@ -7138,14 +7138,14 @@
               a5dd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               a5e8     -1 INSTR LOCAL NoMetaUpdate call    sub_A280 
               a5f1      5 PTRIMMEDESP STACK 16 displ lea     rdx, [rsp+10h]
-              a5f6     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              a5f6     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               a5f8     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_get_pixel_extents 
               a601      5 PTRIMMEDESP STACK 44 displ lea     rdx, [rsp+2Ch]
-              a606     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              a606     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               a608     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_get_pixel_size 
               a612      4 PTRIMMEDESP STACK 44 displ sub     eax, [rsp+2Ch]
-              a61b     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM shr     ebp, 1Fh 
-              a620     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM sar     ebp, 1 
+              a61b     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM shr     ebp, 1Fh 
+              a620     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM sar     ebp, 1 
               a622     -1 INSTR LOCAL NoMetaUpdate call    _cairo_save 
               a627     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm0, dword ptr [r12] 
               a63c     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm1, ebp 
@@ -7226,7 +7226,7 @@
               a6d9      4 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R15 ZZ mov     rdi, [r14+18h] 
               a6dd      2 INSTR BELONGTO a670 
               a6dd      2 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R14 R15 ZZ xor     esi, esi 
-              a6dd     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              a6dd     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               a6df      3 INSTR BELONGTO a670 
               a6df      3 INSTR DEADREGS  EFLAGS RDX RBX R12 R14 R15 ZZ mov     rdx, rsp 
               a6df      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp
@@ -7281,7 +7281,7 @@
               a770      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbx
               a775      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], rbp
               a781      5 PTRIMMEDESP STACK 12 displ lea     rcx, [rsp+0Ch]
-              a789     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              a789     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               a78b     -1 INSTR LOCAL NoMetaUpdate call    sub_A670 
               a790     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
               a793     -1 INSTR LOCAL NoMetaUpdate jz      short loc_A79C 
@@ -7297,7 +7297,7 @@
               a7d0      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbx
               a7d5      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], rbp
               a7e1      5 PTRIMMEDESP STACK 12 displ lea     rdx, [rsp+0Ch]
-              a7e9     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              a7e9     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               a7eb     -1 INSTR LOCAL NoMetaUpdate call    sub_A670 
               a7f0     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
               a7f3     -1 INSTR LOCAL NoMetaUpdate jz      short loc_A7FC 
@@ -7353,7 +7353,7 @@
               a872      5 INSTR BELONGTO a820 
               a877      8 INSTR BELONGTO a820 
               a87f      7 INSTR BELONGTO a820 
-              a886     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              a886     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               a886      5 INSTR BELONGTO a820 
               a88b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               a88b      5 INSTR BELONGTO a820 
@@ -7394,7 +7394,7 @@
               a8c6      5 INSTR BELONGTO a8a0 
               a8cb      8 INSTR BELONGTO a8a0 
               a8d3      7 INSTR BELONGTO a8a0 
-              a8da     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              a8da     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               a8da      5 INSTR BELONGTO a8a0 
               a8df     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               a8df      5 INSTR BELONGTO a8a0 
@@ -7425,11 +7425,11 @@
               a95a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               a969     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               a96e      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-              a98f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              a994     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              a98f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              a994     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               a996      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
               a99b      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              a99f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a99f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a9a1     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               a9a6      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
               a9ab      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -7445,8 +7445,8 @@
               a9e8      5 PTRIMMEDESP STACK 48 displ mov     r12, [rsp+30h]
               a9f4      5 PTRIMMEDESP STACK 56 displ mov     r13, [rsp+38h]
               a9f9      5 PTRIMMEDESP STACK 64 displ mov     r14, [rsp+40h]
-              aa01     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-              aa03     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              aa01     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+              aa03     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               aa05     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
               aa09     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_set 
               aa14     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
@@ -7498,7 +7498,7 @@
               aa7e      4 INSTR BELONGTO aa70 
               aa82      2 INSTR BELONGTO aa70 
               aa82      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-              aa82     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              aa82     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               aa82      8 DEALLOC STACK esp - 8 xor     eax, eax
               aa84     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
               aa84      5 INSTR BELONGTO aa70 
@@ -7524,7 +7524,7 @@
               aa99      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_class_peek_parent 
               aa9e      3 INSTR BELONGTO aa90 
               aa9e      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
-              aaa1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              aaa1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               aaa1      5 INSTR BELONGTO aa90 
               aaa1      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
               aaa6      7 INSTR BELONGTO aa90 
@@ -7555,7 +7555,7 @@
               aade      6 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8d, 0EBh 
               aae4      2 INSTR BELONGTO aa90 
               aae4      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-              aae4     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              aae4     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               aae6      4 INSTR BELONGTO aa90 
               aae6      4 INSTR DEADREGS  EFLAGS ZZ mov     [rbx+20h], rax 
               aaea     -1 INSTR LOCAL MetadataRedundant lea     rax, loc_AFC0 
@@ -7581,7 +7581,7 @@
               ab1b      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
               ab1e      3 INSTR BELONGTO aa90 
               ab1e      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-              ab21     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              ab21     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               ab21      5 INSTR BELONGTO aa90 
               ab21      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
               ab26     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -7596,7 +7596,7 @@
               ab40     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0EBh 
               ab40      6 INSTR BELONGTO aa90 
               ab40      6 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8d, 0EBh 
-              ab46     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 50h 
+              ab46     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 50h 
               ab46      5 INSTR BELONGTO aa90 
               ab46      5 INSTR DEADREGS  EFLAGS RCX ZZ mov     ecx, 50h 
               ab4b     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_object 
@@ -7606,7 +7606,7 @@
               ab50      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
               ab53      3 INSTR BELONGTO aa90 
               ab53      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-              ab56     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+              ab56     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
               ab56      5 INSTR BELONGTO aa90 
               ab56      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 2 
               ab5b     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -7706,7 +7706,7 @@
               ac00     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 40h 
               ac00      6 INSTR BELONGTO aba0 
               ac00      6 INSTR DEADREGS  EFLAGS RDX RBX R8 ZZ mov     r8d, 40h 
-              ac06     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 418h 
+              ac06     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 418h 
               ac06      5 INSTR BELONGTO aba0 
               ac06      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 418h 
               ac0b      7 INSTR BELONGTO aba0 
@@ -7737,28 +7737,28 @@
               ac61     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_view_get_type 
               ac6f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               ac7a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_view_set_model 
-              ac7f     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-              ac81     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+              ac7f     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+              ac81     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
               ac86     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
               ac8e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_pixbuf_new 
-              ac9a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-              ac9c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-              aca7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              ac9a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+              ac9c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+              aca7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               aca9     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
               acae     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_get_type 
               acb9      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
               acbe     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              acc3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              acc3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               accb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_pack_start 
               acd0      5 PTRIMMEDESP STACK 8 displ mov     rcx, [rsp+8]
               acdb     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              ace7     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
+              ace7     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
               acf2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_add_attribute 
               acfd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              ad02     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              ad02     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               ad07     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_view_set_text_column 
               ad12     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              ad17     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 64h 
+              ad17     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 64h 
               ad1f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_view_set_item_width 
               ad24     -1 INSTR LOCAL NoMetaUpdate call    cc_shell_item_view_get_type 
               ad2f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -7766,13 +7766,13 @@
               ad3c     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rbp+0], 0 
               ad3c      5 PTRIMMEDEBP STACK 0 displ cmp     qword ptr [rbp+0], 0
               ad41     -1 INSTR LOCAL NoMetaUpdate jz      loc_AED8 
-              ad47     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-              ad49     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+              ad47     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+              ad49     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
               ad4e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
               ad53      4 PTRIMMEDEBP STACK 8 displ mov     rdi, [rbp+8]
               ad5a     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
               ad5d     -1 INSTR LOCAL NoMetaUpdate jz      loc_AEC8 
-              ad63     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+              ad63     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
               ad68     -1 INSTR LOCAL NoMetaUpdate call    _gtk_image_new_from_gicon 
               ad70      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
               ad75     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
@@ -7780,14 +7780,14 @@
               ad88     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               ad8d      5 PTRIMMEDESP STACK 8 displ mov     r9, [rsp+8]
               ad92     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-              ad95     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-              ad97     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              ad95     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+              ad97     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               ad9f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
               ada4      4 PTRIMMEDEBP STACK 0 displ mov     rdi, [rbp+0]
               ada8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
               adad      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rax
               adb2     -1 INSTR LOCAL NoMetaUpdate call    _pango_attr_list_new 
-              adb7     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3000h 
+              adb7     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3000h 
               adbc      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], rax
               adc1     -1 INSTR LOCAL NoMetaUpdate call    _pango_attr_size_new 
               adc6      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+18h]
@@ -7804,8 +7804,8 @@
               ae0c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               ae11      5 PTRIMMEDESP STACK 16 displ mov     rsi, [rsp+10h]
               ae16     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-              ae19     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-              ae1b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              ae19     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+              ae1b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               ae20     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
               ae25     -1 INSTR LOCAL NoMetaUpdate call    _gtk_frame_get_type 
               ae30      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
@@ -7819,8 +7819,8 @@
               ae66     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
               ae71     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               ae76     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-              ae79     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-              ae7e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              ae79     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+              ae7e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               ae86     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
               ae8b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_get_type 
               ae96     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -7860,7 +7860,7 @@
               af16      5 INSTR BELONGTO aef0 
               af1b      8 INSTR BELONGTO aef0 
               af23      7 INSTR BELONGTO aef0 
-              af2a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              af2a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               af2a      5 INSTR BELONGTO aef0 
               af2f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               af2f      5 INSTR BELONGTO aef0 
@@ -7909,7 +7909,7 @@
               af8c      5 INSTR BELONGTO af50 
               af91      8 INSTR BELONGTO af50 
               af99      7 INSTR BELONGTO af50 
-              afa0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              afa0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               afa0      5 INSTR BELONGTO af50 
               afa5     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               afa5      5 INSTR BELONGTO af50 
@@ -7940,11 +7940,11 @@
               b01a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               b029     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               b02e      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-              b04f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              b054     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              b04f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              b054     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               b056      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
               b05b      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              b05f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b05f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b061     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               b066      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
               b06b      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -7975,11 +7975,11 @@
               b115     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               b124     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               b129      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-              b14a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              b14f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              b14a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              b14f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               b151      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
               b156      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              b15a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b15a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b15c     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               b161      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
               b166      5 PTRIMMEDESP STACK 48 displ mov     rbp, [rsp+30h]
@@ -8078,7 +8078,7 @@
               b25c      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
               b25f      2 INSTR BELONGTO b220 
               b25f      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-              b25f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b25f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b261      4 INSTR BELONGTO b220 
               b261      4 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+28h+var_28], r12 
               b261      4 PTRIMMEDESP STACK 0 displ mov     [rsp+28h+var_28], r12
@@ -8112,10 +8112,10 @@
               b298      1 INSTR BELONGTO b290 
               b298      1 INSTR DEADREGS  EFLAGS ZZ retn 
               b298     -4 INSTR LOCAL SafeReturn retn
-              b2a4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              b2a4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               b2a6     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rsi], 4 
-              b2a9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setnz   dl 
-              b2ae     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b2a9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setnz   dl 
+              b2ae     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b2c0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
               b2c0      0 FUNC MMSAFENESS UNSAFE
               b2c0      1 INSTR BELONGTO b2c0 
@@ -8124,7 +8124,7 @@
               b2c0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
               b2c1      3 INSTR BELONGTO b2c0 
               b2c4      7 INSTR BELONGTO b2c0 
-              b2cb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              b2cb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               b2cb      5 INSTR BELONGTO b2c0 
               b2d0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               b2d0      5 INSTR BELONGTO b2c0 
@@ -8141,7 +8141,7 @@
               b2e0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
               b2e1      3 INSTR BELONGTO b2e0 
               b2e4      7 INSTR BELONGTO b2e0 
-              b2eb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              b2eb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               b2eb      5 INSTR BELONGTO b2e0 
               b2f0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               b2f0      5 INSTR BELONGTO b2e0 
@@ -8159,10 +8159,10 @@
               b332      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], r12
               b337      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
               b343      4 PTRIMMEDEBP STACK 8 displ mov     rax, [rbp+8]
-              b358     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              b35d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              b358     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              b35d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               b35f      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              b363     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b363     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b365     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               b36a      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
               b36f      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -8177,10 +8177,10 @@
               b3b2      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], r12
               b3b7      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
               b3c3      4 PTRIMMEDEBP STACK 8 displ mov     rax, [rbp+8]
-              b3d8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              b3dd     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              b3d8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              b3dd     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               b3df      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              b3e3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b3e3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b3e5     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               b3ea      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
               b3ef      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -8201,17 +8201,17 @@
               b452      5 PTRIMMEDESP STACK 72 displ lea     rcx, [rsp+48h]
               b457      5 PTRIMMEDESP STACK 32 displ lea     rsi, [rsp+20h]
               b45c     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-              b462     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              b462     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               b464      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-              b46c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b46c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b46e      8 PTRIMMEDESP STACK 16 displ mov     dword ptr [rsp+10h], 0FFFFFFFFh
               b476      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [rsp], 2
               b47d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
               b482      5 PTRIMMEDESP STACK 80 displ mov     r9, [rsp+50h]
               b487      5 PTRIMMEDESP STACK 88 displ mov     r8, [rsp+58h]
-              b48c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              b48c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               b48e      5 PTRIMMEDESP STACK 72 displ mov     rcx, [rsp+48h]
-              b499     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b499     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b49b      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               b49e     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
               b4a3      5 PTRIMMEDESP STACK 80 displ mov     rdi, [rsp+50h]
@@ -8230,7 +8230,7 @@
               b4ea      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
               b4f3     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rsi+34h], 1 
               b4fb     -1 INSTR LOCAL NoMetaUpdate jz      short loc_B520 
-              b4fd     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              b4fd     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               b502      5 PTRIMMEDESP STACK 16 displ mov     rbx, [rsp+10h]
               b507      5 PTRIMMEDESP STACK 24 displ mov     rbp, [rsp+18h]
               b50c      5 PTRIMMEDESP STACK 32 displ mov     r12, [rsp+20h]
@@ -8311,7 +8311,7 @@
               b5e0     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 38h 
               b5e0      6 INSTR BELONGTO b580 
               b5e0      6 INSTR DEADREGS  EFLAGS RDX RBX R8 ZZ mov     r8d, 38h 
-              b5e6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 430h 
+              b5e6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 430h 
               b5e6      5 INSTR BELONGTO b580 
               b5e6      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 430h 
               b5eb      7 INSTR BELONGTO b580 
@@ -8351,7 +8351,7 @@
               b619      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
               b61e      3 INSTR BELONGTO b610 
               b61e      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-              b621     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              b621     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               b621      5 INSTR BELONGTO b610 
               b621      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
               b626      7 INSTR BELONGTO b610 
@@ -8402,10 +8402,10 @@
               b687      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 ZZ xor     r8d, r8d 
               b68a      2 INSTR BELONGTO b610 
               b68a      2 INSTR DEADREGS  EFLAGS RAX RCX RBX ZZ xor     ecx, ecx 
-              b68a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              b68a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               b68c      2 INSTR BELONGTO b610 
               b68c      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-              b68c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b68c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b68e     -1 INSTR LOCAL MetadataUnused mov     [rsp+48h+var_20], 40h 
               b68e      9 INSTR BELONGTO b610 
               b697     -1 INSTR LOCAL MetadataUnused mov     [rsp+48h+var_28], 40h 
@@ -8413,7 +8413,7 @@
               b6a0      4 INSTR BELONGTO b610 
               b6a0      4 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+48h+var_48], rdx 
               b6a0      4 PTRIMMEDESP STACK 0 displ mov     [rsp+48h+var_48], rdx
-              b6a4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+              b6a4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
               b6a4      5 INSTR BELONGTO b610 
               b6a4      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 1 
               b6a9     -1 INSTR LOCAL MetadataUnused mov     [rsp+48h+var_30], 40h 
@@ -8465,13 +8465,13 @@
               b6ff      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI ZZ mov     rdi, rbx 
               b702      2 INSTR BELONGTO b6e0 
               b702      2 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ xor     ecx, ecx 
-              b702     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              b702     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               b704      2 INSTR BELONGTO b6e0 
               b704      2 INSTR DEADREGS  EFLAGS RAX RDX ZZ xor     edx, edx 
-              b704     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              b704     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               b706      2 INSTR BELONGTO b6e0 
               b706      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-              b706     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b706     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b708     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
               b708      5 INSTR BELONGTO b6e0 
               b708      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_set 
@@ -8605,7 +8605,7 @@
               b7d4      2 INSTR BELONGTO b770 
               b7d6      3 INSTR BELONGTO b770 
               b7d6      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     rdi, rbp 
-              b7d9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              b7d9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               b7d9      5 INSTR BELONGTO b770 
               b7d9      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 50h 
               b7de     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -8623,13 +8623,13 @@
               b7ee      3 INSTR BELONGTO b770 
               b7f1      2 INSTR BELONGTO b770 
               b7f1      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     ecx, ecx 
-              b7f1     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              b7f1     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               b7f3      2 INSTR BELONGTO b770 
               b7f3      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     edx, edx 
-              b7f3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              b7f3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               b7f5      2 INSTR BELONGTO b770 
               b7f5      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-              b7f5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b7f5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b7f7     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_set 
               b7f7      5 INSTR BELONGTO b770 
               b7f7      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ jmp     _g_object_set 
@@ -8659,7 +8659,7 @@
               b81e      4 INSTR BELONGTO b810 
               b822      2 INSTR BELONGTO b810 
               b822      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-              b822     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b822     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b822      8 DEALLOC STACK esp - 8 xor     eax, eax
               b824     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
               b824      5 INSTR BELONGTO b810 
@@ -8675,7 +8675,7 @@
               b835      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], rbp
               b83a      2 INSTR BELONGTO b830 
               b83a      2 INSTR DEADREGS  EFLAGS RBX ZZ xor     ebp, ebp 
-              b83a     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+              b83a     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
               b83c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
               b83c      5 INSTR BELONGTO b830 
               b841     40 DATAREF STACK 626 esp + 0 PARENT LocalFrame LOCALFRAME
@@ -8696,10 +8696,10 @@
               b856      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _gtk_icon_theme_get_default 
               b85b      3 INSTR BELONGTO b830 
               b85b      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     rsi, rbx 
-              b85e     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
+              b85e     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
               b85e      5 INSTR BELONGTO b830 
               b85e      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI R12 ZZ mov     ecx, 10h 
-              b863     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 30h 
+              b863     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 30h 
               b863      5 INSTR BELONGTO b830 
               b863      5 INSTR DEADREGS  EFLAGS RDX RBX RDI R12 ZZ mov     edx, 30h 
               b868      3 INSTR BELONGTO b830 
@@ -8744,15 +8744,15 @@
               b8a5      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 ZZ mov     rcx, rax 
               b8a8      2 INSTR BELONGTO b830 
               b8a8      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 ZZ xor     edi, edi 
-              b8a8     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              b8a8     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               b8aa      3 INSTR BELONGTO b830 
               b8aa      3 INSTR DEADREGS  EFLAGS RAX RSI R8 ZZ mov     r8, r12 
-              b8ad     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              b8ad     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               b8ad      5 INSTR BELONGTO b830 
               b8ad      5 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ mov     esi, 10h 
               b8b2      2 INSTR BELONGTO b830 
               b8b2      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-              b8b2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b8b2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b8b4     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               b8b4      5 INSTR BELONGTO b830 
               b8b4      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_log 
@@ -8783,15 +8783,15 @@
               b8e1     40 DEALLOC STACK esp - 40 retn
               b8e8      7 INSTR BELONGTO b830 
               b8e8      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 ZZ lea     rdx, dword_DCBC 
-              b8ef     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              b8ef     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               b8ef      5 INSTR BELONGTO b830 
               b8ef      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 ZZ mov     esi, 10h 
               b8f4      2 INSTR BELONGTO b830 
               b8f4      2 INSTR DEADREGS  EFLAGS RAX RBX RDI R12 ZZ xor     edi, edi 
-              b8f4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              b8f4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               b8f6      2 INSTR BELONGTO b830 
               b8f6      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-              b8f6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b8f6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b8f8     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               b8f8      5 INSTR BELONGTO b830 
               b8f8      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_log 
@@ -8874,7 +8874,7 @@
               b982      3 INSTR BELONGTO b920 
               b982      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, rsp 
               b982      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp
-              b985     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+              b985     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
               b985      5 INSTR BELONGTO b920 
               b985      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 8 
               b98a      3 INSTR BELONGTO b920 
@@ -8894,10 +8894,10 @@
               b99d      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
               b9a2      2 INSTR BELONGTO b920 
               b9a2      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-              b9a2     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              b9a2     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               b9a4      2 INSTR BELONGTO b920 
               b9a4      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-              b9a4     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              b9a4     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               b9a6      3 INSTR BELONGTO b920 
               b9a6      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
               b9a9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_sortable_set_sort_column_id 
@@ -8906,7 +8906,7 @@
               b9ae     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_theme_get_default 
               b9ae      5 INSTR BELONGTO b920 
               b9ae      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_icon_theme_get_default 
-              b9b3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              b9b3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               b9b3      5 INSTR BELONGTO b920 
               b9b3      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 50h 
               b9b8      3 INSTR BELONGTO b920 
@@ -8951,9 +8951,9 @@
               ba1d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_get_type 
               ba28      5 PTRIMMEDESP STACK 40 displ lea     rcx, [rsp+28h]
               ba2d     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-              ba33     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6 
+              ba33     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6 
               ba38      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
-              ba3b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              ba3b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               ba40     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
               ba45      5 PTRIMMEDESP STACK 40 displ mov     rdi, [rsp+28h]
               ba4a     -1 INSTR LOCAL NoMetaUpdate call    sub_B830 
@@ -8962,8 +8962,8 @@
               ba5c      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
               ba62     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               ba67     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-              ba73     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-              ba75     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+              ba73     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+              ba75     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
               ba7a      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
               ba7d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_set 
               ba82      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
@@ -9032,7 +9032,7 @@
               bb00     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h 
               bb00      6 INSTR BELONGTO baa0 
               bb00      6 INSTR DEADREGS  EFLAGS RDX RBX R8 ZZ mov     r8d, 20h 
-              bb06     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A8h 
+              bb06     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A8h 
               bb06      5 INSTR BELONGTO baa0 
               bb06      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 0A8h 
               bb0b      7 INSTR BELONGTO baa0 
@@ -9068,7 +9068,7 @@
               bb3e      4 INSTR BELONGTO bb30 
               bb42      2 INSTR BELONGTO bb30 
               bb42      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-              bb42     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              bb42     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               bb42      8 DEALLOC STACK esp - 8 xor     eax, eax
               bb44     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
               bb44      5 INSTR BELONGTO bb30 
@@ -9154,10 +9154,10 @@
               bbd1      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_key_file_new 
               bbd6      2 INSTR BELONGTO bb50 
               bbd6      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ xor     ecx, ecx 
-              bbd6     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              bbd6     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               bbd8      2 INSTR BELONGTO bb50 
               bbd8      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edx, edx 
-              bbd8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              bbd8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               bbda      3 INSTR BELONGTO bb50 
               bbda      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rsi, r13 
               bbdd      3 INSTR BELONGTO bb50 
@@ -9173,7 +9173,7 @@
               bbef      7 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ lea     rsi, aDesktopEntry; "Desktop Entry" 
               bbf6      2 INSTR BELONGTO bb50 
               bbf6      2 INSTR DEADREGS  EFLAGS RCX RDI ZZ xor     ecx, ecx 
-              bbf6     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              bbf6     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               bbf8      3 INSTR BELONGTO bb50 
               bbf8      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rbx 
               bbfb     -1 INSTR LOCAL NoMetaUpdate call    _g_key_file_get_string 
@@ -9197,7 +9197,7 @@
               bc1d      3 INSTR DEADREGS  EFLAGS RCX RDI R8 R12 ZZ xor     r8d, r8d 
               bc20      2 INSTR BELONGTO bb50 
               bc20      2 INSTR DEADREGS  EFLAGS RCX RDI R12 ZZ xor     ecx, ecx 
-              bc20     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              bc20     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               bc22      3 INSTR BELONGTO bb50 
               bc22      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rbx 
               bc25     -1 INSTR LOCAL NoMetaUpdate call    _g_key_file_get_locale_string_list 
@@ -9240,13 +9240,13 @@
               bc62      6 INSTR DEADREGS  EFLAGS RCX RDX RSI R9 ZZ mov     r9d, 1 
               bc68      2 INSTR BELONGTO bb50 
               bc68      2 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ xor     ecx, ecx 
-              bc68     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              bc68     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               bc6a      2 INSTR BELONGTO bb50 
               bc6a      2 INSTR DEADREGS  EFLAGS RDX RSI ZZ xor     edx, edx 
-              bc6a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              bc6a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               bc6c      2 INSTR BELONGTO bb50 
               bc6c      2 INSTR DEADREGS  EFLAGS RSI ZZ xor     esi, esi 
-              bc6c     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              bc6c     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               bc6e     -1 INSTR LOCAL MetadataUnused mov     [rsp+0D8h+var_70], 0FFFFFFFFh 
               bc6e      8 INSTR BELONGTO bb50 
               bc76     -1 INSTR LOCAL MetadataUnused mov     [rsp+0D8h+var_78], r12 
@@ -9255,7 +9255,7 @@
               bc7b      5 INSTR BELONGTO bb50 
               bc80      2 INSTR BELONGTO bb50 
               bc80      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-              bc80     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              bc80     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               bc82     -1 INSTR LOCAL MetadataUnused mov     [rsp+0D8h+var_80], 7 
               bc82      8 INSTR BELONGTO bb50 
               bc8a     -1 INSTR LOCAL MetadataUnused mov     [rsp+0D8h+var_88], r14 
@@ -9371,15 +9371,15 @@
               bd8a      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R12 R14 R15 ZZ lea     rdx, aNotLoadingDesk; "Not loading desktop file '%s' because i"... 
               bd91      2 INSTR BELONGTO bb50 
               bd91      2 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI R12 R14 R15 ZZ xor     edi, edi 
-              bd91     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              bd91     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               bd93      3 INSTR BELONGTO bb50 
               bd93      3 INSTR DEADREGS  EFLAGS RAX RCX RSI R12 R14 R15 ZZ mov     rcx, r13 
-              bd96     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              bd96     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               bd96      5 INSTR BELONGTO bb50 
               bd96      5 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 R14 R15 ZZ mov     esi, 10h 
               bd9b      2 INSTR BELONGTO bb50 
               bd9b      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 ZZ xor     eax, eax 
-              bd9b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              bd9b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               bd9d     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               bd9d      5 INSTR BELONGTO bb50 
               bd9d      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_log 
@@ -9418,7 +9418,7 @@
               bde0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
               bde1      3 INSTR BELONGTO bde0 
               bde4      7 INSTR BELONGTO bde0 
-              bdeb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              bdeb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               bdeb      5 INSTR BELONGTO bde0 
               bdf0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               bdf0      5 INSTR BELONGTO bde0 
@@ -9435,7 +9435,7 @@
               be00      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
               be01      3 INSTR BELONGTO be00 
               be04      7 INSTR BELONGTO be00 
-              be0b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              be0b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               be0b      5 INSTR BELONGTO be00 
               be10     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               be10      5 INSTR BELONGTO be00 
@@ -9453,10 +9453,10 @@
               be52      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], r12
               be57      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
               be63      4 PTRIMMEDEBP STACK 8 displ mov     rax, [rbp+8]
-              be78     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              be7d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              be78     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              be7d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               be7f      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              be83     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              be83     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               be85     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               be8a      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
               be8f      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -9471,17 +9471,17 @@
               bed2      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], r12
               bed7      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
               bee3      4 PTRIMMEDEBP STACK 8 displ mov     rax, [rbp+8]
-              bef8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              befd     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              bef8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              befd     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               beff      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              bf03     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              bf03     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               bf05     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               bf0a      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
               bf0f      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
               bf14      5 PTRIMMEDESP STACK 48 displ mov     r12, [rsp+30h]
               bf19     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
-              bf29     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              bf2b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              bf29     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              bf2b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               bf2d     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
               bf40      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
               bf40      0 FUNC MMSAFENESS SAFE
@@ -9544,7 +9544,7 @@
               bfa0     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 38h 
               bfa0      6 INSTR BELONGTO bf40 
               bfa0      6 INSTR DEADREGS  EFLAGS RDX RBX R8 ZZ mov     r8d, 38h 
-              bfa6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3F0h 
+              bfa6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3F0h 
               bfa6      5 INSTR BELONGTO bf40 
               bfa6      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 3F0h 
               bfab      7 INSTR BELONGTO bf40 
@@ -9584,7 +9584,7 @@
               bfd9      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
               bfde      3 INSTR BELONGTO bfd0 
               bfde      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-              bfe1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              bfe1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               bfe1      5 INSTR BELONGTO bfd0 
               bfe1      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
               bfe6      7 INSTR BELONGTO bfd0 
@@ -9635,10 +9635,10 @@
               c047      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 ZZ xor     r8d, r8d 
               c04a      2 INSTR BELONGTO bfd0 
               c04a      2 INSTR DEADREGS  EFLAGS RAX RCX RBX ZZ xor     ecx, ecx 
-              c04a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              c04a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               c04c      2 INSTR BELONGTO bfd0 
               c04c      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-              c04c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c04c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c04e      8 INSTR BELONGTO bfd0 
               c04e      8 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+38h+var_28], 0 
               c04e      8 PTRIMMEDESP STACK 16 displ mov     [rsp+38h+var_28], 0
@@ -9648,7 +9648,7 @@
               c05f      4 INSTR BELONGTO bfd0 
               c05f      4 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+38h+var_38], rdx 
               c05f      4 PTRIMMEDESP STACK 0 displ mov     [rsp+38h+var_38], rdx
-              c063     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+              c063     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
               c063      5 INSTR BELONGTO bfd0 
               c063      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 1 
               c068     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
@@ -9670,8 +9670,8 @@
               c083     -3 INSTR LOCAL NoWarn push    rbx 
               c087     -1 INSTR LOCAL NoMetaUpdate call    cc_shell_nav_bar_get_type 
               c092     -1 INSTR LOCAL NoMetaUpdate call    _g_type_instance_get_private 
-              c09e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-              c0a7     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              c09e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+              c0a7     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               c0ac     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
               c0b4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_new_with_mnemonic 
               c0b9      4 PTRIMMEDEBP STACK 0 displ mov     [rbp+0], rax
@@ -9680,14 +9680,14 @@
               c0d1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_get_type 
               c0df     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               c0e4     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-              c0e7     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-              c0e9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              c0e7     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+              c0e9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               c0f1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
               c0fa      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
               c104     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               c109     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-              c10c     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-              c10e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              c10c     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+              c10e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               c116     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
               c122     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
               c13c     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
@@ -9716,7 +9716,7 @@
               c19e      4 INSTR BELONGTO c190 
               c1a2      2 INSTR BELONGTO c190 
               c1a2      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-              c1a2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c1a2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c1a2      8 DEALLOC STACK esp - 8 xor     eax, eax
               c1a4     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
               c1a4      5 INSTR BELONGTO c190 
@@ -9812,7 +9812,7 @@
               c23d      4 INSTR DEADREGS  EFLAGS RCX RSI XMM0 ZZ mov     [rbx+18h], rax 
               c241     -1 INSTR LOCAL MetadataRedundant lea     rax, loc_CFB0 
               c241      7 INSTR BELONGTO c210 
-              c248     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
+              c248     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
               c248      5 INSTR BELONGTO c210 
               c248      5 INSTR DEADREGS  EFLAGS RCX RSI XMM0 ZZ mov     ecx, 3 
               c24d     -1 INSTR LOCAL MetadataUnused movsd   xmm1, cs:qword_DE70 
@@ -9834,7 +9834,7 @@
               c273      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     rdi, rbx 
               c276      3 INSTR BELONGTO c210 
               c276      3 INSTR DEADREGS  EFLAGS RDX RSI XMM0 XMM1 XMM2 ZZ mov     rdx, rax 
-              c279     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              c279     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               c279      5 INSTR BELONGTO c210 
               c279      5 INSTR DEADREGS  EFLAGS RSI XMM0 XMM1 XMM2 ZZ mov     esi, 1 
               c27e     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -9850,7 +9850,7 @@
               c297     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 14h 
               c297      6 INSTR BELONGTO c210 
               c297      6 INSTR DEADREGS  EFLAGS RCX RSI R8 XMM0 XMM1 XMM2 ZZ mov     r8d, 14h 
-              c29d     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, r9d 
+              c29d     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, r9d 
               c29d      3 INSTR BELONGTO c210 
               c29d      3 INSTR DEADREGS  EFLAGS RCX RSI XMM0 XMM1 XMM2 ZZ mov     ecx, r9d 
               c2a0      7 INSTR BELONGTO c210 
@@ -9863,7 +9863,7 @@
               c2aa      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 XMM2 ZZ call    _g_param_spec_int 
               c2af      3 INSTR BELONGTO c210 
               c2af      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     rdi, rbx 
-              c2b2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+              c2b2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
               c2b2      5 INSTR BELONGTO c210 
               c2b2      5 INSTR DEADREGS  EFLAGS RDX RSI XMM0 XMM1 XMM2 ZZ mov     esi, 2 
               c2b7      3 INSTR BELONGTO c210 
@@ -9893,7 +9893,7 @@
               c2e4     -3 INSTR LOCAL NoWarn push    rbx 
               c2e5     -1 INSTR LOCAL NoMetaUpdate xorpd   xmm0, xmm0 
               c2e5      4 INSTR BELONGTO c2e0 
-              c2e9     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              c2e9     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               c2e9      5 INSTR BELONGTO c2e0 
               c2e9      5 INSTR DEADREGS  EFLAGS RAX RDX RBX XMM7 XMM9 XMM10 XMM12 ZZ mov     eax, 1 
               c2ee    128 DATAREF STACK 643 esp + 0 PARENT LocalFrame LOCALFRAME
@@ -9907,7 +9907,7 @@
               c2f5      4 INSTR BELONGTO c2e0 
               c2f9     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm2, xmm0 
               c2f9      4 INSTR BELONGTO c2e0 
-              c2fd     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setp    dl 
+              c2fd     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setp    dl 
               c2fd      3 INSTR BELONGTO c2e0 
               c2fd      3 INSTR DEADREGS  RDX XMM9 XMM10 XMM12 ZZ setp    dl 
               c300     -1 INSTR LOCAL MetadataRedundant cmovnz  edx, eax 
@@ -9918,7 +9918,7 @@
               c305      6 INSTR BELONGTO c2e0 
               c30b     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm3, xmm0 
               c30b      4 INSTR BELONGTO c2e0 
-              c30f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setp    dl 
+              c30f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setp    dl 
               c30f      3 INSTR BELONGTO c2e0 
               c30f      3 INSTR DEADREGS  RDX XMM0 XMM9 XMM10 XMM12 ZZ setp    dl 
               c312      3 INSTR BELONGTO c2e0 
@@ -10611,7 +10611,7 @@
               c9b0     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 28h 
               c9b0      6 INSTR BELONGTO c950 
               c9b0      6 INSTR DEADREGS  EFLAGS RDX RBX R8 ZZ mov     r8d, 28h 
-              c9b6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 338h 
+              c9b6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 338h 
               c9b6      5 INSTR BELONGTO c950 
               c9b6      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 338h 
               c9bb      7 INSTR BELONGTO c950 
@@ -10716,7 +10716,7 @@
               cbf2     -1 INSTR LOCAL NoMetaUpdate divsd   xmm1, xmm0 
               cbf6     -1 INSTR LOCAL NoMetaUpdate mulsd   xmm0, qword ptr [rcx] 
               cbfa      6 PTRIMMEDESP STACK 48 displ movsd   qword ptr [rsp+30h], xmm1
-              cc00     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM cvttsd2si eax, xmm0 
+              cc00     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cvttsd2si eax, xmm0 
               cc04     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               cc06      4 PTRIMMEDESP STACK 56 displ mov     [rsp+38h], eax
               cc0a     -1 INSTR LOCAL NoMetaUpdate jz      loc_CE30 
@@ -10817,7 +10817,7 @@
               ce2b     -1 INSTR LOCAL NoMetaUpdate jmp     loc_CBB4 
               ce33     -1 INSTR LOCAL NoMetaUpdate call    _cairo_restore 
               ce38     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 88h 
-              ce3f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              ce3f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               ce5a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_style_context_lookup_color 
               ce5f     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               ce61     -1 INSTR LOCAL NoMetaUpdate jnz     loc_CB8E 
@@ -10833,10 +10833,10 @@
               ceab     -1 INSTR LOCAL NUMViaFPRegDest movapd  xmm1, xmm0 
               ceaf     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm2, cs:qword_DE90 
               ceb7     -1 INSTR LOCAL NoMetaUpdate jmp     loc_CBB4 
-              cec3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 88888889h 
-              cec8     -2 INSTR LOCAL n EAX EDX ZZ  AlwaysNUM imul    edx 
-              cecd     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM sar     eax, 1Fh 
-              ced3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM sar     edx, 4 
+              cec3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 88888889h 
+              cec8     -2 INSTR LOCAL n RAX RDX ZZ  AlwaysNUM imul    edx 
+              cecd     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM sar     eax, 1Fh 
+              ced3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM sar     edx, 4 
               cedb     -1 INSTR LOCAL NoMetaUpdate jmp     loc_CBE5 
               cee0     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8, 3FF0000000000000h 
               ceea     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9, 3FDCCCCCCCCCCCCDh 
@@ -10880,7 +10880,7 @@
               cf57      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
               cf5c      2 INSTR BELONGTO cf40 
               cf5c      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-              cf5c     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              cf5c     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               cf5e      3 INSTR BELONGTO cf40 
               cf5e      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
               cf61     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_has_window 
@@ -10893,10 +10893,10 @@
               cf6c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               cf6c      5 INSTR BELONGTO cf40 
               cf6c      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-              cf71     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 9 
+              cf71     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 9 
               cf71      5 INSTR BELONGTO cf40 
               cf71      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 9 
-              cf76     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 78h 
+              cf76     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 78h 
               cf76      5 INSTR BELONGTO cf40 
               cf76      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 78h 
               cf7b      3 INSTR BELONGTO cf40 
@@ -10944,11 +10944,11 @@
               cff8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               d007     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               d00c      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-              d02d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              d032     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              d02d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              d032     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               d034      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
               d039      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              d03d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              d03d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               d03f     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               d044      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
               d049      5 PTRIMMEDESP STACK 48 displ mov     rbp, [rsp+30h]
@@ -10986,7 +10986,7 @@
               d0ce      4 INSTR BELONGTO d0c0 
               d0d2      2 INSTR BELONGTO d0c0 
               d0d2      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-              d0d2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              d0d2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               d0d2      8 DEALLOC STACK esp - 8 xor     eax, eax
               d0d4     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
               d0d4      5 INSTR BELONGTO d0c0 
@@ -10997,7 +10997,7 @@
               d0e0      1 INSTR BELONGTO d0e0 
               d0e0      1 INSTR DEADREGS  EFLAGS RAX RSI ZZ push    rbp 
               d0e0     -3 INSTR LOCAL NoWarn push    rbp 
-              d0e1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              d0e1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               d0e1      5 INSTR BELONGTO d0e0 
               d0e1      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 50h 
               d0e6      1 INSTR BELONGTO d0e0 
@@ -11114,7 +11114,7 @@
               d179      4 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, [rdi+20h] 
               d17d      3 INSTR BELONGTO d170 
               d17d      3 INSTR DEADREGS  EFLAGS ZZ mov     [rax+8], esi 
-              d180     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              d180     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               d180      5 INSTR BELONGTO d170 
               d180      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
               d185     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -11191,11 +11191,11 @@
               d234     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               d243     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               d248      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-              d269     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              d26e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              d269     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              d26e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               d270      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
               d275      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              d279     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              d279     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               d27b     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               d280      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
               d285      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -11251,7 +11251,7 @@
               d33c      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+28h+var_8]
               d341      7 INSTR BELONGTO d300 
               d348      2 INSTR BELONGTO d300 
-              d348     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              d348     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               d34a     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
               d34a      4 INSTR BELONGTO d300 
               d34e     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -11348,7 +11348,7 @@
               d418      2 INSTR BELONGTO d3d0 
               d41a      2 INSTR BELONGTO d3d0 
               d41a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-              d41a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+              d41a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
               d41c      4 INSTR BELONGTO d3d0 
               d420      3 INSTR BELONGTO d3d0 
               d420      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
diff --git a/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
index 1fbc812a..f040c32c 100644
--- a/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
@@ -3576,7 +3576,7 @@
             409021      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_409840 
             409026      2 INSTR BELONGTO 408fe0 
             409026      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ xor     eax, eax 
-            409026     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409026     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409028     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             409028      4 INSTR BELONGTO 408fe0 
             40902c      1 INSTR BELONGTO 408fe0 
@@ -3708,7 +3708,7 @@
             4090f9      3 INSTR BELONGTO 4090f0 
             4090fc     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409110 
             4090fc      2 INSTR BELONGTO 4090f0 
-            4090fe     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            4090fe     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             4090fe      5 INSTR BELONGTO 4090f0 
             409103     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             409103      3 INSTR BELONGTO 4090f0 
@@ -3733,7 +3733,7 @@
             40912d      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], r13
             409132      2 INSTR BELONGTO 40f660 
             409132      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ xor     edi, edi        ; domainname 
-            409132     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409132     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409134      5 INSTR BELONGTO 40f660 
             409134      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 ZZ mov     [rsp+var_30], rbx 
             409134      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
@@ -3743,7 +3743,7 @@
             40913e      5 INSTR BELONGTO 40f660 
             40913e      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R14 ZZ mov     [rsp+var_8], r15 
             40913e      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
-            409143     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409143     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409143      5 INSTR BELONGTO 40f660 
             409143      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             409148      7 INSTR BELONGTO 40f660 
@@ -3785,7 +3785,7 @@
             4091cc      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _dcgettext 
             4091d1     -1 INSTR LOCAL MetadataRedundant xor     edi, edi        ; domainname 
             4091d1      2 INSTR BELONGTO 40f660 
-            4091d3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4091d3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4091d3      5 INSTR BELONGTO 40f660 
             4091d3      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             4091d8      5 INSTR BELONGTO 40f660 
@@ -3831,7 +3831,7 @@
             409214      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aGdict_show_abo; "gdict_show_about_dialog" 
             409219      2 INSTR BELONGTO 40f660 
             409219      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            409219     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409219     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40921b     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40921b      5 INSTR BELONGTO 40f660 
             40921b      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_return_if_fail_warning 
@@ -3861,8 +3861,8 @@
             409263      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ call    _gtk_widget_get_screen 
             409268      2 INSTR BELONGTO 40f660 
             409268      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R14 R15 ZZ xor     edi, edi        ; domainname 
-            409268     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            40926a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409268     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40926a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40926a      5 INSTR BELONGTO 40f660 
             40926a      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R14 R15 ZZ mov     edx, 5          ; category 
             40926f      5 INSTR BELONGTO 40f660 
@@ -3935,7 +3935,7 @@
             4092ee      5 PTRIMMEDESP STACK 32 displ mov     [rsp+108h+var_E8], rax
             4092f3      2 INSTR BELONGTO 40f660 
             4092f3      2 INSTR DEADREGS  EFLAGS RAX RBX R14 R15 ZZ xor     eax, eax 
-            4092f3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4092f3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4092f5      9 INSTR BELONGTO 40f660 
             4092f5      9 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ mov     [rsp+108h+var_A0], offset aScreen; "screen" 
             4092f5      9 PTRIMMEDESP STACK 104 displ mov     [rsp+108h+var_A0], offset aScreen; "screen"
@@ -4008,7 +4008,7 @@
             4093d5     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_add_main_entries 
             4093da     -1 INSTR LOCAL NoMetaUpdate call    _gdict_get_option_group 
             4093e5     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_add_group 
-            4093ea     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4093ea     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4093ec     -1 INSTR LOCAL NoMetaUpdate call    _gtk_get_option_group 
             4093f7     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_add_group 
             4093fc      5 PTRIMMEDESP STACK 8 displ lea     rcx, [rsp+8]
@@ -4025,8 +4025,8 @@
             409443     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
             409446     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4094BF 
             409448     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
-            40944d     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
-            409466     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40944d     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
+            409466     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409485     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbx, 1 
             409489     -1 INSTR LOCAL NoMetaUpdate call    sub_412010 
             4094a2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -4034,15 +4034,15 @@
             4094b5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             4094ba     -1 INSTR LOCAL NoMetaUpdate cmp     rbp, rbx 
             4094bd     -1 INSTR LOCAL NoMetaUpdate ja      short loc_409458 
-            4094c6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4094c6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4094c8     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             4094cb     -1 INSTR LOCAL NoMetaUpdate jz      loc_40955C 
             4094d1     -1 INSTR LOCAL NoMetaUpdate call    _g_strv_length 
             4094d8     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
             4094db     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40955A 
             4094dd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
-            4094e2     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
-            4094fe     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            4094e2     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
+            4094fe     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             409520     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbx, 1 
             409524     -1 INSTR LOCAL NoMetaUpdate call    sub_412010 
             40953d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -4050,29 +4050,29 @@
             409550     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             409555     -1 INSTR LOCAL NoMetaUpdate cmp     rbp, rbx 
             409558     -1 INSTR LOCAL NoMetaUpdate ja      short loc_4094F0 
-            40955a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40955a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40955c     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 20h 
             409570      5 PTRIMMEDESP STACK 8 displ mov     rax, [rsp+8]
-            40957a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
-            40957f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            409585     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40957a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            40957f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            409585     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409587     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40958c      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
             409591     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
             409599     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_free 
             40959e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 20h 
-            4095a2     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4095a2     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4095b7     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             4095ba     -1 INSTR LOCAL NoMetaUpdate jnz     loc_4094D1 
             4095ce     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
-            4095df     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     dil, 2 
+            4095df     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     dil, 2 
             4095e6     -1 INSTR LOCAL NoMetaUpdate call    sub_412010 
             4095f9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             409604     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409609      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40960f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_application 
             409617     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-            40961c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40961c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40961e     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40955C 
             409630      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             409630      0 FUNC MMSAFENESS SAFE
@@ -4088,7 +4088,7 @@
             409634      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
             409639      3 INSTR BELONGTO 409630 
             409639      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            40963c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40963c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40963c      5 INSTR BELONGTO 409630 
             40963c      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             409641      7 INSTR BELONGTO 409630 
@@ -4145,15 +4145,15 @@
             40969e     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 28h 
             40969e      6 INSTR BELONGTO 409660 
             40969e      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 28h 
-            4096a4     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_409630 
+            4096a4     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_409630 
             4096a4      5 INSTR BELONGTO 409660 
             4096a4      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset sub_409630 
-            4096a9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 88h 
+            4096a9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 88h 
             4096a9      5 INSTR BELONGTO 409660 
             4096a9      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 88h 
             4096ae      3 INSTR BELONGTO 409660 
             4096ae      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-            4096b1     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+            4096b1     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
             4096b1      5 INSTR BELONGTO 409660 
             4096b1      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
             4096b6      7 INSTR BELONGTO 409660 
@@ -4192,7 +4192,7 @@
             4096fd     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             4096fd      5 INSTR BELONGTO 4096e0 
             409702      7 INSTR BELONGTO 4096e0 
-            409709     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            409709     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             409709      5 INSTR BELONGTO 4096e0 
             40970e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             40970e      5 INSTR BELONGTO 4096e0 
@@ -4249,14 +4249,14 @@
             40975b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_init 
             40975b      5 INSTR BELONGTO 409720 
             40975b      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _gtk_init 
-            409760     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409760     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409760      5 INSTR BELONGTO 409720 
             409760      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 5          ; category 
             409765      5 INSTR BELONGTO 409720 
             409765      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset msgid; "Dictionary" 
             40976a      2 INSTR BELONGTO 409720 
             40976a      2 INSTR DEADREGS  EFLAGS RDI R12 ZZ xor     edi, edi        ; domainname 
-            40976a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40976a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40976c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40976c      5 INSTR BELONGTO 409720 
             40976c      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _dcgettext 
@@ -4275,12 +4275,12 @@
             409783      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 ZZ call    sub_409660 
             409788      2 INSTR BELONGTO 409720 
             409788      2 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ xor     esi, esi 
-            409788     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409788     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40978a      3 INSTR BELONGTO 409720 
             40978a      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             40978d      2 INSTR BELONGTO 409720 
             40978d      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            40978d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40978d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40978f     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             40978f      5 INSTR BELONGTO 409720 
             40978f      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_object_new 
@@ -4315,7 +4315,7 @@
             4097c6     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             4097c6      5 INSTR BELONGTO 409720 
             4097c6      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_free 
-            4097cb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            4097cb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             4097cb      5 INSTR BELONGTO 409720 
             4097cb      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 8 
             4097d0      5 INSTR BELONGTO 409720 
@@ -4335,7 +4335,7 @@
             4097eb      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 ZZ xor     r8d, r8d 
             4097ee      5 INSTR BELONGTO 409720 
             4097ee      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     [r12+18h], rax 
-            4097f3     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_409390 
+            4097f3     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_409390 
             4097f3      5 INSTR BELONGTO 409720 
             4097f3      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, offset loc_409390 
             4097f8      5 INSTR BELONGTO 409720 
@@ -4376,7 +4376,7 @@
             409830     -1 INSTR LOCAL NoMetaUpdate jmp     _g_application_run 
             409830      5 INSTR BELONGTO 409720 
             409830      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ jmp     _g_application_run 
-            409835     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
+            409835     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
             409835      5 INSTR BELONGTO 409720 
             409835      5 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     edi, 1          ; status 
             40983a     -1 INSTR LOCAL NoMetaUpdate call    _exit 
@@ -4440,12 +4440,12 @@
             4098a1      3 INSTR BELONGTO 409890 
             4098a4      2 INSTR BELONGTO 409890 
             4098a4      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 ZZ xor     edx, edx 
-            4098a4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4098a4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4098a6      1 INSTR BELONGTO 409890 
             4098a6      1 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx 
             4098a7      2 INSTR BELONGTO 409890 
             4098a7      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            4098a7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4098a7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4098a9     -1 INSTR LOCAL NoMetaUpdate jmp     _g_build_filename 
             4098a9      5 INSTR BELONGTO 409890 
             4098a9      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_build_filename 
@@ -4461,7 +4461,7 @@
             4098b4      5 INSTR DEADREGS  EFLAGS ZZ call    _g_get_home_dir 
             4098b9      2 INSTR BELONGTO 4098b0 
             4098b9      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 ZZ xor     ecx, ecx 
-            4098b9     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4098b9     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4098bb     -1 INSTR LOCAL MetadataUnused mov     rdi, rax 
             4098bb      3 INSTR BELONGTO 4098b0 
             4098be      5 INSTR BELONGTO 4098b0 
@@ -4470,7 +4470,7 @@
             4098c3      5 INSTR BELONGTO 4098b0 
             4098c8      2 INSTR BELONGTO 4098b0 
             4098c8      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            4098c8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4098c8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4098ca     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             4098ca      4 INSTR BELONGTO 4098b0 
             4098ce     -1 INSTR LOCAL NoMetaUpdate jmp     _g_build_filename 
@@ -4498,12 +4498,12 @@
             4098f1      3 INSTR BELONGTO 4098e0 
             4098f4      2 INSTR BELONGTO 4098e0 
             4098f4      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 ZZ xor     edx, edx 
-            4098f4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4098f4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4098f6      1 INSTR BELONGTO 4098e0 
             4098f6      1 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx 
             4098f7      2 INSTR BELONGTO 4098e0 
             4098f7      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            4098f7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4098f7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4098f9     -1 INSTR LOCAL NoMetaUpdate jmp     _g_build_filename 
             4098f9      5 INSTR BELONGTO 4098e0 
             4098f9      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_build_filename 
@@ -4534,7 +4534,7 @@
             409921     -1 INSTR LOCAL NoMetaUpdate call    sub_4098E0 
             409921      5 INSTR BELONGTO 409900 
             409921      5 INSTR DEADREGS  EFLAGS ZZ call    sub_4098E0 
-            409926     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            409926     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             409926      5 INSTR BELONGTO 409900 
             409926      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 4 
             40992b     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, rbx 
@@ -4561,7 +4561,7 @@
             409945     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             409945      5 INSTR BELONGTO 409900 
             409945      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_free 
-            40994a     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, r12d 
+            40994a     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, r12d 
             40994a      3 INSTR BELONGTO 409900 
             40994a      3 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, r12d 
             40994d      4 INSTR BELONGTO 409900 
@@ -4579,13 +4579,13 @@
             40995f     24 DEALLOC STACK esp - 24 retn
             409960      2 INSTR BELONGTO 409900 
             409960      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     edi, edi 
-            409960     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409960     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409962      2 INSTR BELONGTO 409900 
             409962      2 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ xor     eax, eax 
-            409962     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409962     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409964      5 INSTR BELONGTO 409900 
             409964      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, offset aMigratingOldCo; "Migrating old configs to XDG directory "... 
-            409969     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
+            409969     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
             409969      5 INSTR BELONGTO 409900 
             409969      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 20h 
             40996e     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
@@ -4623,15 +4623,15 @@
             409998      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rcx, rbx 
             40999b      5 INSTR BELONGTO 409900 
             40999b      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edx, offset aUnableToRename; "Unable to rename file '%s' to '%s': %s" 
-            4099a0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            4099a0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             4099a0      5 INSTR BELONGTO 409900 
             4099a0      5 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     esi, 8 
             4099a5      2 INSTR BELONGTO 409900 
             4099a5      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ xor     edi, edi 
-            4099a5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4099a5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4099a7      2 INSTR BELONGTO 409900 
             4099a7      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4099a7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4099a7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4099a9     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4099a9      5 INSTR BELONGTO 409900 
             4099a9      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -4656,13 +4656,13 @@
             4099c3     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     rbx, rax 
             4099c3      3 INSTR BELONGTO 4099b0 
             4099c3      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rax 
-            4099c6     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            4099c6     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
             4099c6      5 INSTR BELONGTO 4099b0 
             4099c6      5 INSTR DEADREGS  EFLAGS ZZ mov     ebp, 1 
             4099cb     -1 INSTR LOCAL NoMetaUpdate call    sub_409900 
             4099cb      5 INSTR BELONGTO 4099b0 
             4099cb      5 INSTR DEADREGS  EFLAGS ZZ call    sub_409900 
-            4099d0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            4099d0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             4099d0      5 INSTR BELONGTO 4099b0 
             4099d0      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 4 
             4099d5     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, rbx 
@@ -4683,7 +4683,7 @@
             4099e4      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_free 
             4099e9      2 INSTR BELONGTO 4099b0 
             4099e9      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, ebp 
-            4099e9     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebp 
+            4099e9     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebp 
             4099eb      5 INSTR BELONGTO 4099b0 
             4099eb      5 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ mov     rbx, [rsp+18h+var_10] 
             4099eb      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+18h+var_10]
@@ -4695,7 +4695,7 @@
             4099f9      1 INSTR BELONGTO 4099b0 
             4099f9      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             4099f9     24 DEALLOC STACK esp - 24 retn
-            409a00     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            409a00     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             409a00      5 INSTR BELONGTO 4099b0 
             409a00      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 4 
             409a05     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, rbx 
@@ -4710,13 +4710,13 @@
             409a0f      2 INSTR BELONGTO 4099b0 
             409a11      2 INSTR BELONGTO 4099b0 
             409a11      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     edi, edi 
-            409a11     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409a11     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409a13     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     rcx, rbx 
             409a13      3 INSTR BELONGTO 4099b0 
             409a13      3 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ mov     rcx, rbx 
             409a16      5 INSTR BELONGTO 4099b0 
             409a16      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, offset aCreatingXdgCon; "Creating XDG config direcotry: %s" 
-            409a1b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
+            409a1b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
             409a1b      5 INSTR BELONGTO 4099b0 
             409a1b      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 20h 
             409a20     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
@@ -4738,7 +4738,7 @@
             409a37      5 INSTR DEADREGS  EFLAGS ZZ call    ___errno_location 
             409a3c      2 INSTR BELONGTO 4099b0 
             409a3c      2 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, [rax] 
-            409a3e     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     bpl, bpl 
+            409a3e     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     bpl, bpl 
             409a3e      3 INSTR BELONGTO 4099b0 
             409a3e      3 INSTR DEADREGS  EFLAGS ZZ xor     bpl, bpl 
             409a41     -1 INSTR LOCAL NoMetaUpdate call    _g_strerror 
@@ -4751,15 +4751,15 @@
             409a49      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 ZZ mov     r8, rax 
             409a4c      5 INSTR BELONGTO 4099b0 
             409a4c      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edx, offset aUnableToCreate; "Unable to create directory '%s': %s" 
-            409a51     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            409a51     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             409a51      5 INSTR BELONGTO 4099b0 
             409a51      5 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     esi, 8 
             409a56      2 INSTR BELONGTO 4099b0 
             409a56      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ xor     edi, edi 
-            409a56     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409a56     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409a58      2 INSTR BELONGTO 4099b0 
             409a58      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            409a58     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409a58     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409a5a     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             409a5a      5 INSTR BELONGTO 4099b0 
             409a5a      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -4783,7 +4783,7 @@
             409a83     -1 INSTR LOCAL NoMetaUpdate call    sub_409890 
             409a83      5 INSTR BELONGTO 409a70 
             409a83      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    sub_409890 
-            409a88     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1C0h       ; mode 
+            409a88     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1C0h       ; mode 
             409a88      5 INSTR BELONGTO 409a70 
             409a88      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 1C0h       ; mode 
             409a8d     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, rax        ; path 
@@ -4820,15 +4820,15 @@
             409ab4      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R12 ZZ mov     r8, rax 
             409ab7      5 INSTR BELONGTO 409a70 
             409ab7      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 ZZ mov     edx, offset aUnableToCrea_0; "Unable to create the data directory '%s"... 
-            409abc     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            409abc     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             409abc      5 INSTR BELONGTO 409a70 
             409abc      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 ZZ mov     esi, 8 
             409ac1      2 INSTR BELONGTO 409a70 
             409ac1      2 INSTR DEADREGS  EFLAGS RAX RDI R12 ZZ xor     edi, edi 
-            409ac1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409ac1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409ac3      2 INSTR BELONGTO 409a70 
             409ac3      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            409ac3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409ac3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409ac5     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             409ac5      5 INSTR BELONGTO 409a70 
             409ac5      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_log 
@@ -4840,7 +4840,7 @@
             409acd      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_free 
             409ad2      2 INSTR BELONGTO 409a70 
             409ad2      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            409ad2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409ad2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409ad4      4 INSTR BELONGTO 409a70 
             409ad4      4 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+18h+var_18] 
             409ad4      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp+18h+var_18]
@@ -4854,7 +4854,7 @@
             409ae6      1 INSTR BELONGTO 409a70 
             409ae6      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ retn 
             409ae6     24 DEALLOC STACK esp - 24 retn
-            409af0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            409af0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             409af0      5 INSTR BELONGTO 409a70 
             409af0      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 1 
             409af5     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, rbx 
@@ -4880,7 +4880,7 @@
             409b13     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             409b13      5 INSTR BELONGTO 409a70 
             409b13      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_free 
-            409b18     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            409b18     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             409b18      5 INSTR BELONGTO 409a70 
             409b18      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ mov     eax, 1 
             409b1d     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_409AD4 
@@ -4892,7 +4892,7 @@
             409b23      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aS_pre214; "%s.pre-2-14" 
             409b28      2 INSTR BELONGTO 409a70 
             409b28      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            409b28     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409b28     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409b2a     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             409b2a      5 INSTR BELONGTO 409a70 
             409b2a      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strdup_printf 
@@ -4914,7 +4914,7 @@
             409b45     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             409b45      5 INSTR BELONGTO 409a70 
             409b45      5 INSTR DEADREGS  EFLAGS ZZ call    _g_free 
-            409b4a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1C0h       ; mode 
+            409b4a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1C0h       ; mode 
             409b4a      5 INSTR BELONGTO 409a70 
             409b4a      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 1C0h       ; mode 
             409b4f     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, rbx        ; path 
@@ -4938,7 +4938,7 @@
             409b69      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_strerror 
             409b6e      2 INSTR BELONGTO 409a70 
             409b6e      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R12 ZZ xor     edi, edi 
-            409b6e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409b6e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409b70      3 INSTR BELONGTO 409a70 
             409b70      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R9 R12 ZZ mov     r9, rax 
             409b73      3 INSTR BELONGTO 409a70 
@@ -4948,12 +4948,12 @@
             409b76      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R12 ZZ mov     rcx, rbx 
             409b79      5 INSTR BELONGTO 409a70 
             409b79      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 ZZ mov     edx, offset aUnableToRename; "Unable to rename file '%s' to '%s': %s" 
-            409b7e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            409b7e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             409b7e      5 INSTR BELONGTO 409a70 
             409b7e      5 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ mov     esi, 8 
             409b83      2 INSTR BELONGTO 409a70 
             409b83      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            409b83     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409b83     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409b85     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             409b85      5 INSTR BELONGTO 409a70 
             409b85      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_log 
@@ -5045,20 +5045,20 @@
             409c01      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R13 ZZ mov     r9, r12 
             409c04      6 INSTR BELONGTO 409ba0 
             409c04      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R12 R13 ZZ mov     r8d, (offset aBuildingMenusF+17h); "%s" 
-            409c0a     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            409c0a     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             409c0a      5 INSTR BELONGTO 409ba0 
             409c0a      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R12 R13 ZZ mov     ecx, 1 
-            409c0f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            409c0f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             409c0f      5 INSTR BELONGTO 409ba0 
             409c0f      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ mov     edx, 3 
-            409c14     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            409c14     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             409c14      5 INSTR BELONGTO 409ba0 
             409c14      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ mov     esi, 2 
             409c19      3 INSTR BELONGTO 409ba0 
             409c19      3 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 ZZ mov     rdi, rbx 
             409c1c      2 INSTR BELONGTO 409ba0 
             409c1c      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            409c1c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409c1c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409c1e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             409c1e      5 INSTR BELONGTO 409ba0 
             409c1e      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _gtk_message_dialog_new 
@@ -5105,7 +5105,7 @@
             409c61      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, (offset aBuildingMenusF+17h); "%s" 
             409c66      2 INSTR BELONGTO 409ba0 
             409c66      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            409c66     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409c66     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409c68     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_format_secondary_text 
             409c68      5 INSTR BELONGTO 409ba0 
             409c68      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_message_dialog_format_secondary_text 
@@ -5295,7 +5295,7 @@
             409da4      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
             409da9      3 INSTR BELONGTO 409da0 
             409da9      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            409dac     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            409dac     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             409dac      5 INSTR BELONGTO 409da0 
             409dac      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             409db1      7 INSTR BELONGTO 409da0 
@@ -5382,7 +5382,7 @@
             409e30      5 INSTR DEADREGS  EFLAGS R12 R14 R15 ZZ call    _g_type_check_instance_cast 
             409e35      2 INSTR BELONGTO 409e10 
             409e35      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 ZZ xor     esi, esi 
-            409e35     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409e35     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409e37      3 INSTR BELONGTO 409e10 
             409e37      3 INSTR DEADREGS  EFLAGS RDI R12 R14 R15 ZZ mov     rdi, rax 
             409e3a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_set_model 
@@ -5483,15 +5483,15 @@
             409ee1      7 INSTR BELONGTO 409e10 
             409ee1      7 INSTR DEADREGS  RAX RCX RDX R14 R15 ZZ mov     [rsp+88h+var_88], 2 
             409ee1      7 PTRIMMEDESP STACK 0 displ mov     [rsp+88h+var_88], 2
-            409ee8     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM setz    cl 
+            409ee8     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM setz    cl 
             409ee8      3 INSTR BELONGTO 409e10 
             409ee8      3 INSTR DEADREGS  RAX RCX RDX R14 R15 ZZ setz    cl 
             409eeb      2 INSTR BELONGTO 409e10 
             409eeb      2 INSTR DEADREGS  EFLAGS RAX RDX R14 R15 ZZ xor     edx, edx 
-            409eeb     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409eeb     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409eed      2 INSTR BELONGTO 409e10 
             409eed      2 INSTR DEADREGS  EFLAGS RAX R14 R15 ZZ xor     eax, eax 
-            409eed     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409eed     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409eef     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_set 
             409eef      5 INSTR BELONGTO 409e10 
             409eef      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _gtk_list_store_set 
@@ -5538,7 +5538,7 @@
             409f36      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_type_check_instance_cast 
             409f3b      3 INSTR BELONGTO 409e10 
             409f3b      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     rdx, rbx 
-            409f3e     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset loc_40AF00 
+            409f3e     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset loc_40AF00 
             409f3e      5 INSTR BELONGTO 409e10 
             409f3e      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset loc_40AF00 
             409f43      3 INSTR BELONGTO 409e10 
@@ -5571,12 +5571,12 @@
             409f6f      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], 0
             409f78     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             409f83     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409f88     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 14Ah 
-            409f8d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0DCh 
+            409f88     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 14Ah 
+            409f8d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0DCh 
             409f95     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_default_size 
             409f9a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_get_type 
             409fa8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409fad     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+            409fad     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
             409fb5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_set_border_width 
             409fba     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_get_type 
             409fc2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_type 
@@ -5584,13 +5584,13 @@
             409fd8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_content_area 
             409fdd      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             409fe3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409fe8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            409fe8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             409ff0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_set_spacing 
             409ffb     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a000     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF5h 
+            40a000     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF5h 
             40a00d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_button 
             40a018     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a01d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFDh 
+            40a01d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFDh 
             40a02a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_button 
             40a034     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_new 
             40a03d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_new 
@@ -5619,8 +5619,8 @@
             40a113     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             40a118      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40a11e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a123     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a128     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a123     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a128     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a133     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a13f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_tooltip_text 
             40a148     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
@@ -5629,8 +5629,8 @@
             40a169     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             40a16e      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40a174     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a179     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a17e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a179     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a17e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a18c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a19b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_tooltip_text 
             40a1a7     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
@@ -5639,8 +5639,8 @@
             40a1c8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             40a1cd      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40a1d3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a1d8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a1dd     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a1d8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a1dd     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a1eb     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a1fa     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_tooltip_text 
             40a209     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
@@ -5654,8 +5654,8 @@
             40a257      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40a25d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a268     -1 INSTR LOCAL NoMetaUpdate call    _gtk_font_button_set_font_name 
-            40a26d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a272     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a26d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a272     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a279     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a288     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_tooltip_text 
             40a297     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
@@ -5665,44 +5665,44 @@
             40a2b8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show_all 
             40a2c0     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40a2c3     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a2c6     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a2c6     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40a2d2     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             40a2d7     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
-            40a2e8     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 40h 
-            40a2ed     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40h 
-            40a2f2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 14h 
-            40a2f7     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
-            40a2fc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a2e8     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 40h 
+            40a2ed     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40h 
+            40a2f2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 14h 
+            40a2f7     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
+            40a2fc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a2fe     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_new 
             40a30a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_sortable_get_type 
             40a315     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a31a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40a31c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40a31a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40a31c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40a324     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_sortable_set_sort_column_id 
             40a329     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_toggle_new 
             40a331     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_toggle_get_type 
             40a33c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a341     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40a341     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40a349     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_toggle_set_radio 
             40a34e     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40a351     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40a364     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             40a36e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a371     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40a379     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a371     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a379     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a37b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new_with_attributes 
             40a383     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_type 
             40a392     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a39d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
             40a3a2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_text_new 
             40a3a7     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a3aa     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
-            40a3bc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a3aa     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            40a3bc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a3be     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new_with_attributes 
             40a3cd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a3d8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
             40a3e4     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a3e9     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a3e9     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a3ee     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_set_headers_visible 
             40a3f3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get_type 
             40a3ff     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -5712,15 +5712,15 @@
             40a428     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40a435     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             40a43a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40A0F8 
-            40a448     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
-            40a44d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40a44f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a448     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            40a44d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40a44f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a451     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40a456      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
             40a45b     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
             40a460     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a468     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 272h 
-            40a472     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a468     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 272h 
+            40a472     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a474     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message 
             40a480      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], rbx
             40a485      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbp
@@ -5739,22 +5739,22 @@
             40a4cc      5 PTRIMMEDESP STACK 80 displ mov     r13, [rsp+50h]
             40a4d1     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 58h 
             40a4e0      5 PTRIMMEDESP STACK 40 displ lea     rcx, [rsp+28h]
-            40a4e5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a4e5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a4e7     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            40a4ed     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40a4ed     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40a4f2      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
             40a4f8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             40a4fd      5 PTRIMMEDESP STACK 40 displ mov     r13, [rsp+28h]
             40a502     -1 INSTR LOCAL NoMetaUpdate test    r13, r13 
             40a505     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40A4BD 
             40a507      4 PTRIMMEDEBP STACK 88 displ mov     r12, [rbp+58h]
-            40a50b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a510     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a50b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a510     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a517     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a51f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             40a524      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40a52a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a535     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40a535     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40a540     -1 INSTR LOCAL NoMetaUpdate call    sub_40DE70 
             40a548     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_type 
             40a553     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -5768,13 +5768,13 @@
             40a580      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
             40a585      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
             40a58d      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
-            40a59a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a5a4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a59a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a5a4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a5a6     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a5ae     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             40a5b9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a5c1     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a5c4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40a5c4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40a5c9      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40a5cf     -1 INSTR LOCAL NoMetaUpdate call    sub_40DE70 
             40a5d7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_type 
@@ -5804,8 +5804,8 @@
             40a67a      5 PTRIMMEDESP STACK 48 displ lea     rcx, [rsp+30h]
             40a67f      5 PTRIMMEDESP STACK 16 displ lea     rsi, [rsp+10h]
             40a684     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a68a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            40a68f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a68a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40a68f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a691      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [rsp], 0FFFFFFFFh
             40a698     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             40a69d      4 PTRIMMEDESP STACK 60 displ mov     eax, [rsp+3Ch]
@@ -5852,22 +5852,22 @@
             40a7a3     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rsp+8], 0 
             40a7a3      6 PTRIMMEDESP STACK 8 displ cmp     qword ptr [rsp+8], 0
             40a7a9     -1 INSTR LOCAL NoMetaUpdate jz      loc_40A872 
-            40a7af     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a7b9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a7af     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a7b9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a7bb     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            40a7c3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a7c3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a7c5     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40a7cd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             40a7db     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a7e9     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40a7f1     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
-            40a7f6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
-            40a7fb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a7e9     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40a7f1     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            40a7f6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40a7fb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a7fd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             40a805      5 PTRIMMEDESP STACK 8 displ mov     rax, [rsp+8]
             40a80e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_get_type 
             40a819     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a829     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a829     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a82b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_format_secondary_text 
             40a830      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40a836     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -5930,20 +5930,20 @@
             40a9a1     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 58h 
             40a9b0      5 PTRIMMEDESP STACK 32 displ mov     rdi, [rsp+20h]
             40a9b5      5 PTRIMMEDESP STACK 40 displ lea     rcx, [rsp+28h]
-            40a9ba     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a9ba     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a9bc     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            40a9c2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40a9c2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40a9c7      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
             40a9ca     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             40a9cf      5 PTRIMMEDESP STACK 40 displ mov     r13, [rsp+28h]
             40a9d4     -1 INSTR LOCAL NoMetaUpdate test    r13, r13 
             40a9d7     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40A98D 
-            40a9dd     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a9e2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a9dd     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a9e2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a9e9     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a9f1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             40a9fc     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40aa07     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40aa07     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40aa0c      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40aa12     -1 INSTR LOCAL NoMetaUpdate call    sub_40DE70 
             40aa1a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_type 
@@ -5979,41 +5979,41 @@
             40aad5      5 PTRIMMEDESP STACK 72 displ lea     r9, [rsp+48h]
             40aada      5 PTRIMMEDESP STACK 64 displ lea     rcx, [rsp+40h]
             40aadf      5 PTRIMMEDESP STACK 16 displ lea     rsi, [rsp+10h]
-            40aae4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40aae4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40aae6     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 2 
-            40aaec     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40aaec     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40aaf1      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [rsp], 0FFFFFFFFh
             40aaf8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             40aafd     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rsp+40h], 0 
             40aafd      6 PTRIMMEDESP STACK 64 displ cmp     qword ptr [rsp+40h], 0
             40ab03     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40AAAF 
             40ab05      5 PTRIMMEDESP STACK 72 displ mov     r13, [rsp+48h]
-            40ab0a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40ab0f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40ab0a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40ab0f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40ab16     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40ab1e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             40ab2c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40ab34      3 PTRIMMEDEBP STACK 0 displ mov     r8, rbp
-            40ab37     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40ab3c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            40ab41     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
-            40ab46     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ab37     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ab3c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40ab41     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40ab46     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ab48     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
-            40ab4d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40ab55     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40ab4d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40ab55     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40ab5c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40ab64     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_get_type 
             40ab6f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40ab74      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
-            40ab7a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ab7a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ab7c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_format_secondary_text 
             40ab81     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_type 
             40ab8f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40ab94     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFAh 
+            40ab94     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFAh 
             40aba1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_button 
             40aba6      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40abac     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40abb1     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFBh 
+            40abb1     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFBh 
             40abbe     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_button 
             40abc9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40abd6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_title 
@@ -6039,16 +6039,16 @@
             40ac47     -1 INSTR LOCAL NoMetaUpdate call    sub_409E10 
             40ac4c     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40AAAF 
             40ac58      5 PTRIMMEDESP STACK 72 displ mov     r13, [rsp+48h]
-            40ac5d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40ac67     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40ac5d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40ac67     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40ac69     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            40ac74     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ac74     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ac76     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40ac84     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40ac92     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40ac97     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
-            40ac9f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
-            40aca4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ac92     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40ac97     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            40ac9f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40aca4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40aca6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             40acb4     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40acc1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_title 
@@ -6115,10 +6115,10 @@
             40ad44     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0B0h 
             40ad44      6 INSTR BELONGTO 40acf0 
             40ad44      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 0B0h 
-            40ad4a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_409DA0 
+            40ad4a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_409DA0 
             40ad4a      5 INSTR BELONGTO 40acf0 
             40ad4a      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset sub_409DA0 
-            40ad4f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 460h 
+            40ad4f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 460h 
             40ad4f      5 INSTR BELONGTO 40acf0 
             40ad4f      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 460h 
             40ad54      7 INSTR BELONGTO 40acf0 
@@ -6184,7 +6184,7 @@
             40adbf     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             40adbf      5 INSTR BELONGTO 40ad70 
             40adc4      7 INSTR BELONGTO 40ad70 
-            40adcb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40adcb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40adcb      5 INSTR BELONGTO 40ad70 
             40add0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             40add0      5 INSTR BELONGTO 40ad70 
@@ -6248,20 +6248,20 @@
             40af1c     -1 INSTR LOCAL NoMetaUpdate call    sub_40ACF0 
             40af27     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40af2c      5 PTRIMMEDESP STACK 12 displ lea     rcx, [rsp+0Ch]
-            40af31     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40af31     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40af36     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            40af3c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40af3c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40af41      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40af44     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             40af49      4 PTRIMMEDESP STACK 12 displ mov     edx, [rsp+0Ch]
-            40af4d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40af4d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40af4f     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
             40af51     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40AF7D 
             40af53     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_type 
             40af60     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40af68     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_selection 
             40af73     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_selection_select_iter 
-            40af78     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40af78     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40af7d      5 PTRIMMEDESP STACK 16 displ mov     rbx, [rsp+10h]
             40af82      5 PTRIMMEDESP STACK 24 displ mov     rbp, [rsp+18h]
             40af87      5 PTRIMMEDESP STACK 32 displ mov     r12, [rsp+20h]
@@ -6366,7 +6366,7 @@
             40b037      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ mov     edx, offset aGdict_is_sourc; "GDICT_IS_SOURCE_LOADER (loader)" 
             40b03c     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40AFEC 
             40b03c      2 INSTR BELONGTO 40afa0 
-            40b040     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40b040     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40b040      5 INSTR BELONGTO 40afa0 
             40b040      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 50h 
             40b045      3 INSTR BELONGTO 40afa0 
@@ -6453,7 +6453,7 @@
             40b0d8      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rax 
             40b0db      2 INSTR BELONGTO 40afa0 
             40b0db      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            40b0db     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b0db     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b0dd     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             40b0dd      5 INSTR BELONGTO 40afa0 
             40b0dd      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_object_new 
@@ -6472,8 +6472,8 @@
             40b0f0      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 ZZ xor     r8d, r8d 
             40b0f3      2 INSTR BELONGTO 40afa0 
             40b0f3      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 ZZ xor     ecx, ecx 
-            40b0f3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40b0f5     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset _gtk_widget_hide_on_delete 
+            40b0f3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b0f5     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset _gtk_widget_hide_on_delete 
             40b0f5      5 INSTR BELONGTO 40afa0 
             40b0f5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     edx, offset _gtk_widget_hide_on_delete 
             40b0fa      5 INSTR BELONGTO 40afa0 
@@ -6543,7 +6543,7 @@
             40b16a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40b16a      5 INSTR BELONGTO 40afa0 
             40b16a      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_type_check_instance_cast 
-            40b16f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40b16f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40b16f      5 INSTR BELONGTO 40afa0 
             40b16f      5 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     esi, 1 
             40b174      3 INSTR BELONGTO 40afa0 
@@ -6558,7 +6558,7 @@
             40b184     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40b184      5 INSTR BELONGTO 40afa0 
             40b184      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_type_check_instance_cast 
-            40b189     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset _g_object_unref 
+            40b189     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset _g_object_unref 
             40b189      5 INSTR BELONGTO 40afa0 
             40b189      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ mov     ecx, offset _g_object_unref 
             40b18e      3 INSTR BELONGTO 40afa0 
@@ -6769,7 +6769,7 @@
             40b2f0      5 INSTR DEADREGS  EFLAGS R15 XMM3 ZZ call    _pango_font_description_free 
             40b2f5      5 INSTR BELONGTO 40b230 
             40b2f5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 XMM3 ZZ mov     rsi, [r12+8] 
-            40b2fa     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            40b2fa     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             40b2fa      5 INSTR BELONGTO 40b230 
             40b2fa      5 INSTR DEADREGS  EFLAGS RDX RDI R15 XMM3 ZZ mov     edx, 0FFFFFFFFh 
             40b2ff      3 INSTR BELONGTO 40b230 
@@ -6843,11 +6843,11 @@
             40b386      5 INSTR DEADREGS  EFLAGS RAX RDI R15 XMM3 ZZ mov     edi, offset aDD ; "%d/%d" 
             40b38b      2 INSTR BELONGTO 40b230 
             40b38b      2 INSTR DEADREGS  EFLAGS RAX R15 XMM3 ZZ xor     eax, eax 
-            40b38b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b38b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b38d     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40b38d      5 INSTR BELONGTO 40b230 
             40b38d      5 INSTR DEADREGS  EFLAGS R15 XMM3 ZZ call    _g_strdup_printf 
-            40b392     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            40b392     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             40b392      5 INSTR BELONGTO 40b230 
             40b392      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 XMM3 ZZ mov     edx, 0FFFFFFFFh 
             40b397      3 INSTR BELONGTO 40b230 
@@ -6864,7 +6864,7 @@
             40b3a8     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40b3a8      5 INSTR BELONGTO 40b230 
             40b3a8      5 INSTR DEADREGS  EFLAGS R15 XMM3 ZZ call    _g_free 
-            40b3ad     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
+            40b3ad     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
             40b3ad      5 INSTR BELONGTO 40b230 
             40b3ad      5 INSTR DEADREGS  EFLAGS RSI RDI R15 XMM3 ZZ mov     esi, 0FFFFFFFFh 
             40b3b2      3 INSTR BELONGTO 40b230 
@@ -6963,7 +6963,7 @@
             40b46c      2 INSTR BELONGTO 40b230 
             40b46e     -1 INSTR LOCAL NoMetaUpdate jle     short loc_40B4D4 
             40b46e      2 INSTR BELONGTO 40b230 
-            40b470     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM imul    ebp, eax 
+            40b470     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM imul    ebp, eax 
             40b470      3 INSTR BELONGTO 40b230 
             40b470      3 INSTR DEADREGS  EFLAGS RBX R14 XMM2 XMM3 XMM4 ZZ imul    ebp, eax 
             40b473     -1 INSTR LOCAL NoMetaUpdate cmp     ebp, [r12+28h] 
@@ -6974,7 +6974,7 @@
             40b47a      3 INSTR BELONGTO 40b230 
             40b47d      2 INSTR BELONGTO 40b230 
             40b47d      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI XMM2 XMM3 XMM4 ZZ xor     ebx, ebx 
-            40b47d     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40b47d     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40b47f     -1 INSTR LOCAL MetadataUnused shl     r14, 3 
             40b47f      4 INSTR BELONGTO 40b230 
             40b483     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40B496 
@@ -6989,7 +6989,7 @@
             40b494      2 INSTR BELONGTO 40b230 
             40b496      5 INSTR BELONGTO 40b230 
             40b496      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI XMM2 XMM3 XMM4 ZZ mov     rax, [r12+20h] 
-            40b49b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            40b49b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             40b49b      5 INSTR BELONGTO 40b230 
             40b49b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM2 XMM3 XMM4 ZZ mov     edx, 0FFFFFFFFh 
             40b4a0      3 INSTR BELONGTO 40b230 
@@ -7104,7 +7104,7 @@
             40b556      3 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     rdi, [rbx] 
             40b559      2 INSTR BELONGTO 40b530 
             40b559      2 INSTR DEADREGS  EFLAGS RSI R13 ZZ xor     esi, esi 
-            40b559     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40b559     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40b55b      5 INSTR BELONGTO 40b530 
             40b55b      5 INSTR DEADREGS  EFLAGS R13 ZZ movsd   [rsp+38h+var_38], xmm0 
             40b55b      5 PTRIMMEDESP STACK 0 displ movsd   [rsp+38h+var_38], xmm0
@@ -7113,7 +7113,7 @@
             40b560      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _gdict_defbox_get_text 
             40b565      2 INSTR BELONGTO 40b530 
             40b565      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ xor     edx, edx 
-            40b565     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b565     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b567      5 INSTR BELONGTO 40b530 
             40b567      5 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     esi, offset asc_412FE5; "\n" 
             40b56c      3 INSTR BELONGTO 40b530 
@@ -7149,21 +7149,21 @@
             40b5a3      5 INSTR DEADREGS  EFLAGS ZZ call    _floor 
             40b5a8     -1 INSTR LOCAL AlwaysNUM cvttsd2si ecx, xmm0 
             40b5a8      4 INSTR BELONGTO 40b530 
-            40b5ac     -2 INSTR LOCAL n EAX ZZ  NumericDEFs lea     eax, [r13-1] 
+            40b5ac     -2 INSTR LOCAL n RAX ZZ  NumericDEFs lea     eax, [r13-1] 
             40b5ac      4 INSTR BELONGTO 40b530 
             40b5ac      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI XMM0 ZZ lea     eax, [r13-1] 
             40b5b0      3 INSTR BELONGTO 40b530 
             40b5b0      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 XMM0 ZZ mov     rdi, r12 
             40b5b3      2 INSTR BELONGTO 40b530 
             40b5b3      2 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 XMM0 ZZ mov     edx, eax 
-            40b5b3     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, eax 
+            40b5b3     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, eax 
             40b5b5     -1 INSTR LOCAL MetadataRedundant sar     edx, 1Fh 
             40b5b5      3 INSTR BELONGTO 40b530 
             40b5b8     -1 INSTR LOCAL MetadataRedundant idiv    ecx 
             40b5b8      2 INSTR BELONGTO 40b530 
             40b5ba      3 INSTR BELONGTO 40b530 
             40b5ba      3 INSTR DEADREGS  EFLAGS RSI R12 R13 XMM0 ZZ mov     [rbx+2Ch], ecx 
-            40b5bd     -2 INSTR LOCAL n ESI ZZ  NumericDEFs lea     esi, [rax+1] 
+            40b5bd     -2 INSTR LOCAL n RSI ZZ  NumericDEFs lea     esi, [rax+1] 
             40b5bd      3 INSTR BELONGTO 40b530 
             40b5bd      3 INSTR DEADREGS  EFLAGS RSI R12 R13 XMM0 ZZ lea     esi, [rax+1] 
             40b5c0      3 INSTR BELONGTO 40b530 
@@ -7245,7 +7245,7 @@
             40b62c      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 XMM0 ZZ mov     esi, offset aGdict_show_pri; "gdict_show_print_preview" 
             40b631      2 INSTR BELONGTO 40b5f0 
             40b631      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 XMM0 ZZ xor     edi, edi 
-            40b631     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b631     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b633     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40b633      5 INSTR BELONGTO 40b5f0 
             40b633      5 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM0 ZZ call    _g_return_if_fail_warning 
@@ -7295,7 +7295,7 @@
             40b674      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 XMM0 ZZ mov     esi, offset aGdict_show_pri; "gdict_show_print_preview" 
             40b679      2 INSTR BELONGTO 40b5f0 
             40b679      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 XMM0 ZZ xor     edi, edi 
-            40b679     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b679     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b67b     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40b67b      5 INSTR BELONGTO 40b5f0 
             40b67b      5 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM0 ZZ call    _g_return_if_fail_warning 
@@ -7313,10 +7313,10 @@
             40b68a      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 XMM0 ZZ retn 
             40b690      2 INSTR BELONGTO 40b5f0 
             40b690      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R13 ZZ xor     ecx, ecx 
-            40b690     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b690     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b692      2 INSTR BELONGTO 40b5f0 
             40b692      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R13 ZZ xor     eax, eax 
-            40b692     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b692     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b694      3 INSTR BELONGTO 40b5f0 
             40b694      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R13 ZZ mov     rdx, rsp 
             40b694      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp
@@ -7332,7 +7332,7 @@
             40b6a4      5 PTRIMMEDESP STACK 0 displ cmp     [rsp+38h+var_38], 0
             40b6a9     -1 INSTR LOCAL NoMetaUpdate jz      loc_40B800 
             40b6a9      6 INSTR BELONGTO 40b5f0 
-            40b6af     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 38h 
+            40b6af     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 38h 
             40b6af      5 INSTR BELONGTO 40b5f0 
             40b6af      5 INSTR DEADREGS  EFLAGS RBX RDI R13 ZZ mov     edi, 38h 
             40b6b4     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc0 
@@ -7394,7 +7394,7 @@
             40b70d      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 XMM0 ZZ xor     r8d, r8d 
             40b710      3 INSTR BELONGTO 40b5f0 
             40b710      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 XMM0 ZZ mov     rcx, rbx 
-            40b713     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40B530 
+            40b713     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40B530 
             40b713      5 INSTR BELONGTO 40b5f0 
             40b713      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 XMM0 ZZ mov     edx, offset sub_40B530 
             40b718      5 INSTR BELONGTO 40b5f0 
@@ -7410,7 +7410,7 @@
             40b728      3 INSTR BELONGTO 40b5f0 
             40b72b      3 INSTR BELONGTO 40b5f0 
             40b72b      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 XMM0 ZZ mov     rcx, rbx 
-            40b72e     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40B230 
+            40b72e     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40B230 
             40b72e      5 INSTR BELONGTO 40b5f0 
             40b72e      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 XMM0 ZZ mov     edx, offset sub_40B230 
             40b733      5 INSTR BELONGTO 40b5f0 
@@ -7426,7 +7426,7 @@
             40b743      3 INSTR BELONGTO 40b5f0 
             40b746      3 INSTR BELONGTO 40b5f0 
             40b746      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 XMM0 ZZ mov     rcx, rbx 
-            40b749     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40B200 
+            40b749     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40B200 
             40b749      5 INSTR BELONGTO 40b5f0 
             40b749      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R13 XMM0 ZZ mov     edx, offset sub_40B200 
             40b74e      5 INSTR BELONGTO 40b5f0 
@@ -7441,7 +7441,7 @@
             40b75b      5 PTRIMMEDESP STACK 8 displ lea     rcx, [rsp+38h+var_30]
             40b760      3 INSTR BELONGTO 40b5f0 
             40b760      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R13 XMM0 ZZ mov     rdx, rbp 
-            40b763     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40b763     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40b763      5 INSTR BELONGTO 40b5f0 
             40b763      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 XMM0 ZZ mov     esi, 2 
             40b768      3 INSTR BELONGTO 40b5f0 
@@ -7467,14 +7467,14 @@
             40b789      6 INSTR BELONGTO 40b5f0 
             40b78f      4 INSTR BELONGTO 40b5f0 
             40b78f      4 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 XMM0 ZZ mov     rbx, [rax+8] 
-            40b793     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40b793     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40b793      5 INSTR BELONGTO 40b5f0 
             40b793      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 XMM0 ZZ mov     edx, 5          ; category 
             40b798      5 INSTR BELONGTO 40b5f0 
             40b798      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 ZZ mov     esi, offset aUnableToDispla; "Unable to display the preview: %s" 
             40b79d      2 INSTR BELONGTO 40b5f0 
             40b79d      2 INSTR DEADREGS  EFLAGS RDI R12 R13 XMM0 ZZ xor     edi, edi        ; domainname 
-            40b79d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40b79d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40b79f     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40b79f      5 INSTR BELONGTO 40b5f0 
             40b79f      5 INSTR DEADREGS  EFLAGS R12 R13 XMM0 ZZ call    _dcgettext 
@@ -7482,20 +7482,20 @@
             40b7a4      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R12 R13 XMM0 ZZ mov     r9, rbx 
             40b7a7      3 INSTR BELONGTO 40b5f0 
             40b7a7      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 R13 XMM0 ZZ mov     r8, rax 
-            40b7aa     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            40b7aa     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             40b7aa      5 INSTR BELONGTO 40b5f0 
             40b7aa      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R12 R13 XMM0 ZZ mov     ecx, 2 
-            40b7af     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            40b7af     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             40b7af      5 INSTR BELONGTO 40b5f0 
             40b7af      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 XMM0 ZZ mov     edx, 3 
-            40b7b4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40b7b4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40b7b4      5 INSTR BELONGTO 40b5f0 
             40b7b4      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 R13 XMM0 ZZ mov     esi, 2 
             40b7b9      3 INSTR BELONGTO 40b5f0 
             40b7b9      3 INSTR DEADREGS  EFLAGS RAX RBX RDI R12 R13 XMM0 ZZ mov     rdi, rbp 
             40b7bc      2 INSTR BELONGTO 40b5f0 
             40b7bc      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 XMM0 ZZ xor     eax, eax 
-            40b7bc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b7bc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b7be     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             40b7be      5 INSTR BELONGTO 40b5f0 
             40b7be      5 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM0 ZZ call    _gtk_message_dialog_new 
@@ -7518,8 +7518,8 @@
             40b7d6      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R12 R13 XMM0 ZZ xor     r8d, r8d 
             40b7d9      2 INSTR BELONGTO 40b5f0 
             40b7d9      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R13 XMM0 ZZ xor     ecx, ecx 
-            40b7d9     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40b7db     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset _gtk_widget_destroy 
+            40b7d9     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b7db     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset _gtk_widget_destroy 
             40b7db      5 INSTR BELONGTO 40b5f0 
             40b7db      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 XMM0 ZZ mov     edx, offset _gtk_widget_destroy 
             40b7e0      5 INSTR BELONGTO 40b5f0 
@@ -7547,15 +7547,15 @@
             40b7fc      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 XMM0 ZZ retn 
             40b800      5 INSTR BELONGTO 40b5f0 
             40b800      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 XMM0 ZZ mov     edx, offset aPreviewShouldB; "Preview should be disabled." 
-            40b805     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40b805     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40b805      5 INSTR BELONGTO 40b5f0 
             40b805      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 R13 XMM0 ZZ mov     esi, 10h 
             40b80a      2 INSTR BELONGTO 40b5f0 
             40b80a      2 INSTR DEADREGS  EFLAGS RAX RBX RDI R12 R13 XMM0 ZZ xor     edi, edi 
-            40b80a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b80a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b80c      2 INSTR BELONGTO 40b5f0 
             40b80c      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 XMM0 ZZ xor     eax, eax 
-            40b80c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b80c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b80e     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40b80e      5 INSTR BELONGTO 40b5f0 
             40b80e      5 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM0 ZZ call    _g_log 
@@ -7619,7 +7619,7 @@
             40b85c      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 XMM0 ZZ mov     esi, offset aGdict_show_p_0; "gdict_show_print_dialog" 
             40b861      2 INSTR BELONGTO 40b820 
             40b861      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 XMM0 ZZ xor     edi, edi 
-            40b861     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b861     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b863     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40b863      5 INSTR BELONGTO 40b820 
             40b863      5 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM0 ZZ call    _g_return_if_fail_warning 
@@ -7669,7 +7669,7 @@
             40b8a4      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 XMM0 ZZ mov     esi, offset aGdict_show_p_0; "gdict_show_print_dialog" 
             40b8a9      2 INSTR BELONGTO 40b820 
             40b8a9      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 XMM0 ZZ xor     edi, edi 
-            40b8a9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b8a9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b8ab     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40b8ab      5 INSTR BELONGTO 40b820 
             40b8ab      5 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM0 ZZ call    _g_return_if_fail_warning 
@@ -7687,10 +7687,10 @@
             40b8ba      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 XMM0 ZZ retn 
             40b8c0      2 INSTR BELONGTO 40b820 
             40b8c0      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R13 ZZ xor     ecx, ecx 
-            40b8c0     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b8c0     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b8c2      2 INSTR BELONGTO 40b820 
             40b8c2      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R13 ZZ xor     eax, eax 
-            40b8c2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b8c2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b8c4      3 INSTR BELONGTO 40b820 
             40b8c4      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R13 ZZ mov     rdx, rsp 
             40b8c4      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp
@@ -7706,7 +7706,7 @@
             40b8d4      5 PTRIMMEDESP STACK 0 displ cmp     [rsp+38h+var_38], 0
             40b8d9     -1 INSTR LOCAL NoMetaUpdate jz      loc_40BA30 
             40b8d9      6 INSTR BELONGTO 40b820 
-            40b8df     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 38h 
+            40b8df     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 38h 
             40b8df      5 INSTR BELONGTO 40b820 
             40b8df      5 INSTR DEADREGS  EFLAGS RBX RDI R13 ZZ mov     edi, 38h 
             40b8e4     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc0 
@@ -7768,7 +7768,7 @@
             40b93d      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 XMM0 ZZ xor     r8d, r8d 
             40b940      3 INSTR BELONGTO 40b820 
             40b940      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 XMM0 ZZ mov     rcx, rbx 
-            40b943     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40B530 
+            40b943     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40B530 
             40b943      5 INSTR BELONGTO 40b820 
             40b943      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 XMM0 ZZ mov     edx, offset sub_40B530 
             40b948      5 INSTR BELONGTO 40b820 
@@ -7784,7 +7784,7 @@
             40b958      3 INSTR BELONGTO 40b820 
             40b95b      3 INSTR BELONGTO 40b820 
             40b95b      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 XMM0 ZZ mov     rcx, rbx 
-            40b95e     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40B230 
+            40b95e     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40B230 
             40b95e      5 INSTR BELONGTO 40b820 
             40b95e      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 XMM0 ZZ mov     edx, offset sub_40B230 
             40b963      5 INSTR BELONGTO 40b820 
@@ -7800,7 +7800,7 @@
             40b973      3 INSTR BELONGTO 40b820 
             40b976      3 INSTR BELONGTO 40b820 
             40b976      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 XMM0 ZZ mov     rcx, rbx 
-            40b979     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40B200 
+            40b979     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40B200 
             40b979      5 INSTR BELONGTO 40b820 
             40b979      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R13 XMM0 ZZ mov     edx, offset sub_40B200 
             40b97e      5 INSTR BELONGTO 40b820 
@@ -7815,7 +7815,7 @@
             40b98b      5 PTRIMMEDESP STACK 8 displ lea     rcx, [rsp+38h+var_30]
             40b990      2 INSTR BELONGTO 40b820 
             40b990      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R13 XMM0 ZZ xor     esi, esi 
-            40b990     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40b990     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40b992      3 INSTR BELONGTO 40b820 
             40b992      3 INSTR DEADREGS  EFLAGS RDX RBX RDI R13 XMM0 ZZ mov     rdx, rbp 
             40b995      3 INSTR BELONGTO 40b820 
@@ -7841,14 +7841,14 @@
             40b9b6      6 INSTR BELONGTO 40b820 
             40b9bc      4 INSTR BELONGTO 40b820 
             40b9bc      4 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 XMM0 ZZ mov     rbx, [rax+8] 
-            40b9c0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40b9c0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40b9c0      5 INSTR BELONGTO 40b820 
             40b9c0      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 XMM0 ZZ mov     edx, 5          ; category 
             40b9c5      5 INSTR BELONGTO 40b820 
             40b9c5      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 ZZ mov     esi, offset aUnableToDispla; "Unable to display the preview: %s" 
             40b9ca      2 INSTR BELONGTO 40b820 
             40b9ca      2 INSTR DEADREGS  EFLAGS RDI R12 R13 XMM0 ZZ xor     edi, edi        ; domainname 
-            40b9ca     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40b9ca     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40b9cc     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40b9cc      5 INSTR BELONGTO 40b820 
             40b9cc      5 INSTR DEADREGS  EFLAGS R12 R13 XMM0 ZZ call    _dcgettext 
@@ -7856,20 +7856,20 @@
             40b9d1      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R12 R13 XMM0 ZZ mov     r9, rbx 
             40b9d4      3 INSTR BELONGTO 40b820 
             40b9d4      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 R13 XMM0 ZZ mov     r8, rax 
-            40b9d7     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            40b9d7     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             40b9d7      5 INSTR BELONGTO 40b820 
             40b9d7      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R12 R13 XMM0 ZZ mov     ecx, 2 
-            40b9dc     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            40b9dc     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             40b9dc      5 INSTR BELONGTO 40b820 
             40b9dc      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 XMM0 ZZ mov     edx, 3 
-            40b9e1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40b9e1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40b9e1      5 INSTR BELONGTO 40b820 
             40b9e1      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 R13 XMM0 ZZ mov     esi, 2 
             40b9e6      3 INSTR BELONGTO 40b820 
             40b9e6      3 INSTR DEADREGS  EFLAGS RAX RBX RDI R12 R13 XMM0 ZZ mov     rdi, rbp 
             40b9e9      2 INSTR BELONGTO 40b820 
             40b9e9      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 XMM0 ZZ xor     eax, eax 
-            40b9e9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b9e9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b9eb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             40b9eb      5 INSTR BELONGTO 40b820 
             40b9eb      5 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM0 ZZ call    _gtk_message_dialog_new 
@@ -7892,8 +7892,8 @@
             40ba03      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R12 R13 XMM0 ZZ xor     r8d, r8d 
             40ba06      2 INSTR BELONGTO 40b820 
             40ba06      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R13 XMM0 ZZ xor     ecx, ecx 
-            40ba06     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40ba08     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset _gtk_widget_destroy 
+            40ba06     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ba08     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset _gtk_widget_destroy 
             40ba08      5 INSTR BELONGTO 40b820 
             40ba08      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 XMM0 ZZ mov     edx, offset _gtk_widget_destroy 
             40ba0d      5 INSTR BELONGTO 40b820 
@@ -7921,15 +7921,15 @@
             40ba29      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 XMM0 ZZ retn 
             40ba30      5 INSTR BELONGTO 40b820 
             40ba30      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 XMM0 ZZ mov     edx, offset aPrintShouldBeD; "Print should be disabled." 
-            40ba35     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40ba35     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40ba35      5 INSTR BELONGTO 40b820 
             40ba35      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 R13 XMM0 ZZ mov     esi, 10h 
             40ba3a      2 INSTR BELONGTO 40b820 
             40ba3a      2 INSTR DEADREGS  EFLAGS RAX RBX RDI R12 R13 XMM0 ZZ xor     edi, edi 
-            40ba3a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40ba3a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40ba3c      2 INSTR BELONGTO 40b820 
             40ba3c      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 XMM0 ZZ xor     eax, eax 
-            40ba3c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ba3c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ba3e     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40ba3e      5 INSTR BELONGTO 40b820 
             40ba3e      5 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM0 ZZ call    _g_log 
@@ -7989,7 +7989,7 @@
             40ba98      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
             40ba9d      3 INSTR BELONGTO 40ba90 
             40ba9d      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            40baa0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40baa0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40baa0      5 INSTR BELONGTO 40ba90 
             40baa0      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             40baa5      7 INSTR BELONGTO 40ba90 
@@ -8032,19 +8032,19 @@
             40baf2      8 PTRIMMEDESP STACK 0 displ mov     [rsp+28h+var_28], offset _g_cclosure_marshal_VOID__VOID
             40bafa      3 INSTR BELONGTO 40ba90 
             40bafa      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rsi, [rbx] 
-            40bafd     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3F0h 
+            40bafd     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3F0h 
             40bafd      5 INSTR BELONGTO 40ba90 
             40bafd      5 INSTR DEADREGS  EFLAGS RCX RDX RDI ZZ mov     ecx, 3F0h 
             40bb02      6 INSTR BELONGTO 40ba90 
             40bb02      6 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     cs:dword_617E80, eax 
-            40bb08     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40bb08     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40bb08      5 INSTR BELONGTO 40ba90 
             40bb08      5 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ mov     edx, 2 
             40bb0d      5 INSTR BELONGTO 40ba90 
             40bb0d      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aPageChanged; "page-changed" 
             40bb12      2 INSTR BELONGTO 40ba90 
             40bb12      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40bb12     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bb12     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bb14     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             40bb14      5 INSTR BELONGTO 40ba90 
             40bb14      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_new 
@@ -8062,17 +8062,17 @@
             40bb38      3 INSTR BELONGTO 40ba90 
             40bb3b      6 INSTR BELONGTO 40ba90 
             40bb3b      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI ZZ mov     cs:dword_617E84, eax 
-            40bb41     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3F8h 
+            40bb41     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3F8h 
             40bb41      5 INSTR BELONGTO 40ba90 
             40bb41      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI ZZ mov     ecx, 3F8h 
-            40bb46     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40bb46     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40bb46      5 INSTR BELONGTO 40ba90 
             40bb46      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RDI ZZ mov     edx, 2 
             40bb4b      5 INSTR BELONGTO 40ba90 
             40bb4b      5 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     edi, offset aClosed; "closed" 
             40bb50      2 INSTR BELONGTO 40ba90 
             40bb50      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40bb50     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bb50     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bb52     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             40bb52      5 INSTR BELONGTO 40ba90 
             40bb52      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_signal_new 
@@ -8142,14 +8142,14 @@
             40bbbb      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGtk_is_buttonU; "GTK_IS_BUTTON (user_data)" 
             40bbc1      5 INSTR BELONGTO 40bb70 
             40bbc1      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_sideba_0; "gdict_sidebar_menu_position_function" 
-            40bbc6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 96h 
+            40bbc6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 96h 
             40bbc6      5 INSTR BELONGTO 40bb70 
             40bbc6      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 96h 
             40bbcb      5 INSTR BELONGTO 40bb70 
             40bbcb      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictSidebar_c; "gdict-sidebar.c" 
             40bbd0      2 INSTR BELONGTO 40bb70 
             40bbd0      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40bbd0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40bbd0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40bbd2     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40bbd2      5 INSTR BELONGTO 40bb70 
             40bbd2      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -8276,10 +8276,10 @@
             40bca4     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 38h 
             40bca4      6 INSTR BELONGTO 40bc50 
             40bca4      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 38h 
-            40bcaa     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_40BA90 
+            40bcaa     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_40BA90 
             40bcaa      5 INSTR BELONGTO 40bc50 
             40bcaa      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset sub_40BA90 
-            40bcaf     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 420h 
+            40bcaf     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 420h 
             40bcaf      5 INSTR BELONGTO 40bc50 
             40bcaf      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 420h 
             40bcb4      7 INSTR BELONGTO 40bc50 
@@ -8332,7 +8332,7 @@
             40bd1b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_menu_get_active 
             40bd1b      5 INSTR BELONGTO 40bcd0 
             40bd20      7 INSTR BELONGTO 40bcd0 
-            40bd27     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40bd27     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40bd27      5 INSTR BELONGTO 40bcd0 
             40bd2c      3 INSTR BELONGTO 40bcd0 
             40bd2f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -8397,13 +8397,13 @@
             40bdcf      5 INSTR BELONGTO 40bcd0 
             40bdcf      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+28h+var_18]
             40bdd4      2 INSTR BELONGTO 40bcd0 
-            40bdd4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40bdd4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40bdd6      5 INSTR BELONGTO 40bcd0 
             40bdd6      5 PTRIMMEDESP STACK 24 displ mov     r13, [rsp+28h+var_10]
             40bddb      5 INSTR BELONGTO 40bcd0 
             40bddb      5 PTRIMMEDESP STACK 32 displ mov     r14, [rsp+28h+var_8]
             40bde0      2 INSTR BELONGTO 40bcd0 
-            40bde0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bde0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bde2     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
             40bde2      4 INSTR BELONGTO 40bcd0 
             40bde6     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
@@ -8423,21 +8423,21 @@
             40be0c      1 INSTR BELONGTO 40bcd0 
             40be10      6 INSTR BELONGTO 40bcd0 
             40be16      5 INSTR BELONGTO 40bcd0 
-            40be1b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 106h 
+            40be1b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 106h 
             40be1b      5 INSTR BELONGTO 40bcd0 
             40be20      5 INSTR BELONGTO 40bcd0 
             40be25      2 INSTR BELONGTO 40bcd0 
-            40be25     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40be25     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40be27     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40be27      5 INSTR BELONGTO 40bcd0 
             40be2c      4 INSTR BELONGTO 40bcd0 
             40be30      6 INSTR BELONGTO 40bcd0 
             40be36      5 INSTR BELONGTO 40bcd0 
-            40be3b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 109h 
+            40be3b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 109h 
             40be3b      5 INSTR BELONGTO 40bcd0 
             40be40      5 INSTR BELONGTO 40bcd0 
             40be45      2 INSTR BELONGTO 40bcd0 
-            40be45     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40be45     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40be47     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40be47      5 INSTR BELONGTO 40bcd0 
             40be4c      4 INSTR BELONGTO 40bcd0 
@@ -8474,7 +8474,7 @@
             40be9e      4 INSTR BELONGTO 40bcd0 
             40bea2      8 INSTR BELONGTO 40bcd0 
             40beaa      7 INSTR BELONGTO 40bcd0 
-            40beb1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40beb1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40beb1      5 INSTR BELONGTO 40bcd0 
             40beb6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             40beb6      5 INSTR BELONGTO 40bcd0 
@@ -8523,7 +8523,7 @@
             40bf12     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40BF29 
             40bf12      2 INSTR BELONGTO 40bee0 
             40bf14      2 INSTR BELONGTO 40bee0 
-            40bf14     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40bf14     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40bf16      5 INSTR BELONGTO 40bee0 
             40bf1b     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_foreach 
             40bf1b      5 INSTR BELONGTO 40bee0 
@@ -8531,7 +8531,7 @@
             40bf24     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_free 
             40bf24      5 INSTR BELONGTO 40bee0 
             40bf29      7 INSTR BELONGTO 40bee0 
-            40bf30     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40bf30     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40bf30      5 INSTR BELONGTO 40bee0 
             40bf35     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             40bf35      5 INSTR BELONGTO 40bee0 
@@ -8553,15 +8553,15 @@
             40bf61     -1 INSTR LOCAL NoMetaUpdate call    sub_40BC50 
             40bf6c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_instance_get_private 
             40bf8a     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_new 
-            40bf8f     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40bf91     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40bf8f     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40bf91     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40bf93      4 PTRIMMEDEBP STACK 0 displ mov     [rbp+0], rax
             40bf97     -1 INSTR LOCAL NoMetaUpdate call    _gtk_hbox_new 
             40bf9f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_get_type 
             40bfad     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40bfb2     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40bfb5     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40bfb7     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40bfb5     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40bfb7     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40bfbf     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40bfc7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40bfcc      4 PTRIMMEDEBP STACK 16 displ mov     [rbp+10h], r14
@@ -8569,7 +8569,7 @@
             40bfd8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_get_type 
             40bfe3      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], rax
             40bfe8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40bfed     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40bfed     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40bff5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_set_relief 
             40bffa     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40bffd     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -8577,11 +8577,11 @@
             40c015     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40c01b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40c02b     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            40c030     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40c030     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40c032      4 PTRIMMEDEBP STACK 56 displ mov     [rbp+38h], r12
-            40c036     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40c036     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40c038     -1 INSTR LOCAL NoMetaUpdate call    _gtk_hbox_new 
-            40c03d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40c03d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40c042     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
             40c047      4 PTRIMMEDEBP STACK 48 displ mov     [rbp+30h], rax
             40c04b      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
@@ -8596,20 +8596,20 @@
             40c084     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40c089      5 PTRIMMEDESP STACK 16 displ mov     rsi, [rsp+10h]
             40c08e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40c094     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40c096     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c094     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40c096     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c098     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40c09d      4 PTRIMMEDEBP STACK 48 displ mov     rdi, [rbp+30h]
             40c0a1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-            40c0a6     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40c0a8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40c0a6     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40c0a8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40c0ad     -1 INSTR LOCAL NoMetaUpdate call    _gtk_arrow_new 
             40c0b8      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rax
             40c0bd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40c0c2      5 PTRIMMEDESP STACK 16 displ mov     rsi, [rsp+10h]
             40c0c7     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40c0ca     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40c0cc     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c0ca     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40c0cc     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c0d1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_end 
             40c0d6      5 PTRIMMEDESP STACK 16 displ mov     rdi, [rsp+10h]
             40c0db     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
@@ -8619,16 +8619,16 @@
             40c0fe     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40c109     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40c10e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40c111     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40c116     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40c111     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40c116     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40c121     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40c129     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40c12e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_new 
             40c133      5 PTRIMMEDESP STACK 24 displ mov     rsi, [rsp+18h]
             40c13e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40c143     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40c143     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40c14b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_set_relief 
-            40c150     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40c150     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40c15a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_image_new_from_stock 
             40c15f      5 PTRIMMEDESP STACK 24 displ mov     rsi, [rsp+18h]
             40c16a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -8638,8 +8638,8 @@
             40c190     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             40c19b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40c1a0     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40c1a3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40c1a8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c1a3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40c1a8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c1ad     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_end 
             40c1b5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40c1ba      4 PTRIMMEDEBP STACK 40 displ mov     [rbp+28h], r12
@@ -8660,17 +8660,17 @@
             40c23d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_notebook_get_type 
             40c249      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40c250     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40c255     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40c255     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40c25a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_notebook_set_show_border 
             40c263      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40c26a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40c26f     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40c26f     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40c274     -1 INSTR LOCAL NoMetaUpdate call    _gtk_notebook_set_show_tabs 
             40c287     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40c28c     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 6 
-            40c295     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40c295     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40c29a      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
-            40c29d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40c29d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40c2a2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40c2af     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
             40c2bd     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_widget_show 
@@ -8770,10 +8770,10 @@
             40c35b      3 INSTR BELONGTO 40c340 
             40c35e      2 INSTR BELONGTO 40c340 
             40c35e      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 ZZ xor     edx, edx 
-            40c35e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c35e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c360      2 INSTR BELONGTO 40c340 
             40c360      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            40c360     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c360     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c362     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
             40c362      5 INSTR BELONGTO 40c340 
             40c362      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_signal_emit 
@@ -8789,7 +8789,7 @@
             40c3ad     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40C3D8 
             40c3af     -1 INSTR LOCAL NoMetaUpdate cmp     edx, 0FF0Dh 
             40c3b5     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40C3D8 
-            40c3b7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c3b7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c3b9     -1 INSTR LOCAL NoMetaUpdate cmp     edx, 0FF8Dh 
             40c3bf     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40C3D8 
             40c3c1      5 PTRIMMEDESP STACK 16 displ mov     rbx, [rsp+10h]
@@ -8798,17 +8798,17 @@
             40c3d0     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
             40c3d8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_get_type 
             40c3e3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40c3e8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40c3e8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40c3f0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_set_active 
             40c3f5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_menu_get_type 
             40c3ff      3 PTRIMMEDEBP STACK 20 displ mov     ebp, [rbp+14h]
             40c409     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40c40e     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 1 
-            40c41f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40c421     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40c41f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40c421     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40c423      3 PTRIMMEDESP STACK 0 displ mov     [rsp], ebp
             40c426     -1 INSTR LOCAL NoMetaUpdate call    _gtk_menu_popup 
-            40c42b     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40c42b     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40c430     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40C3C1 
             40c440      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], rbx
             40c445      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbp
@@ -8816,7 +8816,7 @@
             40c452      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r13
             40c461     -1 INSTR LOCAL NoMetaUpdate call    sub_40BC50 
             40c46c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40c474     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c474     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c476     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rbp+34h], 1 
             40c476      4 PTRIMMEDEBP STACK 52 displ cmp     dword ptr [rbp+34h], 1
             40c47a     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40C498 
@@ -8827,7 +8827,7 @@
             40c490     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 58h 
             40c498      5 PTRIMMEDESP STACK 16 displ lea     rsi, [rsp+10h]
             40c4a0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_allocation 
-            40c4aa     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            40c4aa     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             40c4af      5 PTRIMMEDESP STACK 24 displ mov     r13d, [rsp+18h]
             40c4ba     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_size_request 
             40c4c4      5 PTRIMMEDESP STACK 32 displ lea     rsi, [rsp+20h]
@@ -8835,23 +8835,23 @@
             40c4d7     -1 INSTR LOCAL NoMetaUpdate cmp     [rsp+20h], r13d 
             40c4d7      5 PTRIMMEDESP STACK 32 displ cmp     [rsp+20h], r13d
             40c4df      5 PTRIMMEDESP STACK 32 displ cmovge  esi, [rsp+20h]
-            40c4e4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            40c4e4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             40c4ed     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_size_request 
             40c4f5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_grab_focus 
             40c4fa     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_get_type 
             40c505     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40c50a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40c50a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40c512     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_set_active 
             40c517     -1 INSTR LOCAL NoMetaUpdate call    _gtk_menu_get_type 
             40c521      4 PTRIMMEDEBP STACK 20 displ mov     r13d, [rbp+14h]
             40c528      3 PTRIMMEDEBP STACK 52 displ mov     ebp, [rbp+34h]
             40c52f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40c534      3 PTRIMMEDEBP STACK 0 displ mov     r9d, ebp
-            40c542     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40c544     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40c542     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40c544     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40c546      4 PTRIMMEDESP STACK 0 displ mov     [rsp], r13d
             40c54a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_menu_popup 
-            40c54f     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40c54f     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40c554     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40C47C 
             40c560      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             40c560      0 FUNC MMSAFENESS SAFE
@@ -8868,7 +8868,7 @@
             40c56d      5 INSTR BELONGTO 40c560 
             40c572     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             40c572      5 INSTR BELONGTO 40c560 
-            40c577     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
+            40c577     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
             40c577      5 INSTR BELONGTO 40c560 
             40c577      5 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     edi, 28h 
             40c57c     40 DATAREF STACK 1211 esp + 0 PARENT LocalFrame LOCALFRAME
@@ -8939,7 +8939,7 @@
             40c5ee      4 INSTR BELONGTO 40c5e0 
             40c5f2      2 INSTR BELONGTO 40c5e0 
             40c5f2      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            40c5f2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c5f2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c5f2      8 DEALLOC STACK esp - 8 xor     eax, eax
             40c5f4     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
             40c5f4      5 INSTR BELONGTO 40c5e0 
@@ -9097,7 +9097,7 @@
             40c710      2 INSTR BELONGTO 40c600 
             40c712      2 INSTR BELONGTO 40c600 
             40c712      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     eax, eax 
-            40c712     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c712     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c714     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
             40c714      4 INSTR BELONGTO 40c600 
             40c718     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
@@ -9146,7 +9146,7 @@
             40c761      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
             40c766      2 INSTR BELONGTO 40c600 
             40c766      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            40c766     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c766     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c768      3 INSTR BELONGTO 40c600 
             40c768      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r15 
             40c76b      3 INSTR BELONGTO 40c600 
@@ -9174,7 +9174,7 @@
             40c78d      6 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     eax, cs:dword_617E80 
             40c793      3 INSTR BELONGTO 40c600 
             40c793      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, r15 
-            40c796     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40c796     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40c796      5 INSTR BELONGTO 40c600 
             40c796      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             40c79b      4 INSTR BELONGTO 40c600 
@@ -9190,7 +9190,7 @@
             40c7a8      3 INSTR DEADREGS  EFLAGS RCX RDX RDI ZZ mov     rdx, r14 
             40c7ab      3 INSTR BELONGTO 40c600 
             40c7ab      3 INSTR DEADREGS  EFLAGS RCX RDI R14 ZZ mov     rdi, rax 
-            40c7ae     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset _g_free 
+            40c7ae     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset _g_free 
             40c7ae      5 INSTR BELONGTO 40c600 
             40c7ae      5 INSTR DEADREGS  EFLAGS RCX R14 ZZ mov     ecx, offset _g_free 
             40c7b3     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set_qdata_full 
@@ -9204,7 +9204,7 @@
             40c7be     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40c7be      3 INSTR BELONGTO 40c600 
             40c7be      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R14 ZZ xor     r8d, r8d 
-            40c7c1     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40BCD0 
+            40c7c1     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40BCD0 
             40c7c1      5 INSTR BELONGTO 40c600 
             40c7c1      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R14 ZZ mov     edx, offset sub_40BCD0 
             40c7c6      3 INSTR BELONGTO 40c600 
@@ -9330,7 +9330,7 @@
             40c8d7     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40c8d9     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40C900 
             40c8e0     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
-            40c8e9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40c8e9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40c8f5     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
             40c900     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
             40c903     -1 INSTR LOCAL NoMetaUpdate jz      loc_40CA86 
@@ -9387,9 +9387,9 @@
             40ca81     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_widget_hide 
             40ca8b     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40C8E0 
             40ca90     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
-            40caa6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            40caab     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40caad     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40caa6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40caab     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40caad     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40caaf     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
             40cac0      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 16 3 -24 0 4 0 8 5 -16 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 -8 0 13 0 0 14 0 0 15 0 0 ZZ
             40cac0      0 FUNC MMSAFENESS SAFE
@@ -9599,13 +9599,13 @@
             40cbdf      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGdict_sideba_4; "gdict_sidebar_current_page" 
             40cbe4      2 INSTR BELONGTO 40cbb0 
             40cbe4      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            40cbe4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40cbe4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40cbe6     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40cbe6      5 INSTR BELONGTO 40cbb0 
             40cbe6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             40cbeb      2 INSTR BELONGTO 40cbb0 
             40cbeb      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40cbeb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cbeb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cbed      1 INSTR BELONGTO 40cbb0 
             40cbed      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40cbee      1 INSTR BELONGTO 40cbb0 
@@ -9646,7 +9646,7 @@
             40cc22      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             40cc23      2 INSTR BELONGTO 40cbb0 
             40cc23      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40cc23     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cc23     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cc25      1 INSTR BELONGTO 40cbb0 
             40cc25      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40cc26      1 INSTR BELONGTO 40cbb0 
@@ -9666,14 +9666,14 @@
             40cc5b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_is_a 
             40cc60     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40cc62     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40CC80 
-            40cc6e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40cc6e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40cc70     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-            40cc75     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cc75     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cc84     -2 INSTR LOCAL n R13 ZZ  AlwaysNUM xor     r13d, r13d 
             40cc8b     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_length 
-            40cc93     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            40cc93     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             40cc98     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc_n 
-            40cca4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cca4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cca6     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
             40cca9     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40CCD8 
             40ccb3     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     r13d, 2 
@@ -9704,7 +9704,7 @@
             40cd08      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
             40cd0d      3 INSTR BELONGTO 40cd00 
             40cd0d      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            40cd10     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40cd10     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40cd10      5 INSTR BELONGTO 40cd00 
             40cd10      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             40cd15      7 INSTR BELONGTO 40cd00 
@@ -9743,7 +9743,7 @@
             40cd66      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
             40cd69      3 INSTR BELONGTO 40cd00 
             40cd69      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-            40cd6c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40cd6c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40cd6c      5 INSTR BELONGTO 40cd00 
             40cd6c      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
             40cd71     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -9754,7 +9754,7 @@
             40cd76      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 7 
             40cd7c      2 INSTR BELONGTO 40cd00 
             40cd7c      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            40cd7c     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40cd7c     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40cd7e      5 INSTR BELONGTO 40cd00 
             40cd7e      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset byte_41368B 
             40cd83      5 INSTR BELONGTO 40cd00 
@@ -9768,7 +9768,7 @@
             40cd92      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
             40cd95      3 INSTR BELONGTO 40cd00 
             40cd95      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-            40cd98     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40cd98     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40cd98      5 INSTR BELONGTO 40cd00 
             40cd98      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 2 
             40cd9d     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -9786,7 +9786,7 @@
             40cdb4     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 2 
             40cdb4      6 INSTR BELONGTO 40cd00 
             40cdb4      6 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8d, 2 
-            40cdba     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFFh 
+            40cdba     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFFh 
             40cdba      5 INSTR BELONGTO 40cd00 
             40cdba      5 INSTR DEADREGS  EFLAGS RCX ZZ mov     ecx, 0FFFFFFFFh 
             40cdbf      7 INSTR BELONGTO 40cd00 
@@ -9918,10 +9918,10 @@
             40ce8f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40ce8f      5 INSTR BELONGTO 40ce80 
             40ce8f      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-            40ce94     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 12Ch 
+            40ce94     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 12Ch 
             40ce94      5 INSTR BELONGTO 40ce80 
             40ce94      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 12Ch 
-            40ce99     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 190h 
+            40ce99     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 190h 
             40ce99      5 INSTR BELONGTO 40ce80 
             40ce99      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 190h 
             40ce9e      3 INSTR BELONGTO 40ce80 
@@ -9941,7 +9941,7 @@
             40ceb1      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
             40ceb6      2 INSTR BELONGTO 40ce80 
             40ceb6      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            40ceb6     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40ceb6     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40ceb8      3 INSTR BELONGTO 40ce80 
             40ceb8      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             40cebb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_resizable 
@@ -9959,8 +9959,8 @@
             40cece      3 INSTR BELONGTO 40ce80 
             40ced1      2 INSTR BELONGTO 40ce80 
             40ced1      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ xor     ecx, ecx 
-            40ced1     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40ced3     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40DA90 
+            40ced1     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ced3     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40DA90 
             40ced3      5 INSTR BELONGTO 40ce80 
             40ced3      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     edx, offset loc_40DA90 
             40ced8     -1 INSTR LOCAL MetadataUnused mov     esi, offset aResponse; "response" 
@@ -10026,7 +10026,7 @@
             40cf40      4 INSTR BELONGTO 40cef0 
             40cf44     -1 INSTR LOCAL MetadataUnused mov     rbp, [rsp+18h+var_10] 
             40cf44      5 INSTR BELONGTO 40cef0 
-            40cf49     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            40cf49     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             40cf49      5 INSTR BELONGTO 40cef0 
             40cf49      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 R10 R11 R12 ZZ mov     edx, 0FFFFFFFFh 
             40cf4e     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+18h+var_8] 
@@ -10042,7 +10042,7 @@
             40cf5c      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ jmp     _gtk_editable_get_chars 
             40cf68      2 INSTR BELONGTO 40cef0 
             40cf68      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            40cf68     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cf68     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cf6a      4 INSTR BELONGTO 40cef0 
             40cf6a      4 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+18h+var_18] 
             40cf6a      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp+18h+var_18]
@@ -10114,10 +10114,10 @@
             40cfd4     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0B0h 
             40cfd4      6 INSTR BELONGTO 40cf80 
             40cfd4      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 0B0h 
-            40cfda     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_40CD00 
+            40cfda     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_40CD00 
             40cfda      5 INSTR BELONGTO 40cf80 
             40cfda      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset sub_40CD00 
-            40cfdf     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 460h 
+            40cfdf     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 460h 
             40cfdf      5 INSTR BELONGTO 40cf80 
             40cfdf      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 460h 
             40cfe4      7 INSTR BELONGTO 40cf80 
@@ -10190,7 +10190,7 @@
             40d05d     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             40d05d      5 INSTR BELONGTO 40d000 
             40d062      7 INSTR BELONGTO 40d000 
-            40d069     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40d069     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40d069      5 INSTR BELONGTO 40d000 
             40d06e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             40d06e      5 INSTR BELONGTO 40d000 
@@ -10271,7 +10271,7 @@
             40d1f4     -3 INSTR LOCAL NoWarn push    r13 
             40d1f6     -3 INSTR LOCAL NoWarn push    r12 
             40d1fb     -3 INSTR LOCAL NoWarn push    rbp 
-            40d1fe     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40d1fe     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40d203     -3 INSTR LOCAL NoWarn push    rbx 
             40d212      9 PTRIMMEDESP STACK 24 displ mov     qword ptr [rsp+18h], 0
             40d21b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
@@ -10281,14 +10281,14 @@
             40d239     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40d241     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_get_type 
             40d24f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40d254     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+            40d254     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
             40d25c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_set_border_width 
             40d261     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_get_type 
             40d269     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_type 
             40d277     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40d27f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_content_area 
             40d28a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40d28f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40d28f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40d297     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_set_spacing 
             40d29c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_push_composite_child 
             40d2a1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_new 
@@ -10314,7 +10314,7 @@
             40d337     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40d351     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             40d35c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40d361     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF5h 
+            40d361     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF5h 
             40d36e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_button 
             40d383     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             40d388      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
@@ -10324,8 +10324,8 @@
             40d39c      4 PTRIMMEDESP STACK 0 displ mov     rdi, [rsp]
             40d3ad     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40d3b2     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40d3b5     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40d3ba     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40d3b5     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40d3ba     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40d3c5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40d3d1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40d3df     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
@@ -10336,8 +10336,8 @@
             40d3f8      4 PTRIMMEDESP STACK 0 displ mov     rdi, [rsp]
             40d409     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40d40e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40d414     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40d419     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40d414     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40d419     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40d421     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40d42d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40d435     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 1 
@@ -10346,24 +10346,24 @@
             40d444     -1 INSTR LOCAL NoMetaUpdate call    _gtk_editable_get_type 
             40d455     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             40d460     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40d465     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40d465     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40d46a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_editable_set_editable 
             40d478     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             40d483     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40d488     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40d488     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40d48d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_editable_set_editable 
             40d49b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             40d4a6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40d4ab     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40d4ab     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40d4b0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_editable_set_editable 
             40d4be     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             40d4c9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40d4ce     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40d4ce     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40d4d3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_editable_set_editable 
-            40d4df     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40d4df     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40d4e1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
             40d4ec     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40d4f1     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF9h 
+            40d4f1     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF9h 
             40d4fe     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_button 
             40d50d     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 1 
             40d510     -1 INSTR LOCAL NoMetaUpdate jz      loc_40D760 
@@ -10371,14 +10371,14 @@
             40d518     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 2 
             40d51b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40D568 
             40d51d     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40d525     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 110h 
-            40d52f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40d525     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 110h 
+            40d52f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40d531     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message 
             40d540     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 2 
             40d543     -1 INSTR LOCAL NoMetaUpdate jz      loc_40D7B0 
             40d549     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40d551     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 299h 
-            40d55b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40d551     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 299h 
+            40d55b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40d55d     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message 
             40d56c     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
             40d56f     -1 INSTR LOCAL NoMetaUpdate jz      loc_40D858 
@@ -10401,7 +10401,7 @@
             40d609     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40d614     -1 INSTR LOCAL NoMetaUpdate call    _gdict_client_context_get_hostname 
             40d61f     -1 INSTR LOCAL NoMetaUpdate call    _gdict_client_context_get_port 
-            40d62b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40d62b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40d62d     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40d640     -1 INSTR LOCAL NoMetaUpdate call    sub_40CDE0 
             40d650     -1 INSTR LOCAL NoMetaUpdate call    sub_40CDE0 
@@ -10437,49 +10437,49 @@
             40d75b     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40D791 
             40d760     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_get_type 
             40d76f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40d774     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40d774     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40d779     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_set_active 
-            40d78a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40d78a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40d78c     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit_by_name 
             40d791     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_pop_composite_child 
             40d796     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
             40d7b6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40d7bb     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFAh 
+            40d7bb     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFAh 
             40d7c8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_button 
             40d7d4     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40D4E6 
             40d7e6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40d7eb     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFAh 
+            40d7eb     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFAh 
             40d7f8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_button 
             40d80a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40d80f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFDh 
+            40d80f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFDh 
             40d81c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_button 
-            40d821     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40d821     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40d82a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
             40d82f     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40D50A 
-            40d841     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            40d846     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40d848     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40d841     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40d846     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40d848     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40d84a     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40d84f     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40D791 
-            40d85d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     sil, 10h 
-            40d860     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40d862     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40d85d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     sil, 10h 
+            40d860     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40d862     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40d864     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40d869     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40D791 
-            40d879     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            40d87e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40d880     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40d879     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40d87e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40d880     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40d882     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40d887     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40D791 
-            40d895     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
-            40d89a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40d89c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40d895     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            40d89a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40d89c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40d89e     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40d8a3      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+18h]
             40d8a8     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
             40d8ad     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40d8b5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 253h 
-            40d8bf     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40d8b5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 253h 
+            40d8bf     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40d8c1     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message 
             40d8d0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -16 0 4 0 8 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             40d8d0      0 FUNC MMSAFENESS SAFE
@@ -10717,7 +10717,7 @@
             40da4e      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, [rbx+78h] 
             40da52      2 INSTR BELONGTO 40d8d0 
             40da52      2 INSTR DEADREGS  EFLAGS RSI ZZ xor     esi, esi 
-            40da52     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40da52     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40da54     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
             40da54      5 INSTR BELONGTO 40d8d0 
             40da54      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_widget_set_sensitive 
@@ -10727,7 +10727,7 @@
             40da60      5 INSTR BELONGTO 40d8d0 
             40da68      4 INSTR BELONGTO 40d8d0 
             40da68      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, [rbx+78h] 
-            40da6c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40da6c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40da6c      5 INSTR BELONGTO 40d8d0 
             40da6c      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
             40da71     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
@@ -10767,8 +10767,8 @@
             40db33      5 PTRIMMEDESP STACK 24 displ mov     rbp, [rsp+18h]
             40db38     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
             40db3b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40DB79 
-            40db3d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40db47     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40db3d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40db47     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40db49     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40db51     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             40db5c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -10782,9 +10782,9 @@
             40db9b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40dba3     -1 INSTR LOCAL NoMetaUpdate call    _gdict_source_new 
             40dbab     -1 INSTR LOCAL NoMetaUpdate call    _getpid 
-            40dbb0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40dbb0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40dbb5     -1 INSTR LOCAL NoMetaUpdate call    _time 
-            40dbc5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40dbc5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40dbc7     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40dbcc      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40dbd5     -1 INSTR LOCAL NoMetaUpdate call    _gdict_source_set_name 
@@ -10807,18 +10807,18 @@
             40dc64     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40dc6c     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
             40dc6e     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40DC90 
-            40dc75     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            40dc7a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40dc7c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40dc75     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40dc7a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40dc7c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40dc7e     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40dc83     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40DAD5 
             40dc98     -1 INSTR LOCAL NoMetaUpdate call    sub_40CEF0 
             40dca8     -1 INSTR LOCAL NoMetaUpdate call    sub_40CEF0 
-            40dcad     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40dcaf     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0Ah 
+            40dcad     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40dcaf     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0Ah 
             40dcba     -1 INSTR LOCAL NoMetaUpdate call    _strtol 
-            40dcc5     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40dcc7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40dcc5     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40dcc7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40dcd4      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40dcd7      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], 0
             40dcdf     -1 INSTR LOCAL NoMetaUpdate call    _gdict_source_set_transport 
@@ -10832,8 +10832,8 @@
             40dd0f      5 PTRIMMEDESP STACK 40 displ mov     r13, [rsp+28h]
             40dd17     -1 INSTR LOCAL NoMetaUpdate test    r13, r13 
             40dd1a     -1 INSTR LOCAL NoMetaUpdate jz      loc_40DDB0 
-            40dd20     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40dd25     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40dd20     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40dd25     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40dd2c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40dd34     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             40dd3f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -10846,19 +10846,19 @@
             40dd7b     -1 INSTR LOCAL NoMetaUpdate call    _gdict_source_loader_get_source 
             40dd80     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40dd86     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40DBE2 
-            40dd95     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            40dd9a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40dd9c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40dd95     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40dd9a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40dd9c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40dd9e     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40dda3     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40DAD5 
             40ddb0     -1 INSTR LOCAL NoMetaUpdate call    sub_4098E0 
             40ddb5      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40ddbb     -1 INSTR LOCAL NoMetaUpdate call    _gdict_source_get_name 
-            40ddc0     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40ddca     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ddc0     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40ddca     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ddcc     -1 INSTR LOCAL NoMetaUpdate call    _g_strconcat 
-            40ddd1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40dddc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ddd1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40dddc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ddde     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40dde9     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40ddf1     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
@@ -10868,8 +10868,8 @@
             40de0b      5 PTRIMMEDESP STACK 40 displ mov     r14, [rsp+28h]
             40de10     -1 INSTR LOCAL NoMetaUpdate test    r14, r14 
             40de13     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40DE47 
-            40de15     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40de1f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40de15     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40de1f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40de21     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40de29     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             40de34     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -10943,10 +10943,10 @@
             40dec7      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 ZZ mov     esi, offset aGdict_source_d; "gdict_source_dialog_new" 
             40decc      2 INSTR BELONGTO 40de70 
             40decc      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 ZZ xor     edi, edi 
-            40decc     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40decc     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40dece      2 INSTR BELONGTO 40de70 
             40dece      2 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ xor     ebp, ebp 
-            40dece     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40dece     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40ded0     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40ded0      5 INSTR BELONGTO 40de70 
             40ded0      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ call    _g_return_if_fail_warning 
@@ -11003,13 +11003,13 @@
             40df2c      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 ZZ mov     esi, offset aGdict_source_d; "gdict_source_dialog_new" 
             40df31      2 INSTR BELONGTO 40de70 
             40df31      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 ZZ xor     edi, edi 
-            40df31     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40df31     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40df33     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40df33      5 INSTR BELONGTO 40de70 
             40df33      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ call    _g_return_if_fail_warning 
             40df38      2 INSTR BELONGTO 40de70 
             40df38      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 ZZ xor     ebp, ebp 
-            40df38     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40df38     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40df3a     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40DED5 
             40df3a      2 INSTR BELONGTO 40de70 
             40df40     -1 INSTR LOCAL NoMetaUpdate call    sub_40CF80 
@@ -11023,7 +11023,7 @@
             40df4b      6 INSTR DEADREGS  EFLAGS RAX RCX RSI R8 R9 ZZ mov     r9d, offset aAction; "action" 
             40df51      2 INSTR BELONGTO 40de70 
             40df51      2 INSTR DEADREGS  EFLAGS RAX RCX RSI R8 ZZ xor     eax, eax 
-            40df51     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40df51     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40df53      3 INSTR BELONGTO 40de70 
             40df53      3 INSTR DEADREGS  EFLAGS RCX RSI R8 ZZ mov     r8, r14 
             40df56      5 INSTR BELONGTO 40de70 
@@ -11074,7 +11074,7 @@
             40dfb0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40dfb0      5 INSTR BELONGTO 40de70 
             40dfb0      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _g_type_check_instance_cast 
-            40dfb5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40dfb5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40dfb5      5 INSTR BELONGTO 40de70 
             40dfb5      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 ZZ mov     esi, 1 
             40dfba      3 INSTR BELONGTO 40de70 
@@ -11142,18 +11142,18 @@
             40e00d      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_get_user_cache_dir 
             40e012      2 INSTR BELONGTO 40e000 
             40e012      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 ZZ xor     edx, edx 
-            40e012     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40e012     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40e014      3 INSTR BELONGTO 40e000 
             40e014      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     rdi, rax 
             40e017      5 INSTR BELONGTO 40e000 
             40e017      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 ZZ mov     esi, offset aGnomeDictionar; "gnome-dictionary-3.0" 
             40e01c      2 INSTR BELONGTO 40e000 
             40e01c      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-            40e01c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40e01c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40e01e     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40e01e      5 INSTR BELONGTO 40e000 
             40e01e      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_build_filename 
-            40e023     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1C0h 
+            40e023     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1C0h 
             40e023      5 INSTR BELONGTO 40e000 
             40e023      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, 1C0h 
             40e028      3 INSTR BELONGTO 40e000 
@@ -11162,7 +11162,7 @@
             40e02b      3 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ mov     r12, rax 
             40e02e      2 INSTR BELONGTO 40e000 
             40e02e      2 INSTR DEADREGS  EFLAGS RAX RBX R13 ZZ xor     eax, eax 
-            40e02e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40e02e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40e030     -1 INSTR LOCAL NoMetaUpdate call    _g_mkdir 
             40e030      5 INSTR BELONGTO 40e000 
             40e030      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _g_mkdir 
@@ -11172,14 +11172,14 @@
             40e038      6 INSTR BELONGTO 40e000 
             40e03e      2 INSTR BELONGTO 40e000 
             40e03e      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R13 ZZ xor     edx, edx 
-            40e03e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40e03e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40e040      5 INSTR BELONGTO 40e000 
             40e040      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R13 ZZ mov     esi, offset aWindow_ini; "window.ini" 
             40e045      3 INSTR BELONGTO 40e000 
             40e045      3 INSTR DEADREGS  EFLAGS RAX RBX RDI R13 ZZ mov     rdi, r12 
             40e048      2 INSTR BELONGTO 40e000 
             40e048      2 INSTR DEADREGS  EFLAGS RAX RBX R13 ZZ xor     eax, eax 
-            40e048     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40e048     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40e04a     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40e04a      5 INSTR BELONGTO 40e000 
             40e04a      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _g_build_filename 
@@ -11212,7 +11212,7 @@
             40e085     -1 INSTR LOCAL NoMetaUpdate call    _g_key_file_set_integer 
             40e085      5 INSTR BELONGTO 40e000 
             40e085      5 INSTR DEADREGS  EFLAGS ZZ call    _g_key_file_set_integer 
-            40e08a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movzx   ecx, byte ptr [rbp+160h] 
+            40e08a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movzx   ecx, byte ptr [rbp+160h] 
             40e08a      7 INSTR BELONGTO 40e000 
             40e08a      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ movzx   ecx, byte ptr [rbp+160h] 
             40e091      5 INSTR BELONGTO 40e000 
@@ -11226,7 +11226,7 @@
             40e0a1     -1 INSTR LOCAL NoMetaUpdate call    _g_key_file_set_boolean 
             40e0a1      5 INSTR BELONGTO 40e000 
             40e0a1      5 INSTR DEADREGS  EFLAGS ZZ call    _g_key_file_set_boolean 
-            40e0a6     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movzx   ecx, byte ptr [rbp+160h] 
+            40e0a6     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movzx   ecx, byte ptr [rbp+160h] 
             40e0a6      7 INSTR BELONGTO 40e000 
             40e0a6      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ movzx   ecx, byte ptr [rbp+160h] 
             40e0ad      5 INSTR BELONGTO 40e000 
@@ -11242,7 +11242,7 @@
             40e0bf     -1 INSTR LOCAL NoMetaUpdate call    _g_key_file_set_boolean 
             40e0bf      5 INSTR BELONGTO 40e000 
             40e0bf      5 INSTR DEADREGS  EFLAGS ZZ call    _g_key_file_set_boolean 
-            40e0c4     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movzx   ecx, byte ptr [rbp+160h] 
+            40e0c4     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movzx   ecx, byte ptr [rbp+160h] 
             40e0c4      7 INSTR BELONGTO 40e000 
             40e0c4      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ movzx   ecx, byte ptr [rbp+160h] 
             40e0cb      5 INSTR BELONGTO 40e000 
@@ -11329,15 +11329,15 @@
             40e15f      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, [rax+8] 
             40e163      2 INSTR BELONGTO 40e000 
             40e163      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     edi, edi 
-            40e163     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40e163     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40e165      5 INSTR BELONGTO 40e000 
             40e165      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aUnableToCrea_2; "Unable to create the window state file:"... 
-            40e16a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40e16a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40e16a      5 INSTR BELONGTO 40e000 
             40e16a      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 10h 
             40e16f      2 INSTR BELONGTO 40e000 
             40e16f      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40e16f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40e16f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40e171     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40e171      5 INSTR BELONGTO 40e000 
             40e171      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -11389,15 +11389,15 @@
             40e1bd      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R13 ZZ mov     edx, offset aUnableToCrea_3; "Unable to create a cache directory: %s" 
             40e1c2      3 INSTR BELONGTO 40e000 
             40e1c2      3 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI R13 ZZ mov     rcx, rax 
-            40e1c5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40e1c5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40e1c5      5 INSTR BELONGTO 40e000 
             40e1c5      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R13 ZZ mov     esi, 10h 
             40e1ca      2 INSTR BELONGTO 40e000 
             40e1ca      2 INSTR DEADREGS  EFLAGS RAX RBX RDI R13 ZZ xor     edi, edi 
-            40e1ca     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40e1ca     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40e1cc      2 INSTR BELONGTO 40e000 
             40e1cc      2 INSTR DEADREGS  EFLAGS RAX RBX R13 ZZ xor     eax, eax 
-            40e1cc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40e1cc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40e1ce     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40e1ce      5 INSTR BELONGTO 40e000 
             40e1ce      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _g_log 
@@ -11444,15 +11444,15 @@
             40e20e      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, [rax+8] 
             40e212      2 INSTR BELONGTO 40e000 
             40e212      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     edi, edi 
-            40e212     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40e212     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40e214      5 INSTR BELONGTO 40e000 
             40e214      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aUnableToWriteT; "Unable to write the window state file: "... 
-            40e219     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40e219     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40e219      5 INSTR BELONGTO 40e000 
             40e219      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 10h 
             40e21e      2 INSTR BELONGTO 40e000 
             40e21e      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40e21e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40e21e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40e220     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40e220      5 INSTR BELONGTO 40e000 
             40e220      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -11552,11 +11552,11 @@
             40e2d1     -1 INSTR LOCAL NoMetaUpdate jz      loc_40E3A8 
             40e2d7     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rsi+138h], 0 
             40e2df     -1 INSTR LOCAL NoMetaUpdate jz      loc_40E3B0 
-            40e2e5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40e2e7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40e2e5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40e2e7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             40e2f1     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40e2f6      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
-            40e2fc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40e2fc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40e2fe     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40e30d     -1 INSTR LOCAL NoMetaUpdate test    r12, r12 
             40e310     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40E31B 
@@ -11574,10 +11574,10 @@
             40e380     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_get_type 
             40e38b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e390      3 PTRIMMEDEBP STACK 0 displ mov     rdx, rbp
-            40e393     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40e393     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40e398     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_push 
             40e39d     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40E31B 
-            40e3b0     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 96h 
+            40e3b0     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 96h 
             40e3b5     -1 INSTR LOCAL NoMetaUpdate call    _gdk_cursor_new 
             40e3c8     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40E2E5 
             40e3d0      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
@@ -11596,8 +11596,8 @@
             40e41d      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
             40e422      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
             40e427     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
-            40e430     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40e43a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40e430     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40e43a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40e43c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40e444     -1 INSTR LOCAL NoMetaUpdate call    _gdict_database_chooser_get_type 
             40e450     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -11614,7 +11614,7 @@
             40e48a      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
             40e48e      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
             40e493      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
-            40e498     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40e498     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40e49d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             40e4a1     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_statusbar_push 
             40e4b0      4 PTRIMMEDEBP STACK 1 displ movzx   eax, byte ptr [rbp+1]
@@ -11624,22 +11624,22 @@
             40e4be     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40E500 
             40e4c0     -1 INSTR LOCAL NoMetaUpdate cmp     al, 6Fh 
             40e4c2     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40E419 
-            40e4c8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40e4cd     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40e4c8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40e4cd     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40e4d4     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40e4dc     -1 INSTR LOCAL NoMetaUpdate call    _gdict_source_chooser_get_type 
             40e4e8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e4f0     -1 INSTR LOCAL NoMetaUpdate call    _gdict_source_chooser_refresh 
             40e4f5     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40E45D 
-            40e500     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40e505     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40e500     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40e505     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40e50c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40e514     -1 INSTR LOCAL NoMetaUpdate call    _gdict_strategy_chooser_get_type 
             40e520     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e528     -1 INSTR LOCAL NoMetaUpdate call    _gdict_strategy_chooser_refresh 
             40e52d     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40E45D 
-            40e538     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40e53a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40e538     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40e53a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             40e544     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40e553     -1 INSTR LOCAL NoMetaUpdate test    r12, r12 
             40e556     -1 INSTR LOCAL NoMetaUpdate jz      loc_40E45D 
@@ -11678,7 +11678,7 @@
             40e5bf      7 INSTR DEADREGS  EFLAGS RDI ZZ and     byte ptr [rbx+160h], 0F8h 
             40e5c6      2 INSTR BELONGTO 40e580 
             40e5c6      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; timer 
-            40e5c6     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; timer 
+            40e5c6     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; timer 
             40e5c8      7 INSTR BELONGTO 40e580 
             40e5c8      7 INSTR DEADREGS  EFLAGS ZZ mov     [rbx+130h], rax 
             40e5cf     11 INSTR BELONGTO 40e580 
@@ -11793,7 +11793,7 @@
             40e6d8      6 INSTR BELONGTO 40e650 
             40e6de     -1 INSTR LOCAL NoMetaUpdate test    r13, r13 
             40e6de      3 INSTR BELONGTO 40e650 
-            40e6e1     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40e6e1     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40e6e1      5 INSTR BELONGTO 40e650 
             40e6e1      5 INSTR DEADREGS  RDX RSI RDI R14 ZZ mov     edx, 5          ; category 
             40e6e6     -1 INSTR LOCAL NoMetaUpdate jz      loc_40E7A0 
@@ -11802,7 +11802,7 @@
             40e6ec      5 INSTR DEADREGS  EFLAGS RSI RDI R14 ZZ mov     esi, offset aS  ; "%s - " 
             40e6f1      2 INSTR BELONGTO 40e650 
             40e6f1      2 INSTR DEADREGS  EFLAGS RDI R14 ZZ xor     edi, edi        ; domainname 
-            40e6f1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40e6f1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40e6f3     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40e6f3      5 INSTR BELONGTO 40e650 
             40e6f3      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _dcgettext 
@@ -11812,7 +11812,7 @@
             40e6fb      3 INSTR DEADREGS  EFLAGS RDI R13 R14 ZZ mov     rdi, rax 
             40e6fe      2 INSTR BELONGTO 40e650 
             40e6fe      2 INSTR DEADREGS  EFLAGS RAX R13 R14 ZZ xor     eax, eax 
-            40e6fe     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40e6fe     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40e700     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40e700      5 INSTR BELONGTO 40e650 
             40e700      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _g_strdup_printf 
@@ -11900,7 +11900,7 @@
             40e7a0      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 ZZ mov     esi, offset msgid; "Dictionary" 
             40e7a5      2 INSTR BELONGTO 40e650 
             40e7a5      2 INSTR DEADREGS  EFLAGS RDI R13 R14 ZZ xor     edi, edi        ; domainname 
-            40e7a5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40e7a5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40e7a7     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40e7a7      5 INSTR BELONGTO 40e650 
             40e7a7      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _dcgettext 
@@ -11980,14 +11980,14 @@
             40e827      4 INSTR BELONGTO 40e7c0 
             40e82b      1 INSTR BELONGTO 40e7c0 
             40e82b      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ retn 
-            40e830     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40e830     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40e830      5 INSTR BELONGTO 40e7c0 
             40e830      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 5          ; category 
             40e835      5 INSTR BELONGTO 40e7c0 
             40e835      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aWordSSelected; "Word `%s' selected" 
             40e83a      2 INSTR BELONGTO 40e7c0 
             40e83a      2 INSTR DEADREGS  EFLAGS RDI R12 ZZ xor     edi, edi        ; domainname 
-            40e83a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40e83a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40e83c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40e83c      5 INSTR BELONGTO 40e7c0 
             40e83c      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _dcgettext 
@@ -11997,7 +11997,7 @@
             40e844      3 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     rdi, rax 
             40e847      2 INSTR BELONGTO 40e7c0 
             40e847      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            40e847     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40e847     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40e849     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40e849      5 INSTR BELONGTO 40e7c0 
             40e849      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_strdup_printf 
@@ -12019,7 +12019,7 @@
             40e868      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     rdi, rax 
             40e86b      2 INSTR BELONGTO 40e7c0 
             40e86b      2 INSTR DEADREGS  EFLAGS RSI R12 ZZ xor     esi, esi 
-            40e86b     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40e86b     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40e86d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_push 
             40e86d      5 INSTR BELONGTO 40e7c0 
             40e86d      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _gtk_statusbar_push 
@@ -12153,7 +12153,7 @@
             40e95c      7 INSTR BELONGTO 40e890 
             40e963      3 INSTR BELONGTO 40e890 
             40e963      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     rdi, rbx 
-            40e966     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40e966     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40e966      5 INSTR BELONGTO 40e890 
             40e966      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 50h 
             40e96b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -12215,17 +12215,17 @@
             40e9d7      4 INSTR BELONGTO 40e9b0 
             40e9d7      4 INSTR DEADREGS  EFLAGS RSI R13 ZZ mov     [rsp+38h+var_38], rcx 
             40e9d7      4 PTRIMMEDESP STACK 0 displ mov     [rsp+38h+var_38], rcx
-            40e9db     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+            40e9db     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
             40e9db      5 INSTR BELONGTO 40e9b0 
             40e9db      5 INSTR DEADREGS  EFLAGS RCX RSI R13 ZZ mov     esi, 18h 
             40e9e0      2 INSTR BELONGTO 40e9b0 
             40e9e0      2 INSTR DEADREGS  EFLAGS RCX R13 ZZ xor     ecx, ecx 
-            40e9e0     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40e9e0     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40e9e2      3 INSTR BELONGTO 40e9b0 
             40e9e2      3 INSTR DEADREGS  EFLAGS R13 ZZ mov     r13, rdx 
             40e9e5      2 INSTR BELONGTO 40e9b0 
             40e9e5      2 INSTR DEADREGS  EFLAGS RDX ZZ xor     edx, edx 
-            40e9e5     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40e9e5     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40e9e7      3 INSTR BELONGTO 40e9b0 
             40e9e7      3 INSTR DEADREGS  EFLAGS ZZ mov     rbp, rdi 
             40e9ea     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_handlers_block_matched 
@@ -12243,14 +12243,14 @@
             40e9fa      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R12 ZZ xor     r8d, r8d 
             40e9fd      2 INSTR BELONGTO 40e9b0 
             40e9fd      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R9 R12 ZZ xor     ecx, ecx 
-            40e9fd     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40e9fd     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40e9ff      2 INSTR BELONGTO 40e9b0 
             40e9ff      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R9 R12 ZZ xor     edx, edx 
-            40e9ff     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40e9ff     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ea01     -2 INSTR LOCAL n R9 ZZ  NumericDEFs mov     r9d, offset sub_40E9B0 
             40ea01      6 INSTR BELONGTO 40e9b0 
             40ea01      6 INSTR DEADREGS  EFLAGS RSI RDI R9 R12 ZZ mov     r9d, offset sub_40E9B0 
-            40ea07     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+            40ea07     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
             40ea07      5 INSTR BELONGTO 40e9b0 
             40ea07      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 18h 
             40ea0c      3 INSTR BELONGTO 40e9b0 
@@ -12283,14 +12283,14 @@
             40ea3f      4 INSTR BELONGTO 40e9b0 
             40ea43      1 INSTR BELONGTO 40e9b0 
             40ea43      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 ZZ retn 
-            40ea48     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40ea48     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40ea48      5 INSTR BELONGTO 40e9b0 
             40ea48      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 5          ; category 
             40ea4d      5 INSTR BELONGTO 40e9b0 
             40ea4d      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aDatabaseSSelec; "Database `%s' selected" 
             40ea52      2 INSTR BELONGTO 40e9b0 
             40ea52      2 INSTR DEADREGS  EFLAGS RDI R12 ZZ xor     edi, edi        ; domainname 
-            40ea52     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40ea52     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40ea54     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40ea54      5 INSTR BELONGTO 40e9b0 
             40ea54      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _dcgettext 
@@ -12300,7 +12300,7 @@
             40ea5c      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rax 
             40ea5f      2 INSTR BELONGTO 40e9b0 
             40ea5f      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            40ea5f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ea5f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ea61     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40ea61      5 INSTR BELONGTO 40e9b0 
             40ea61      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_strdup_printf 
@@ -12322,7 +12322,7 @@
             40ea80      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     rdi, rax 
             40ea83      2 INSTR BELONGTO 40e9b0 
             40ea83      2 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 ZZ xor     esi, esi 
-            40ea83     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40ea83     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40ea85     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_push 
             40ea85      5 INSTR BELONGTO 40e9b0 
             40ea85      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _gtk_statusbar_push 
@@ -12458,7 +12458,7 @@
             40eb79      7 INSTR BELONGTO 40eab0 
             40eb80      3 INSTR BELONGTO 40eab0 
             40eb80      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     rdi, rbx 
-            40eb83     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40eb83     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40eb83      5 INSTR BELONGTO 40eab0 
             40eb83      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 50h 
             40eb88     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -12736,7 +12736,7 @@
             40eda6      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 R14 ZZ xor     r8d, r8d 
             40eda9      3 INSTR BELONGTO 40ebd0 
             40eda9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 ZZ mov     rcx, rbx 
-            40edac     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_411710 
+            40edac     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_411710 
             40edac      5 INSTR BELONGTO 40ebd0 
             40edac      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ mov     edx, offset sub_411710 
             40edb1      5 INSTR BELONGTO 40ebd0 
@@ -12752,7 +12752,7 @@
             40edc1      3 INSTR BELONGTO 40ebd0 
             40edc4      3 INSTR BELONGTO 40ebd0 
             40edc4      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 ZZ mov     rcx, rbx 
-            40edc7     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40E2C0 
+            40edc7     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40E2C0 
             40edc7      5 INSTR BELONGTO 40ebd0 
             40edc7      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ mov     edx, offset loc_40E2C0 
             40edcc      5 INSTR BELONGTO 40ebd0 
@@ -12770,7 +12770,7 @@
             40ede2      3 INSTR BELONGTO 40ebd0 
             40ede5      3 INSTR BELONGTO 40ebd0 
             40ede5      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 ZZ mov     rcx, rbx 
-            40ede8     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_4105F0 
+            40ede8     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_4105F0 
             40ede8      5 INSTR BELONGTO 40ebd0 
             40ede8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ mov     edx, offset loc_4105F0 
             40eded      5 INSTR BELONGTO 40ebd0 
@@ -12790,7 +12790,7 @@
             40ee09      3 INSTR BELONGTO 40ebd0 
             40ee0c      3 INSTR BELONGTO 40ebd0 
             40ee0c      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 ZZ mov     rcx, rbx 
-            40ee0f     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_410450 
+            40ee0f     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_410450 
             40ee0f      5 INSTR BELONGTO 40ebd0 
             40ee0f      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ mov     edx, offset loc_410450 
             40ee14      5 INSTR BELONGTO 40ebd0 
@@ -12833,7 +12833,7 @@
             40ee59      7 INSTR BELONGTO 40ebd0 
             40ee60      3 INSTR BELONGTO 40ebd0 
             40ee60      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 ZZ mov     rdi, rbx 
-            40ee63     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40ee63     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40ee63      5 INSTR BELONGTO 40ebd0 
             40ee63      5 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 R14 ZZ mov     esi, 50h 
             40ee68     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -12894,7 +12894,7 @@
             40eec0      7 INSTR DEADREGS  RCX RSI RDI R12 R13 R14 ZZ mov     rbp, [rbx+0E0h] 
             40eec7      5 INSTR BELONGTO 40ebd0 
             40eec7      5 INSTR DEADREGS  RCX RSI RDI R12 R13 R14 ZZ mov     edi, offset aDefault; "Default" 
-            40eecc     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 8 
+            40eecc     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 8 
             40eecc      5 INSTR BELONGTO 40ebd0 
             40eecc      5 INSTR DEADREGS  RCX RSI R12 R13 R14 ZZ mov     ecx, 8 
             40eed1      3 INSTR BELONGTO 40ebd0 
@@ -12903,14 +12903,14 @@
             40eed4      2 INSTR BELONGTO 40ebd0 
             40eed6     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40EF60 
             40eed6      6 INSTR BELONGTO 40ebd0 
-            40eedc     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40eedc     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40eedc      5 INSTR BELONGTO 40ebd0 
             40eedc      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ mov     edx, 5          ; category 
             40eee1      5 INSTR BELONGTO 40ebd0 
             40eee1      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 ZZ mov     esi, offset aNoDictionarySo; "No dictionary source available with nam"... 
             40eee6      2 INSTR BELONGTO 40ebd0 
             40eee6      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 ZZ xor     edi, edi        ; domainname 
-            40eee6     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40eee6     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40eee8     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40eee8      5 INSTR BELONGTO 40ebd0 
             40eee8      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _dcgettext 
@@ -12920,18 +12920,18 @@
             40eef0      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 ZZ mov     rdi, rax 
             40eef3      2 INSTR BELONGTO 40ebd0 
             40eef3      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 ZZ xor     eax, eax 
-            40eef3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40eef3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40eef5     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40eef5      5 INSTR BELONGTO 40ebd0 
             40eef5      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _g_strdup_printf 
-            40eefa     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40eefa     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40eefa      5 INSTR BELONGTO 40ebd0 
             40eefa      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ mov     edx, 5          ; category 
             40eeff      5 INSTR BELONGTO 40ebd0 
             40eeff      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 ZZ mov     esi, offset aUnableToFindDi; "Unable to find dictionary source" 
             40ef04      2 INSTR BELONGTO 40ebd0 
             40ef04      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 ZZ xor     edi, edi        ; domainname 
-            40ef04     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40ef04     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40ef06      3 INSTR BELONGTO 40ebd0 
             40ef06      3 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ mov     rbp, rax 
             40ef09     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -12962,7 +12962,7 @@
             40ef2f      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 ZZ mov     rdi, rbp 
             40ef32      2 INSTR BELONGTO 40ebd0 
             40ef32      2 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ xor     ebp, ebp 
-            40ef32     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40ef32     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40ef34     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40ef34      5 INSTR BELONGTO 40ebd0 
             40ef34      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _g_free 
@@ -13009,14 +13009,14 @@
             40efa0     -1 INSTR LOCAL NoMetaUpdate call    _gdict_source_get_description 
             40efa0      5 INSTR BELONGTO 40ebd0 
             40efa0      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _gdict_source_get_description 
-            40efa5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40efa5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40efa5      5 INSTR BELONGTO 40ebd0 
             40efa5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 ZZ mov     edx, 5          ; category 
             40efaa      3 INSTR BELONGTO 40ebd0 
             40efaa      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 ZZ mov     r13, rax 
             40efad      2 INSTR BELONGTO 40ebd0 
             40efad      2 INSTR DEADREGS  EFLAGS RSI RDI R14 ZZ xor     edi, edi        ; domainname 
-            40efad     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40efad     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40efaf      5 INSTR BELONGTO 40ebd0 
             40efaf      5 INSTR DEADREGS  EFLAGS RSI R14 ZZ mov     esi, offset aNoContextAvail; "No context available for source '%s'" 
             40efb4     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -13028,16 +13028,16 @@
             40efbc      3 INSTR DEADREGS  EFLAGS RDI R13 R14 ZZ mov     rdi, rax 
             40efbf      2 INSTR BELONGTO 40ebd0 
             40efbf      2 INSTR DEADREGS  EFLAGS RAX R13 R14 ZZ xor     eax, eax 
-            40efbf     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40efbf     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40efc1     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40efc1      5 INSTR BELONGTO 40ebd0 
             40efc1      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _g_strdup_printf 
-            40efc6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40efc6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40efc6      5 INSTR BELONGTO 40ebd0 
             40efc6      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 ZZ mov     edx, 5          ; category 
             40efcb      2 INSTR BELONGTO 40ebd0 
             40efcb      2 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 ZZ xor     edi, edi        ; domainname 
-            40efcb     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40efcb     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40efcd      5 INSTR BELONGTO 40ebd0 
             40efcd      5 INSTR DEADREGS  EFLAGS RSI R13 R14 ZZ mov     esi, offset aUnableToCrea_4; "Unable to create a con" 
             40efd2      3 INSTR BELONGTO 40ebd0 
@@ -13109,17 +13109,17 @@
             40f037      4 INSTR BELONGTO 40f010 
             40f037      4 INSTR DEADREGS  EFLAGS RSI R13 ZZ mov     [rsp+38h+var_38], rcx 
             40f037      4 PTRIMMEDESP STACK 0 displ mov     [rsp+38h+var_38], rcx
-            40f03b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+            40f03b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
             40f03b      5 INSTR BELONGTO 40f010 
             40f03b      5 INSTR DEADREGS  EFLAGS RCX RSI R13 ZZ mov     esi, 18h 
             40f040      2 INSTR BELONGTO 40f010 
             40f040      2 INSTR DEADREGS  EFLAGS RCX R13 ZZ xor     ecx, ecx 
-            40f040     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40f040     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40f042      3 INSTR BELONGTO 40f010 
             40f042      3 INSTR DEADREGS  EFLAGS R13 ZZ mov     r13, rdx 
             40f045      2 INSTR BELONGTO 40f010 
             40f045      2 INSTR DEADREGS  EFLAGS RDX ZZ xor     edx, edx 
-            40f045     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40f045     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40f047      3 INSTR BELONGTO 40f010 
             40f047      3 INSTR DEADREGS  EFLAGS ZZ mov     rbp, rdi 
             40f04a     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_handlers_block_matched 
@@ -13137,14 +13137,14 @@
             40f05a      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R12 ZZ xor     r8d, r8d 
             40f05d      2 INSTR BELONGTO 40f010 
             40f05d      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R9 R12 ZZ xor     ecx, ecx 
-            40f05d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40f05d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40f05f      2 INSTR BELONGTO 40f010 
             40f05f      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R9 R12 ZZ xor     edx, edx 
-            40f05f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40f05f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40f061     -2 INSTR LOCAL n R9 ZZ  NumericDEFs mov     r9d, offset sub_40F010 
             40f061      6 INSTR BELONGTO 40f010 
             40f061      6 INSTR DEADREGS  EFLAGS RSI RDI R9 R12 ZZ mov     r9d, offset sub_40F010 
-            40f067     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+            40f067     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
             40f067      5 INSTR BELONGTO 40f010 
             40f067      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 18h 
             40f06c      3 INSTR BELONGTO 40f010 
@@ -13177,14 +13177,14 @@
             40f09f      4 INSTR BELONGTO 40f010 
             40f0a3      1 INSTR BELONGTO 40f010 
             40f0a3      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 ZZ retn 
-            40f0a8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40f0a8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40f0a8      5 INSTR BELONGTO 40f010 
             40f0a8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 5          ; category 
             40f0ad      5 INSTR BELONGTO 40f010 
             40f0ad      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aStrategySSelec; "Strategy `%s' selected" 
             40f0b2      2 INSTR BELONGTO 40f010 
             40f0b2      2 INSTR DEADREGS  EFLAGS RDI R12 ZZ xor     edi, edi        ; domainname 
-            40f0b2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40f0b2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40f0b4     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40f0b4      5 INSTR BELONGTO 40f010 
             40f0b4      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _dcgettext 
@@ -13194,7 +13194,7 @@
             40f0bc      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rax 
             40f0bf      2 INSTR BELONGTO 40f010 
             40f0bf      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            40f0bf     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40f0bf     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40f0c1     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40f0c1      5 INSTR BELONGTO 40f010 
             40f0c1      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_strdup_printf 
@@ -13216,7 +13216,7 @@
             40f0e0      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     rdi, rax 
             40f0e3      2 INSTR BELONGTO 40f010 
             40f0e3      2 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 ZZ xor     esi, esi 
-            40f0e3     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40f0e3     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40f0e5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_push 
             40f0e5      5 INSTR BELONGTO 40f010 
             40f0e5      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _gtk_statusbar_push 
@@ -13267,17 +13267,17 @@
             40f137      4 INSTR BELONGTO 40f110 
             40f137      4 INSTR DEADREGS  EFLAGS RSI R13 ZZ mov     [rsp+38h+var_38], rcx 
             40f137      4 PTRIMMEDESP STACK 0 displ mov     [rsp+38h+var_38], rcx
-            40f13b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+            40f13b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
             40f13b      5 INSTR BELONGTO 40f110 
             40f13b      5 INSTR DEADREGS  EFLAGS RCX RSI R13 ZZ mov     esi, 18h 
             40f140      2 INSTR BELONGTO 40f110 
             40f140      2 INSTR DEADREGS  EFLAGS RCX R13 ZZ xor     ecx, ecx 
-            40f140     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40f140     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40f142      3 INSTR BELONGTO 40f110 
             40f142      3 INSTR DEADREGS  EFLAGS R13 ZZ mov     r13, rdx 
             40f145      2 INSTR BELONGTO 40f110 
             40f145      2 INSTR DEADREGS  EFLAGS RDX ZZ xor     edx, edx 
-            40f145     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40f145     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40f147      3 INSTR BELONGTO 40f110 
             40f147      3 INSTR DEADREGS  EFLAGS ZZ mov     rbp, rdi 
             40f14a     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_handlers_block_matched 
@@ -13294,13 +13294,13 @@
             40f15a      3 INSTR BELONGTO 40f110 
             40f15d      2 INSTR BELONGTO 40f110 
             40f15d      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R9 R12 ZZ xor     ecx, ecx 
-            40f15d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40f15d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40f15f      2 INSTR BELONGTO 40f110 
             40f15f      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R9 R12 ZZ xor     edx, edx 
-            40f15f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40f15f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40f161     -1 INSTR LOCAL MetadataRedundant mov     r9d, offset sub_40F110 
             40f161      6 INSTR BELONGTO 40f110 
-            40f167     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+            40f167     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
             40f167      5 INSTR BELONGTO 40f110 
             40f167      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 18h 
             40f16c      3 INSTR BELONGTO 40f110 
@@ -13338,7 +13338,7 @@
             40f1ab     -1 INSTR LOCAL NoMetaUpdate call    _gdict_source_get_description 
             40f1ab      5 INSTR BELONGTO 40f110 
             40f1ab      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _gdict_source_get_description 
-            40f1b0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40f1b0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40f1b0      5 INSTR BELONGTO 40f110 
             40f1b0      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     edx, 5          ; category 
             40f1b5      3 INSTR BELONGTO 40f110 
@@ -13347,7 +13347,7 @@
             40f1b8      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, offset aDictionarySour; "Dictionary source `%s' selected" 
             40f1bd      2 INSTR BELONGTO 40f110 
             40f1bd      2 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ xor     edi, edi        ; domainname 
-            40f1bd     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40f1bd     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40f1bf     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40f1bf      5 INSTR BELONGTO 40f110 
             40f1bf      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _dcgettext 
@@ -13357,7 +13357,7 @@
             40f1c7      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rax 
             40f1ca      2 INSTR BELONGTO 40f110 
             40f1ca      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            40f1ca     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40f1ca     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40f1cc     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40f1cc      5 INSTR BELONGTO 40f110 
             40f1cc      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_strdup_printf 
@@ -13379,7 +13379,7 @@
             40f1eb      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     rdi, rax 
             40f1ee      2 INSTR BELONGTO 40f110 
             40f1ee      2 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 ZZ xor     esi, esi 
-            40f1ee     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40f1ee     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40f1f0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_push 
             40f1f0      5 INSTR BELONGTO 40f110 
             40f1f0      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _gtk_statusbar_push 
@@ -13457,10 +13457,10 @@
             40f274     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 170h 
             40f274      6 INSTR BELONGTO 40f220 
             40f274      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 170h 
-            40f27a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_4123D0 
+            40f27a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_4123D0 
             40f27a      5 INSTR BELONGTO 40f220 
             40f27a      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset sub_4123D0 
-            40f27f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 438h 
+            40f27f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 438h 
             40f27f      5 INSTR BELONGTO 40f220 
             40f27f      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 438h 
             40f284      7 INSTR BELONGTO 40f220 
@@ -13528,37 +13528,37 @@
             40f2d1      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40f2d7      5 INSTR BELONGTO 40f2a0 
             40f2d7      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_window_s; "gdict_window_set_sidebar_visible" 
-            40f2dc     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0E8h 
+            40f2dc     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0E8h 
             40f2dc      5 INSTR BELONGTO 40f2a0 
             40f2dc      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 0E8h 
             40f2e1      5 INSTR BELONGTO 40f2a0 
             40f2e1      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40f2e6      2 INSTR BELONGTO 40f2a0 
             40f2e6      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40f2e6     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f2e6     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f2e8     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40f2e8      5 INSTR BELONGTO 40f2a0 
             40f2e8      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
             40f2ed      3 INSTR BELONGTO 40f2a0 
-            40f2f0     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rbx+160h] 
+            40f2f0     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rbx+160h] 
             40f2f0      7 INSTR BELONGTO 40f2a0 
             40f2f0      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ movzx   eax, byte ptr [rbx+160h] 
             40f2f7     -1 INSTR LOCAL NoMetaUpdate test    ebp, ebp 
             40f2f7      2 INSTR BELONGTO 40f2a0 
-            40f2f9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setnz   dl 
+            40f2f9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setnz   dl 
             40f2f9      3 INSTR BELONGTO 40f2a0 
             40f2f9      3 INSTR DEADREGS  RCX RDX RSI RDI ZZ setnz   dl 
-            40f2fc     -2 INSTR LOCAL n EDI ZZ  NumericDEFs movzx   edi, dl 
+            40f2fc     -2 INSTR LOCAL n RDI ZZ  NumericDEFs movzx   edi, dl 
             40f2fc      3 INSTR BELONGTO 40f2a0 
             40f2fc      3 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ movzx   edi, dl 
             40f2ff      2 INSTR BELONGTO 40f2a0 
             40f2ff      2 INSTR DEADREGS  EFLAGS RCX RSI ZZ mov     ecx, eax 
-            40f2ff     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, eax 
+            40f2ff     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, eax 
             40f301     -1 INSTR LOCAL MetadataRedundant shr     cl, 1 
             40f301      2 INSTR BELONGTO 40f2a0 
             40f303      2 INSTR BELONGTO 40f2a0 
             40f303      2 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, ecx 
-            40f303     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, ecx 
+            40f303     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, ecx 
             40f305     -1 INSTR LOCAL MetadataRedundant and     esi, 1 
             40f305      3 INSTR BELONGTO 40f2a0 
             40f308     -1 INSTR LOCAL NoMetaUpdate cmp     esi, edi 
@@ -13567,7 +13567,7 @@
             40f30a      2 INSTR BELONGTO 40f2a0 
             40f30c     -1 INSTR LOCAL 2ndSrcNumeric add     edx, edx 
             40f30c      2 INSTR BELONGTO 40f2a0 
-            40f30e     -2 INSTR LOCAL n EAX ZZ  NumericDEFs and     eax, 0FFFFFFFDh 
+            40f30e     -2 INSTR LOCAL n RAX ZZ  NumericDEFs and     eax, 0FFFFFFFDh 
             40f30e      3 INSTR BELONGTO 40f2a0 
             40f30e      3 INSTR DEADREGS  EFLAGS RDI ZZ and     eax, 0FFFFFFFDh 
             40f311      4 INSTR BELONGTO 40f2a0 
@@ -13719,14 +13719,14 @@
             40f482      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40f488      5 INSTR BELONGTO 40f450 
             40f488      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_window_c; "gdict_window_cmd_view_statusbar" 
-            40f48d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 460h 
+            40f48d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 460h 
             40f48d      5 INSTR BELONGTO 40f450 
             40f48d      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 460h 
             40f492      5 INSTR BELONGTO 40f450 
             40f492      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40f497      2 INSTR BELONGTO 40f450 
             40f497      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40f497     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f497     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f499     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40f499      5 INSTR BELONGTO 40f450 
             40f499      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -13737,7 +13737,7 @@
             40f4a3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_action_get_active 
             40f4a3      5 INSTR BELONGTO 40f450 
             40f4a3      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_toggle_action_get_active 
-            40f4a8     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [rbx+160h] 
+            40f4a8     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [rbx+160h] 
             40f4a8      7 INSTR BELONGTO 40f450 
             40f4a8      7 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R9 R10 R11 ZZ movzx   edx, byte ptr [rbx+160h] 
             40f4af     -1 INSTR LOCAL MetadataRedundant and     eax, 1 
@@ -13825,14 +13825,14 @@
             40f522      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40f528      5 INSTR BELONGTO 40f4f0 
             40f528      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_window_0; "gdict_window_cmd_view_sidebar" 
-            40f52d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 452h 
+            40f52d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 452h 
             40f52d      5 INSTR BELONGTO 40f4f0 
             40f52d      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 452h 
             40f532      5 INSTR BELONGTO 40f4f0 
             40f532      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40f537      2 INSTR BELONGTO 40f4f0 
             40f537      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40f537     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f537     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f539     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40f539      5 INSTR BELONGTO 40f4f0 
             40f539      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -13843,7 +13843,7 @@
             40f543     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_action_get_active 
             40f543      5 INSTR BELONGTO 40f4f0 
             40f543      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_toggle_action_get_active 
-            40f548     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [rbx+160h] 
+            40f548     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [rbx+160h] 
             40f548      7 INSTR BELONGTO 40f4f0 
             40f548      7 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R9 R10 R11 ZZ movzx   edx, byte ptr [rbx+160h] 
             40f54f      3 INSTR BELONGTO 40f4f0 
@@ -13922,14 +13922,14 @@
             40f5ba      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40f5c0      5 INSTR BELONGTO 40f590 
             40f5c0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_window_1; "gdict_window_cmd_escape" 
-            40f5c5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4F9h 
+            40f5c5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4F9h 
             40f5c5      5 INSTR BELONGTO 40f590 
             40f5c5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 4F9h 
             40f5ca      5 INSTR BELONGTO 40f590 
             40f5ca      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40f5cf      2 INSTR BELONGTO 40f590 
             40f5cf      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40f5cf     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f5cf     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f5d1     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40f5d1      5 INSTR BELONGTO 40f590 
             40f5d1      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -13994,14 +13994,14 @@
             40f62a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40f630      5 INSTR BELONGTO 40f600 
             40f630      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_window_2; "gdict_window_cmd_lookup" 
-            40f635     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4F0h 
+            40f635     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4F0h 
             40f635      5 INSTR BELONGTO 40f600 
             40f635      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 4F0h 
             40f63a      5 INSTR BELONGTO 40f600 
             40f63a      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40f63f      2 INSTR BELONGTO 40f600 
             40f63f      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40f63f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f63f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f641     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40f641      5 INSTR BELONGTO 40f600 
             40f641      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -14054,14 +14054,14 @@
             40f68a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40f690      5 INSTR BELONGTO 40f660 
             40f690      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_window_3; "gdict_window_cmd_help_about" 
-            40f695     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4E7h 
+            40f695     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4E7h 
             40f695      5 INSTR BELONGTO 40f660 
             40f695      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 4E7h 
             40f69a      5 INSTR BELONGTO 40f660 
             40f69a      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40f69f      2 INSTR BELONGTO 40f660 
             40f69f      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40f69f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f69f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f6a1     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40f6a1      5 INSTR BELONGTO 40f660 
             40f6a1      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -14137,7 +14137,7 @@
             40f71a      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset aGdict_window_4; "gdict_window_cmd_help_contents" 
             40f71f      2 INSTR BELONGTO 40f6d0 
             40f71f      2 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ xor     edi, edi 
-            40f71f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f71f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f721     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40f721      5 INSTR BELONGTO 40f6d0 
             40f721      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
@@ -14193,12 +14193,12 @@
             40f778      3 INSTR BELONGTO 40f6d0 
             40f77b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40F726 
             40f77b      2 INSTR BELONGTO 40f6d0 
-            40f77d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40f77d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40f77d      5 INSTR BELONGTO 40f6d0 
             40f77d      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             40f782      2 INSTR BELONGTO 40f6d0 
             40f782      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            40f782     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40f782     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40f784      5 INSTR BELONGTO 40f6d0 
             40f784      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aThereWasAnErro; "There was an error while displaying hel"... 
             40f789     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -14275,14 +14275,14 @@
             40f7ea      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40f7f0      5 INSTR BELONGTO 40f7c0 
             40f7f0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_window_5; "gdict_window_cmd_view_strategies" 
-            40f7f5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 485h 
+            40f7f5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 485h 
             40f7f5      5 INSTR BELONGTO 40f7c0 
             40f7f5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 485h 
             40f7fa      5 INSTR BELONGTO 40f7c0 
             40f7fa      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40f7ff      2 INSTR BELONGTO 40f7c0 
             40f7ff      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40f7ff     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f7ff     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f801     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40f801      5 INSTR BELONGTO 40f7c0 
             40f801      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -14354,14 +14354,14 @@
             40f86a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40f870      5 INSTR BELONGTO 40f840 
             40f870      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_window_6; "gdict_window_cmd_view_databases" 
-            40f875     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 47Ah 
+            40f875     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 47Ah 
             40f875      5 INSTR BELONGTO 40f840 
             40f875      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 47Ah 
             40f87a      5 INSTR BELONGTO 40f840 
             40f87a      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40f87f      2 INSTR BELONGTO 40f840 
             40f87f      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40f87f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f87f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f881     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40f881      5 INSTR BELONGTO 40f840 
             40f881      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -14433,14 +14433,14 @@
             40f8ea      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40f8f0      5 INSTR BELONGTO 40f8c0 
             40f8f0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_window_7; "gdict_window_cmd_view_sources" 
-            40f8f5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 490h 
+            40f8f5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 490h 
             40f8f5      5 INSTR BELONGTO 40f8c0 
             40f8f5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 490h 
             40f8fa      5 INSTR BELONGTO 40f8c0 
             40f8fa      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40f8ff      2 INSTR BELONGTO 40f8c0 
             40f8ff      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40f8ff     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f8ff     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f901     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40f901      5 INSTR BELONGTO 40f8c0 
             40f901      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -14512,14 +14512,14 @@
             40f96a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40f970      5 INSTR BELONGTO 40f940 
             40f970      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_window_8; "gdict_window_cmd_view_speller" 
-            40f975     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 46Fh 
+            40f975     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 46Fh 
             40f975      5 INSTR BELONGTO 40f940 
             40f975      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 46Fh 
             40f97a      5 INSTR BELONGTO 40f940 
             40f97a      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40f97f      2 INSTR BELONGTO 40f940 
             40f97f      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40f97f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f97f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f981     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40f981      5 INSTR BELONGTO 40f940 
             40f981      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -14597,14 +14597,14 @@
             40f9fc      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40fa02      5 INSTR BELONGTO 40f9c0 
             40fa02      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     ecx, offset aGdict_window_9; "gdict_window_cmd_go_last_def" 
-            40fa07     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4C5h 
+            40fa07     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4C5h 
             40fa07      5 INSTR BELONGTO 40f9c0 
             40fa07      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 4C5h 
             40fa0c      5 INSTR BELONGTO 40f9c0 
             40fa0c      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40fa11      2 INSTR BELONGTO 40f9c0 
             40fa11      2 INSTR DEADREGS  EFLAGS RDI R12 ZZ xor     edi, edi 
-            40fa11     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40fa11     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40fa13     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40fa13      5 INSTR BELONGTO 40f9c0 
             40fa13      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_assertion_message_expr 
@@ -14707,14 +14707,14 @@
             40faba      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40fac0      5 INSTR BELONGTO 40fa90 
             40fac0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_windo_10; "gdict_window_cmd_go_first_def" 
-            40fac5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 49Bh 
+            40fac5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 49Bh 
             40fac5      5 INSTR BELONGTO 40fa90 
             40fac5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 49Bh 
             40faca      5 INSTR BELONGTO 40fa90 
             40faca      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40facf      2 INSTR BELONGTO 40fa90 
             40facf      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40facf     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40facf     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40fad1     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40fad1      5 INSTR BELONGTO 40fa90 
             40fad1      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -14788,14 +14788,14 @@
             40fb3f      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40fb45      5 INSTR BELONGTO 40fb10 
             40fb45      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_windo_11; "gdict_window_cmd_go_next_def" 
-            40fb4a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4B4h 
+            40fb4a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4B4h 
             40fb4a      5 INSTR BELONGTO 40fb10 
             40fb4a      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 4B4h 
             40fb4f      5 INSTR BELONGTO 40fb10 
             40fb4f      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40fb54      2 INSTR BELONGTO 40fb10 
             40fb54      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40fb54     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40fb54     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40fb56     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40fb56      5 INSTR BELONGTO 40fb10 
             40fb56      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -14915,14 +14915,14 @@
             40fc0f      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40fc15      5 INSTR BELONGTO 40fbe0 
             40fc15      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_windo_12; "gdict_window_cmd_go_previous_def" 
-            40fc1a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4A6h 
+            40fc1a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4A6h 
             40fc1a      5 INSTR BELONGTO 40fbe0 
             40fc1a      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 4A6h 
             40fc1f      5 INSTR BELONGTO 40fbe0 
             40fc1f      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40fc24      2 INSTR BELONGTO 40fbe0 
             40fc24      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40fc24     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40fc24     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40fc26     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40fc26      5 INSTR BELONGTO 40fbe0 
             40fc26      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -15016,28 +15016,28 @@
             40fcbc      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40fcc2      5 INSTR BELONGTO 40fc80 
             40fcc2      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     ecx, offset aGdict_windo_13; "gdict_window_cmd_edit_preferences" 
-            40fcc7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 447h 
+            40fcc7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 447h 
             40fcc7      5 INSTR BELONGTO 40fc80 
             40fcc7      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 447h 
             40fccc      5 INSTR BELONGTO 40fc80 
             40fccc      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40fcd1      2 INSTR BELONGTO 40fc80 
             40fcd1      2 INSTR DEADREGS  EFLAGS RDI R12 ZZ xor     edi, edi 
-            40fcd1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40fcd1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40fcd3     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40fcd3      5 INSTR BELONGTO 40fc80 
             40fcd3      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_assertion_message_expr 
             40fcd8      8 INSTR BELONGTO 40fc80 
             40fce0      7 INSTR BELONGTO 40fc80 
             40fce0      7 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     r12, [rbx+0E8h] 
-            40fce7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40fce7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40fce7      5 INSTR BELONGTO 40fc80 
             40fce7      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             40fcec      5 INSTR BELONGTO 40fc80 
             40fcec      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aDictionaryPref; "Dictionary Preferences" 
             40fcf1      2 INSTR BELONGTO 40fc80 
             40fcf1      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            40fcf1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40fcf1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40fcf3     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40fcf3      5 INSTR BELONGTO 40fc80 
             40fcf3      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -15112,14 +15112,14 @@
             40fd5a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40fd60      5 INSTR BELONGTO 40fd30 
             40fd60      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_windo_14; "gdict_window_cmd_edit_find_previous" 
-            40fd65     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 43Eh 
+            40fd65     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 43Eh 
             40fd65      5 INSTR BELONGTO 40fd30 
             40fd65      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 43Eh 
             40fd6a      5 INSTR BELONGTO 40fd30 
             40fd6a      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40fd6f      2 INSTR BELONGTO 40fd30 
             40fd6f      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40fd6f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40fd6f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40fd71     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40fd71      5 INSTR BELONGTO 40fd30 
             40fd71      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -15182,14 +15182,14 @@
             40fdca      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40fdd0      5 INSTR BELONGTO 40fda0 
             40fdd0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_windo_15; "gdict_window_cmd_edit_find_next" 
-            40fdd5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 435h 
+            40fdd5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 435h 
             40fdd5      5 INSTR BELONGTO 40fda0 
             40fdd5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 435h 
             40fdda      5 INSTR BELONGTO 40fda0 
             40fdda      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40fddf      2 INSTR BELONGTO 40fda0 
             40fddf      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40fddf     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40fddf     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40fde1     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40fde1      5 INSTR BELONGTO 40fda0 
             40fde1      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -15252,14 +15252,14 @@
             40fe3a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40fe40      5 INSTR BELONGTO 40fe10 
             40fe40      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_windo_16; "gdict_window_cmd_edit_find" 
-            40fe45     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 42Ch 
+            40fe45     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 42Ch 
             40fe45      5 INSTR BELONGTO 40fe10 
             40fe45      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 42Ch 
             40fe4a      5 INSTR BELONGTO 40fe10 
             40fe4a      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40fe4f      2 INSTR BELONGTO 40fe10 
             40fe4f      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40fe4f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40fe4f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40fe51     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40fe51      5 INSTR BELONGTO 40fe10 
             40fe51      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -15324,14 +15324,14 @@
             40feba      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40fec0      5 INSTR BELONGTO 40fe90 
             40fec0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_windo_17; "gdict_window_cmd_edit_select_all" 
-            40fec5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 423h 
+            40fec5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 423h 
             40fec5      5 INSTR BELONGTO 40fe90 
             40fec5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 423h 
             40feca      5 INSTR BELONGTO 40fe90 
             40feca      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40fecf      2 INSTR BELONGTO 40fe90 
             40fecf      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40fecf     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40fecf     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40fed1     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40fed1      5 INSTR BELONGTO 40fe90 
             40fed1      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -15398,19 +15398,19 @@
             40ff37      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40ff3d      5 INSTR BELONGTO 40ff00 
             40ff3d      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_windo_18; "gdict_window_cmd_edit_copy" 
-            40ff42     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 419h 
+            40ff42     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 419h 
             40ff42      5 INSTR BELONGTO 40ff00 
             40ff42      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 419h 
             40ff47      5 INSTR BELONGTO 40ff00 
             40ff47      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40ff4c      2 INSTR BELONGTO 40ff00 
             40ff4c      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40ff4c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40ff4c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40ff4e     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40ff4e      5 INSTR BELONGTO 40ff00 
             40ff4e      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
             40ff53      5 INSTR BELONGTO 40ff00 
-            40ff58     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 45h 
+            40ff58     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 45h 
             40ff58      5 INSTR BELONGTO 40ff00 
             40ff58      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 45h 
             40ff5d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_clipboard_get 
@@ -15492,14 +15492,14 @@
             40ffd2      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             40ffd8      5 INSTR BELONGTO 40ffa0 
             40ffd8      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_windo_19; "gdict_window_cmd_file_close_window" 
-            40ffdd     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 409h 
+            40ffdd     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 409h 
             40ffdd      5 INSTR BELONGTO 40ffa0 
             40ffdd      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 409h 
             40ffe2      5 INSTR BELONGTO 40ffa0 
             40ffe2      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             40ffe7      2 INSTR BELONGTO 40ffa0 
             40ffe7      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40ffe7     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40ffe7     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40ffe9     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40ffe9      5 INSTR BELONGTO 40ffa0 
             40ffe9      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -15592,14 +15592,14 @@
             41005f      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             410065      5 INSTR BELONGTO 410030 
             410065      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_windo_20; "gdict_window_cmd_file_print" 
-            41006a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3FFh 
+            41006a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3FFh 
             41006a      5 INSTR BELONGTO 410030 
             41006a      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 3FFh 
             41006f      5 INSTR BELONGTO 410030 
             41006f      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             410074      2 INSTR BELONGTO 410030 
             410074      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            410074     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            410074     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             410076     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             410076      5 INSTR BELONGTO 410030 
             410076      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -15688,14 +15688,14 @@
             4100ef      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             4100f5      5 INSTR BELONGTO 4100c0 
             4100f5      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_windo_21; "gdict_window_cmd_file_preview" 
-            4100fa     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3F5h 
+            4100fa     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3F5h 
             4100fa      5 INSTR BELONGTO 4100c0 
             4100fa      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 3F5h 
             4100ff      5 INSTR BELONGTO 4100c0 
             4100ff      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             410104      2 INSTR BELONGTO 4100c0 
             410104      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            410104     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            410104     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             410106     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             410106      5 INSTR BELONGTO 4100c0 
             410106      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -15792,14 +15792,14 @@
             41019b      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 R14 R15 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             4101a1      5 INSTR BELONGTO 410150 
             4101a1      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 R15 ZZ mov     ecx, offset aGdict_windo_22; "gdict_window_cmd_save_as" 
-            4101a6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3C0h 
+            4101a6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3C0h 
             4101a6      5 INSTR BELONGTO 410150 
             4101a6      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 3C0h 
             4101ab      5 INSTR BELONGTO 410150 
             4101ab      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             4101b0      2 INSTR BELONGTO 410150 
             4101b0      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            4101b0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4101b0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4101b2     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             4101b2      5 INSTR BELONGTO 410150 
             4101b2      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_assertion_message_expr 
@@ -15818,10 +15818,10 @@
             4101ce      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_type_check_instance_cast 
             4101d3      2 INSTR BELONGTO 410150 
             4101d3      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            4101d3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4101d3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4101d5      3 INSTR BELONGTO 410150 
             4101d5      3 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 ZZ mov     r12, rax 
-            4101d8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4101d8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4101d8      5 INSTR BELONGTO 410150 
             4101d8      5 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 R15 ZZ mov     edx, 5          ; category 
             4101dd      5 INSTR BELONGTO 410150 
@@ -15836,7 +15836,7 @@
             4101ed      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R14 R15 ZZ mov     r8d, 0FFFFFFFAh 
             4101f3      5 INSTR BELONGTO 410150 
             4101f3      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 ZZ mov     ecx, offset aGtkCancel; "gtk-cancel" 
-            4101f8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4101f8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4101f8      5 INSTR BELONGTO 410150 
             4101f8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 ZZ mov     edx, 1 
             4101fd      3 INSTR BELONGTO 410150 
@@ -15845,7 +15845,7 @@
             410200      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ mov     rdi, rax 
             410203      2 INSTR BELONGTO 410150 
             410203      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 ZZ xor     eax, eax 
-            410203     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410203     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410205     -1 INSTR LOCAL MetadataUnused mov     [rsp+68h+var_60], 0 
             410205      9 INSTR BELONGTO 410150 
             41020e      7 INSTR BELONGTO 410150 
@@ -15868,7 +15868,7 @@
             41022b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             41022b      5 INSTR BELONGTO 410150 
             41022b      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _g_type_check_instance_cast 
-            410230     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            410230     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             410230      5 INSTR BELONGTO 410150 
             410230      5 INSTR DEADREGS  EFLAGS RSI RDI R14 R15 ZZ mov     esi, 1 
             410235      3 INSTR BELONGTO 410150 
@@ -15895,12 +15895,12 @@
             410256     -1 INSTR LOCAL NoMetaUpdate call    _gtk_file_chooser_set_current_folder 
             410256      5 INSTR BELONGTO 410150 
             410256      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _gtk_file_chooser_set_current_folder 
-            41025b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            41025b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             41025b      5 INSTR BELONGTO 410150 
             41025b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 R15 ZZ mov     edx, 5          ; category 
             410260      2 INSTR BELONGTO 410150 
             410260      2 INSTR DEADREGS  EFLAGS RSI RDI R14 R15 ZZ xor     edi, edi        ; domainname 
-            410260     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            410260     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             410262      5 INSTR BELONGTO 410150 
             410262      5 INSTR DEADREGS  EFLAGS RSI R14 R15 ZZ mov     esi, offset aUntitledDocume; "Untitled document" 
             410267     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -16020,14 +16020,14 @@
             410328      6 PTRIMMEDESP STACK 40 displ cmp     [rsp+68h+var_40], 0
             41032e     -1 INSTR LOCAL NoMetaUpdate jz      short loc_41037E 
             41032e      2 INSTR BELONGTO 410150 
-            410330     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            410330     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             410330      5 INSTR BELONGTO 410150 
             410330      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     edx, 5          ; category 
             410335      5 INSTR BELONGTO 410150 
             410335      5 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     esi, offset aErrorWhileWrit; "Error while writing to '%s'" 
             41033a      2 INSTR BELONGTO 410150 
             41033a      2 INSTR DEADREGS  EFLAGS RDI R15 ZZ xor     edi, edi        ; domainname 
-            41033a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            41033a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             41033c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             41033c      5 INSTR BELONGTO 410150 
             41033c      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _dcgettext 
@@ -16037,7 +16037,7 @@
             410344      3 INSTR DEADREGS  EFLAGS RDI R15 ZZ mov     rdi, rax 
             410347      2 INSTR BELONGTO 410150 
             410347      2 INSTR DEADREGS  EFLAGS RAX R15 ZZ xor     eax, eax 
-            410347     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410347     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410349     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             410349      5 INSTR BELONGTO 410150 
             410349      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _g_strdup_printf 
@@ -16132,14 +16132,14 @@
             4103ce      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             4103d4      5 INSTR BELONGTO 4103a0 
             4103d4      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     ecx, offset aGdict_window_e; "gdict_window_ensure_menu_state" 
-            4103d9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0D2h 
+            4103d9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0D2h 
             4103d9      5 INSTR BELONGTO 4103a0 
             4103d9      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 0D2h 
             4103de      5 INSTR BELONGTO 4103a0 
             4103de      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             4103e3      2 INSTR BELONGTO 4103a0 
             4103e3      2 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ xor     edi, edi 
-            4103e3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4103e3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4103e5     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             4103e5      5 INSTR BELONGTO 4103a0 
             4103e5      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_assertion_message_expr 
@@ -16168,7 +16168,7 @@
             410419      3 INSTR BELONGTO 4103a0 
             41041c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_410429 
             41041c      2 INSTR BELONGTO 4103a0 
-            41041e     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, r12d 
+            41041e     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, r12d 
             41041e      3 INSTR BELONGTO 4103a0 
             41041e      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, r12d 
             410421      3 INSTR BELONGTO 4103a0 
@@ -16201,7 +16201,7 @@
             41046e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
             410479     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410481     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_window 
-            410486     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            410486     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             41048b     -1 INSTR LOCAL NoMetaUpdate call    _gdk_window_set_cursor 
             410490     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rbx+90h], 0 
             410498     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4104A3 
@@ -16218,15 +16218,15 @@
             4104de      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
             4104e3     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
             4104e7     -1 INSTR LOCAL NoMetaUpdate jmp     sub_4103A0 
-            4104f0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            4104f5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4104f0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4104f5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4104fc     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             410504     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_get_type 
             410513     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            41051b     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            41051b     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             410520     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_push 
             410525     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4104A3 
-            410533     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            410533     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             410538     -1 INSTR LOCAL NoMetaUpdate call    sub_40F2A0 
             41053d     -1 INSTR LOCAL NoMetaUpdate call    sub_40BC50 
             410549     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -16254,8 +16254,8 @@
             41061b      3 PTRIMMEDEBP STACK -1 displ lea     eax, [rbp-1]
             41061e     -1 INSTR LOCAL NoMetaUpdate test    ebp, ebp 
             410626     -1 INSTR LOCAL NoMetaUpdate jnz     loc_4107E0 
-            41062c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            410636     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            41062c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            410636     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             410638     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             410640     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
             41064f     -1 INSTR LOCAL NoMetaUpdate test    r13, r13 
@@ -16285,14 +16285,14 @@
             410717      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
             41071a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_append 
             41072d     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            410733     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            410733     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             410735      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
-            410738     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410738     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             41073a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_set 
             41073f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
             41074a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410752     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_window 
-            410757     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            410757     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             41075c     -1 INSTR LOCAL NoMetaUpdate call    _gdk_window_set_cursor 
             410764     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             41076c     -1 INSTR LOCAL NoMetaUpdate call    sub_4103A0 
@@ -16306,22 +16306,22 @@
             410798     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
             4107a3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4107ab     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_window 
-            4107b0     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4107b0     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4107b5     -1 INSTR LOCAL NoMetaUpdate call    _gdk_window_set_cursor 
             4107bd     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             4107c9     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             4107d9     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_410769 
             4107e0     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM movsxd  rcx, ebp 
             4107e3     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 5 
-            4107f3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4107f3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4107f5     -1 INSTR LOCAL NoMetaUpdate call    _dcngettext 
             4107fa      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
-            4107ff     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4107ff     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410801     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             410809     -1 INSTR LOCAL NoMetaUpdate jmp     loc_410648 
             410810     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_get_type 
             41081b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            410823     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            410823     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             410828     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_push 
             41082d     -1 INSTR LOCAL NoMetaUpdate jmp     loc_410661 
             410840     -3 INSTR LOCAL NoWarn push    r15 
@@ -16329,7 +16329,7 @@
             410844     -3 INSTR LOCAL NoWarn push    r13 
             410846     -3 INSTR LOCAL NoWarn push    r12 
             41084b     -3 INSTR LOCAL NoWarn push    rbp 
-            41084e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            41084e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             410853     -3 INSTR LOCAL NoWarn push    rbx 
             410862     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             41086a      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
@@ -16339,20 +16339,20 @@
             41087c      5 PTRIMMEDESP STACK 40 displ mov     rdi, [rsp+28h]
             410884     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410893     -1 INSTR LOCAL NoMetaUpdate call    _g_get_user_cache_dir 
-            410898     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4108a7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410898     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4108a7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4108a9     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             4108b1     -1 INSTR LOCAL NoMetaUpdate call    _g_key_file_new 
             4108b6      5 PTRIMMEDESP STACK 72 displ lea     rcx, [rsp+48h]
-            4108bb     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4108bb     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4108c6      9 PTRIMMEDESP STACK 72 displ mov     qword ptr [rsp+48h], 0
             4108cf     -1 INSTR LOCAL NoMetaUpdate call    _g_key_file_load_from_file 
             4108d4      5 PTRIMMEDESP STACK 72 displ mov     rax, [rsp+48h]
             4108d9     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             4108dc     -1 INSTR LOCAL NoMetaUpdate jz      loc_411420 
-            4108eb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            4108f0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            4108f2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4108eb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4108f0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            4108f2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4108f4     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4108f9      5 PTRIMMEDESP STACK 72 displ mov     rdi, [rsp+48h]
             4108fe     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
@@ -16360,8 +16360,8 @@
             410906     -1 INSTR LOCAL NoMetaUpdate call    _g_key_file_free 
             41090e     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             410913     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_push_composite_child 
-            410918     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            41091a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            410918     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            41091a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             41091c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_vbox_new 
             410928     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_get_type 
             410936     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -16369,16 +16369,16 @@
             410941     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
             41094a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             410954     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_new 
-            410959     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            410959     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             410968     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_set_translation_domain 
             41096d      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-            410973     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1Dh 
+            410973     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1Dh 
             41097d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_add_actions 
             410985      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-            410988     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            410988     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             410992     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_add_toggle_actions 
             410997     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_new 
-            41099c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            41099c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             41099e      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             4109ab     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_insert_action_group 
             4109b7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_get_accel_group 
@@ -16393,34 +16393,34 @@
             4109fe     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             410a00     -1 INSTR LOCAL NoMetaUpdate jnz     loc_4112B0 
             410a06      5 PTRIMMEDESP STACK 64 displ mov     rax, [rsp+40h]
-            410a10     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            410a15     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            410a1b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410a10     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            410a15     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            410a1b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410a1d     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             410a22      5 PTRIMMEDESP STACK 64 displ mov     rdi, [rsp+40h]
             410a27     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
             410a2c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_get_type 
-            410a34     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            410a36     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            410a34     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            410a36     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             410a3b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_vbox_new 
             410a49     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            410a4e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            410a4e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             410a56     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_set_border_width 
             410a62     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410a6d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
             410a75     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-            410a7a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            410a7c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            410a7a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            410a7c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             410a81     -1 INSTR LOCAL NoMetaUpdate call    _gtk_hbox_new 
             410a86      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             410a8f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410a94     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            410a97     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            410a99     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            410a97     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            410a99     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             410aa1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             410aa9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-            410aae     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            410ab8     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            410aae     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            410ab8     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             410aba     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             410ac2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_new_with_mnemonic 
             410ac7     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 2 
@@ -16428,26 +16428,26 @@
             410ae3     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             410ae8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_get_type 
             410af3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            410af8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            410af8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             410b00     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_set_relief 
             410b05      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             410b0b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410b10     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            410b13     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            410b15     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            410b13     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            410b15     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             410b1d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             410b25     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-            410b2a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
-            410b2f     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
-            410b34     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410b2a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
+            410b2f     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            410b34     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410b36     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_new 
             410b42     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_completion_new 
-            410b47     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            410b47     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             410b56     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_completion_set_popup_completion 
             410b5b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get_type 
             410b6a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410b79     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_completion_set_model 
-            410b85     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            410b85     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             410b87     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_completion_set_text_column 
             410b8c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_new 
             410b9c      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
@@ -16467,24 +16467,24 @@
             410c15      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             410c18     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410c1d     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            410c20     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            410c25     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            410c20     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            410c25     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             410c30     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             410c39     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-            410c3e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            410c3e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             410c40     -1 INSTR LOCAL NoMetaUpdate call    _gtk_paned_new 
             410c4b      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             410c4e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410c53     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            410c56     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            410c5b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            410c56     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            410c5b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             410c66     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             410c6e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-            410c73     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            410c75     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            410c73     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            410c75     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             410c77     -1 INSTR LOCAL NoMetaUpdate call    _gtk_vbox_new 
-            410c7c     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            410c7e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            410c7c     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            410c7e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             410c80      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rax
             410c85     -1 INSTR LOCAL NoMetaUpdate call    _gtk_vbox_new 
             410c8a      5 PTRIMMEDESP STACK 32 displ mov     [rsp+20h], rax
@@ -16498,8 +16498,8 @@
             410ccf     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             410ce2     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             410cee     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 2 
-            410cf4     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 4 
-            410cfe     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
+            410cf4     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 4 
+            410cfe     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
             410d03     -1 INSTR LOCAL NoMetaUpdate call    _gtk_drag_dest_set 
             410d0f     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             410d12     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -16525,8 +16525,8 @@
             410dd2     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             410dd5     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             410de8     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            410ded     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            410df2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            410ded     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            410df2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             410dfd     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             410e02      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
             410e07     -1 INSTR LOCAL NoMetaUpdate call    sub_40BC50 
@@ -16542,8 +16542,8 @@
             410e65     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             410e68     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             410e78     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            410e7d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            410e82     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            410e7d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            410e82     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             410e8d     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             410e99      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
             410e9e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -16560,8 +16560,8 @@
             410f07     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             410f0a     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             410f1a     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            410f1f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            410f24     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            410f1f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            410f24     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             410f2f     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             410f3b      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
             410f40     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -16574,8 +16574,8 @@
             410f89     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             410f8c     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             410fa3     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            410fa8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            410fad     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            410fa8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            410fad     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             410fb8     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             410fc4      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
             410fc9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -16590,13 +16590,13 @@
             411022     -1 INSTR LOCAL NoMetaUpdate call    _gtk_paned_get_type 
             411030     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             411035      5 PTRIMMEDESP STACK 16 displ mov     rsi, [rsp+10h]
-            41103a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            41103c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            41103a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            41103c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             411044     -1 INSTR LOCAL NoMetaUpdate call    _gtk_paned_pack1 
             41104f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             411054      5 PTRIMMEDESP STACK 32 displ mov     rsi, [rsp+20h]
-            411059     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            41105e     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            411059     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            41105e     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             411063     -1 INSTR LOCAL NoMetaUpdate call    _gtk_paned_pack2 
             411068      5 PTRIMMEDESP STACK 16 displ mov     rax, [rsp+10h]
             41106d      5 PTRIMMEDESP STACK 16 displ mov     rdi, [rsp+10h]
@@ -16608,8 +16608,8 @@
             4110a0      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             4110aa     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4110af     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4110b2     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4110b4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4110b2     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4110b4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4110bc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_end 
             4110c1     -1 INSTR LOCAL NoMetaUpdate test    byte ptr [rbx+160h], 4 
             4110c8     -1 INSTR LOCAL NoMetaUpdate jnz     loc_411370 
@@ -16617,8 +16617,8 @@
             4110dd      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             4110e7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4110ec     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4110ef     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4110f1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4110ef     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4110f1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4110f9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_end 
             41110a     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_get_string 
             411118     -1 INSTR LOCAL NoMetaUpdate call    sub_40E240 
@@ -16632,8 +16632,8 @@
             411163     -1 INSTR LOCAL NoMetaUpdate jz      loc_411308 
             411169      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             41116c     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_free 
-            411171     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            411176     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            411171     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            411176     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             41117d     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             411182      5 PTRIMMEDESP STACK 24 displ mov     rsi, [rsp+18h]
             41118d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -16660,11 +16660,11 @@
             41122f     -1 INSTR LOCAL NoMetaUpdate call    sub_40CAC0 
             411237     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             41123a     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            41123d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            41123d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             411249     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             411251     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             411254     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            411257     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            411257     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             411263     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             41126b     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             41126e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -16677,8 +16677,8 @@
             4112c8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_get_type 
             4112d7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4112dc     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4112e2     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4112e4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4112e2     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4112e4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4112e9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             4112f2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             4112fa     -1 INSTR LOCAL NoMetaUpdate call    sub_4103A0 
@@ -16686,13 +16686,13 @@
             411308      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             41130b     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_get_size 
             411310     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     eax, 200h 
-            411315     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 38h 
-            41131a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM sar     eax, 0Ah 
-            41131f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM imul    ecx, edx 
-            411322     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 190h 
+            411315     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 38h 
+            41131a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM sar     eax, 0Ah 
+            41131f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM imul    ecx, edx 
+            411322     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 190h 
             411327     -1 INSTR LOCAL NoMetaUpdate cmp     ecx, 190h 
-            411338     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM shl     edx, 5 
-            41133d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 14Ah 
+            411338     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM shl     edx, 5 
+            41133d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 14Ah 
             411342     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 14Ah 
             411350     -1 INSTR LOCAL NoMetaUpdate jmp     loc_411169 
             411358     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_get_type 
@@ -16701,14 +16701,14 @@
             41137c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
             411384     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_action_get_type 
             41138f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            411394     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            411394     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             41139c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_action_set_active 
             4113a8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             4113ad     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4110CE 
             4113c4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
             4113cc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_action_get_type 
             4113d7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4113dc     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4113dc     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4113e4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_action_set_active 
             4113ed     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             4113f2     -1 INSTR LOCAL NoMetaUpdate jmp     loc_411094 
@@ -16751,7 +16751,7 @@
             41151e      5 PTRIMMEDESP STACK 72 displ lea     rcx, [rsp+48h]
             41152d      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             411530     -1 INSTR LOCAL NoMetaUpdate call    _g_key_file_get_boolean 
-            41153f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM shl     eax, 2 
+            41153f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM shl     eax, 2 
             41154d     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rsp+48h], 0 
             41154d      6 PTRIMMEDESP STACK 72 displ cmp     qword ptr [rsp+48h], 0
             411553     -1 INSTR LOCAL NoMetaUpdate jz      short loc_411566 
@@ -16868,7 +16868,7 @@
             41169f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4116a4     -1 INSTR LOCAL NoMetaUpdate test    byte ptr [rbx+18h], 4 
             4116a8     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4116C8 
-            4116b1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4116b1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4116b3      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             4116b8      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             4116bd     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
@@ -16894,7 +16894,7 @@
             4116ef      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_check_instance_cast 
             4116f4      2 INSTR BELONGTO 4116e0 
             4116f4      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     edi, edi 
-            4116f4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4116f4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4116f6      3 INSTR BELONGTO 4116e0 
             4116f6      3 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     rsi, rax 
             4116f9     -1 INSTR LOCAL NoMetaUpdate call    sub_40FFA0 
@@ -16902,7 +16902,7 @@
             4116f9      5 INSTR DEADREGS  EFLAGS RBX ZZ call    sub_40FFA0 
             4116fe      2 INSTR BELONGTO 4116e0 
             4116fe      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            4116fe     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4116fe     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             411700      1 INSTR BELONGTO 4116e0 
             411700      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             411701      1 INSTR BELONGTO 4116e0 
@@ -16957,14 +16957,14 @@
             411743      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             411749      5 INSTR BELONGTO 411710 
             411749      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGdict_window_d; "gdict_window_definition_cb" 
-            41174e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 11Ch 
+            41174e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 11Ch 
             41174e      5 INSTR BELONGTO 411710 
             41174e      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 11Ch 
             411753      5 INSTR BELONGTO 411710 
             411753      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             411758      2 INSTR BELONGTO 411710 
             411758      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            411758     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            411758     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             41175a     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             41175a      5 INSTR BELONGTO 411710 
             41175a      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -17058,21 +17058,21 @@
             411848     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             41184d      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             411853     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_set_text 
-            411858     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            411858     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             41185a      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             411860     -1 INSTR LOCAL NoMetaUpdate call    sub_40E650 
             411865      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             411868     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
-            411870     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            411872     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            411870     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            411872     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             41187a      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             41187f      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             411884      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
             411889      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
             41188e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
             411892     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_drag_finish 
-            4118a3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            4118a5     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4118a3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            4118a5     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4118a7     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_411877 
             4118b0      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 4 3 -16 0 4 0 8 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             4118b0      0 FUNC MMSAFENESS SAFE
@@ -17122,14 +17122,14 @@
             4118df      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aGdict_is_windo; "GDICT_IS_WINDOW (window)" 
             4118e5      5 INSTR BELONGTO 4118b0 
             4118e5      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLookup_word; "lookup_word" 
-            4118ea     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 569h 
+            4118ea     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 569h 
             4118ea      5 INSTR BELONGTO 4118b0 
             4118ea      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 569h 
             4118ef      5 INSTR BELONGTO 4118b0 
             4118ef      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             4118f4      2 INSTR BELONGTO 4118b0 
             4118f4      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            4118f4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4118f4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4118f6     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             4118f6      5 INSTR BELONGTO 4118b0 
             4118f6      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -17190,7 +17190,7 @@
             411953      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
             411956      2 INSTR BELONGTO 4118b0 
             411956      2 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ xor     edx, edx 
-            411956     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            411956     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             411958      3 INSTR BELONGTO 4118b0 
             411958      3 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     rsi, rax 
             41195b     -1 INSTR LOCAL NoMetaUpdate call    sub_40E650 
@@ -17221,11 +17221,11 @@
             4119af     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             4119be     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             4119c3      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-            4119df     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            4119e4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4119df     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4119e4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4119e6      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
             4119eb      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-            4119ef     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4119ef     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4119f1     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4119f6      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
             4119fb      5 PTRIMMEDESP STACK 48 displ mov     rbp, [rsp+30h]
@@ -17276,11 +17276,11 @@
             411b77     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             411b85     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             411b8a      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-            411ba6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            411bab     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            411ba6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            411bab     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             411bad      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
             411bb2      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-            411bb6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            411bb6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             411bb8     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             411bbd      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
             411bc2      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -17294,7 +17294,7 @@
             411c00      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
             411c05      5 PTRIMMEDESP STACK 48 displ mov     r12, [rsp+30h]
             411c0a      5 PTRIMMEDESP STACK 56 displ mov     r13, [rsp+38h]
-            411c0f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            411c0f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             411c11      5 PTRIMMEDESP STACK 64 displ mov     r14, [rsp+40h]
             411c19     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
             411c1d     -1 INSTR LOCAL NoMetaUpdate jmp     sub_40E650 
@@ -17450,7 +17450,7 @@
             411ed6      5 INSTR BELONGTO 411dc0 
             411edb     11 INSTR BELONGTO 411dc0 
             411ee6      7 INSTR BELONGTO 411dc0 
-            411eed     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            411eed     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             411eed      5 INSTR BELONGTO 411dc0 
             411ef2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             411ef2      5 INSTR BELONGTO 411dc0 
@@ -17522,7 +17522,7 @@
             411fdf     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             411fdf      5 INSTR BELONGTO 411f80 
             411fe4      7 INSTR BELONGTO 411f80 
-            411feb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            411feb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             411feb      5 INSTR BELONGTO 411f80 
             411ff0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             411ff0      5 INSTR BELONGTO 411f80 
@@ -17606,10 +17606,10 @@
             412071      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aGdict_window_n; "gdict_window_new" 
             412076      2 INSTR BELONGTO 412010 
             412076      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            412076     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            412076     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             412078      2 INSTR BELONGTO 412010 
             412078      2 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ xor     ebx, ebx 
-            412078     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            412078     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             41207a     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             41207a      5 INSTR BELONGTO 412010 
             41207a      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_return_if_fail_warning 
@@ -17648,7 +17648,7 @@
             4120b8      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R9 ZZ mov     r9d, offset aSourceName; "source-name" 
             4120be      5 INSTR BELONGTO 412010 
             4120be      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     ecx, offset aSourceLoader; "source-loader" 
-            4120c3     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, r12d 
+            4120c3     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, r12d 
             4120c3      3 INSTR BELONGTO 412010 
             4120c3      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, r12d 
             4120c6      5 INSTR BELONGTO 412010 
@@ -17663,7 +17663,7 @@
             4120d2      5 PTRIMMEDESP STACK 32 displ mov     [rsp+78h+var_58], rax
             4120d7      2 INSTR BELONGTO 412010 
             4120d7      2 INSTR DEADREGS  EFLAGS RAX RBX R13 ZZ xor     eax, eax 
-            4120d7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4120d7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4120d9      9 INSTR BELONGTO 412010 
             4120d9      9 INSTR DEADREGS  EFLAGS RBX R13 ZZ mov     [rsp+78h+var_50], 0 
             4120d9      9 PTRIMMEDESP STACK 40 displ mov     [rsp+78h+var_50], 0
@@ -17715,14 +17715,14 @@
             412136      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R14 R15 ZZ xor     r8d, r8d 
             412139      5 INSTR BELONGTO 412010 
             412139      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 R15 ZZ mov     ecx, offset aGdict_window_n; "gdict_window_new" 
-            41213e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 850h 
+            41213e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 850h 
             41213e      5 INSTR BELONGTO 412010 
             41213e      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 ZZ mov     edx, 850h 
             412143      5 INSTR BELONGTO 412010 
             412143      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 ZZ mov     esi, offset aGdictWindow_c; "gdict-window.c" 
             412148      2 INSTR BELONGTO 412010 
             412148      2 INSTR DEADREGS  EFLAGS RDI R12 R14 R15 ZZ xor     edi, edi 
-            412148     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            412148     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             41214a     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message 
             41214a      5 INSTR BELONGTO 412010 
             41214a      5 INSTR DEADREGS  EFLAGS R12 R14 R15 ZZ call    _g_assertion_message 
@@ -17746,7 +17746,7 @@
             412167      5 INSTR DEADREGS  EFLAGS R12 R14 R15 ZZ call    _gtk_entry_set_text 
             41216c      2 INSTR BELONGTO 412010 
             41216c      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 ZZ xor     edx, edx 
-            41216c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            41216c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             41216e      3 INSTR BELONGTO 412010 
             41216e      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 ZZ mov     rsi, rbp 
             412171      3 INSTR BELONGTO 412010 
@@ -17775,7 +17775,7 @@
             412197      5 INSTR DEADREGS  EFLAGS R12 R14 R15 ZZ call    _gtk_entry_set_text 
             41219c      3 INSTR BELONGTO 412010 
             41219c      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 ZZ mov     rdi, r13 
-            41219f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            41219f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             41219f      5 INSTR BELONGTO 412010 
             41219f      5 INSTR DEADREGS  EFLAGS RSI R12 R14 R15 ZZ mov     esi, 1 
             4121a4     -1 INSTR LOCAL NoMetaUpdate call    sub_40F2A0 
@@ -17937,7 +17937,7 @@
             4122c7      2 INSTR BELONGTO 412280 
             4122c9      2 INSTR BELONGTO 412280 
             4122c9      2 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 R9 R12 ZZ xor     edi, edi 
-            4122c9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4122c9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4122cb      3 INSTR BELONGTO 412280 
             4122cb      3 INSTR DEADREGS  EFLAGS RCX RDX R8 R9 R12 ZZ mov     r9, rax 
             4122ce     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -17945,10 +17945,10 @@
             4122ce      3 INSTR DEADREGS  EFLAGS RCX RDX R8 R12 ZZ xor     r8d, r8d 
             4122d1      2 INSTR BELONGTO 412280 
             4122d1      2 INSTR DEADREGS  EFLAGS RCX RDX R12 ZZ xor     ecx, ecx 
-            4122d1     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4122d1     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4122d3      2 INSTR BELONGTO 412280 
             4122d3      2 INSTR DEADREGS  EFLAGS RDX R12 ZZ xor     edx, edx 
-            4122d3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4122d3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4122d5     -1 INSTR LOCAL NoMetaUpdate call    sub_412010 
             4122d5      5 INSTR BELONGTO 412280 
             4122d5      5 INSTR DEADREGS  EFLAGS R12 ZZ call    sub_412010 
@@ -17976,12 +17976,12 @@
             4122fe      4 INSTR BELONGTO 412280 
             412302      2 INSTR BELONGTO 412280 
             412302      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     edx, edx 
-            412302     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            412302     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             412304     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+18h+var_8] 
             412304      5 INSTR BELONGTO 412280 
             412309      2 INSTR BELONGTO 412280 
             412309      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            412309     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            412309     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             41230b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             41230b      4 INSTR BELONGTO 412280 
             41230f     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
@@ -17996,11 +17996,11 @@
             41231b      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 R12 ZZ xor     r8d, r8d 
             41231e      2 INSTR BELONGTO 412280 
             41231e      2 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 ZZ xor     ecx, ecx 
-            41231e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            41231e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             412320      2 INSTR BELONGTO 412280 
             412320      2 INSTR DEADREGS  EFLAGS RDX RDI R12 ZZ xor     edx, edx 
-            412320     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            412322     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            412320     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            412322     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             412322      5 INSTR BELONGTO 412280 
             412322      5 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     edi, 2 
             412327     -1 INSTR LOCAL NoMetaUpdate call    sub_412010 
@@ -18039,16 +18039,16 @@
             41235b      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 ZZ mov     r9, rbp 
             41235e      2 INSTR BELONGTO 412340 
             41235e      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     ecx, ecx 
-            41235e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            41235e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             412360      2 INSTR BELONGTO 412340 
             412360      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 ZZ xor     edx, edx 
-            412360     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            412360     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             412362     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             412362      3 INSTR BELONGTO 412340 
             412362      3 INSTR DEADREGS  EFLAGS RSI RDI R8 ZZ xor     r8d, r8d 
             412365      2 INSTR BELONGTO 412340 
             412365      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi 
-            412365     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            412365     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             412367      3 INSTR BELONGTO 412340 
             412367      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, rax 
             41236a     -1 INSTR LOCAL NoMetaUpdate call    sub_412010 
@@ -18074,10 +18074,10 @@
             412388      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     rcx, rbp 
             41238b      2 INSTR BELONGTO 412340 
             41238b      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 ZZ xor     edx, edx 
-            41238b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            41238b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             41238d      2 INSTR BELONGTO 412340 
             41238d      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            41238d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            41238d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             41238f      1 INSTR BELONGTO 412340 
             41238f      1 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbp 
             412390     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
@@ -18132,7 +18132,7 @@
             4123d9      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_class_peek_parent 
             4123de      3 INSTR BELONGTO 4123d0 
             4123de      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
-            4123e1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4123e1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4123e1      5 INSTR BELONGTO 4123d0 
             4123e1      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             4123e6      7 INSTR BELONGTO 4123d0 
@@ -18272,7 +18272,7 @@
             412517      6 INSTR BELONGTO 4123d0 
             41251d      2 INSTR BELONGTO 4123d0 
             41251d      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            41251d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            41251d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             41251f      5 INSTR BELONGTO 4123d0 
             41251f      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset aTheWordToSearc; "The word to search" 
             412524      5 INSTR BELONGTO 4123d0 
@@ -18291,7 +18291,7 @@
             41253d      6 INSTR BELONGTO 4123d0 
             412543      2 INSTR BELONGTO 4123d0 
             412543      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            412543     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            412543     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             412545      5 INSTR BELONGTO 4123d0 
             412545      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset aTheUniqueIdent; "The unique identifier for this window" 
             41254a      5 INSTR BELONGTO 4123d0 
@@ -18328,17 +18328,17 @@
             412594      3 INSTR BELONGTO 4123d0 
             412597      3 INSTR BELONGTO 4123d0 
             412597      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rsi, [rbx] 
-            41259a     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 430h 
+            41259a     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 430h 
             41259a      5 INSTR BELONGTO 4123d0 
             41259a      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI ZZ mov     ecx, 430h 
-            41259f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            41259f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             41259f      5 INSTR BELONGTO 4123d0 
             41259f      5 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ mov     edx, 2 
             4125a4      5 INSTR BELONGTO 4123d0 
             4125a4      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aCreated; "created" 
             4125a9      2 INSTR BELONGTO 4123d0 
             4125a9      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4125a9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4125a9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4125ab     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             4125ab      5 INSTR BELONGTO 4123d0 
             4125ab      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_new 
@@ -18356,7 +18356,7 @@
             4125d3      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, offset qword_617EC0 
             4125d8      8 INSTR BELONGTO 4123d0 
             4125d8      8 INSTR DEADREGS  EFLAGS RSI ZZ mov     qword ptr [rbx+10h], offset loc_410840 
-            4125e0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
+            4125e0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
             4125e0      5 INSTR BELONGTO 4123d0 
             4125e0      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 0Ah 
             4125e5      6 INSTR BELONGTO 4123d0 
@@ -18423,7 +18423,7 @@
             412658      2 INSTR BELONGTO 412610 
             41265a      2 INSTR BELONGTO 412610 
             41265a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            41265a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            41265a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             41265c      4 INSTR BELONGTO 412610 
             412660      3 INSTR BELONGTO 412610 
             412660      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 41f31109..3c8c10eb 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
@@ -738,7 +738,7 @@
             401fbd      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _textdomain 
             401fc2      2 INSTR BELONGTO 401f90 
             401fc2      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            401fc2     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            401fc2     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             401fc4      5 INSTR BELONGTO 401f90 
             401fc4      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, offset aOrg_gnome_user; "org.gnome.user-share.properties" 
             401fc9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_application_new 
@@ -752,10 +752,10 @@
             401fd1      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 ZZ xor     r8d, r8d 
             401fd4      2 INSTR BELONGTO 401f90 
             401fd4      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ xor     ecx, ecx 
-            401fd4     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            401fd4     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             401fd6      3 INSTR BELONGTO 401f90 
             401fd6      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rbx, rax 
-            401fd9     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_402B10 
+            401fd9     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_402B10 
             401fd9      5 INSTR BELONGTO 401f90 
             401fd9      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset loc_402B10 
             401fde      5 INSTR BELONGTO 401f90 
@@ -927,7 +927,7 @@
             4020d9      3 INSTR BELONGTO 4020d0 
             4020dc     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4020F0 
             4020dc      2 INSTR BELONGTO 4020d0 
-            4020de     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            4020de     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             4020de      5 INSTR BELONGTO 4020d0 
             4020e3     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             4020e3      3 INSTR BELONGTO 4020d0 
@@ -965,20 +965,20 @@
             402112      6 INSTR BELONGTO 402100 
             402118      6 INSTR BELONGTO 402100 
             402118      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 ZZ mov     r8d, (offset aSSS+6); "%s" 
-            40211e     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40211e     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40211e      5 INSTR BELONGTO 402100 
             40211e      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     ecx, 1 
-            402123     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            402123     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             402123      5 INSTR BELONGTO 402100 
             402123      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edx, 3 
             402128      3 INSTR BELONGTO 402100 
             402128      3 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rdi, rbp 
-            40212b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40212b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40212b      5 INSTR BELONGTO 402100 
             40212b      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             402130      2 INSTR BELONGTO 402100 
             402130      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            402130     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402130     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402132     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             402132      5 INSTR BELONGTO 402100 
             402132      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_message_dialog_new 
@@ -1002,7 +1002,7 @@
             402150      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, (offset aSSS+6); "%s" 
             402155      2 INSTR BELONGTO 402100 
             402155      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            402155     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402155     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402157     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_format_secondary_text 
             402157      5 INSTR BELONGTO 402100 
             402157      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _gtk_message_dialog_format_secondary_text 
@@ -1035,7 +1035,7 @@
             402187     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             402187      5 INSTR BELONGTO 402100 
             402187      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-            40218c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+            40218c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
             40218c      5 INSTR BELONGTO 402100 
             40218c      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 5 
             402191      3 INSTR BELONGTO 402100 
@@ -1053,7 +1053,7 @@
             4021a4     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4021a4      5 INSTR BELONGTO 402100 
             4021a4      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-            4021a9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFBh 
+            4021a9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFBh 
             4021a9      5 INSTR BELONGTO 402100 
             4021a9      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 0FFFFFFFBh 
             4021ae      3 INSTR BELONGTO 402100 
@@ -1068,7 +1068,7 @@
             4021bc     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4021bc      5 INSTR BELONGTO 402100 
             4021bc      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_check_instance_cast 
-            4021c1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4021c1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4021c1      5 INSTR BELONGTO 402100 
             4021c1      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 1 
             4021c6      3 INSTR BELONGTO 402100 
@@ -1087,14 +1087,14 @@
             4021d6      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
             4021d7      1 INSTR BELONGTO 402100 
             4021d7      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-            4021e0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4021e0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4021e0      5 INSTR BELONGTO 402100 
             4021e0      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             4021e5      5 INSTR BELONGTO 402100 
             4021e5      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset msgid; "No reason" 
             4021ea      2 INSTR BELONGTO 402100 
             4021ea      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; domainname 
-            4021ea     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4021ea     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4021ec      5 INSTR BELONGTO 402100 
             4021ec      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+28h+var_20], r9 
             4021ec      5 PTRIMMEDESP STACK 8 displ mov     [rsp+28h+var_20], r9
@@ -1141,7 +1141,7 @@
             402224      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _gconf_client_get_default 
             402229      2 INSTR BELONGTO 402210 
             402229      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ xor     edx, edx 
-            402229     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            402229     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40222b      3 INSTR BELONGTO 402210 
             40222b      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     rbx, rax 
             40222e      5 INSTR BELONGTO 402210 
@@ -1153,7 +1153,7 @@
             402236      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _gconf_client_get_bool 
             40223b      2 INSTR BELONGTO 402210 
             40223b      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ xor     edx, edx 
-            40223b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40223b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40223d      5 INSTR BELONGTO 402210 
             40223d      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aDesktopGnome_0; "/desktop/gnome/file_sharing/bluetooth_e"... 
             402242      3 INSTR BELONGTO 402210 
@@ -1165,7 +1165,7 @@
             402248      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _gconf_client_get_bool 
             40224d      2 INSTR BELONGTO 402210 
             40224d      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ xor     edx, edx 
-            40224d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40224d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40224f      5 INSTR BELONGTO 402210 
             40224f      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 ZZ mov     esi, offset aDesktopGnome_1; "/desktop/gnome/file_sharing/bluetooth_a"... 
             402254      3 INSTR BELONGTO 402210 
@@ -1177,7 +1177,7 @@
             40225a      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _gconf_client_get_bool 
             40225f      2 INSTR BELONGTO 402210 
             40225f      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ xor     edx, edx 
-            40225f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40225f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             402261      5 INSTR BELONGTO 402210 
             402261      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, offset aDesktopGnome_2; "/desktop/gnome/file_sharing/bluetooth_r"... 
             402266      3 INSTR BELONGTO 402210 
@@ -1190,7 +1190,7 @@
             40226d      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _gconf_client_get_bool 
             402272      2 INSTR BELONGTO 402210 
             402272      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ xor     edx, edx 
-            402272     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            402272     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             402274      5 INSTR BELONGTO 402210 
             402274      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, offset aDesktopGnome_3; "/desktop/gnome/file_sharing/bluetooth_o"... 
             402279      3 INSTR BELONGTO 402210 
@@ -1203,7 +1203,7 @@
             402280      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _gconf_client_get_bool 
             402285      2 INSTR BELONGTO 402210 
             402285      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ xor     edx, edx 
-            402285     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            402285     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             402287      5 INSTR BELONGTO 402210 
             402287      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, offset aDesktopGnome_4; "/desktop/gnome/file_sharing/bluetooth_n"... 
             40228c      3 INSTR BELONGTO 402210 
@@ -1215,7 +1215,7 @@
             402292      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _gconf_client_get_bool 
             402297      2 INSTR BELONGTO 402210 
             402297      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ xor     edx, edx 
-            402297     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            402297     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             402299      5 INSTR BELONGTO 402210 
             402299      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aDesktopGnome_5; "/desktop/gnome/file_sharing/require_pas"... 
             40229e      3 INSTR BELONGTO 402210 
@@ -1243,7 +1243,7 @@
             4022bc      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_free 
             4022c1      2 INSTR BELONGTO 402210 
             4022c1      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ xor     edx, edx 
-            4022c1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4022c1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4022c3      5 INSTR BELONGTO 402210 
             4022c3      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aDesktopGnome_6; "/desktop/gnome/file_sharing/bluetooth_a"... 
             4022c8      3 INSTR BELONGTO 402210 
@@ -1512,7 +1512,7 @@
             4024af      5 INSTR BELONGTO 402210 
             4024af      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, [rsp+0B8h+var_B0] 
             4024af      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+0B8h+var_B0]
-            4024b4     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, r12d 
+            4024b4     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, r12d 
             4024b4      3 INSTR BELONGTO 402210 
             4024b4      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, r12d 
             4024b7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
@@ -1551,7 +1551,7 @@
             4024eb      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+0B8h+var_A0]
             4024f0     -1 INSTR LOCAL NoMetaUpdate test    r15d, r15d 
             4024f0      3 INSTR BELONGTO 402210 
-            4024f3     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setnz   sil 
+            4024f3     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setnz   sil 
             4024f3      4 INSTR BELONGTO 402210 
             4024f3      4 INSTR DEADREGS  RSI ZZ setnz   sil 
             4024f7     -1 INSTR LOCAL MetadataRedundant and     esi, r12d 
@@ -1559,7 +1559,7 @@
             4024fa     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
             4024fa      5 INSTR BELONGTO 402210 
             4024fa      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_widget_set_sensitive 
-            4024ff     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rsp+0B8h+var_A4] 
+            4024ff     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rsp+0B8h+var_A4] 
             4024ff      4 INSTR BELONGTO 402210 
             4024ff      4 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     eax, [rsp+0B8h+var_A4] 
             4024ff      4 PTRIMMEDESP STACK 20 displ mov     eax, [rsp+0B8h+var_A4]
@@ -1569,14 +1569,14 @@
             402505      2 INSTR BELONGTO 402210 
             402507     -1 INSTR LOCAL NoMetaUpdate test    r15d, r15d 
             402507      3 INSTR BELONGTO 402210 
-            40250a     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, r12d 
+            40250a     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, r12d 
             40250a      3 INSTR BELONGTO 402210 
             40250a      3 INSTR DEADREGS  RSI RDI R15 ZZ mov     esi, r12d 
             40250d     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_402511 
             40250d      2 INSTR BELONGTO 402210 
             40250f      2 INSTR BELONGTO 402210 
             40250f      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R15 ZZ xor     esi, esi 
-            40250f     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40250f     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             402511      5 INSTR BELONGTO 402210 
             402511      5 INSTR DEADREGS  EFLAGS RDI R12 R15 ZZ mov     rdi, [rsp+0B8h+var_60] 
             402511      5 PTRIMMEDESP STACK 88 displ mov     rdi, [rsp+0B8h+var_60]
@@ -1596,7 +1596,7 @@
             40252b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40252b      5 INSTR BELONGTO 402210 
             40252b      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _g_type_check_instance_cast 
-            402530     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, [rsp+0B8h+var_A4] 
+            402530     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, [rsp+0B8h+var_A4] 
             402530      4 INSTR BELONGTO 402210 
             402530      4 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     esi, [rsp+0B8h+var_A4] 
             402530      4 PTRIMMEDESP STACK 20 displ mov     esi, [rsp+0B8h+var_A4]
@@ -1723,7 +1723,7 @@
             4025f3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4025f3      5 INSTR BELONGTO 402210 
             4025f3      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_type_check_instance_cast 
-            4025f8     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, [rsp+0B8h+var_64] 
+            4025f8     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, [rsp+0B8h+var_64] 
             4025f8      4 INSTR BELONGTO 402210 
             4025f8      4 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     esi, [rsp+0B8h+var_64] 
             4025f8      4 PTRIMMEDESP STACK 84 displ mov     esi, [rsp+0B8h+var_64]
@@ -1752,12 +1752,12 @@
             402618     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_unref 
             402618      5 INSTR BELONGTO 402210 
             402618      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ jmp     _g_object_unref 
-            402620     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            402620     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             402620      5 INSTR BELONGTO 402210 
             402620      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             402625      2 INSTR BELONGTO 402210 
             402625      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            402625     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            402625     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             402627      5 INSTR BELONGTO 402210 
             402627      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aThisFeatureCan; "This feature cannot be enabled because "... 
             40262c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -1769,7 +1769,7 @@
             402636      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, rax 
             402639      2 INSTR BELONGTO 402210 
             402639      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            402639     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402639     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40263b     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40263b      5 INSTR BELONGTO 402210 
             40263b      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strdup_printf 
@@ -1838,12 +1838,12 @@
             40274f      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             402758     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             402760      5 PTRIMMEDESP STACK 8 displ mov     rax, [rsp+8]
-            402765     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40276f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            402765     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40276f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             402775     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             402780      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             402783     -1 INSTR LOCAL NoMetaUpdate call    sub_402100 
-            402788     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            402788     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             402793     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             402798     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40279b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -1864,7 +1864,7 @@
             402814     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_get_active 
             40281b     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_get_default 
             402820      2 PTRIMMEDEBP STACK 0 displ mov     edx, ebp
-            402828     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            402828     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40282f     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_set_bool 
             402837      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             40283c      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
@@ -1877,7 +1877,7 @@
             402874     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_get_active 
             40287b     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_get_default 
             402880      2 PTRIMMEDEBP STACK 0 displ mov     edx, ebp
-            402888     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            402888     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40288f     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_set_bool 
             402897      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             40289c      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
@@ -1890,7 +1890,7 @@
             4028d4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_get_active 
             4028db     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_get_default 
             4028e0      2 PTRIMMEDEBP STACK 0 displ mov     edx, ebp
-            4028e8     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4028e8     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4028ef     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_set_bool 
             4028f7      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             4028fc      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
@@ -1902,7 +1902,7 @@
             402925     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_get_default 
             40292a      2 PTRIMMEDEBP STACK 0 displ mov     edi, ebp
             40292f     -1 INSTR LOCAL NoMetaUpdate call    sub_4034F0 
-            402937     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            402937     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             402941     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_set_string 
             402949      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             40294e      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
@@ -1914,23 +1914,23 @@
             402975     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_get_default 
             40297a      2 PTRIMMEDEBP STACK 0 displ mov     edi, ebp
             40297f     -1 INSTR LOCAL NoMetaUpdate call    sub_403450 
-            402987     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            402987     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             402991     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_set_string 
             402999      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             40299e      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             4029a3     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             4029a7     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_unref 
             4029b0     -3 INSTR LOCAL NoWarn push    r12 
-            4029b2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4029b2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4029b7     -3 INSTR LOCAL NoWarn push    rbp 
             4029b8     -3 INSTR LOCAL NoWarn push    rbx 
             4029b9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4029be     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4029be     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4029cb     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set_data 
             4029d0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
             4029e4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             4029ef     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4029f4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4029f4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4029ff     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             402a0c     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get_data 
             402a11     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
@@ -1942,27 +1942,27 @@
             402a31     -1 INSTR LOCAL NoMetaUpdate jz      short loc_402A38 
             402a33     -1 INSTR LOCAL NoMetaUpdate cmp     byte ptr [rax], 0 
             402a36     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_402A40 
-            402a52     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402a52     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402a54     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             402a5f     -1 INSTR LOCAL NoMetaUpdate call    _strlen 
-            402a6a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            402a6a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             402a6c     -1 INSTR LOCAL NoMetaUpdate call    _g_compute_checksum_for_string 
             402a77     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             402a7c      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-            402a8e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402a8e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402a90     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             402a95      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             402a9b     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             402aa0     -1 INSTR LOCAL NoMetaUpdate call    _g_get_user_config_dir 
-            402aa5     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            402ab4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402aa5     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            402ab4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402ab6     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             402ac6     -1 INSTR LOCAL NoMetaUpdate call    _fopen 
             402acb     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             402ad1     -1 INSTR LOCAL NoMetaUpdate jz      short loc_402AF6 
             402ad6     -1 INSTR LOCAL NoMetaUpdate call    _strlen 
             402ade      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-            402ae1     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            402ae1     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             402ae9     -1 INSTR LOCAL NoMetaUpdate call    _fwrite 
             402aee      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             402af1     -1 INSTR LOCAL NoMetaUpdate call    _fclose 
@@ -2000,8 +2000,8 @@
             402bf7      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             402bfd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             402c05     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_get_default 
-            402c0a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            402c0c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            402c0a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            402c0c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             402c1c     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_add_dir 
             402c2d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             402c32      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
@@ -2038,10 +2038,10 @@
             402d35     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             402d3a      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             402d40     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            402d45     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
-            402d4a     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            402d45     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
+            402d4a     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             402d4f      5 PTRIMMEDESP STACK 88 displ mov     [rsp+58h], rax
-            402d54     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402d54     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402d56     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_new 
             402d5e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get_type 
             402d69      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
@@ -2057,44 +2057,44 @@
             402da6      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+18h]
             402db1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             402db6      5 PTRIMMEDESP STACK 40 displ mov     rsi, [rsp+28h]
-            402dbb     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            402dbb     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             402dc3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_pack_start 
             402dc8      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+18h]
             402dd0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             402dd5      5 PTRIMMEDESP STACK 40 displ mov     rsi, [rsp+28h]
             402dda     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            402ddd     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            402de7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402ddd     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            402de7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402de9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_set_attributes 
             402dee      5 PTRIMMEDESP STACK 96 displ lea     rsi, [rsp+60h]
             402df6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_append 
-            402dfb     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            402dfd     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            402dfb     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            402dfd     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             402e07     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             402e0c      5 PTRIMMEDESP STACK 96 displ lea     rsi, [rsp+60h]
             402e14     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            402e1a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            402e1c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402e1a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            402e1c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402e21     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_set 
             402e26      5 PTRIMMEDESP STACK 96 displ lea     rsi, [rsp+60h]
             402e2e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_append 
-            402e33     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            402e35     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            402e33     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            402e35     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             402e3f     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             402e44      5 PTRIMMEDESP STACK 96 displ lea     rsi, [rsp+60h]
             402e4c     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            402e52     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            402e54     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402e52     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            402e54     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402e59     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_set 
             402e5e      5 PTRIMMEDESP STACK 96 displ lea     rsi, [rsp+60h]
             402e66     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_append 
-            402e6b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            402e6d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            402e6b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            402e6d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             402e77     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             402e7c      5 PTRIMMEDESP STACK 96 displ lea     rsi, [rsp+60h]
             402e84     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            402e8a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            402e8c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402e8a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            402e8c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402e91     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_set 
             402e99     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             402e9e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_get_type 
@@ -2102,18 +2102,18 @@
             402eab     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             402eb8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_set_text 
             402ebd      5 PTRIMMEDESP STACK 16 displ mov     rdi, [rsp+10h]
-            402ec2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            402ec2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             402ec7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            402ecc     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            402ecc     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             402ed6     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set_data 
             402edb      5 PTRIMMEDESP STACK 16 displ mov     rdi, [rsp+10h]
             402ee0     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             402ee8     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            402ef0     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            402ef0     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             402ef2     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            402ef7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
-            402efc     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
-            402f01     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402ef7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
+            402efc     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            402f01     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402f03     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_new 
             402f08      4 PTRIMMEDESP STACK 0 displ mov     r10, [rsp]
             402f15     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -2128,76 +2128,76 @@
             402f4b      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rax
             402f50     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             402f55      5 PTRIMMEDESP STACK 16 displ mov     rsi, [rsp+10h]
-            402f5a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            402f5a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             402f62     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_pack_start 
             402f67      5 PTRIMMEDESP STACK 32 displ mov     rdi, [rsp+20h]
             402f6f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             402f74      5 PTRIMMEDESP STACK 16 displ mov     rsi, [rsp+10h]
             402f79     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            402f7c     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            402f86     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402f7c     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            402f86     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402f88     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_set_attributes 
             402f8d      5 PTRIMMEDESP STACK 96 displ lea     rsi, [rsp+60h]
             402f95     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_append 
-            402f9a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            402f9c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            402f9a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            402f9c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             402fa6     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             402fab      5 PTRIMMEDESP STACK 96 displ lea     rsi, [rsp+60h]
             402fb3     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            402fb9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            402fbb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402fb9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            402fbb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402fc0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_set 
             402fc5      5 PTRIMMEDESP STACK 96 displ lea     rsi, [rsp+60h]
             402fcd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_append 
-            402fd2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            402fd4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            402fd2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            402fd4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             402fde     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             402fe3      5 PTRIMMEDESP STACK 96 displ lea     rsi, [rsp+60h]
-            402feb     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            402feb     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             402fed     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            402ff3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402ff3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402ff8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_set 
             403000     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             403005     -1 INSTR LOCAL NoMetaUpdate call    sub_402210 
             40300a      5 PTRIMMEDESP STACK 48 displ mov     rdi, [rsp+30h]
             40300f     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             403012     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            403015     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403015     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403021     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             403026      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+18h]
             40302b     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40302e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            403031     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403031     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40303d     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             403042      5 PTRIMMEDESP STACK 56 displ mov     rdi, [rsp+38h]
             403047     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40304a     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40304d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40304d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403059     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             40305e      5 PTRIMMEDESP STACK 64 displ mov     rdi, [rsp+40h]
             403063     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             403066     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            403069     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403069     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403075     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             40307a      5 PTRIMMEDESP STACK 72 displ mov     rdi, [rsp+48h]
             40307f     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             403082     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            403085     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403085     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403091     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             403096      5 PTRIMMEDESP STACK 80 displ mov     rdi, [rsp+50h]
             40309b     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40309e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4030a1     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4030a1     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4030ad     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             4030b2      5 PTRIMMEDESP STACK 32 displ mov     rdi, [rsp+20h]
             4030b7     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             4030ba     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4030bd     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4030bd     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4030c9     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             4030ce      5 PTRIMMEDESP STACK 88 displ mov     rdi, [rsp+58h]
             4030d3     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             4030d6     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4030d9     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4030d9     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4030e5     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             4030f6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             4030fb      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
@@ -2214,35 +2214,35 @@
             40316a     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             40316f     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             403172     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            403175     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403175     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403184     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_notify_add 
             403189     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40318c     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40318f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40318f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40319e     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_notify_add 
             4031a3     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             4031a6     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4031a9     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4031a9     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4031b8     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_notify_add 
             4031bd     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             4031c0     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4031c3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4031c3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4031d2     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_notify_add 
             4031d7     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             4031da     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4031dd     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4031dd     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4031ec     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_notify_add 
             4031f1     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             4031f4     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4031f7     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4031f7     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403206     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_notify_add 
             40320b     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40320e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            403211     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403211     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403220     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_notify_add 
             403228     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40322b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40322e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40322e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40323a     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_notify_add 
             403242     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             403247     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
@@ -2250,11 +2250,11 @@
             40325d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_application 
             403265     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40326a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_402B5E 
-            403274     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40327e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403274     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40327e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403280     -2 INSTR LOCAL n R14 ZZ  AlwaysNUM xor     r14d, r14d 
             403283     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            403288     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            403288     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40328a      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             403290     -1 INSTR LOCAL NoMetaUpdate call    sub_402100 
             403298     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_type 
@@ -2285,13 +2285,13 @@
             4032da      5 PTRIMMEDESP STACK 16 displ lea     rsi, [rsp+28h+var_18]
             4032df      2 INSTR BELONGTO 4032d0 
             4032df      2 INSTR DEADREGS  EFLAGS RCX RDX RDI ZZ xor     ecx, ecx 
-            4032df     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4032df     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4032e1      2 INSTR BELONGTO 4032d0 
             4032e1      2 INSTR DEADREGS  EFLAGS RDX RDI ZZ xor     edx, edx 
-            4032e1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4032e1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4032e3      2 INSTR BELONGTO 4032d0 
             4032e3      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            4032e3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4032e3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4032e5      9 INSTR BELONGTO 4032d0 
             4032e5      9 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+28h+var_18], offset aUsrLibGnomeUse; "/usr/lib/gnome-user-share/gnome-user-sh"... 
             4032e5      9 PTRIMMEDESP STACK 16 displ mov     [rsp+28h+var_18], offset aUsrLibGnomeUse; "/usr/lib/gnome-user-share/gnome-user-sh"...
@@ -2313,12 +2313,12 @@
             40330f      2 INSTR BELONGTO 4032d0 
             403311      5 INSTR BELONGTO 4032d0 
             403311      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset aUnableToStartG; "Unable to start gnome-user-share progra"... 
-            403316     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            403316     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             403316      5 INSTR BELONGTO 4032d0 
             403316      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 10h 
             40331b      2 INSTR BELONGTO 4032d0 
             40331b      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40331b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40331b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40331d     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40331d      5 INSTR BELONGTO 4032d0 
             40331d      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -2365,7 +2365,7 @@
             403353      5 INSTR DEADREGS  EFLAGS ZZ call    _gconf_client_get_default 
             403358      2 INSTR BELONGTO 403330 
             403358      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            403358     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403358     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40335a      3 INSTR BELONGTO 403330 
             40335a      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rbp, rax 
             40335d      2 INSTR BELONGTO 403330 
@@ -2442,7 +2442,7 @@
             4033b3      5 INSTR DEADREGS  EFLAGS ZZ call    _gconf_client_get_default 
             4033b8      2 INSTR BELONGTO 403390 
             4033b8      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            4033b8     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4033b8     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4033ba      3 INSTR BELONGTO 403390 
             4033ba      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rbp, rax 
             4033bd      2 INSTR BELONGTO 403390 
@@ -2519,7 +2519,7 @@
             403413      5 INSTR DEADREGS  EFLAGS ZZ call    _gconf_client_get_default 
             403418      2 INSTR BELONGTO 4033f0 
             403418      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            403418     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403418     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40341a      3 INSTR BELONGTO 4033f0 
             40341a      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rbp, rax 
             40341d      2 INSTR BELONGTO 4033f0 
@@ -2586,12 +2586,12 @@
             403470      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
             403473      3 INSTR BELONGTO 403470 
             403473      3 INSTR DEADREGS  RAX RDX ZZ mov     rdx, rdi 
-            403476     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 2 
+            403476     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 2 
             403476      5 INSTR BELONGTO 403470 
             403476      5 INSTR DEADREGS  RAX ZZ mov     eax, 2 
             40347b     -1 INSTR LOCAL NoMetaUpdate jz      short locret_4034B7 
             40347b      2 INSTR BELONGTO 403470 
-            40347d     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 6 
+            40347d     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 6 
             40347d      5 INSTR BELONGTO 403470 
             40347d      5 INSTR DEADREGS  RAX RCX RSI RDI ZZ mov     ecx, 6 
             403482      3 INSTR BELONGTO 403470 
@@ -2600,19 +2600,19 @@
             403485      5 INSTR DEADREGS  RAX RDI ZZ mov     edi, offset aNever; "never" 
             40348a     -1 INSTR LOCAL NoMetaUpdate repe cmpsb 
             40348a      2 INSTR BELONGTO 403470 
-            40348c     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setnbe  sil 
+            40348c     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setnbe  sil 
             40348c      4 INSTR BELONGTO 403470 
             40348c      4 INSTR DEADREGS  RAX RCX RSI ZZ setnbe  sil 
             403490     -1 INSTR LOCAL MetadataRedundant setb    cl 
             403490      3 INSTR BELONGTO 403470 
             403493      2 INSTR BELONGTO 403470 
             403493      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     al, al 
-            403493     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     al, al 
+            403493     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     al, al 
             403495     -1 INSTR LOCAL NoMetaUpdate cmp     sil, cl 
             403495      3 INSTR BELONGTO 403470 
             403498     -1 INSTR LOCAL NoMetaUpdate jz      short locret_4034B7 
             403498      2 INSTR BELONGTO 403470 
-            40349a     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 7 
+            40349a     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 7 
             40349a      5 INSTR BELONGTO 403470 
             40349a      5 INSTR DEADREGS  RAX RCX RSI RDI ZZ mov     ecx, 7 
             40349f      3 INSTR BELONGTO 403470 
@@ -2623,8 +2623,8 @@
             4034a7      2 INSTR BELONGTO 403470 
             4034a9      2 INSTR BELONGTO 403470 
             4034a9      2 INSTR DEADREGS  RAX RCX RSI ZZ mov     al, 2 
-            4034a9     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     al, 2 
-            4034ab     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setnbe  sil 
+            4034a9     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     al, 2 
+            4034ab     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setnbe  sil 
             4034ab      4 INSTR BELONGTO 403470 
             4034ab      4 INSTR DEADREGS  RCX RSI ZZ setnbe  sil 
             4034af     -1 INSTR LOCAL MetadataRedundant setb    cl 
@@ -2640,15 +2640,15 @@
             4034c0      3 INSTR DEADREGS  RAX RCX RSI RDI ZZ mov     rsi, rdx 
             4034c3      5 INSTR BELONGTO 403470 
             4034c3      5 INSTR DEADREGS  RAX RCX RDX RDI ZZ mov     edi, offset aOn_write; "on_write" 
-            4034c8     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 9 
+            4034c8     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 9 
             4034c8      5 INSTR BELONGTO 403470 
             4034c8      5 INSTR DEADREGS  RAX RCX RDX ZZ mov     ecx, 9 
             4034cd     -1 INSTR LOCAL NoMetaUpdate repe cmpsb 
             4034cd      2 INSTR BELONGTO 403470 
-            4034cf     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setb    dl 
+            4034cf     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setb    dl 
             4034cf      3 INSTR BELONGTO 403470 
             4034cf      3 INSTR DEADREGS  RAX RDX ZZ setb    dl 
-            4034d2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setnbe  al 
+            4034d2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setnbe  al 
             4034d2      3 INSTR BELONGTO 403470 
             4034d2      3 INSTR DEADREGS  RAX ZZ setnbe  al 
             4034d5     -1 INSTR LOCAL MetadataRedundant sub     al, dl 
@@ -2692,12 +2692,12 @@
             403510      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
             403513      3 INSTR BELONGTO 403510 
             403513      3 INSTR DEADREGS  RAX RDX ZZ mov     rdx, rdi 
-            403516     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            403516     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             403516      5 INSTR BELONGTO 403510 
             403516      5 INSTR DEADREGS  RAX ZZ mov     eax, 1 
             40351b     -1 INSTR LOCAL NoMetaUpdate jz      short locret_403588 
             40351b      2 INSTR BELONGTO 403510 
-            40351d     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 7 
+            40351d     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 7 
             40351d      5 INSTR BELONGTO 403510 
             40351d      5 INSTR DEADREGS  RAX RCX RSI RDI ZZ mov     ecx, 7 
             403522      3 INSTR BELONGTO 403510 
@@ -2706,19 +2706,19 @@
             403525      5 INSTR DEADREGS  RAX RDI ZZ mov     edi, offset aAlways; "always" 
             40352a     -1 INSTR LOCAL NoMetaUpdate repe cmpsb 
             40352a      2 INSTR BELONGTO 403510 
-            40352c     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setnbe  sil 
+            40352c     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setnbe  sil 
             40352c      4 INSTR BELONGTO 403510 
             40352c      4 INSTR DEADREGS  RAX RCX RSI ZZ setnbe  sil 
             403530     -1 INSTR LOCAL MetadataRedundant setb    cl 
             403530      3 INSTR BELONGTO 403510 
             403533      2 INSTR BELONGTO 403510 
             403533      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     al, al 
-            403533     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     al, al 
+            403533     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     al, al 
             403535     -1 INSTR LOCAL NoMetaUpdate cmp     sil, cl 
             403535      3 INSTR BELONGTO 403510 
             403538     -1 INSTR LOCAL NoMetaUpdate jz      short locret_403588 
             403538      2 INSTR BELONGTO 403510 
-            40353a     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 7 
+            40353a     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 7 
             40353a      5 INSTR BELONGTO 403510 
             40353a      5 INSTR DEADREGS  RAX RCX RSI RDI ZZ mov     ecx, 7 
             40353f      3 INSTR BELONGTO 403510 
@@ -2729,8 +2729,8 @@
             403547      2 INSTR BELONGTO 403510 
             403549      2 INSTR BELONGTO 403510 
             403549      2 INSTR DEADREGS  RAX RCX RSI ZZ mov     al, 1 
-            403549     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     al, 1 
-            40354b     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setnbe  sil 
+            403549     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     al, 1 
+            40354b     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setnbe  sil 
             40354b      4 INSTR BELONGTO 403510 
             40354b      4 INSTR DEADREGS  RCX RSI ZZ setnbe  sil 
             40354f     -1 INSTR LOCAL MetadataRedundant setb    cl 
@@ -2741,7 +2741,7 @@
             403555      2 INSTR BELONGTO 403510 
             403557      5 INSTR BELONGTO 403510 
             403557      5 INSTR DEADREGS  RCX RSI RDI ZZ mov     edi, offset aBonded_and_tru; "bonded_and_trusted" 
-            40355c     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 13h 
+            40355c     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 13h 
             40355c      5 INSTR BELONGTO 403510 
             40355c      5 INSTR DEADREGS  RCX RSI ZZ mov     ecx, 13h 
             403561      3 INSTR BELONGTO 403510 
@@ -2806,7 +2806,7 @@
             4035b5      3 INSTR BELONGTO 403590 
             4035b8     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4035A8 
             4035b8      2 INSTR BELONGTO 403590 
-            4035ba     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            4035ba     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             4035ba      5 INSTR BELONGTO 403590 
             4035ba      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 8 
             4035bf      3 INSTR BELONGTO 403590 
@@ -2818,7 +2818,7 @@
             4035c7      2 INSTR BELONGTO 403590 
             4035c9     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4035A8 
             4035c9      2 INSTR BELONGTO 403590 
-            4035cb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            4035cb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             4035cb      5 INSTR BELONGTO 403590 
             4035cb      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 4 
             4035d0      3 INSTR BELONGTO 403590 
@@ -2845,7 +2845,7 @@
             4035f0      4 INSTR BELONGTO 403590 
             4035f4      2 INSTR BELONGTO 403590 
             4035f4      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            4035f4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4035f4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4035f4      8 DEALLOC STACK esp - 8 xor     eax, eax
             4035f6      1 INSTR BELONGTO 403590 
             4035f6      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
@@ -2901,7 +2901,7 @@
             403648      2 INSTR BELONGTO 403600 
             40364a      2 INSTR BELONGTO 403600 
             40364a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            40364a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40364a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40364c      4 INSTR BELONGTO 403600 
             403650      3 INSTR BELONGTO 403600 
             403650      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 ba55cb14..88df2955 100644
--- a/tests/commit/trimmed-sorted-save-gnome-font-viewer.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-font-viewer.psexe.annot
@@ -991,14 +991,14 @@
             402dd1      5 INSTR BELONGTO 402d50 
             402dd1      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ mov     rax, [rsp+108h+var_C8] 
             402dd1      5 PTRIMMEDESP STACK 64 displ mov     rax, [rsp+108h+var_C8]
-            402dd6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            402dd6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             402dd6      5 INSTR BELONGTO 402d50 
             402dd6      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ mov     edx, 5          ; category 
             402ddb      5 INSTR BELONGTO 402d50 
             402ddb      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ mov     esi, offset msgid; "Usage: %s fontfile\n" 
             402de0      2 INSTR BELONGTO 402d50 
             402de0      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ xor     edi, edi        ; domainname 
-            402de0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            402de0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             402de2      3 INSTR BELONGTO 402d50 
             402de2      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ mov     rbx, [rax] 
             402de5     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -1008,13 +1008,13 @@
             402dea      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ mov     rdi, rax 
             402ded      2 INSTR BELONGTO 402d50 
             402ded      2 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ xor     eax, eax 
-            402ded     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402ded     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402def      3 INSTR BELONGTO 402d50 
             402def      3 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ mov     rsi, rbx 
             402df2     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             402df2      5 INSTR BELONGTO 402d50 
             402df2      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ call    _g_printerr 
-            402df7     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            402df7     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             402df7      5 INSTR BELONGTO 402d50 
             402df7      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ mov     eax, 1 
             402dfc     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 0D8h 
@@ -1078,7 +1078,7 @@
             402e58      8 PTRIMMEDESP STACK 200 displ lea     rcx, [rsp+108h+var_40]
             402e60      2 INSTR BELONGTO 402d50 
             402e60      2 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R14 R15 ZZ xor     edx, edx 
-            402e60     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            402e60     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             402e62      3 INSTR BELONGTO 402d50 
             402e62      3 INSTR DEADREGS  EFLAGS RBX RSI R12 R14 R15 ZZ mov     rsi, r13 
             402e65     -1 INSTR LOCAL NoMetaUpdate call    sub_403890 
@@ -1090,7 +1090,7 @@
             402e6c      6 INSTR BELONGTO 402d50 
             402e72      2 INSTR BELONGTO 402d50 
             402e72      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R14 R15 ZZ xor     edi, edi 
-            402e72     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            402e72     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             402e74     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_new 
             402e74      5 INSTR BELONGTO 402d50 
             402e74      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ call    _gtk_window_new 
@@ -1113,10 +1113,10 @@
             402e9b      4 INSTR DEADREGS  RAX RBX R12 R14 R15 ZZ cmovz   rsi, rcx 
             402e9f      2 INSTR BELONGTO 402d50 
             402e9f      2 INSTR DEADREGS  EFLAGS RAX RCX RBX R12 R14 R15 ZZ xor     ecx, ecx 
-            402e9f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            402e9f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             402ea1      2 INSTR BELONGTO 402d50 
             402ea1      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R14 R15 ZZ xor     eax, eax 
-            402ea1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402ea1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402ea3     -1 INSTR LOCAL NoMetaUpdate call    _g_strconcat 
             402ea3      5 INSTR BELONGTO 402d50 
             402ea3      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ call    _g_strconcat 
@@ -1184,10 +1184,10 @@
             402f06      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 ZZ xor     r8d, r8d 
             402f09      2 INSTR BELONGTO 402d50 
             402f09      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ xor     ecx, ecx 
-            402f09     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            402f09     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             402f0b      2 INSTR BELONGTO 402d50 
             402f0b      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ xor     edx, edx 
-            402f0b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            402f0b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             402f0d      3 INSTR BELONGTO 402d50 
             402f0d      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     r12, rax 
             402f10      5 INSTR BELONGTO 402d50 
@@ -1279,7 +1279,7 @@
             402f9e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             402f9e      5 INSTR BELONGTO 402d50 
             402f9e      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ call    _g_type_check_instance_cast 
-            402fa3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402fa3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402fa3      5 INSTR BELONGTO 402d50 
             402fa3      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R14 R15 ZZ mov     esi, 1 
             402fa8      3 INSTR BELONGTO 402d50 
@@ -1291,7 +1291,7 @@
             402fb0      2 INSTR BELONGTO 402d50 
             402fb2      2 INSTR BELONGTO 402d50 
             402fb2      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R14 R15 ZZ xor     edi, edi 
-            402fb2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            402fb2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             402fb4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
             402fb4      5 INSTR BELONGTO 402d50 
             402fb4      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ call    _gtk_box_new 
@@ -1320,10 +1320,10 @@
             402fd9      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ call    _gtk_container_add 
             402fde      2 INSTR BELONGTO 402d50 
             402fde      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R14 R15 ZZ xor     esi, esi 
-            402fde     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            402fde     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             402fe0      2 INSTR BELONGTO 402d50 
             402fe0      2 INSTR DEADREGS  EFLAGS RBX RDI R14 R15 ZZ xor     edi, edi 
-            402fe0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            402fe0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             402fe2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_new 
             402fe2      5 INSTR BELONGTO 402d50 
             402fe2      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ call    _gtk_scrolled_window_new 
@@ -1341,10 +1341,10 @@
             402ff8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             402ff8      5 INSTR BELONGTO 402d50 
             402ff8      5 INSTR DEADREGS  EFLAGS RBX R15 ZZ call    _g_type_check_instance_cast 
-            402ffd     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            402ffd     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             402ffd      5 INSTR BELONGTO 402d50 
             402ffd      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R15 ZZ mov     edx, 2 
-            403002     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403002     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403002      5 INSTR BELONGTO 402d50 
             403002      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R15 ZZ mov     esi, 1 
             403007      3 INSTR BELONGTO 402d50 
@@ -1367,12 +1367,12 @@
             403022     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             403022      3 INSTR BELONGTO 402d50 
             403022      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 ZZ xor     r8d, r8d 
-            403025     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            403025     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             403025      5 INSTR BELONGTO 402d50 
             403025      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     ecx, 1 
             40302a      3 INSTR BELONGTO 402d50 
             40302a      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rsi, rbp 
-            40302d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40302d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40302d      5 INSTR BELONGTO 402d50 
             40302d      5 INSTR DEADREGS  EFLAGS RDX RBX RDI ZZ mov     edx, 1 
             403032      3 INSTR BELONGTO 402d50 
@@ -1388,7 +1388,7 @@
             40303f      8 PTRIMMEDESP STACK 176 displ lea     rdx, [rsp+108h+var_58]
             403047      2 INSTR BELONGTO 402d50 
             403047      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            403047     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            403047     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             403049      3 INSTR BELONGTO 402d50 
             403049      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
             40304c      3 INSTR BELONGTO 402d50 
@@ -1421,7 +1421,7 @@
             403075      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R14 ZZ xor     r8d, r8d 
             403078      3 INSTR BELONGTO 402d50 
             403078      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 ZZ mov     rdi, rbx 
-            40307b     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_404280 
+            40307b     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_404280 
             40307b      5 INSTR BELONGTO 402d50 
             40307b      5 INSTR DEADREGS  EFLAGS RDX RSI R14 ZZ mov     edx, offset loc_404280 
             403080      5 INSTR BELONGTO 402d50 
@@ -1438,7 +1438,7 @@
             403095      3 INSTR BELONGTO 402d50 
             403098      3 INSTR BELONGTO 402d50 
             403098      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 ZZ mov     rdi, rbx 
-            40309b     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_404150 
+            40309b     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_404150 
             40309b      5 INSTR BELONGTO 402d50 
             40309b      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R14 ZZ mov     edx, offset loc_404150 
             4030a0      5 INSTR BELONGTO 402d50 
@@ -1450,7 +1450,7 @@
             4030aa      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R14 ZZ or      edx, 0FFFFFFFFh 
             4030ad      3 INSTR BELONGTO 402d50 
             4030ad      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R14 ZZ mov     rdi, rbp 
-            4030b0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1F4h 
+            4030b0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1F4h 
             4030b0      5 INSTR BELONGTO 402d50 
             4030b0      5 INSTR DEADREGS  EFLAGS RBX RSI R14 ZZ mov     esi, 1F4h 
             4030b5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_size_request 
@@ -1462,7 +1462,7 @@
             4030bf     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             4030bf      3 INSTR BELONGTO 402d50 
             4030bf      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R8 R9 R14 ZZ xor     r9d, r9d 
-            4030c2     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset _gtk_main_quit 
+            4030c2     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset _gtk_main_quit 
             4030c2      5 INSTR BELONGTO 402d50 
             4030c2      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R8 R14 ZZ mov     edx, offset _gtk_main_quit 
             4030c7     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -1472,7 +1472,7 @@
             4030ca      5 INSTR DEADREGS  EFLAGS RCX RBX RSI R14 ZZ mov     esi, offset aDestroy; "destroy" 
             4030cf      2 INSTR BELONGTO 402d50 
             4030cf      2 INSTR DEADREGS  EFLAGS RCX RBX R14 ZZ xor     ecx, ecx 
-            4030cf     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4030cf     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4030d1     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             4030d1      5 INSTR BELONGTO 402d50 
             4030d1      5 INSTR DEADREGS  EFLAGS RBX R14 ZZ call    _g_signal_connect_data 
@@ -1491,7 +1491,7 @@
             4030e9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4030e9      5 INSTR BELONGTO 402d50 
             4030e9      5 INSTR DEADREGS  EFLAGS RBX R14 ZZ call    _g_type_check_instance_cast 
-            4030ee     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4030ee     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4030ee      5 INSTR BELONGTO 402d50 
             4030ee      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R14 ZZ mov     esi, 1 
             4030f3      3 INSTR BELONGTO 402d50 
@@ -1507,7 +1507,7 @@
             403103     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             403103      5 INSTR BELONGTO 402d50 
             403103      5 INSTR DEADREGS  EFLAGS RBX R14 ZZ call    _g_type_check_instance_cast 
-            403108     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+            403108     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
             403108      5 INSTR BELONGTO 402d50 
             403108      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R14 ZZ mov     esi, 5 
             40310d      3 INSTR BELONGTO 402d50 
@@ -1525,12 +1525,12 @@
             403120     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             403120      3 INSTR BELONGTO 402d50 
             403120      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 R14 R15 ZZ xor     r8d, r8d 
-            403123     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            403123     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             403123      5 INSTR BELONGTO 402d50 
             403123      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R14 R15 ZZ mov     ecx, 1 
             403128      2 INSTR BELONGTO 402d50 
             403128      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R14 R15 ZZ xor     edx, edx 
-            403128     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            403128     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40312a      3 INSTR BELONGTO 402d50 
             40312a      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R14 R15 ZZ mov     rdi, rax 
             40312d      3 INSTR BELONGTO 402d50 
@@ -1543,8 +1543,8 @@
             403135      8 PTRIMMEDESP STACK 200 displ mov     r12, [rsp+108h+var_40]
             40313d      2 INSTR BELONGTO 402d50 
             40313d      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R14 R15 ZZ xor     edi, edi        ; domainname 
-            40313d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            40313f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40313d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40313f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40313f      5 INSTR BELONGTO 402d50 
             40313f      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R14 R15 ZZ mov     edx, 5          ; category 
             403144      5 INSTR BELONGTO 402d50 
@@ -1559,7 +1559,7 @@
             403153      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R14 R15 ZZ xor     r8d, r8d 
             403156      2 INSTR BELONGTO 402d50 
             403156      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 R15 ZZ xor     ecx, ecx 
-            403156     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403156     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403158      3 INSTR BELONGTO 402d50 
             403158      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 R15 ZZ mov     rsi, rax 
             40315b      3 INSTR BELONGTO 402d50 
@@ -1575,14 +1575,14 @@
             40316b      3 INSTR BELONGTO 402d50 
             40316e     -1 INSTR LOCAL NoMetaUpdate jz      short loc_403194 
             40316e      2 INSTR BELONGTO 402d50 
-            403170     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            403170     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             403170      5 INSTR BELONGTO 402d50 
             403170      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 R15 ZZ mov     edx, 5          ; category 
             403175      5 INSTR BELONGTO 402d50 
             403175      5 INSTR DEADREGS  EFLAGS RSI RDI R14 R15 ZZ mov     esi, offset aStyle; "Style:" 
             40317a      2 INSTR BELONGTO 402d50 
             40317a      2 INSTR DEADREGS  EFLAGS RDI R14 R15 ZZ xor     edi, edi        ; domainname 
-            40317a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40317a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40317c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40317c      5 INSTR BELONGTO 402d50 
             40317c      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _dcgettext 
@@ -1591,7 +1591,7 @@
             403181      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R14 R15 ZZ xor     r8d, r8d 
             403184      2 INSTR BELONGTO 402d50 
             403184      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 R15 ZZ xor     ecx, ecx 
-            403184     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403184     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403186      3 INSTR BELONGTO 402d50 
             403186      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 R15 ZZ mov     rdx, rbx 
             403189      3 INSTR BELONGTO 402d50 
@@ -1611,10 +1611,10 @@
             40319c      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R14 R15 ZZ xor     r8d, r8d 
             40319f      2 INSTR BELONGTO 402d50 
             40319f      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R14 R15 ZZ xor     ecx, ecx 
-            40319f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40319f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4031a1      2 INSTR BELONGTO 402d50 
             4031a1      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R14 R15 ZZ xor     edx, edx 
-            4031a1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4031a1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4031a3      3 INSTR BELONGTO 402d50 
             4031a3      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R14 R15 ZZ mov     r14, rax 
             4031a6      5 INSTR BELONGTO 402d50 
@@ -1645,7 +1645,7 @@
             4031d2     -1 INSTR LOCAL NoMetaUpdate call    _g_content_type_get_description 
             4031d2      5 INSTR BELONGTO 402d50 
             4031d2      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _g_content_type_get_description 
-            4031d7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4031d7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4031d7      5 INSTR BELONGTO 402d50 
             4031d7      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 R15 ZZ mov     edx, 5          ; category 
             4031dc      3 INSTR BELONGTO 402d50 
@@ -1654,7 +1654,7 @@
             4031df      5 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     esi, offset aType; "Type:" 
             4031e4      2 INSTR BELONGTO 402d50 
             4031e4      2 INSTR DEADREGS  EFLAGS RDI R15 ZZ xor     edi, edi        ; domainname 
-            4031e4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4031e4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4031e6     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4031e6      5 INSTR BELONGTO 402d50 
             4031e6      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _dcgettext 
@@ -1663,7 +1663,7 @@
             4031eb      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 ZZ xor     r8d, r8d 
             4031ee      2 INSTR BELONGTO 402d50 
             4031ee      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ xor     ecx, ecx 
-            4031ee     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4031ee     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4031f0      3 INSTR BELONGTO 402d50 
             4031f0      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     rdx, r14 
             4031f3      3 INSTR BELONGTO 402d50 
@@ -1688,7 +1688,7 @@
             403211     -1 INSTR LOCAL NoMetaUpdate call    _g_format_size 
             403211      5 INSTR BELONGTO 402d50 
             403211      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _g_format_size 
-            403216     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            403216     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             403216      5 INSTR BELONGTO 402d50 
             403216      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 R15 ZZ mov     edx, 5          ; category 
             40321b      3 INSTR BELONGTO 402d50 
@@ -1697,7 +1697,7 @@
             40321e      5 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     esi, offset aSize; "Size:" 
             403223      2 INSTR BELONGTO 402d50 
             403223      2 INSTR DEADREGS  EFLAGS RDI R15 ZZ xor     edi, edi        ; domainname 
-            403223     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            403223     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             403225     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             403225      5 INSTR BELONGTO 402d50 
             403225      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _dcgettext 
@@ -1706,7 +1706,7 @@
             40322a      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 ZZ xor     r8d, r8d 
             40322d      2 INSTR BELONGTO 402d50 
             40322d      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ xor     ecx, ecx 
-            40322d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40322d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40322f      3 INSTR BELONGTO 402d50 
             40322f      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     rdx, r14 
             403232      3 INSTR BELONGTO 402d50 
@@ -1749,7 +1749,7 @@
             403275      9 PTRIMMEDESP STACK 48 displ mov     [rsp+108h+var_D8], 0
             40327e      2 INSTR BELONGTO 402d50 
             40327e      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R15 ZZ xor     ebx, ebx 
-            40327e     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40327e     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             403280      9 INSTR BELONGTO 402d50 
             403280      9 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     [rsp+108h+var_D0], 0 
             403280      9 PTRIMMEDESP STACK 56 displ mov     [rsp+108h+var_D0], 0
@@ -1791,7 +1791,7 @@
             4032cc      3 INSTR BELONGTO 402d50 
             4032cf     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_403295 
             4032cf      2 INSTR BELONGTO 402d50 
-            4032d1     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, word ptr [rsp+108h+var_78+6] 
+            4032d1     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, word ptr [rsp+108h+var_78+6] 
             4032d1      8 INSTR BELONGTO 402d50 
             4032d1      8 INSTR DEADREGS  EFLAGS RAX ZZ movzx   eax, word ptr [rsp+108h+var_78+6] 
             4032d1      8 PTRIMMEDESP STACK 150 displ movzx   eax, word ptr [rsp+108h+var_78+6]
@@ -1842,7 +1842,7 @@
             40332d      5 INSTR BELONGTO 402d50 
             403332      2 INSTR BELONGTO 402d50 
             403332      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 R14 R15 XMM0 XMM1 XMM3 ZZ xor     eax, eax 
-            403332     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403332     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403334      3 INSTR BELONGTO 402d50 
             403334      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R14 R15 XMM0 XMM1 XMM3 ZZ mov     rsi, r13 
             403337      5 INSTR BELONGTO 402d50 
@@ -1850,20 +1850,20 @@
             40333c     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             40333c      5 INSTR BELONGTO 402d50 
             40333c      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ call    _g_printerr 
-            403341     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            403341     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             403341      5 INSTR BELONGTO 402d50 
             403341      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ mov     eax, 1 
             403346     -1 INSTR LOCAL NoMetaUpdate jmp     loc_402DFC 
             403346      5 INSTR BELONGTO 402d50 
             40334b      2 INSTR BELONGTO 402d50 
             40334b      2 INSTR DEADREGS  EFLAGS RAX RBX RDI R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ xor     eax, eax 
-            40334b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40334b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40334d      5 INSTR BELONGTO 402d50 
             40334d      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ mov     edi, offset aCouldNotInitia; "Could not initialise freetype\n" 
             403352     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             403352      5 INSTR BELONGTO 402d50 
             403352      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ call    _g_printerr 
-            403357     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            403357     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             403357      5 INSTR BELONGTO 402d50 
             403357      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ mov     eax, 1 
             40335c     -1 INSTR LOCAL NoMetaUpdate jmp     loc_402DFC 
@@ -1889,7 +1889,7 @@
             40337a      2 INSTR BELONGTO 402d50 
             40337c      2 INSTR BELONGTO 402d50 
             40337c      2 INSTR DEADREGS  EFLAGS RDX RBX R12 R14 R15 ZZ xor     edx, edx 
-            40337c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40337c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40337e      4 INSTR BELONGTO 402d50 
             40337e      4 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ or      rsi, 0FFFFFFFFFFFFFFFFh 
             403382     -1 INSTR LOCAL NoMetaUpdate call    _g_utf8_validate 
@@ -1908,7 +1908,7 @@
             403397      2 INSTR BELONGTO 402d50 
             403399      2 INSTR BELONGTO 402d50 
             403399      2 INSTR DEADREGS  EFLAGS RDX RBX R12 R14 R15 ZZ xor     edx, edx 
-            403399     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            403399     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40339b      4 INSTR BELONGTO 402d50 
             40339b      4 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ or      rsi, 0FFFFFFFFFFFFFFFFh 
             40339f     -1 INSTR LOCAL NoMetaUpdate call    _g_utf8_validate 
@@ -1921,21 +1921,21 @@
             4033a8      5 INSTR BELONGTO 402d50 
             4033a8      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R14 R15 ZZ mov     rbx, [rsp+108h+var_B0] 
             4033a8      5 PTRIMMEDESP STACK 88 displ mov     rbx, [rsp+108h+var_B0]
-            4033ad     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4033ad     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4033ad      5 INSTR BELONGTO 402d50 
             4033ad      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 ZZ mov     edx, 5          ; category 
             4033b2      5 INSTR BELONGTO 402d50 
             4033b2      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 ZZ mov     esi, offset aCopyright; "Copyright:" 
             4033b7      2 INSTR BELONGTO 402d50 
             4033b7      2 INSTR DEADREGS  EFLAGS RDI R12 R14 R15 ZZ xor     edi, edi        ; domainname 
-            4033b7     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4033b7     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4033b9     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4033b9      5 INSTR BELONGTO 402d50 
             4033b9      5 INSTR DEADREGS  EFLAGS R12 R14 R15 ZZ call    _dcgettext 
             4033be     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             4033be      3 INSTR BELONGTO 402d50 
             4033be      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R14 R15 ZZ xor     r8d, r8d 
-            4033c1     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            4033c1     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             4033c1      5 INSTR BELONGTO 402d50 
             4033c1      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 R15 ZZ mov     ecx, 1 
             4033c6      3 INSTR BELONGTO 402d50 
@@ -1958,7 +1958,7 @@
             4033ea     -1 INSTR LOCAL NoMetaUpdate call    _gtk_alignment_new 
             4033ea      5 INSTR BELONGTO 402d50 
             4033ea      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ call    _gtk_alignment_new 
-            4033ef     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4033ef     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4033ef      5 INSTR BELONGTO 402d50 
             4033ef      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ mov     esi, 1 
             4033f4      3 INSTR BELONGTO 402d50 
@@ -1979,7 +1979,7 @@
             40340c     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40340c      3 INSTR BELONGTO 402d50 
             40340c      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ xor     r8d, r8d 
-            40340f     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            40340f     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             40340f      5 INSTR BELONGTO 402d50 
             40340f      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ mov     ecx, 2 
             403414      3 INSTR BELONGTO 402d50 
@@ -1990,18 +1990,18 @@
             40341a      5 INSTR DEADREGS  EFLAGS RAX RDX R12 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ mov     edx, offset aWidth; "width" 
             40341f      2 INSTR BELONGTO 402d50 
             40341f      2 INSTR DEADREGS  EFLAGS RAX R12 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ xor     eax, eax 
-            40341f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40341f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403421     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add_with_properties 
             403421      5 INSTR BELONGTO 402d50 
             403421      5 INSTR DEADREGS  EFLAGS R12 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ call    _gtk_container_add_with_properties 
-            403426     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            403426     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             403426      5 INSTR BELONGTO 402d50 
             403426      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ mov     edx, 5          ; category 
             40342b      5 INSTR BELONGTO 402d50 
             40342b      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ mov     esi, offset aI_nstallFont; "I_nstall Font" 
             403430      2 INSTR BELONGTO 402d50 
             403430      2 INSTR DEADREGS  EFLAGS RDI R12 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ xor     edi, edi        ; domainname 
-            403430     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            403430     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             403432     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             403432      5 INSTR BELONGTO 402d50 
             403432      5 INSTR DEADREGS  EFLAGS R12 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ call    _dcgettext 
@@ -2018,7 +2018,7 @@
             403442      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ xor     r8d, r8d 
             403445      3 INSTR BELONGTO 402d50 
             403445      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ mov     rcx, r13 
-            403448     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_403CE0 
+            403448     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_403CE0 
             403448      5 INSTR BELONGTO 402d50 
             403448      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ mov     edx, offset loc_403CE0 
             40344d      5 INSTR BELONGTO 402d50 
@@ -2057,7 +2057,7 @@
             403483     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             403483      5 INSTR BELONGTO 402d50 
             403483      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ call    _g_type_check_instance_cast 
-            403488     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            403488     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             403488      5 INSTR BELONGTO 402d50 
             403488      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ mov     esi, 8 
             40348d      3 INSTR BELONGTO 402d50 
@@ -2072,7 +2072,7 @@
             40349b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40349b      5 INSTR BELONGTO 402d50 
             40349b      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ call    _g_type_check_instance_cast 
-            4034a0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            4034a0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             4034a0      5 INSTR BELONGTO 402d50 
             4034a0      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ mov     esi, 2 
             4034a5      3 INSTR BELONGTO 402d50 
@@ -2091,7 +2091,7 @@
             4034b7      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ call    _gtk_main 
             4034bc      2 INSTR BELONGTO 402d50 
             4034bc      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 ZZ xor     eax, eax 
-            4034bc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4034bc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4034be     -1 INSTR LOCAL NoMetaUpdate jmp     loc_402DFC 
             4034be      5 INSTR BELONGTO 402d50 
             4034c3     -1 INSTR LOCAL NoMetaUpdate cmp     [rsp+108h+var_D8], 0 
@@ -2099,14 +2099,14 @@
             4034c3      6 PTRIMMEDESP STACK 48 displ cmp     [rsp+108h+var_D8], 0
             4034c9     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4034FB 
             4034c9      2 INSTR BELONGTO 402d50 
-            4034cb     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4034cb     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4034cb      5 INSTR BELONGTO 402d50 
             4034cb      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R14 R15 ZZ mov     edx, 5          ; category 
             4034d0      5 INSTR BELONGTO 402d50 
             4034d0      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R14 R15 ZZ mov     esi, offset aVersion; "Version:" 
             4034d5      2 INSTR BELONGTO 402d50 
             4034d5      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R14 R15 ZZ xor     edi, edi        ; domainname 
-            4034d5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4034d5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4034d7     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4034d7      5 INSTR BELONGTO 402d50 
             4034d7      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ call    _dcgettext 
@@ -2120,7 +2120,7 @@
             4034e4      3 INSTR DEADREGS  EFLAGS RCX RBX RSI R8 R12 R14 R15 ZZ xor     r8d, r8d 
             4034e7      2 INSTR BELONGTO 402d50 
             4034e7      2 INSTR DEADREGS  EFLAGS RCX RBX RSI R12 R14 R15 ZZ xor     ecx, ecx 
-            4034e7     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4034e7     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4034e9      3 INSTR BELONGTO 402d50 
             4034e9      3 INSTR DEADREGS  EFLAGS RBX RSI R12 R14 R15 ZZ mov     rsi, rax 
             4034ec     -1 INSTR LOCAL NoMetaUpdate call    sub_403A20 
@@ -2137,14 +2137,14 @@
             4034fb      6 PTRIMMEDESP STACK 56 displ cmp     [rsp+108h+var_D0], 0
             403501     -1 INSTR LOCAL NoMetaUpdate jz      short loc_403539 
             403501      2 INSTR BELONGTO 402d50 
-            403503     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            403503     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             403503      5 INSTR BELONGTO 402d50 
             403503      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R14 R15 ZZ mov     edx, 5          ; category 
             403508      5 INSTR BELONGTO 402d50 
             403508      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R14 R15 ZZ mov     esi, offset aCopyright; "Copyright:" 
             40350d      2 INSTR BELONGTO 402d50 
             40350d      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R14 R15 ZZ xor     edi, edi        ; domainname 
-            40350d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40350d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40350f     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40350f      5 INSTR BELONGTO 402d50 
             40350f      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ call    _dcgettext 
@@ -2156,7 +2156,7 @@
             40351c     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
             40351c      6 INSTR BELONGTO 402d50 
             40351c      6 INSTR DEADREGS  EFLAGS RCX RBX RSI R8 R12 R14 R15 ZZ mov     r8d, 1 
-            403522     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            403522     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             403522      5 INSTR BELONGTO 402d50 
             403522      5 INSTR DEADREGS  EFLAGS RCX RBX RSI R12 R14 R15 ZZ mov     ecx, 1 
             403527      3 INSTR BELONGTO 402d50 
@@ -2177,8 +2177,8 @@
             40353f      6 INSTR BELONGTO 402d50 
             403545      2 INSTR BELONGTO 402d50 
             403545      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R14 R15 ZZ xor     edi, edi        ; domainname 
-            403545     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            403547     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            403545     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            403547     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             403547      5 INSTR BELONGTO 402d50 
             403547      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R14 R15 ZZ mov     edx, 5          ; category 
             40354c      5 INSTR BELONGTO 402d50 
@@ -2194,7 +2194,7 @@
             40355e     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
             40355e      6 INSTR BELONGTO 402d50 
             40355e      6 INSTR DEADREGS  EFLAGS RCX RBX RSI R8 R12 R14 R15 ZZ mov     r8d, 1 
-            403564     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            403564     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             403564      5 INSTR BELONGTO 402d50 
             403564      5 INSTR DEADREGS  EFLAGS RCX RBX RSI R12 R14 R15 ZZ mov     ecx, 1 
             403569      3 INSTR BELONGTO 402d50 
@@ -2304,13 +2304,13 @@
             403623      5 INSTR BELONGTO 402d50 
             403628      2 INSTR BELONGTO 402d50 
             403628      2 INSTR DEADREGS  EFLAGS RAX RBX RDI R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ xor     eax, eax 
-            403628     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403628     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40362a      5 INSTR BELONGTO 402d50 
             40362a      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ mov     edi, offset aCouldNotParseA; "Could not parse argument into a URI\n" 
             40362f     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             40362f      5 INSTR BELONGTO 402d50 
             40362f      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ call    _g_printerr 
-            403634     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            403634     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             403634      5 INSTR BELONGTO 402d50 
             403634      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ mov     eax, 1 
             403639     -1 INSTR LOCAL NoMetaUpdate jmp     loc_402DFC 
@@ -2353,8 +2353,8 @@
             40367e      5 PTRIMMEDESP STACK 80 displ mov     rbx, [rsp+108h+var_B8]
             403683      2 INSTR BELONGTO 402d50 
             403683      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 ZZ xor     edi, edi        ; domainname 
-            403683     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            403685     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            403683     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            403685     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             403685      5 INSTR BELONGTO 402d50 
             403685      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R14 R15 ZZ mov     edx, 5          ; category 
             40368a      5 INSTR BELONGTO 402d50 
@@ -2367,7 +2367,7 @@
             403694      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R14 R15 ZZ xor     r8d, r8d 
             403697      2 INSTR BELONGTO 402d50 
             403697      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 R15 ZZ xor     ecx, ecx 
-            403697     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403697     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403699      3 INSTR BELONGTO 402d50 
             403699      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 ZZ mov     rdx, rbx 
             40369c      3 INSTR BELONGTO 402d50 
@@ -2505,7 +2505,7 @@
             403769      3 INSTR BELONGTO 403760 
             40376c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_403780 
             40376c      2 INSTR BELONGTO 403760 
-            40376e     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            40376e     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             40376e      5 INSTR BELONGTO 403760 
             403773     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             403773      3 INSTR BELONGTO 403760 
@@ -2553,17 +2553,17 @@
             4037e3     -1 INSTR LOCAL NoMetaUpdate test    rcx, rcx 
             4037ed     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4037FA 
             4037ef     -1 INSTR LOCAL NoMetaUpdate cmp     [rdi+8], rsi 
-            4037f3     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            4037f3     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
             4037f8     -1 INSTR LOCAL NoMetaUpdate jb      short loc_40382A 
             4037fa     -1 INSTR LOCAL NoMetaUpdate call    _g_seekable_get_type 
             403805     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40380a     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40380d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40380f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40380d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40380f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40381a     -1 INSTR LOCAL NoMetaUpdate call    _g_seekable_seek 
             40381f     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             403821     -1 INSTR LOCAL NoMetaUpdate jz      short loc_403850 
-            403823     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            403823     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             403825     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
             403828     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_403860 
             40382a      3 PTRIMMEDEBP STACK 0 displ mov     rax, rbp
@@ -2573,14 +2573,14 @@
             40383b      5 PTRIMMEDESP STACK 24 displ mov     r13, [rsp+18h]
             403840      5 PTRIMMEDESP STACK 32 displ mov     r14, [rsp+20h]
             403845     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
-            403850     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            403850     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             403852     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
-            403855     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM setz    bpl 
+            403855     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM setz    bpl 
             403859     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40382A 
             403860     -1 INSTR LOCAL NoMetaUpdate call    _g_input_stream_get_type 
             40386b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             403870     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            403873     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403873     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40387e     -1 INSTR LOCAL NoMetaUpdate call    _g_input_stream_read 
             403883     -1 INSTR LOCAL NoMetaUpdate cmp     rax, 0FFFFFFFFFFFFFFFFh 
             40388b     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40382A 
@@ -2601,7 +2601,7 @@
             4038a2      5 INSTR BELONGTO 403890 
             4038a2      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     [rsp+var_10], r14 
             4038a2      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], r14
-            4038a7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h        ; size 
+            4038a7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h        ; size 
             4038a7      5 INSTR BELONGTO 403890 
             4038a7      5 INSTR DEADREGS  EFLAGS RBX RSI R12 R14 ZZ mov     esi, 50h        ; size 
             4038ac      5 INSTR BELONGTO 403890 
@@ -2616,7 +2616,7 @@
             4038b9      7 INSTR BELONGTO 403890 
             4038b9      7 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 ZZ sub     rsp, 88h 
             4038b9      8 MEMORYHOLE STACK esp + 136 ReturnAddress 
-            4038c0     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; nmemb 
+            4038c0     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; nmemb 
             4038c0      5 INSTR BELONGTO 403890 
             4038c0      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 ZZ mov     edi, 1          ; nmemb 
             4038c5     -2 INSTR LOCAL n R14 ZZ  NumericDEFs mov     r14, rdx 
@@ -2629,7 +2629,7 @@
             4038cb      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _calloc 
             4038d0      3 INSTR BELONGTO 403890 
             4038d0      3 INSTR DEADREGS  EFLAGS RBX R13 ZZ mov     rbx, rax 
-            4038d3     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 40h 
+            4038d3     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 40h 
             4038d3      5 INSTR BELONGTO 403890 
             4038d3      5 INSTR DEADREGS  EFLAGS RAX R13 ZZ mov     eax, 40h 
             4038d8     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -2643,10 +2643,10 @@
             4038e4      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_file_new_for_uri 
             4038e9      2 INSTR BELONGTO 403890 
             4038e9      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ xor     edx, edx 
-            4038e9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4038e9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4038eb      2 INSTR BELONGTO 403890 
             4038eb      2 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ xor     esi, esi 
-            4038eb     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4038eb     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4038ed      3 INSTR BELONGTO 403890 
             4038ed      3 INSTR DEADREGS  EFLAGS RDI R13 ZZ mov     rdi, rax 
             4038f0      3 INSTR BELONGTO 403890 
@@ -2665,10 +2665,10 @@
             403904      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             403907      2 INSTR BELONGTO 403890 
             403907      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            403907     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403907     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403909      2 INSTR BELONGTO 403890 
             403909      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            403909     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            403909     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40390b      5 INSTR BELONGTO 403890 
             40390b      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aStandardSize; "standard::size" 
             403910      3 INSTR BELONGTO 403890 
@@ -2799,7 +2799,7 @@
             403a0b     -1 INSTR LOCAL NoMetaUpdate call    _free 
             403a0b      5 INSTR BELONGTO 403890 
             403a0b      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _free 
-            403a10     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            403a10     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             403a10      5 INSTR BELONGTO 403890 
             403a10      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     eax, 1 
             403a15     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4039B8 
@@ -2812,7 +2812,7 @@
             403a20    694 FUNC GLOBAL sub_403A20 FUNC_UNSAFE NOFP RET             403cd5 
             403a22      2 INSTR BELONGTO 403a20 
             403a22      2 INSTR DEADREGS  EFLAGS RAX R15 XMM0 ZZ xor     eax, eax 
-            403a22     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403a22     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403a24      3 INSTR BELONGTO 403a20 
             403a24      3 INSTR DEADREGS  EFLAGS R15 XMM0 ZZ mov     r15, rdx 
             403a27      5 INSTR BELONGTO 403a20 
@@ -2827,7 +2827,7 @@
             403a30      3 INSTR BELONGTO 403a20 
             403a33      2 INSTR BELONGTO 403a20 
             403a33      2 INSTR DEADREGS  EFLAGS RCX R14 XMM0 ZZ xor     ecx, ecx 
-            403a33     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403a33     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403a35      2 INSTR BELONGTO 403a20 
             403a35      2 INSTR DEADREGS  EFLAGS R14 XMM0 ZZ push    r12 
             403a35     -3 INSTR LOCAL NoWarn push    r12 
@@ -2899,7 +2899,7 @@
             403a95     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             403a95      5 INSTR BELONGTO 403a20 
             403a95      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-            403a9a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403a9a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403a9a      5 INSTR BELONGTO 403a20 
             403a9a      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 1 
             403a9f      3 INSTR BELONGTO 403a20 
@@ -2945,7 +2945,7 @@
             403ae0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             403ae0      5 INSTR BELONGTO 403a20 
             403ae0      5 INSTR DEADREGS  EFLAGS R13 R15 XMM0 ZZ call    _g_type_check_instance_cast 
-            403ae5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403ae5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403ae5      5 INSTR BELONGTO 403a20 
             403ae5      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM0 ZZ mov     esi, 1 
             403aea      3 INSTR BELONGTO 403a20 
@@ -2961,7 +2961,7 @@
             403af9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             403af9      5 INSTR BELONGTO 403a20 
             403af9      5 INSTR DEADREGS  EFLAGS R13 R15 XMM0 ZZ call    _g_type_check_instance_cast 
-            403afe     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403afe     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403afe      5 INSTR BELONGTO 403a20 
             403afe      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM0 ZZ mov     esi, 1 
             403b03      3 INSTR BELONGTO 403a20 
@@ -2999,12 +2999,12 @@
             403b34      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM0 XMM1 ZZ call    _gtk_scrolled_window_get_type 
             403b39      2 INSTR BELONGTO 403a20 
             403b39      2 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 XMM0 XMM1 ZZ xor     esi, esi 
-            403b39     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            403b39     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             403b3b      3 INSTR BELONGTO 403a20 
             403b3b      3 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 XMM0 XMM1 ZZ mov     r13, rax 
             403b3e      2 INSTR BELONGTO 403a20 
             403b3e      2 INSTR DEADREGS  EFLAGS RDI R14 R15 XMM0 XMM1 ZZ xor     edi, edi 
-            403b3e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403b3e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403b40     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_new 
             403b40      5 INSTR BELONGTO 403a20 
             403b40      5 INSTR DEADREGS  EFLAGS R14 R15 XMM0 XMM1 ZZ call    _gtk_scrolled_window_new 
@@ -3015,12 +3015,12 @@
             403b4b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             403b4b      5 INSTR BELONGTO 403a20 
             403b4b      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM0 XMM1 ZZ call    _g_type_check_instance_cast 
-            403b50     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            403b50     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             403b50      5 INSTR BELONGTO 403a20 
             403b50      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 XMM0 XMM1 ZZ mov     edx, 1 
             403b55      3 INSTR BELONGTO 403a20 
             403b55      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 XMM0 XMM1 ZZ mov     r14, rax 
-            403b58     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            403b58     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             403b58      5 INSTR BELONGTO 403a20 
             403b58      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM0 XMM1 ZZ mov     esi, 2 
             403b5d      3 INSTR BELONGTO 403a20 
@@ -3061,7 +3061,7 @@
             403b91      5 INSTR DEADREGS  EFLAGS R15 XMM0 XMM1 ZZ call    _g_type_check_instance_cast 
             403b96      2 INSTR BELONGTO 403a20 
             403b96      2 INSTR DEADREGS  EFLAGS RSI RDI R15 XMM0 XMM1 ZZ xor     esi, esi 
-            403b96     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            403b96     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             403b98      3 INSTR BELONGTO 403a20 
             403b98      3 INSTR DEADREGS  EFLAGS RDI R15 XMM0 XMM1 ZZ mov     rdi, rax 
             403b9b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_viewport_set_shadow_type 
@@ -3112,14 +3112,14 @@
             403be5     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             403be5      3 INSTR BELONGTO 403a20 
             403be5      3 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R12 R14 R15 XMM0 XMM1 ZZ xor     r8d, r8d 
-            403be8     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            403be8     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             403be8      5 INSTR BELONGTO 403a20 
             403be8      5 INSTR DEADREGS  EFLAGS RAX RCX RDX R12 R14 R15 XMM0 XMM1 ZZ mov     ecx, 2 
             403bed      5 INSTR BELONGTO 403a20 
             403bed      5 INSTR DEADREGS  EFLAGS RAX RDX R12 R14 R15 XMM0 XMM1 ZZ mov     edx, offset aWidth; "width" 
             403bf2      2 INSTR BELONGTO 403a20 
             403bf2      2 INSTR DEADREGS  EFLAGS RAX R12 R14 R15 XMM0 XMM1 ZZ xor     eax, eax 
-            403bf2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403bf2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403bf4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add_with_properties 
             403bf4      5 INSTR BELONGTO 403a20 
             403bf4      5 INSTR DEADREGS  EFLAGS R12 R14 R15 XMM0 XMM1 ZZ call    _gtk_container_add_with_properties 
@@ -3180,7 +3180,7 @@
             403c4a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             403c4a      5 INSTR BELONGTO 403a20 
             403c4a      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM0 XMM1 ZZ call    _g_type_check_instance_cast 
-            403c4f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403c4f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403c4f      5 INSTR BELONGTO 403a20 
             403c4f      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 XMM0 XMM1 ZZ mov     esi, 1 
             403c54      3 INSTR BELONGTO 403a20 
@@ -3221,7 +3221,7 @@
             403c80      6 INSTR BELONGTO 403a20 
             403c86     -1 INSTR LOCAL MetadataUnused mov     r8d, 1 
             403c86      6 INSTR BELONGTO 403a20 
-            403c8c     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            403c8c     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             403c8c      5 INSTR BELONGTO 403a20 
             403c8c      5 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 ZZ mov     ecx, 1 
             403c91     -1 INSTR LOCAL MetadataUnused mov     rdi, rax 
@@ -3241,7 +3241,7 @@
             403ca7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             403ca7      5 INSTR BELONGTO 403a20 
             403ca7      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 ZZ call    _g_type_check_instance_cast 
-            403cac     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403cac     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403cac      5 INSTR BELONGTO 403a20 
             403cac      5 INSTR DEADREGS  EFLAGS RSI RDI XMM0 XMM1 ZZ mov     esi, 1 
             403cb1      3 INSTR BELONGTO 403a20 
@@ -3256,7 +3256,7 @@
             403cbf     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             403cbf      5 INSTR BELONGTO 403a20 
             403cbf      5 INSTR DEADREGS  EFLAGS R15 XMM0 XMM1 ZZ call    _g_type_check_instance_cast 
-            403cc4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403cc4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403cc4      5 INSTR BELONGTO 403a20 
             403cc4      5 INSTR DEADREGS  EFLAGS RSI RDI R15 XMM0 XMM1 ZZ mov     esi, 1 
             403cc9      3 INSTR BELONGTO 403a20 
@@ -3272,24 +3272,24 @@
             403cf2      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r12
             403cfe      9 PTRIMMEDESP STACK 40 displ mov     qword ptr [rsp+28h], 0
             403d07     -1 INSTR LOCAL NoMetaUpdate call    _g_get_home_dir 
-            403d0c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            403d16     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403d0c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            403d16     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403d18     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
-            403d1d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            403d1d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             403d28     -1 INSTR LOCAL NoMetaUpdate call    _g_file_test 
             403d2d     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             403d2f     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_403D90 
             403d34     -1 INSTR LOCAL NoMetaUpdate call    _g_file_new_for_path 
             403d39      5 PTRIMMEDESP STACK 40 displ lea     rdx, [rsp+28h]
-            403d3e     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            403d3e     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             403d46     -1 INSTR LOCAL NoMetaUpdate call    _g_file_make_directory_with_parents 
             403d4e     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             403d53      5 PTRIMMEDESP STACK 40 displ mov     rax, [rsp+28h]
             403d58     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             403d5b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_403D90 
-            403d66     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            403d6b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            403d6d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403d66     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            403d6b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            403d6d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403d6f     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403d74      5 PTRIMMEDESP STACK 40 displ mov     rdi, [rsp+28h]
             403d79     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
@@ -3300,16 +3300,16 @@
             403d9b     -1 INSTR LOCAL NoMetaUpdate call    _g_file_new_for_uri 
             403da6     -1 INSTR LOCAL NoMetaUpdate call    _g_file_get_basename 
             403dae     -1 INSTR LOCAL NoMetaUpdate call    _g_get_home_dir 
-            403db6     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            403dc0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403db6     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            403dc0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403dc2     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             403dcd     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             403dd2      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             403dd5     -1 INSTR LOCAL NoMetaUpdate call    _g_file_new_for_path 
             403dda     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             403ddd     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            403de0     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            403de2     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            403de0     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            403de2     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             403ded      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], r13
             403df2      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], offset loc_403E40
             403dfb      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], 0
@@ -3334,27 +3334,27 @@
             403e75     -1 INSTR LOCAL NoMetaUpdate call    _g_file_copy_finish 
             403e7a     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rsp+8], 0 
             403e7a      6 PTRIMMEDESP STACK 8 displ cmp     qword ptr [rsp+8], 0
-            403e80     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            403e80     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             403e85     -1 INSTR LOCAL NoMetaUpdate jz      short loc_403F00 
-            403e8c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403e8c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403e8e     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             403e96     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_get_type 
             403ea1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             403ea6      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             403eac     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_set_label 
             403eb1      5 PTRIMMEDESP STACK 8 displ mov     rax, [rsp+8]
-            403eb6     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            403ebd     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-            403ec6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403eb6     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            403ebd     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            403ec6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403ec8     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403ecd      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
             403ed2     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
             403ed7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
             403ee2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            403ee7     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            403ee7     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             403eec     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
             403ef1     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
-            403f00     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403f00     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403f07     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             403f0f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_get_type 
             403f1a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -3473,7 +3473,7 @@
             403ff5      3 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     rbp, rdi 
             403ff8      2 INSTR BELONGTO 403ff0 
             403ff8      2 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ xor     edi, edi 
-            403ff8     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403ff8     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403ffa      1 INSTR BELONGTO 403ff0 
             403ffa      1 INSTR DEADREGS  EFLAGS R12 R13 ZZ push    rbx 
             403ffa     -3 INSTR LOCAL NoWarn push    rbx 
@@ -3587,7 +3587,7 @@
             404090      2 INSTR BELONGTO 404080 
             404092      6 INSTR BELONGTO 404080 
             404092      6 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     dword ptr [rsi], 8 
-            404098     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 20h 
+            404098     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 20h 
             404098      5 INSTR BELONGTO 404080 
             404098      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 20h 
             40409d     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc 
@@ -3624,7 +3624,7 @@
             4040f0      4 INSTR DEADREGS  EFLAGS ZZ movsxd  rdi, dword ptr [rdi+38h] 
             4040f4      2 INSTR BELONGTO 404080 
             4040f4      2 INSTR DEADREGS  EFLAGS ZZ mov     [rsi], edi 
-            4040f6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            4040f6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             4040f6      5 INSTR BELONGTO 404080 
             4040f6      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 4 
             4040fb     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc_n 
@@ -3642,15 +3642,15 @@
             40410e      4 INSTR BELONGTO 404080 
             404112      2 INSTR BELONGTO 404080 
             404112      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R9 R10 R11 ZZ xor     edx, edx 
-            404112     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            404112     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             404114      2 INSTR BELONGTO 404080 
             404114      2 INSTR DEADREGS  EFLAGS RCX RSI RDI R9 R10 R11 ZZ xor     esi, esi 
-            404114     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            404114     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             404116     10 INSTR BELONGTO 404080 
-            404120     -2 INSTR LOCAL n EDI ZZ  NumericDEFs movzx   edi, word ptr [r8+rdx*8] 
+            404120     -2 INSTR LOCAL n RDI ZZ  NumericDEFs movzx   edi, word ptr [r8+rdx*8] 
             404120      5 INSTR BELONGTO 404080 
             404120      5 INSTR DEADREGS  EFLAGS RCX RDI R9 R10 R11 ZZ movzx   edi, word ptr [r8+rdx*8] 
-            404125     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movsx   ecx, di 
+            404125     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movsx   ecx, di 
             404125      3 INSTR BELONGTO 404080 
             404125      3 INSTR DEADREGS  EFLAGS RCX R9 R10 R11 ZZ movsx   ecx, di 
             404128     -1 INSTR LOCAL NoMetaUpdate cmp     di, 18h 
@@ -3689,7 +3689,7 @@
             40416a      5 PTRIMMEDESP STACK 56 displ lea     rdx, [rsp+38h]
             40416f      5 PTRIMMEDESP STACK 52 displ lea     rsi, [rsp+34h]
             40417a     -1 INSTR LOCAL NoMetaUpdate call    sub_404080 
-            40417f     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40417f     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             404187     -1 INSTR LOCAL NoMetaUpdate call    _cairo_ft_font_face_create_for_ft_face 
             404195     -1 INSTR LOCAL NoMetaUpdate call    _cairo_set_font_face 
             40419a      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
@@ -3697,11 +3697,11 @@
             4041a8     -1 INSTR LOCAL NoMetaUpdate call    _cairo_font_face_destroy 
             4041ad     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm0, qword ptr [rsp+10h] 
             4041ad      6 PTRIMMEDESP STACK 16 displ movsd   xmm0, qword ptr [rsp+10h]
-            4041b3     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 24h 
+            4041b3     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 24h 
             4041b8     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm0, cs:qword_404808 
             4041c0     -1 INSTR LOCAL NoMetaUpdate jbe     short loc_4041CE 
             4041c2     -1 INSTR LOCAL NoMetaUpdate addsd   xmm0, cs:qword_404800 
-            4041ca     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM cvttsd2si eax, xmm0 
+            4041ca     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cvttsd2si eax, xmm0 
             4041d1      4 PTRIMMEDESP STACK 60 displ mov     [rsp+3Ch], eax
             4041d5     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm0, dword ptr [rsp+38h] 
             4041d5      6 PTRIMMEDESP STACK 56 displ cvtsi2sd xmm0, dword ptr [rsp+38h]
@@ -3741,7 +3741,7 @@
             4042ac      5 PTRIMMEDESP STACK 76 displ lea     rdx, [rsp+4Ch]
             4042b1      5 PTRIMMEDESP STACK 72 displ lea     rsi, [rsp+48h]
             4042bc     -1 INSTR LOCAL NoMetaUpdate call    sub_404080 
-            4042c1     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4042c1     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4042c9     -1 INSTR LOCAL NoMetaUpdate call    _cairo_ft_font_face_create_for_ft_face 
             4042d7     -1 INSTR LOCAL NoMetaUpdate call    _cairo_set_font_face 
             4042dc     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm0, dword ptr [rsp+4Ch] 
@@ -3786,13 +3786,13 @@
             4043b5      6 PTRIMMEDESP STACK 40 displ addsd   xmm1, qword ptr [rsp+28h]
             4043bb     -1 INSTR LOCAL NoMetaUpdate addsd   xmm0, xmm1 
             4043bf     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm1, r12d 
-            4043c4     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM cvttsd2si ecx, xmm0 
+            4043c4     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM cvttsd2si ecx, xmm0 
             4043c8     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm0, cs:qword_404810 
             4043d0     -1 INSTR LOCAL NoMetaUpdate addsd   xmm0, qword ptr [rsp+20h] 
             4043d0      6 PTRIMMEDESP STACK 32 displ addsd   xmm0, qword ptr [rsp+20h]
             4043d6     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm1, xmm0 
             4043da     -1 INSTR LOCAL NoMetaUpdate jbe     loc_4044B0 
-            4043e0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM cvttsd2si eax, xmm1 
+            4043e0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cvttsd2si eax, xmm1 
             4043e4      4 PTRIMMEDESP STACK 72 displ mov     esi, [rsp+48h]
             4043e8     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     ecx, 8 
             4043eb     -1 INSTR LOCAL NoMetaUpdate test    esi, esi 
@@ -3803,7 +3803,7 @@
             404404     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     r15, 4 
             404408     -1 INSTR LOCAL NoMetaUpdate cmp     [rsp+48h], r12d 
             404408      5 PTRIMMEDESP STACK 72 displ cmp     [rsp+48h], r12d
-            40440d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM cvttsd2si eax, xmm1 
+            40440d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cvttsd2si eax, xmm1 
             404411     -1 INSTR LOCAL NoMetaUpdate jle     short loc_404483 
             404416     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm0, dword ptr [r15] 
             40441b      4 PTRIMMEDESP STACK 8 displ mov     [rsp+8], eax
@@ -3820,7 +3820,7 @@
             40444c     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm0, ecx 
             404450     -1 INSTR LOCAL NoMetaUpdate addsd   xmm0, xmm1 
             404454     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm1, eax 
-            404458     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM cvttsd2si ecx, xmm0 
+            404458     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM cvttsd2si ecx, xmm0 
             40445c     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm0, cs:qword_404810 
             404464     -1 INSTR LOCAL NoMetaUpdate addsd   xmm0, qword ptr [rsp+20h] 
             404464      6 PTRIMMEDESP STACK 32 displ addsd   xmm0, qword ptr [rsp+20h]
@@ -3830,13 +3830,13 @@
             404474     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     r15, 4 
             404478     -1 INSTR LOCAL NoMetaUpdate cmp     [rsp+48h], r12d 
             404478      5 PTRIMMEDESP STACK 72 displ cmp     [rsp+48h], r12d
-            40447d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM cvttsd2si eax, xmm0 
+            40447d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cvttsd2si eax, xmm0 
             404481     -1 INSTR LOCAL NoMetaUpdate jg      short loc_404413 
             40448a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_size_request 
             404492     -1 INSTR LOCAL NoMetaUpdate call    _cairo_destroy 
             40449a     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40449f     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 58h 
-            4044b0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM cvttsd2si eax, xmm0 
+            4044b0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cvttsd2si eax, xmm0 
             4044b4     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4043E4 
             4044c0     -2 INSTR LOCAL n R12 ZZ  AlwaysNUM cvttsd2si r12d, xmm0 
             4044c5     -1 INSTR LOCAL NoMetaUpdate jmp     loc_404396 
@@ -3888,7 +3888,7 @@
             404518      2 INSTR BELONGTO 4044d0 
             40451a      2 INSTR BELONGTO 4044d0 
             40451a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            40451a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40451a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40451c      4 INSTR BELONGTO 4044d0 
             404520      3 INSTR BELONGTO 4044d0 
             404520      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
diff --git a/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot
index d8bfd6d0..46789e4e 100644
--- a/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot
@@ -1804,7 +1804,7 @@
             404f99      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_type_init 
             404f9e      5 INSTR BELONGTO 404f90 
             404f9e      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset locale; locale 
-            404fa3     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
+            404fa3     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
             404fa3      5 INSTR BELONGTO 404f90 
             404fa3      5 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     edi, 6          ; category 
             404fa8     -1 INSTR LOCAL NoMetaUpdate call    _setlocale 
@@ -1985,7 +1985,7 @@
             4050c9      3 INSTR BELONGTO 4050c0 
             4050cc     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4050E0 
             4050cc      2 INSTR BELONGTO 4050c0 
-            4050ce     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            4050ce     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             4050ce      5 INSTR BELONGTO 4050c0 
             4050d3     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             4050d3      3 INSTR BELONGTO 4050c0 
@@ -2025,10 +2025,10 @@
             40512f      1 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx 
             405130      2 INSTR BELONGTO 405110 
             405130      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 ZZ xor     edx, edx 
-            405130     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405130     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405132      2 INSTR BELONGTO 405110 
             405132      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            405132     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405132     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405134     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
             405134      5 INSTR BELONGTO 405110 
             405134      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_signal_emit 
@@ -2064,7 +2064,7 @@
             40516e      1 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx 
             40516f      2 INSTR BELONGTO 405150 
             40516f      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            40516f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40516f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405171     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit_by_name 
             405171      5 INSTR BELONGTO 405150 
             405171      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_signal_emit_by_name 
@@ -2085,7 +2085,7 @@
             40519d      5 INSTR BELONGTO 405190 
             4051a2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             4051a2      5 INSTR BELONGTO 405190 
-            4051a7     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
+            4051a7     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
             4051a7      5 INSTR BELONGTO 405190 
             4051a7      5 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     edi, 10h 
             4051ac     40 DATAREF STACK 496 esp + 0 PARENT LocalFrame LOCALFRAME
@@ -2114,7 +2114,7 @@
             4051cc     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             4051cc      3 INSTR BELONGTO 405190 
             4051cc      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 ZZ xor     r8d, r8d 
-            4051cf     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_406240 
+            4051cf     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_406240 
             4051cf      5 INSTR BELONGTO 405190 
             4051cf      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset loc_406240 
             4051d4      3 INSTR BELONGTO 405190 
@@ -2193,7 +2193,7 @@
             405250      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_class_cast 
             405255      3 INSTR BELONGTO 405230 
             405255      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            405258     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            405258     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             405258      5 INSTR BELONGTO 405230 
             405258      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             40525d      3 INSTR BELONGTO 405230 
@@ -2223,13 +2223,13 @@
             4052a1      3 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 ZZ xor     r8d, r8d 
             4052a4      2 INSTR BELONGTO 405230 
             4052a4      2 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ xor     ecx, ecx 
-            4052a4     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4052a6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            4052a4     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4052a6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             4052a6      5 INSTR BELONGTO 405230 
             4052a6      5 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     edx, 2 
             4052ab      2 INSTR BELONGTO 405230 
             4052ab      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4052ab     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4052ab     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4052ad     -1 INSTR LOCAL MetadataUnused mov     [rsp+38h+var_20], 40h 
             4052ad      9 INSTR BELONGTO 405230 
             4052b6      8 INSTR BELONGTO 405230 
@@ -2267,23 +2267,23 @@
             4052fe     -3 INSTR LOCAL NoWarn push    rbp 
             4052ff     -3 INSTR LOCAL NoWarn push    rbx 
             40530a     -1 INSTR LOCAL NoMetaUpdate call    _g_strv_length 
-            40530f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40530f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405311      4 PTRIMMEDESP STACK 44 displ mov     [rsp+2Ch], eax
             405315     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_new 
-            40531a     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40531a     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             405322     -1 INSTR LOCAL NoMetaUpdate call    _gtk_get_option_group 
             405327      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40532d     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_add_group 
             40533c      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40533f     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_add_main_entries 
             405344      5 PTRIMMEDESP STACK 44 displ lea     rsi, [rsp+2Ch]
-            405349     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            405349     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40534e      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             405351     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_parse 
             405356     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rsp+2Ch], 1 
             405356      5 PTRIMMEDESP STACK 44 displ cmp     dword ptr [rsp+2Ch], 1
             40535b     -1 INSTR LOCAL NoMetaUpdate jle     loc_405428 
-            405361     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 8 
+            405361     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 8 
             405366     -2 INSTR LOCAL n R14 ZZ  NUMVia2ndSrcIMMEDNUM mov     r14d, 1 
             40536c     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_405383 
             405370     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     r14d, 1 
@@ -2291,7 +2291,7 @@
             405378     -1 INSTR LOCAL NoMetaUpdate cmp     [rsp+2Ch], r14d 
             405378      5 PTRIMMEDESP STACK 44 displ cmp     [rsp+2Ch], r14d
             40537d     -1 INSTR LOCAL NoMetaUpdate jle     loc_405428 
-            405386     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3Ah 
+            405386     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3Ah 
             40538b      4 PTRIMMEDEBP STACK 0 displ mov     r15, [rax+rbp]
             405392     -1 INSTR LOCAL NoMetaUpdate call    _strchr 
             405397     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
@@ -2324,9 +2324,9 @@
             405437     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             405445     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [rax+0A8h] 
             40544b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
-            405473     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405473     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405475     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
-            40547a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40547a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40547c     -1 INSTR LOCAL NoMetaUpdate call    _exit 
             405490      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             405490      0 FUNC MMSAFENESS SAFE
@@ -2382,14 +2382,14 @@
             4054de     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 28h 
             4054de      6 INSTR BELONGTO 405490 
             4054de      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 28h 
-            4054e4     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_405230 
+            4054e4     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_405230 
             4054e4      5 INSTR BELONGTO 405490 
             4054e4      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset sub_405230 
             4054e9      3 INSTR BELONGTO 405490 
             4054e9      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rsi, rbx 
             4054ec      3 INSTR BELONGTO 405490 
             4054ec      3 INSTR DEADREGS  EFLAGS RDX RBX RDI ZZ mov     rdi, rax 
-            4054ef     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1A8h 
+            4054ef     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1A8h 
             4054ef      5 INSTR BELONGTO 405490 
             4054ef      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 1A8h 
             4054f4      7 INSTR BELONGTO 405490 
@@ -2465,7 +2465,7 @@
             405575     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_remove 
             405575      5 INSTR BELONGTO 405550 
             405575      5 INSTR DEADREGS  EFLAGS ZZ call    _g_slist_remove 
-            40557a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40557a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40557a      5 INSTR BELONGTO 405550 
             40557a      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 50h 
             40557f      3 INSTR BELONGTO 405550 
@@ -2497,7 +2497,7 @@
             4055a9      4 INSTR BELONGTO 405550 
             4055ad      2 INSTR BELONGTO 405550 
             4055ad      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            4055ad     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4055ad     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4055ad      8 DEALLOC STACK esp - 8 xor     eax, eax
             4055af      1 INSTR BELONGTO 405550 
             4055af      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
@@ -2525,12 +2525,12 @@
             405633     -1 INSTR LOCAL NoMetaUpdate call    sub_409300 
             405638      5 PTRIMMEDESP STACK 12 displ mov     r8d, [rsp+0Ch]
             40563d      4 PTRIMMEDESP STACK 8 displ mov     ecx, [rsp+8]
-            40564e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40564e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405650     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_set 
             405655      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             405658     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             405660     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
-            405665     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405665     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405667      5 PTRIMMEDESP STACK 24 displ mov     rbx, [rsp+18h]
             40566c      5 PTRIMMEDESP STACK 32 displ mov     rbp, [rsp+20h]
             405671      5 PTRIMMEDESP STACK 40 displ mov     r12, [rsp+28h]
@@ -2543,7 +2543,7 @@
             4056a8     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_destroy 
             4056ad      4 PTRIMMEDEBP STACK 40 displ mov     rdi, [rbp+28h]
             4056b1     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_destroy 
-            4056bd     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4056bd     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4056c2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             4056ce      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             4056d3      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
@@ -2585,7 +2585,7 @@
             40571b      5 INSTR BELONGTO 4056e0 
             405720      8 INSTR BELONGTO 4056e0 
             405728      7 INSTR BELONGTO 4056e0 
-            40572f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40572f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40572f      5 INSTR BELONGTO 4056e0 
             405734     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             405734      5 INSTR BELONGTO 4056e0 
@@ -2604,26 +2604,26 @@
             40575a     -1 INSTR LOCAL NoMetaUpdate call    sub_405490 
             405765     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40576a      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-            40576d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40576d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             405772     -1 INSTR LOCAL NoMetaUpdate call    _g_application_command_line_get_arguments 
             40577e     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             405781     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4057BF 
             405783      3 PTRIMMEDEBP STACK 0 displ mov     r12, rbp
             405790     -1 INSTR LOCAL NoMetaUpdate call    _yelp_uri_new 
             405795     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     r12, 8 
-            405799     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405799     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4057a1     -1 INSTR LOCAL NoMetaUpdate call    sub_405190 
             4057ab     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             4057ae     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_405790 
             4057b0      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4057b3     -1 INSTR LOCAL NoMetaUpdate call    _g_strfreev 
-            4057ba     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4057ba     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4057c4     -1 INSTR LOCAL NoMetaUpdate call    _getenv 
-            4057ce     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 6 
+            4057ce     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 6 
             4057d6     -1 INSTR LOCAL NoMetaUpdate repe cmpsb 
             4057d8     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_405800 
             4057df     -1 INSTR LOCAL NoMetaUpdate call    _yelp_uri_new 
-            4057e4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4057e4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4057ec     -1 INSTR LOCAL NoMetaUpdate call    sub_405190 
             4057f1      4 PTRIMMEDEBP STACK 8 displ mov     rdi, [rbp+8]
             4057f5     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
@@ -2707,7 +2707,7 @@
             405890     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
             405890      5 INSTR BELONGTO 405810 
             405890      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_action_group_get_action 
-            405895     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, r13d 
+            405895     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, r13d 
             405895      3 INSTR BELONGTO 405810 
             405895      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, r13d 
             405898      3 INSTR BELONGTO 405810 
@@ -2781,13 +2781,13 @@
             40596a     -1 INSTR LOCAL NoMetaUpdate call    _yelp_settings_get_default 
             405978     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40597a     -1 INSTR LOCAL NoMetaUpdate jz      short loc_405989 
-            40597c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40597c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             405984     -1 INSTR LOCAL NoMetaUpdate call    _yelp_settings_set_editor_mode 
-            405989     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            405989     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40599a     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_new_full 
             4059a3     -1 INSTR LOCAL NoMetaUpdate call    _g_get_user_config_dir 
-            4059a8     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4059b7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4059a8     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4059b7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4059b9     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             4059ce     -1 INSTR LOCAL NoMetaUpdate call    _g_keyfile_settings_backend_new 
             4059da     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
@@ -2799,13 +2799,13 @@
             405a21     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_new 
             405a32     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_set_translation_domain 
             405a3b      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-            405a3e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            405a3e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             405a48     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_add_actions 
-            405a4d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            405a57     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405a4d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            405a57     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405a59     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            405a5e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            405a60     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405a5e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            405a60     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405a6a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_action_new 
             405a7e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_add_action_with_accel 
             405a8a     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -2916,18 +2916,18 @@
             405b5f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_instance_get_private 
             405b5f      5 INSTR BELONGTO 405b50 
             405b5f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_instance_get_private 
-            405b64     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset _g_object_unref 
+            405b64     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset _g_object_unref 
             405b64      5 INSTR BELONGTO 405b50 
             405b64      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     ecx, offset _g_object_unref 
             405b69      3 INSTR BELONGTO 405b50 
             405b69      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rbx, rax 
-            405b6c     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset _g_free 
+            405b6c     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset _g_free 
             405b6c      5 INSTR BELONGTO 405b50 
             405b6c      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset _g_free 
-            405b71     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset _g_str_equal 
+            405b71     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset _g_str_equal 
             405b71      5 INSTR BELONGTO 405b50 
             405b71      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset _g_str_equal 
-            405b76     -2 INSTR LOCAL n EDI ZZ  NumericDEFs mov     edi, offset _g_str_hash 
+            405b76     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     edi, offset _g_str_hash 
             405b76      5 INSTR BELONGTO 405b50 
             405b76      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, offset _g_str_hash 
             405b7b     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_new_full 
@@ -2990,7 +2990,7 @@
             405bd2      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, offset aApplicationId; "application-id" 
             405bd7      2 INSTR BELONGTO 405bb0 
             405bd7      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            405bd7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405bd7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405bd9     -1 INSTR LOCAL MetadataUnused mov     [rsp+18h+var_10], 0 
             405bd9      9 INSTR BELONGTO 405bb0 
             405be2      7 INSTR BELONGTO 405bb0 
@@ -3020,7 +3020,7 @@
             405c07      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_ref 
             405c0c     -1 INSTR LOCAL MetadataUnused mov     rdi, rbx 
             405c0c      3 INSTR BELONGTO 405c00 
-            405c0f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            405c0f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             405c0f      5 INSTR BELONGTO 405c00 
             405c0f      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     edx, 1 
             405c14     -1 INSTR LOCAL MetadataUnused mov     rsi, rax 
@@ -3056,7 +3056,7 @@
             405c36      5 INSTR DEADREGS  RCX RSI RDI ZZ mov     edi, offset aGnome; "GNOME" 
             405c3b      3 INSTR BELONGTO 405c20 
             405c3b      3 INSTR DEADREGS  RCX RSI ZZ mov     rsi, rax 
-            405c3e     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 6 
+            405c3e     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 6 
             405c3e      5 INSTR BELONGTO 405c20 
             405c3e      5 INSTR DEADREGS  RAX RCX ZZ mov     ecx, 6 
             405c43     -1 INSTR LOCAL NoMetaUpdate repe cmpsb 
@@ -3170,7 +3170,7 @@
             405cf9     40 DEALLOC STACK esp - 40 retn
             405d00      2 INSTR BELONGTO 405c90 
             405d00      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ xor     edx, edx 
-            405d00     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405d00     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405d02      5 INSTR BELONGTO 405c90 
             405d02      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset locale 
             405d07      3 INSTR BELONGTO 405c90 
@@ -3180,7 +3180,7 @@
             405d0a      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_uri_escape_string 
             405d0f      2 INSTR BELONGTO 405c90 
             405d0f      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ xor     ecx, ecx 
-            405d0f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            405d0f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             405d11      3 INSTR BELONGTO 405c90 
             405d11      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     rsi, rax 
             405d14      3 INSTR BELONGTO 405c90 
@@ -3191,7 +3191,7 @@
             405d1c      5 INSTR DEADREGS  EFLAGS RAX RDI R12 ZZ mov     edi, offset aOrgGnomeYelpDo; "/org/gnome/yelp/documents/" 
             405d21      2 INSTR BELONGTO 405c90 
             405d21      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            405d21     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405d21     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405d23     -1 INSTR LOCAL NoMetaUpdate call    _g_strconcat 
             405d23      5 INSTR BELONGTO 405c90 
             405d23      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_strconcat 
@@ -3252,7 +3252,7 @@
             405d80      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 ZZ mov     rcx, rbp 
             405d83      3 INSTR BELONGTO 405c90 
             405d83      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 ZZ mov     rdi, rbx 
-            405d86     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_405150 
+            405d86     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_405150 
             405d86      5 INSTR BELONGTO 405c90 
             405d86      5 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 ZZ mov     edx, offset sub_405150 
             405d8b      5 INSTR BELONGTO 405c90 
@@ -3268,7 +3268,7 @@
             405d9b      3 INSTR BELONGTO 405c90 
             405d9e      3 INSTR BELONGTO 405c90 
             405d9e      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 R14 ZZ mov     rcx, rbp 
-            405da1     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_405110 
+            405da1     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_405110 
             405da1      5 INSTR BELONGTO 405c90 
             405da1      5 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 ZZ mov     edx, offset sub_405110 
             405da6      5 INSTR BELONGTO 405c90 
@@ -3377,7 +3377,7 @@
             405e51      3 INSTR DEADREGS  EFLAGS RAX RDI R13 ZZ mov     rdi, r12 
             405e54      2 INSTR BELONGTO 405de0 
             405e54      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            405e54     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405e54     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405e56     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_get 
             405e56      5 INSTR BELONGTO 405de0 
             405e56      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_settings_get 
@@ -3393,10 +3393,10 @@
             405e69      3 INSTR DEADREGS  EFLAGS RAX RCX RSI R8 R12 R13 ZZ xor     r8d, r8d 
             405e6c      2 INSTR BELONGTO 405de0 
             405e6c      2 INSTR DEADREGS  EFLAGS RAX RCX RSI R12 R13 ZZ xor     ecx, ecx 
-            405e6c     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            405e6c     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             405e6e      2 INSTR BELONGTO 405de0 
             405e6e      2 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 ZZ xor     eax, eax 
-            405e6e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405e6e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405e70      5 INSTR BELONGTO 405de0 
             405e70      5 INSTR DEADREGS  EFLAGS RSI R12 R13 ZZ mov     esi, offset aSSS; "(&s&s&s)" 
             405e75     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_iter_loop 
@@ -3435,7 +3435,7 @@
             405ea1      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_variant_unref 
             405ea6     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             405ea6      4 INSTR BELONGTO 405de0 
-            405eaa     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, r13d 
+            405eaa     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, r13d 
             405eaa      3 INSTR BELONGTO 405de0 
             405eaa      3 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ mov     eax, r13d 
             405ead      1 INSTR BELONGTO 405de0 
@@ -3473,7 +3473,7 @@
             405edc      1 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ pop     rbp 
             405edd      2 INSTR BELONGTO 405de0 
             405edd      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ pop     r12 
-            405edf     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, r13d 
+            405edf     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, r13d 
             405edf      3 INSTR BELONGTO 405de0 
             405edf      3 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ mov     eax, r13d 
             405ee2      2 INSTR BELONGTO 405de0 
@@ -3501,7 +3501,7 @@
             405f04      1 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ pop     rbp 
             405f05      2 INSTR BELONGTO 405de0 
             405f05      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ pop     r12 
-            405f07     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, r13d 
+            405f07     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, r13d 
             405f07      3 INSTR BELONGTO 405de0 
             405f07      3 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ mov     eax, r13d 
             405f0a      2 INSTR BELONGTO 405de0 
@@ -3573,7 +3573,7 @@
             405f6f      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             405f72      2 INSTR BELONGTO 405f10 
             405f72      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            405f72     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405f72     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405f74     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_get 
             405f74      5 INSTR BELONGTO 405f10 
             405f74      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_settings_get 
@@ -3618,7 +3618,7 @@
             405fbc      8 PTRIMMEDESP STACK 136 displ lea     rdx, [rsp+0B8h+var_30]
             405fc4      2 INSTR BELONGTO 405f10 
             405fc4      2 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ xor     eax, eax 
-            405fc4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405fc4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405fc6      5 INSTR BELONGTO 405f10 
             405fc6      5 INSTR DEADREGS  EFLAGS RSI R12 ZZ mov     esi, offset aSSS; "(&s&s&s)" 
             405fcb     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_iter_loop 
@@ -3792,7 +3792,7 @@
             4060e9      3 INSTR DEADREGS  EFLAGS RDI R14 ZZ mov     rdi, rax 
             4060ec      2 INSTR BELONGTO 406080 
             4060ec      2 INSTR DEADREGS  EFLAGS RAX R14 ZZ xor     eax, eax 
-            4060ec     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4060ec     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4060ee     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_get 
             4060ee      5 INSTR BELONGTO 406080 
             4060ee      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _g_settings_get 
@@ -3854,7 +3854,7 @@
             406165      8 PTRIMMEDESP STACK 136 displ lea     rdx, [rsp+0C8h+var_40]
             40616d      2 INSTR BELONGTO 406080 
             40616d      2 INSTR DEADREGS  EFLAGS RAX RSI R14 ZZ xor     eax, eax 
-            40616d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40616d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40616f      5 INSTR BELONGTO 406080 
             40616f      5 INSTR DEADREGS  EFLAGS RSI R14 ZZ mov     esi, offset aSSS; "(&s&s&s)" 
             406174     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_iter_loop 
@@ -3883,7 +3883,7 @@
             406198      3 PTRIMMEDESP STACK 0 displ mov     rdi, rsp
             40619b      2 INSTR BELONGTO 406080 
             40619b      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 R14 ZZ xor     eax, eax 
-            40619b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40619b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40619d     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_builder_add 
             40619d      5 INSTR BELONGTO 406080 
             40619d      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ call    _g_variant_builder_add 
@@ -4000,7 +4000,7 @@
             4062ad     -1 INSTR LOCAL NoMetaUpdate call    sub_405C90 
             4062b2      5 PTRIMMEDESP STACK 28 displ lea     r8, [rsp+1Ch]
             4062b7      5 PTRIMMEDESP STACK 24 displ lea     rcx, [rsp+18h]
-            4062c9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4062c9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4062cb     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_get 
             4062d3     -1 INSTR LOCAL NoMetaUpdate call    sub_409130 
             4062d8      4 PTRIMMEDESP STACK 28 displ mov     edx, [rsp+1Ch]
@@ -4072,7 +4072,7 @@
             406484      3 PTRIMMEDEBP STACK 0 displ mov     rdx, rbp
             40648a     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_insert 
             40648f      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-            406492     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            406492     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             406497     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4064a7     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set_data 
             4064ac     -1 INSTR LOCAL NoMetaUpdate jmp     loc_406348 
@@ -4133,7 +4133,7 @@
             40650d      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             406510      2 INSTR BELONGTO 4064c0 
             406510      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            406510     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406510     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406512     -1 INSTR LOCAL MetadataUnused xor     r12d, r12d 
             406512      3 INSTR BELONGTO 4064c0 
             406515     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_get 
@@ -4174,7 +4174,7 @@
             40655e      3 PTRIMMEDESP STACK 0 displ mov     rdi, rsp
             406561      2 INSTR BELONGTO 4064c0 
             406561      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            406561     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406561     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406563     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_builder_add 
             406563      5 INSTR BELONGTO 4064c0 
             406563      5 INSTR DEADREGS  EFLAGS ZZ call    _g_variant_builder_add 
@@ -4192,7 +4192,7 @@
             406580      8 PTRIMMEDESP STACK 136 displ lea     rdx, [rsp+0C8h+var_40]
             406588      2 INSTR BELONGTO 4064c0 
             406588      2 INSTR DEADREGS  EFLAGS RAX RSI ZZ xor     eax, eax 
-            406588     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406588     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40658a      5 INSTR BELONGTO 4064c0 
             40658a      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aSSS; "(&s&s&s)" 
             40658f     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_iter_loop 
@@ -4437,7 +4437,7 @@
             406724      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             406727      2 INSTR BELONGTO 4066f0 
             406727      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            406727     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406727     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406729     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_get 
             406729      5 INSTR BELONGTO 4066f0 
             406729      5 INSTR DEADREGS  EFLAGS ZZ call    _g_settings_get 
@@ -4493,7 +4493,7 @@
             40678d      8 PTRIMMEDESP STACK 144 displ lea     rdx, [rsp+0B8h+var_28]
             406795      2 INSTR BELONGTO 4066f0 
             406795      2 INSTR DEADREGS  EFLAGS RAX RSI ZZ xor     eax, eax 
-            406795     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406795     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406797      5 INSTR BELONGTO 4066f0 
             406797      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aSS ; "(&s&s)" 
             40679c     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_iter_loop 
@@ -4520,7 +4520,7 @@
             4067bd      3 PTRIMMEDESP STACK 0 displ mov     rdi, rsp
             4067c0      2 INSTR BELONGTO 4066f0 
             4067c0      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            4067c0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4067c0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4067c2     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_builder_add 
             4067c2      5 INSTR BELONGTO 4066f0 
             4067c2      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_variant_builder_add 
@@ -4601,7 +4601,7 @@
             40683f      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             406842      2 INSTR BELONGTO 406810 
             406842      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            406842     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406842     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406844     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_get 
             406844      5 INSTR BELONGTO 406810 
             406844      5 INSTR DEADREGS  EFLAGS ZZ call    _g_settings_get 
@@ -4643,7 +4643,7 @@
             406884      8 PTRIMMEDESP STACK 144 displ lea     rdx, [rsp+0B8h+var_28]
             40688c      2 INSTR BELONGTO 406810 
             40688c      2 INSTR DEADREGS  EFLAGS RAX RSI ZZ xor     eax, eax 
-            40688c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40688c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40688e      5 INSTR BELONGTO 406810 
             40688e      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aSS ; "(&s&s)" 
             406893     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_iter_loop 
@@ -4724,25 +4724,25 @@
             40691d      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r12
             406922      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r13
             40692b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
-            406933     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            406933     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40693f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             406967     -1 INSTR LOCAL NoMetaUpdate call    sub_405490 
-            40696c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            406976     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40696c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            406976     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40697b     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            406980     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40698d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            406980     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40698d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40698f     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             406997     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0EBh 
             4069a8     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_object 
             4069ad      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-            4069b3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4069b3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4069b8     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
             4069c5     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             4069c8     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4069cb     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4069cd     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
-            4069d2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4069cb     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4069cd     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            4069d2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4069d4      8 PTRIMMEDESP STACK 16 displ mov     dword ptr [rsp+10h], 0
             4069dc      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], 4
             4069e5      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], offset _g_cclosure_marshal_VOID__VOID
@@ -4751,7 +4751,7 @@
             4069fa      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
             4069ff      5 PTRIMMEDESP STACK 56 displ mov     r12, [rsp+38h]
             406a04      5 PTRIMMEDESP STACK 64 displ mov     r13, [rsp+40h]
-            406a09     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0C8h 
+            406a09     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0C8h 
             406a14     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
             406a18     -1 INSTR LOCAL NoMetaUpdate jmp     _g_type_class_add_private 
             406a20      0 FUNC FRAMERESTORE 0 0 0 1 0 1 2 0 2 3 -8 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -4771,8 +4771,8 @@
             406a27      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 ZZ xor     r8d, r8d 
             406a2a      2 INSTR BELONGTO 406a20 
             406a2a      2 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ xor     ecx, ecx 
-            406a2a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            406a2c     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_408FF0 
+            406a2a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            406a2c     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_408FF0 
             406a2c      5 INSTR BELONGTO 406a20 
             406a2c      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, offset loc_408FF0 
             406a31      5 INSTR BELONGTO 406a20 
@@ -4790,8 +4790,8 @@
             406a44      1 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx 
             406a45      2 INSTR BELONGTO 406a20 
             406a45      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ xor     ecx, ecx 
-            406a45     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            406a47     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_408FC0 
+            406a45     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            406a47     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_408FC0 
             406a47      5 INSTR BELONGTO 406a20 
             406a47      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     edx, offset sub_408FC0 
             406a4c     -1 INSTR LOCAL MetadataUnused mov     esi, offset aMapEvent; "map-event" 
@@ -4809,14 +4809,14 @@
             406a61      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI ZZ mov     rbx, rsi 
             406a64      2 INSTR BELONGTO 406a60 
             406a64      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ xor     edx, edx 
-            406a64     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            406a64     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             406a66      3 INSTR BELONGTO 406a60 
             406a66      3 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ mov     rdi, rbx 
             406a69      5 INSTR BELONGTO 406a60 
             406a69      5 INSTR DEADREGS  EFLAGS RAX RCX RSI ZZ mov     esi, offset aDeleteEvent; "delete-event" 
             406a6e      2 INSTR BELONGTO 406a60 
             406a6e      2 INSTR DEADREGS  EFLAGS RAX RCX ZZ xor     eax, eax 
-            406a6e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406a6e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406a70     16 DATAREF STACK 517 esp + 0 PARENT LocalFrame LOCALFRAME
             406a70      4 INSTR BELONGTO 406a60 
             406a70      4 INSTR DEADREGS  EFLAGS RCX ZZ sub     rsp, 10h 
@@ -4859,10 +4859,10 @@
             406ab0     -3 INSTR LOCAL NoWarn push    rbp 
             406ab1      2 INSTR BELONGTO 406ab0 
             406ab1      2 INSTR DEADREGS  EFLAGS RAX RCX RSI ZZ xor     ecx, ecx 
-            406ab1     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            406ab1     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             406ab3      2 INSTR BELONGTO 406ab0 
             406ab3      2 INSTR DEADREGS  EFLAGS RAX RSI ZZ xor     eax, eax 
-            406ab3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406ab3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406ab5      5 INSTR BELONGTO 406ab0 
             406ab5      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aRootTitle; "root-title" 
             406aba      1 INSTR BELONGTO 406ab0 
@@ -4919,14 +4919,14 @@
             406b00      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
             406b01      1 INSTR BELONGTO 406ab0 
             406b01      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-            406b08     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406b08     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406b08      5 INSTR BELONGTO 406ab0 
             406b08      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             406b0d      5 INSTR BELONGTO 406ab0 
             406b0d      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset msgid; "Help" 
             406b12      2 INSTR BELONGTO 406ab0 
             406b12      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            406b12     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406b12     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406b14     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             406b14      5 INSTR BELONGTO 406ab0 
             406b14      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -5007,7 +5007,7 @@
             406b85     -1 INSTR LOCAL NoMetaUpdate jmp     _g_utf8_collate 
             406b85      5 INSTR BELONGTO 406b40 
             406b85      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_utf8_collate 
-            406b90     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
+            406b90     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
             406b90      5 INSTR BELONGTO 406b40 
             406b90      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 0FFFFFFFFh 
             406b95      3 INSTR BELONGTO 406b40 
@@ -5088,10 +5088,10 @@
             406c14     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 38h 
             406c14      6 INSTR BELONGTO 406bc0 
             406c14      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 38h 
-            406c1a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset loc_406910 
+            406c1a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset loc_406910 
             406c1a      5 INSTR BELONGTO 406bc0 
             406c1a      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset loc_406910 
-            406c1f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 430h 
+            406c1f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 430h 
             406c1f      5 INSTR BELONGTO 406bc0 
             406c1f      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 430h 
             406c24      7 INSTR BELONGTO 406bc0 
@@ -5177,10 +5177,10 @@
             406ca2     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             406ca2      3 INSTR BELONGTO 406c40 
             406ca2      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 ZZ xor     r8d, r8d 
-            406ca5     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            406ca5     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             406ca5      5 INSTR BELONGTO 406c40 
             406ca5      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     ecx, 1 
-            406caa     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            406caa     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             406caa      5 INSTR BELONGTO 406c40 
             406caa      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 1 
             406caf      3 INSTR BELONGTO 406c40 
@@ -5222,7 +5222,7 @@
             406cf0     -1 INSTR LOCAL NoMetaUpdate call    _yelp_settings_get_default 
             406cf0      5 INSTR BELONGTO 406c40 
             406cf0      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _yelp_settings_get_default 
-            406cf5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            406cf5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             406cf5      5 INSTR BELONGTO 406c40 
             406cf5      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 0Ch 
             406cfa      3 INSTR BELONGTO 406c40 
@@ -5256,10 +5256,10 @@
             406d24      5 PTRIMMEDESP STACK 24 displ lea     rdx, [rsp+38h+var_20]
             406d29      2 INSTR BELONGTO 406c40 
             406d29      2 INSTR DEADREGS  EFLAGS RAX RCX RSI R12 ZZ xor     ecx, ecx 
-            406d29     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            406d29     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             406d2b      2 INSTR BELONGTO 406c40 
             406d2b      2 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ xor     eax, eax 
-            406d2b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406d2b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406d2d      5 INSTR BELONGTO 406c40 
             406d2d      5 INSTR DEADREGS  EFLAGS RSI R12 ZZ mov     esi, offset aYelpUri; "yelp-uri" 
             406d32     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
@@ -5303,7 +5303,7 @@
             406d6a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_set_text 
             406d6a      5 INSTR BELONGTO 406c40 
             406d6a      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_entry_set_text 
-            406d6f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3Ah        ; c 
+            406d6f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3Ah        ; c 
             406d6f      5 INSTR BELONGTO 406c40 
             406d6f      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 3Ah        ; c 
             406d74      3 INSTR BELONGTO 406c40 
@@ -5330,7 +5330,7 @@
             406d93      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_check_instance_cast 
             406d98      3 INSTR BELONGTO 406c40 
             406d98      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ lea     esi, [rbp+1] 
-            406d9b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            406d9b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             406d9b      5 INSTR BELONGTO 406c40 
             406d9b      5 INSTR DEADREGS  EFLAGS RDX RBX RDI ZZ mov     edx, 0FFFFFFFFh 
             406da0      3 INSTR BELONGTO 406c40 
@@ -5361,7 +5361,7 @@
             406dc4      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp
             406dc7      2 INSTR BELONGTO 406c40 
             406dc7      2 INSTR DEADREGS  EFLAGS RSI ZZ xor     esi, esi 
-            406dc7     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            406dc7     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             406dc9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_modify_base 
             406dc9      5 INSTR BELONGTO 406c40 
             406dc9      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_widget_modify_base 
@@ -5377,10 +5377,10 @@
             406de4     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             406de4      5 INSTR BELONGTO 406c40 
             406de4      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_check_instance_cast 
-            406de9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            406de9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             406de9      5 INSTR BELONGTO 406c40 
             406de9      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 0FFFFFFFFh 
-            406dee     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+            406dee     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
             406dee      5 INSTR BELONGTO 406c40 
             406dee      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 5 
             406df3      3 INSTR BELONGTO 406c40 
@@ -5464,10 +5464,10 @@
             406e54     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_widget_grab_focus 
             406e54      5 INSTR BELONGTO 406e20 
             406e54      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _gtk_widget_grab_focus 
-            406e60     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, [rbx+0B0h] 
+            406e60     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, [rbx+0B0h] 
             406e60      6 INSTR BELONGTO 406e20 
             406e60      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     ecx, [rbx+0B0h] 
-            406e66     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 55555556h 
+            406e66     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 55555556h 
             406e66      5 INSTR BELONGTO 406e20 
             406e66      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edx, 55555556h 
             406e6b      4 INSTR BELONGTO 406e20 
@@ -5478,7 +5478,7 @@
             406e74      2 INSTR BELONGTO 406e20 
             406e76      2 INSTR BELONGTO 406e20 
             406e76      2 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, ecx 
-            406e76     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ecx 
+            406e76     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ecx 
             406e78     -1 INSTR LOCAL MetadataRedundant sar     ecx, 1Fh 
             406e78      3 INSTR BELONGTO 406e20 
             406e7b     -1 INSTR LOCAL MetadataRedundant imul    edx 
@@ -5513,10 +5513,10 @@
             406ea3      3 INSTR DEADREGS  EFLAGS RCX RDX R8 ZZ xor     r8d, r8d 
             406ea6      2 INSTR BELONGTO 406e20 
             406ea6      2 INSTR DEADREGS  EFLAGS RCX RDX ZZ xor     ecx, ecx 
-            406ea6     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            406ea6     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             406ea8      2 INSTR BELONGTO 406e20 
             406ea8      2 INSTR DEADREGS  EFLAGS RDX ZZ xor     edx, edx 
-            406ea8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            406ea8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             406eaa     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_end 
             406eaa      5 INSTR BELONGTO 406e20 
             406eaa      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_box_pack_end 
@@ -5583,7 +5583,7 @@
             406f0f      3 INSTR BELONGTO 406ed0 
             406f12      2 INSTR BELONGTO 406ed0 
             406f12      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            406f12     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406f12     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406f14     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             406f14      5 INSTR BELONGTO 406ed0 
             406f14      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_object_get 
@@ -5715,7 +5715,7 @@
             406ff2      4 PTRIMMEDESP STACK 0 displ mov     [rsp+68h+var_68], rax
             406ff6      2 INSTR BELONGTO 406f80 
             406ff6      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 ZZ xor     eax, eax 
-            406ff6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406ff6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406ff8     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             406ff8      5 INSTR BELONGTO 406f80 
             406ff8      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _g_object_get 
@@ -5866,14 +5866,14 @@
             4070dd      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+28h+var_20]
             4070e2      2 INSTR BELONGTO 4070c0 
             4070e2      2 INSTR DEADREGS  EFLAGS RCX RBX RSI ZZ xor     ecx, ecx 
-            4070e2     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4070e2     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4070e4     -1 INSTR LOCAL MetadataUnused mov     rbx, rax 
             4070e4      3 INSTR BELONGTO 4070c0 
             4070e7      5 INSTR BELONGTO 4070c0 
             4070e7      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, offset aYelpUri; "yelp-uri" 
             4070ec      2 INSTR BELONGTO 4070c0 
             4070ec      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4070ec     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4070ec     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4070ee     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             4070ee      5 INSTR BELONGTO 4070c0 
             4070ee      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_get 
@@ -5981,7 +5981,7 @@
             4071a2      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R13 R14 ZZ mov     ecx, offset aPageId; "page-id" 
             4071a7      2 INSTR BELONGTO 407130 
             4071a7      2 INSTR DEADREGS  EFLAGS RAX RDX RSI R13 R14 ZZ xor     eax, eax 
-            4071a7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4071a7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4071a9      3 INSTR BELONGTO 407130 
             4071a9      3 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 ZZ mov     rdx, rsp 
             4071a9      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp
@@ -6036,8 +6036,8 @@
             4071fd      2 INSTR BELONGTO 407130 
             4071ff      2 INSTR BELONGTO 407130 
             4071ff      2 INSTR DEADREGS  RBX RSI RDI R14 ZZ mov     ebx, eax 
-            4071ff     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, eax 
-            407201     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setz    sil 
+            4071ff     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     ebx, eax 
+            407201     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setz    sil 
             407201      4 INSTR BELONGTO 407130 
             407201      4 INSTR DEADREGS  RSI RDI R14 ZZ setz    sil 
             407205      3 INSTR BELONGTO 407130 
@@ -6094,7 +6094,7 @@
             407254     56 DEALLOC STACK esp - 56 retn
             407258      2 INSTR BELONGTO 407130 
             407258      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 R14 ZZ xor     esi, esi 
-            407258     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407258     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40725a      3 INSTR BELONGTO 407130 
             40725a      3 INSTR DEADREGS  EFLAGS RBX RDI R13 R14 ZZ mov     rdi, rbp 
             40725d     -2 INSTR LOCAL n R13 ZZ  AlwaysNUM xor     r13d, r13d 
@@ -6128,9 +6128,9 @@
             4072c7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             4072cc      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
             4072d1      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-            4072ed     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4072ed     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             4072f7      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-            4072fb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4072fb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4072fd     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             407302     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
             40731b     -1 INSTR LOCAL NoMetaUpdate call    _g_value_get_object 
@@ -6142,11 +6142,11 @@
             407345     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407352     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_icon_name 
             407357     -1 INSTR LOCAL NoMetaUpdate call    _yelp_view_new 
-            40735c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            407362     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40735c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            407362     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             40736c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            407371     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            407373     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407371     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            407373     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40737d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_new 
             407382     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             407385     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -6158,88 +6158,88 @@
             4073bb     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             4073be      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
             4073cb     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            4073d0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            4073d2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            4073d0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            4073d2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             4073db     -1 INSTR LOCAL NoMetaUpdate call    _gtk_vbox_new 
             4073e7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_get_type 
             4073ec      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4073f2      5 PTRIMMEDESP STACK 48 displ mov     [rsp+30h], rax
             4073f7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407402     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
-            407407     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            407409     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407407     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            407409     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40740b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_vbox_new 
             407417     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_get_type 
             407426     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40742b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40742e     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            407433     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40742e     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            407433     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40743e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             407448     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_new 
             407459     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_set_translation_domain 
             407462      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-            407465     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0Ch 
+            407465     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0Ch 
             40746f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_add_actions 
             407479     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_new 
-            40747e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            407480     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            407482     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40747e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            407480     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            407482     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40748e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_set_translate_func 
             407493     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_new 
-            4074a3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4074a3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4074a5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_insert_action_group 
-            4074b5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4074b5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4074ba     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_insert_action_group 
             4074c3     -1 INSTR LOCAL NoMetaUpdate call    sub_405B90 
-            4074cc     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            4074cc     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             4074d4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_insert_action_group 
             4074dd     -1 INSTR LOCAL NoMetaUpdate call    _yelp_view_get_action_group 
-            4074e6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            4074e6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             4074f1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_insert_action_group 
             4074fa     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_get_accel_group 
             407505      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             407508     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407513     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_add_accel_group 
-            40751c     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40751c     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40751e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     rdx, 0FFFFFFFFFFFFFFFFh 
             40752a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_add_ui_from_string 
             407538     -1 INSTR LOCAL NoMetaUpdate call    _launchpad_integration_add_ui 
             407546     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_get_widget 
             407555     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40755a     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40755d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40755f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40755d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40755f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407567     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             407570     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_new_merge_id 
             407579     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40757c     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40757f      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
             407592     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            407597     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            407599     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407597     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            407599     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40759f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_hbox_new 
-            4075a4     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4075aa     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
-            4075b7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4075a4     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4075aa     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            4075b7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4075b9     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             4075c9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4075ce     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4075d1     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4075d3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4075d1     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4075d3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4075db     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             4075e8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
             4075f0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_create_tool_item 
             4075ff     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407604     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            407607     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            407609     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407607     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            407609     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407611     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40761e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
             407626     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_create_tool_item 
             407635     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40763a     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40763d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40763f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40763d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40763f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407647     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40764c     -1 INSTR LOCAL NoMetaUpdate call    _yelp_bookmarks_get_type 
             407658     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -6265,8 +6265,8 @@
             4076fa     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407709     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40770e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            407711     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            407716     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            407711     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            407716     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             407721     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40772d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407739      5 PTRIMMEDESP STACK 48 displ mov     rsi, [rsp+30h]
@@ -6295,38 +6295,38 @@
             4077f1      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
             4077f4     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             407801     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            407806     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            407808     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407806     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            407808     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40780a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_new 
             407812     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_get_type 
             407820     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            407825     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            40782d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            407825     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40782d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             407832     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_set_policy 
             40783d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            407842     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            407842     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40784a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_set_shadow_type 
             407856     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40785b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40785e     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            407863     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40785e     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            407863     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40786e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
-            407873     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
-            407878     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407873     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            407878     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40787a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_hbox_new 
             407882     -1 INSTR LOCAL NoMetaUpdate call    _g_object_ref_sink 
             407887     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40788a     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 10h 
-            40789c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
-            4078a1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40789c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            4078a1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4078a8     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
-            4078ad     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            4078b7     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4078ad     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4078b7     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4078b9     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4078c1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
             4078d0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4078d5     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4078d7     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4078d5     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4078d7     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4078dc     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 6 
             4078e5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             4078ea     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_new 
@@ -6342,46 +6342,46 @@
             407931     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             407934      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
             407941     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            40794a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40794c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 12Ch 
-            407951     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40794a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40794c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 12Ch 
+            407951     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407958     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             407968     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40796d     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            407970     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            407975     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407970     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            407975     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40797a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             407984     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
             407989     -1 INSTR LOCAL NoMetaUpdate xorpd   xmm0, xmm0 
-            40798d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40799b     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40798d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40799b     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4079a0     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             4079b0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4079b5     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4079b8     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4079ba     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4079b8     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4079ba     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4079c2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             4079c7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_info_bar_new 
             4079cf     -1 INSTR LOCAL NoMetaUpdate call    _g_object_ref_sink 
-            4079d4     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            4079d6     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4079d4     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            4079d6     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4079df     -1 INSTR LOCAL NoMetaUpdate call    _gtk_vbox_new 
             4079e7     -1 INSTR LOCAL NoMetaUpdate call    _yelp_settings_get_default 
-            4079ec     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            4079ec     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             4079f4     -1 INSTR LOCAL NoMetaUpdate call    _yelp_settings_get_color 
-            4079f9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            4079fb     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4079f9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            4079fb     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             407a05      5 PTRIMMEDESP STACK 56 displ mov     [rsp+38h], rax
             407a0a     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             407a0f      5 PTRIMMEDESP STACK 56 displ mov     rsi, [rsp+38h]
-            407a1c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407a1c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407a1e     -1 INSTR LOCAL NoMetaUpdate call    _g_markup_printf_escaped 
             407a26      5 PTRIMMEDESP STACK 40 displ mov     [rsp+28h], rax
             407a2b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
             407a30     -1 INSTR LOCAL NoMetaUpdate xorpd   xmm0, xmm0 
             407a37     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            407a3f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            407a4c     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            407a3f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            407a4c     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             407a51      5 PTRIMMEDESP STACK 32 displ mov     [rsp+20h], r10
             407a56     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             407a5b      5 PTRIMMEDESP STACK 56 displ mov     rdi, [rsp+38h]
@@ -6391,26 +6391,26 @@
             407a78     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407a7d      5 PTRIMMEDESP STACK 32 displ mov     r10, [rsp+20h]
             407a82     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            407a85     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            407a87     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407a85     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            407a87     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407a8f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             407a94     -1 INSTR LOCAL NoMetaUpdate call    _gtk_info_bar_get_type 
             407aa3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407aab     -1 INSTR LOCAL NoMetaUpdate call    _gtk_info_bar_get_content_area 
             407ab6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407abb     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            407abe     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            407ac0     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407abe     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            407ac0     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407ac8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
-            407acd     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            407acf     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407acd     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            407acf     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407ad1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_vbox_new 
             407ae0      5 PTRIMMEDESP STACK 40 displ mov     [rsp+28h], rax
             407ae5     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407aea      5 PTRIMMEDESP STACK 40 displ mov     r9, [rsp+28h]
             407aef     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            407af2     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            407af4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407af2     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            407af4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407afc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             407b05     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             407b08     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -6443,9 +6443,9 @@
             407bd6      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             407bd9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407bde     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 2 
-            407be4     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            407be6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            407beb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
+            407be4     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            407be6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            407beb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
             407bf0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_drag_dest_set 
             407bf8      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             407bfb     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -6454,7 +6454,7 @@
             407c0c      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             407c0f     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             407c1c     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            407c1f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            407c1f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             407c2b     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_connect_data 
             407c30      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -48 0 4 0 8 5 -40 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 -32 0 13 -24 0 14 -16 0 15 -8 0 ZZ
             407c30      0 FUNC MMSAFENESS SAFE
@@ -6536,13 +6536,13 @@
             407c90      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 R14 ZZ mov     esi, offset aASss; "a(sss)" 
             407c95      2 INSTR BELONGTO 407c30 
             407c95      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 R14 ZZ xor     eax, eax 
-            407c95     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407c95     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407c97     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_get 
             407c97      5 INSTR BELONGTO 407c30 
             407c97      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ call    _g_variant_get 
             407c9c     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_407CDF 
             407c9c      2 INSTR BELONGTO 407c30 
-            407ca0     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
+            407ca0     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
             407ca0      5 INSTR BELONGTO 407c30 
             407ca0      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 ZZ mov     edi, 18h 
             407ca5     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc0 
@@ -6568,7 +6568,7 @@
             407cc3      5 PTRIMMEDESP STACK 72 displ mov     rax, [rsp+88h+var_40]
             407cc8      3 INSTR BELONGTO 407c30 
             407cc8      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ mov     rdi, r15 
-            407ccb     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_406B40 
+            407ccb     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_406B40 
             407ccb      5 INSTR BELONGTO 407c30 
             407ccb      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 ZZ mov     edx, offset sub_406B40 
             407cd0      3 INSTR BELONGTO 407c30 
@@ -6594,7 +6594,7 @@
             407cee      5 PTRIMMEDESP STACK 56 displ lea     rdx, [rsp+88h+var_50]
             407cf3      2 INSTR BELONGTO 407c30 
             407cf3      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 R14 ZZ xor     eax, eax 
-            407cf3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407cf3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407cf5      5 INSTR BELONGTO 407c30 
             407cf5      5 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 R14 ZZ mov     esi, offset aSSS; "(&s&s&s)" 
             407cfa     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_iter_loop 
@@ -6613,12 +6613,12 @@
             407d10      3 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 R14 ZZ mov     rbx, [r15] 
             407d13      2 INSTR BELONGTO 407c30 
             407d13      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 R14 ZZ xor     edx, edx 
-            407d13     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407d13     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407d15      5 INSTR BELONGTO 407c30 
             407d15      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 R14 ZZ mov     edi, offset aLoadbookmark; "LoadBookmark-" 
             407d1a      2 INSTR BELONGTO 407c30 
             407d1a      2 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 R14 ZZ xor     eax, eax 
-            407d1a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407d1a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407d1c      3 INSTR BELONGTO 407c30 
             407d1c      3 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 ZZ mov     rsi, [rbx] 
             407d1f     -1 INSTR LOCAL NoMetaUpdate call    _g_strconcat 
@@ -6655,7 +6655,7 @@
             407d57      5 INSTR DEADREGS  EFLAGS RAX RSI R13 R14 ZZ mov     esi, offset aLabel; "label" 
             407d5c      2 INSTR BELONGTO 407c30 
             407d5c      2 INSTR DEADREGS  EFLAGS RAX R13 R14 ZZ xor     eax, eax 
-            407d5c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407d5c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407d5e     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             407d5e      5 INSTR BELONGTO 407c30 
             407d5e      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _g_object_set 
@@ -6737,11 +6737,11 @@
             407dde      2 INSTR BELONGTO 407c30 
             407de0      2 INSTR BELONGTO 407c30 
             407de0      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            407de0     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            407de0     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             407de2      2 INSTR BELONGTO 407c30 
             407de2      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     eax, eax 
-            407de2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            407de4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            407de2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            407de4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             407de4      5 INSTR BELONGTO 407c30 
             407de4      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 1 
             407de9      5 INSTR BELONGTO 407c30 
@@ -6822,10 +6822,10 @@
             407e5c      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+88h+var_70]
             407e61      2 INSTR BELONGTO 407c30 
             407e61      2 INSTR DEADREGS  EFLAGS RCX RDX R12 R13 R14 ZZ xor     ecx, ecx 
-            407e61     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            407e61     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             407e63      2 INSTR BELONGTO 407c30 
             407e63      2 INSTR DEADREGS  EFLAGS RDX R12 R13 R14 ZZ xor     edx, edx 
-            407e63     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407e63     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407e65     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_new 
             407e65      5 INSTR BELONGTO 407c30 
             407e65      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _gtk_action_new 
@@ -6838,7 +6838,7 @@
             407e72     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             407e72      3 INSTR BELONGTO 407c30 
             407e72      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R12 R13 R14 ZZ xor     r8d, r8d 
-            407e75     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_407FB0 
+            407e75     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_407FB0 
             407e75      5 INSTR BELONGTO 407c30 
             407e75      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ mov     edx, offset loc_407FB0 
             407e7a      5 INSTR BELONGTO 407c30 
@@ -6871,11 +6871,11 @@
             407eb6     -3 INSTR LOCAL NoWarn push    rbx 
             407ebe     -1 INSTR LOCAL NoMetaUpdate call    sub_406BC0 
             407ec9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_instance_get_private 
-            407ece     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            407ece     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             407ed9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407ede      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+8]
-            407ee3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            407eed     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407ee3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            407eed     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407eef     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             407ef4     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rsp+8], 0 
             407ef4      6 PTRIMMEDESP STACK 8 displ cmp     qword ptr [rsp+8], 0
@@ -6886,7 +6886,7 @@
             407f18     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             407f1e     -1 INSTR LOCAL NoMetaUpdate jz      short loc_407F40 
             407f23     -1 INSTR LOCAL NoMetaUpdate call    _gdk_window_get_display 
-            407f28     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 96h 
+            407f28     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 96h 
             407f30     -1 INSTR LOCAL NoMetaUpdate call    _gdk_cursor_new_for_display 
             407f3b     -1 INSTR LOCAL NoMetaUpdate call    _gdk_window_set_cursor 
             407f40      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
@@ -6913,13 +6913,13 @@
             407fce      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             407fd4     -1 INSTR LOCAL NoMetaUpdate call    _g_type_instance_get_private 
             407fdf     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_get_name 
-            407fe8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            407fef     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407fe8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            407fef     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407ff1     -1 INSTR LOCAL NoMetaUpdate call    _g_strconcat 
             407ff6      4 PTRIMMEDEBP STACK 48 displ mov     rdi, [rbp+30h]
             407ffa      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+8]
-            407fff     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            408009     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407fff     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            408009     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40800b     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             408010      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
             408018     -1 INSTR LOCAL NoMetaUpdate call    _yelp_uri_new_relative 
@@ -6997,7 +6997,7 @@
             4080e1      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
             4080e6      2 INSTR BELONGTO 4080a0 
             4080e6      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            4080e6     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4080e6     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4080e8      3 INSTR BELONGTO 4080a0 
             4080e8      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             4080eb     -1 INSTR LOCAL NoMetaUpdate call    _webkit_web_view_set_highlight_text_matches 
@@ -7035,7 +7035,7 @@
             40811e      4 INSTR BELONGTO 4080a0 
             408122      2 INSTR BELONGTO 4080a0 
             408122      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            408122     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408122     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408122      8 DEALLOC STACK esp - 8 xor     eax, eax
             408124      1 INSTR BELONGTO 4080a0 
             408124      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
@@ -7053,7 +7053,7 @@
             408168     -1 INSTR LOCAL NoMetaUpdate jz      loc_4081F8 
             40816e     -1 INSTR LOCAL NoMetaUpdate cmp     edx, 0FF8Dh 
             408174     -1 INSTR LOCAL NoMetaUpdate jz      short loc_408198 
-            408176     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408176     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408178     -1 INSTR LOCAL NoMetaUpdate cmp     edx, 0FF0Dh 
             40817e     -1 INSTR LOCAL NoMetaUpdate jz      short loc_408198 
             408180      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
@@ -7062,24 +7062,24 @@
             40818e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             408198     -1 INSTR LOCAL NoMetaUpdate call    _gtk_editable_get_type 
             4081a3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4081a8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
-            4081ad     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4081a8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            4081ad     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4081b2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_editable_get_chars 
             4081ba     -1 INSTR LOCAL NoMetaUpdate call    _webkit_web_view_get_type 
             4081bf      4 PTRIMMEDEBP STACK 48 displ mov     rdi, [rbp+30h]
             4081c6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4081cb     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-            4081d1     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            4081d6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4081d1     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            4081d6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4081de     -1 INSTR LOCAL NoMetaUpdate call    _webkit_web_view_search_text 
             4081e6     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
-            4081eb     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4081eb     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4081f0     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_408180 
             4081f8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
             4081fd      4 PTRIMMEDEBP STACK 48 displ mov     rdi, [rbp+30h]
             408204     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40820c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_grab_focus 
-            408211     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            408211     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             408216     -1 INSTR LOCAL NoMetaUpdate jmp     loc_408180 
             408220     -3 INSTR LOCAL NoWarn push    r12 
             408222     -3 INSTR LOCAL NoWarn push    rbp 
@@ -7092,34 +7092,34 @@
             408256     -1 INSTR LOCAL NoMetaUpdate call    _gtk_editable_get_type 
             40825b      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             408261     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            408266     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            408268     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            408266     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            408268     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             408270     -1 INSTR LOCAL NoMetaUpdate call    _gtk_editable_get_chars 
             408275     -1 INSTR LOCAL NoMetaUpdate cmp     byte ptr [rax], 0 
             40827b     -1 INSTR LOCAL NoMetaUpdate jz      loc_408350 
             408281     -1 INSTR LOCAL NoMetaUpdate call    _webkit_web_view_get_type 
             40828d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            408292     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            408294     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            408292     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            408294     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408296      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40829c     -1 INSTR LOCAL NoMetaUpdate call    _webkit_web_view_mark_text_matches 
             4082a1     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             4082a6     -1 INSTR LOCAL NoMetaUpdate jle     loc_408378 
             4082ac     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM movsxd  rcx, eax 
             4082af     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 5 
-            4082bf     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4082bf     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4082c1     -1 INSTR LOCAL NoMetaUpdate call    _dcngettext 
-            4082cc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4082cc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4082ce     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             4082d6     -1 INSTR LOCAL NoMetaUpdate call    _webkit_web_view_get_type 
             4082e2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4082e7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4082e7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4082ef     -1 INSTR LOCAL NoMetaUpdate call    _webkit_web_view_set_highlight_text_matches 
             4082f4     -1 INSTR LOCAL NoMetaUpdate call    _webkit_web_view_get_type 
             408300     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             408305     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-            40830b     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            408310     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40830b     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            408310     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408312      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             408318     -1 INSTR LOCAL NoMetaUpdate call    _webkit_web_view_search_text 
             40831d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_get_type 
@@ -7133,10 +7133,10 @@
             40836d     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_label_set_text 
             408378     -1 INSTR LOCAL NoMetaUpdate call    _webkit_web_view_get_type 
             408384     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            408389     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            408389     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40838e     -1 INSTR LOCAL NoMetaUpdate call    _webkit_web_view_set_highlight_text_matches 
-            408393     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40839d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408393     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40839d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40839f     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4083a7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_get_type 
             4083b3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -7148,7 +7148,7 @@
             4083e4     -1 INSTR LOCAL NoMetaUpdate call    sub_406BC0 
             4083e9      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4083ef     -1 INSTR LOCAL NoMetaUpdate call    _g_type_instance_get_private 
-            4083f7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4083f7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4083f9     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rbx+1Ch], 0FF1Bh 
             408400     -1 INSTR LOCAL NoMetaUpdate jz      short loc_408418 
             408402      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
@@ -7158,7 +7158,7 @@
             40841d      4 PTRIMMEDEBP STACK 48 displ mov     rdi, [rbp+30h]
             408424     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40842c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_grab_focus 
-            408431     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            408431     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             408436      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             40843b      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             408440     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
@@ -7240,10 +7240,10 @@
             4084c2      1 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx 
             4084c3      1 INSTR BELONGTO 408450 
             4084c3      1 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbp 
-            4084c4     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            4084c4     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             4084c4      5 INSTR BELONGTO 408450 
             4084c4      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 1 
-            4084c9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4084c9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4084c9      5 INSTR BELONGTO 408450 
             4084c9      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     edx, 1 
             4084ce     -1 INSTR LOCAL MetadataUnused mov     rdi, rax 
@@ -7298,7 +7298,7 @@
             40851b      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _gtk_widget_grab_focus 
             408520      2 INSTR BELONGTO 4084f0 
             408520      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            408520     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408520     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408522      1 INSTR BELONGTO 4084f0 
             408522      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             408523      1 INSTR BELONGTO 4084f0 
@@ -7311,9 +7311,9 @@
             40855a     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40855c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_408580 
             408568      3 PTRIMMEDEBP STACK 0 displ mov     rdx, rbp
-            408570     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
+            408570     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
             408575     -1 INSTR LOCAL NoMetaUpdate call    _g_timeout_add 
-            408580     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408580     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408582      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             408587      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             40858c     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
@@ -7348,7 +7348,7 @@
             4085bc     -1 INSTR LOCAL NoMetaUpdate call    _yelp_settings_get_default 
             4085bc      5 INSTR BELONGTO 4085a0 
             4085bc      5 INSTR DEADREGS  EFLAGS ZZ call    _yelp_settings_get_default 
-            4085c1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            4085c1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             4085c1      5 INSTR BELONGTO 4085a0 
             4085c1      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 0Ch 
             4085c6      3 INSTR BELONGTO 4085a0 
@@ -7376,7 +7376,7 @@
             4085e4      5 INSTR DEADREGS  EFLAGS ZZ call    _yelp_settings_get_default 
             4085e9      2 INSTR BELONGTO 4085a0 
             4085e9      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            4085e9     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4085e9     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4085eb      3 INSTR BELONGTO 4085a0 
             4085eb      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             4085ee     -1 INSTR LOCAL NoMetaUpdate call    _yelp_settings_get_color 
@@ -7399,7 +7399,7 @@
             408606      5 INSTR DEADREGS  EFLAGS ZZ call    _g_free 
             40860b     -1 INSTR LOCAL SafeIfNoIndexing movss   xmm1, dword ptr [rbx+0BCh] 
             40860b      8 INSTR BELONGTO 4085a0 
-            408613     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, [rsp+38h+var_34] 
+            408613     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, [rsp+38h+var_34] 
             408613      5 INSTR BELONGTO 4085a0 
             408613      5 INSTR DEADREGS  EFLAGS RAX ZZ movzx   eax, [rsp+38h+var_34] 
             408613      5 PTRIMMEDESP STACK 4 displ movzx   eax, [rsp+38h+var_34]
@@ -7492,7 +7492,7 @@
             4086c0      5 INSTR DEADREGS  EFLAGS XMM2 XMM3 ZZ call    _gtk_bin_get_child 
             4086c5      2 INSTR BELONGTO 4085a0 
             4086c5      2 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM2 XMM3 ZZ xor     esi, esi 
-            4086c5     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4086c5     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4086c7      3 INSTR BELONGTO 4085a0 
             4086c7      3 INSTR DEADREGS  EFLAGS RDX RDI XMM2 XMM3 ZZ mov     rdi, rax 
             4086ca      3 INSTR BELONGTO 4085a0 
@@ -7505,7 +7505,7 @@
             4086d2      8 INSTR BELONGTO 4085a0 
             4086da     -1 INSTR LOCAL NoMetaUpdate xorps   xmm1, xmm1 
             4086da      3 INSTR BELONGTO 4085a0 
-            4086dd     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4086dd     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4086dd      5 INSTR BELONGTO 4085a0 
             4086dd      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 XMM2 XMM3 ZZ mov     eax, 1 
             4086e2     -1 INSTR LOCAL NoMetaUpdate cvtps2pd xmm0, xmm0 
@@ -7526,7 +7526,7 @@
             408702     10 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 XMM0 XMM1 XMM2 XMM3 ZZ mov     dword ptr [rbx+0B8h], 0 
             40870c      2 INSTR BELONGTO 4085a0 
             40870c      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 XMM0 XMM1 XMM2 XMM3 ZZ xor     eax, eax 
-            40870c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40870c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40870e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
             40870e      4 INSTR BELONGTO 4085a0 
             408712      1 INSTR BELONGTO 4085a0 
@@ -7542,8 +7542,8 @@
             408739     -1 INSTR LOCAL NoMetaUpdate call    sub_406BC0 
             408744     -1 INSTR LOCAL NoMetaUpdate call    _g_type_instance_get_private 
             40874d      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+8]
-            408752     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            408759     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408752     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            408759     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40875b     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             408760      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
             408765     -1 INSTR LOCAL NoMetaUpdate call    _yelp_uri_get_document_uri 
@@ -7689,7 +7689,7 @@
             40885c      5 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ mov     esi, offset aASs; "a(ss)" 
             408861      2 INSTR BELONGTO 4087b0 
             408861      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            408861     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408861     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408863     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_get 
             408863      5 INSTR BELONGTO 4087b0 
             408863      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_variant_get 
@@ -7708,10 +7708,10 @@
             40887c      5 INSTR DEADREGS  EFLAGS R12 XMM1 ZZ call    _gtk_alignment_new 
             408881      2 INSTR BELONGTO 4087b0 
             408881      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 XMM1 ZZ xor     ecx, ecx 
-            408881     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408881     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408883      3 INSTR BELONGTO 4087b0 
             408883      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 XMM1 ZZ mov     rbp, rax 
-            408886     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6 
+            408886     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6 
             408886      5 INSTR BELONGTO 4087b0 
             408886      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 XMM1 ZZ mov     edx, 6 
             40888b      3 INSTR BELONGTO 4087b0 
@@ -7720,7 +7720,7 @@
             40888e      5 INSTR DEADREGS  EFLAGS RAX RSI R12 XMM1 ZZ mov     esi, offset aLeftPadding; "left-padding" 
             408893      2 INSTR BELONGTO 4087b0 
             408893      2 INSTR DEADREGS  EFLAGS RAX R12 XMM1 ZZ xor     eax, eax 
-            408893     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408893     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408895     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             408895      5 INSTR BELONGTO 4087b0 
             408895      5 INSTR DEADREGS  EFLAGS R12 XMM1 ZZ call    _g_object_set 
@@ -7739,10 +7739,10 @@
             4088ab      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 XMM1 ZZ xor     r8d, r8d 
             4088ae      2 INSTR BELONGTO 4087b0 
             4088ae      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 XMM1 ZZ xor     ecx, ecx 
-            4088ae     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4088ae     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4088b0      2 INSTR BELONGTO 4087b0 
             4088b0      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 XMM1 ZZ xor     edx, edx 
-            4088b0     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4088b0     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4088b2      3 INSTR BELONGTO 4087b0 
             4088b2      3 INSTR DEADREGS  EFLAGS RSI RDI R12 XMM1 ZZ mov     rsi, rbp 
             4088b5      3 INSTR BELONGTO 4087b0 
@@ -7767,10 +7767,10 @@
             4088d3      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 ZZ mov     rdi, rax 
             4088d6      2 INSTR BELONGTO 4087b0 
             4088d6      2 INSTR DEADREGS  EFLAGS RAX RDX RSI XMM0 XMM1 ZZ xor     edx, edx 
-            4088d6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4088d6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4088d8      5 INSTR BELONGTO 4087b0 
             4088d8      5 INSTR DEADREGS  EFLAGS RAX RSI XMM0 XMM1 ZZ mov     esi, offset aXalign; "xalign" 
-            4088dd     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4088dd     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4088dd      5 INSTR BELONGTO 4087b0 
             4088dd      5 INSTR DEADREGS  EFLAGS RAX XMM0 XMM1 ZZ mov     eax, 1 
             4088e2     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
@@ -7784,7 +7784,7 @@
             4088ea      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 XMM0 XMM1 ZZ xor     r8d, r8d 
             4088ed      3 INSTR BELONGTO 4087b0 
             4088ed      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI XMM0 XMM1 ZZ mov     rcx, r14 
-            4088f0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_408B50 
+            4088f0     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_408B50 
             4088f0      5 INSTR BELONGTO 4087b0 
             4088f0      5 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 ZZ mov     edx, offset loc_408B50 
             4088f5      5 INSTR BELONGTO 4087b0 
@@ -7826,7 +7826,7 @@
             40892f      5 PTRIMMEDESP STACK 32 displ lea     rdx, [rsp+68h+var_48]
             408934      2 INSTR BELONGTO 4087b0 
             408934      2 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ xor     eax, eax 
-            408934     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408934     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408936      5 INSTR BELONGTO 4087b0 
             408936      5 INSTR DEADREGS  EFLAGS RSI R12 ZZ mov     esi, offset aSS ; "(&s&s)" 
             40893b     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_iter_loop 
@@ -7935,10 +7935,10 @@
             4089d2      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 R15 XMM2 XMM3 ZZ mov     rdi, rax 
             4089d5      2 INSTR BELONGTO 4087b0 
             4089d5      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R13 R14 R15 XMM2 XMM3 ZZ xor     ecx, ecx 
-            4089d5     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4089d5     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4089d7      2 INSTR BELONGTO 4087b0 
             4089d7      2 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 XMM2 XMM3 ZZ xor     edx, edx 
-            4089d7     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4089d7     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4089d9      3 INSTR BELONGTO 4087b0 
             4089d9      3 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 R15 XMM2 XMM3 ZZ mov     rsi, rbp 
             4089dc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_end 
@@ -7961,7 +7961,7 @@
             408a23      5 PTRIMMEDESP STACK 60 displ lea     r8, [rsp+3Ch]
             408a28      5 PTRIMMEDESP STACK 24 displ lea     rdx, [rsp+18h]
             408a2d     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
-            408a40     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408a40     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408a42     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             408a47      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+18h]
             408a4c     -1 INSTR LOCAL NoMetaUpdate call    _yelp_uri_get_document_uri 
@@ -7972,7 +7972,7 @@
             408a72     -1 INSTR LOCAL NoMetaUpdate jz      short loc_408A91 
             408a7a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             408a82     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_window 
-            408a87     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            408a87     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             408a8c     -1 INSTR LOCAL NoMetaUpdate call    _gdk_window_set_cursor 
             408a91     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rsp+3Ch], 3 
             408a91      5 PTRIMMEDESP STACK 60 displ cmp     dword ptr [rsp+3Ch], 3
@@ -7981,7 +7981,7 @@
             408a9d      5 PTRIMMEDESP STACK 40 displ lea     r8, [rsp+28h]
             408aa2      5 PTRIMMEDESP STACK 32 displ lea     rdx, [rsp+20h]
             408ab7      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-            408abe     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408abe     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408ac0      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], 0
             408ac9     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             408ace      5 PTRIMMEDESP STACK 48 displ mov     r8, [rsp+30h]
@@ -8016,8 +8016,8 @@
             408b7c     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
             408b81      4 PTRIMMEDEBP STACK 48 displ mov     rdi, [rbp+30h]
             408b85      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+8]
-            408b8a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            408b94     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408b8a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            408b94     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408b96     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             408b9b      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
             408ba0     -1 INSTR LOCAL NoMetaUpdate call    _yelp_uri_get_document_uri 
@@ -8030,7 +8030,7 @@
             408bd0     -1 INSTR LOCAL NoMetaUpdate call    _yelp_view_load 
             408bd8     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             408bdd     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
-            408be1     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            408be1     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             408bf0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             408bf0      0 FUNC MMSAFENESS SAFE
             408bf0    177 FUNC GLOBAL sub_408BF0 FUNC_UNSAFE NOFP RET             408ca0 
@@ -8076,14 +8076,14 @@
             408c2f      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+38h+var_30]
             408c34      2 INSTR BELONGTO 408bf0 
             408c34      2 INSTR DEADREGS  EFLAGS RCX RSI R12 ZZ xor     ecx, ecx 
-            408c34     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408c34     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408c36      5 INSTR BELONGTO 408bf0 
             408c36      5 INSTR DEADREGS  EFLAGS RSI R12 ZZ mov     esi, offset aYelpUri; "yelp-uri" 
             408c3b     -1 INSTR LOCAL MetadataUnused mov     r12, rax 
             408c3b      3 INSTR BELONGTO 408bf0 
             408c3e      2 INSTR BELONGTO 408bf0 
             408c3e      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            408c3e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408c3e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408c40     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             408c40      5 INSTR BELONGTO 408bf0 
             408c40      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_get 
@@ -8183,10 +8183,10 @@
             408daf     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             408dbe     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             408dc3      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-            408ddf     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            408ddf     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             408de9      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
             408dee      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-            408df2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408df2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408df4     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             408df9      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
             408dfe      5 PTRIMMEDESP STACK 48 displ mov     rbp, [rsp+30h]
@@ -8216,7 +8216,7 @@
             408e5b     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             408e5b      5 INSTR BELONGTO 408e40 
             408e60      7 INSTR BELONGTO 408e40 
-            408e67     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            408e67     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             408e67      5 INSTR BELONGTO 408e40 
             408e6c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             408e6c      5 INSTR BELONGTO 408e40 
@@ -8311,7 +8311,7 @@
             408f55      5 INSTR BELONGTO 408e80 
             408f5a     10 INSTR BELONGTO 408e80 
             408f64      7 INSTR BELONGTO 408e80 
-            408f6b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            408f6b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             408f6b      5 INSTR BELONGTO 408e80 
             408f70     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             408f70      5 INSTR BELONGTO 408e80 
@@ -8357,7 +8357,7 @@
             408fd4     10 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ mov     dword ptr [rax+0C0h], 1 
             408fde      2 INSTR BELONGTO 408fc0 
             408fde      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            408fde     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408fde     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408fe0      1 INSTR BELONGTO 408fc0 
             408fe0      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             408fe1      1 INSTR BELONGTO 408fc0 
@@ -8368,10 +8368,10 @@
             409009     -1 INSTR LOCAL NoMetaUpdate call    sub_406BC0 
             409014     -1 INSTR LOCAL NoMetaUpdate call    _g_type_instance_get_private 
             40901c      3 PTRIMMEDEBP STACK 28 displ mov     eax, [rbp+1Ch]
-            40901f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40901f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             409024     -1 INSTR LOCAL NoMetaUpdate cmp     [rbx+0B0h], eax 
             40902a     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409034 
-            409032     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     dl, dl 
+            409032     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     dl, dl 
             409034      3 PTRIMMEDEBP STACK 32 displ mov     eax, [rbp+20h]
             409037     -1 INSTR LOCAL NoMetaUpdate cmp     [rbx+0B4h], eax 
             40903d     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4090B0 
@@ -8379,15 +8379,15 @@
             40904d     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409099 
             409055     -1 INSTR LOCAL NoMetaUpdate test    edi, edi 
             409057     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4090C0 
-            409061     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0C8h 
+            409061     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0C8h 
             409066     -1 INSTR LOCAL NoMetaUpdate call    _g_timeout_add 
-            409077     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 55555556h 
-            409089     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM sar     ecx, 1Fh 
-            40908c     -2 INSTR LOCAL n EAX EDX ZZ  AlwaysNUM imul    edx 
-            40908e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            409092     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            409077     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 55555556h 
+            409089     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM sar     ecx, 1Fh 
+            40908c     -2 INSTR LOCAL n RAX RDX ZZ  AlwaysNUM imul    edx 
+            40908e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            409092     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             409094     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
-            409099     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409099     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40909b      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
             40909f      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
             4090a4      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
@@ -8401,11 +8401,11 @@
             4090d5      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], rbp
             4090e1     -1 INSTR LOCAL NoMetaUpdate call    sub_406BC0 
             4090ec     -1 INSTR LOCAL NoMetaUpdate call    _g_type_instance_get_private 
-            4090fd     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            4090ff     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4090fd     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            4090ff     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409101     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
             409106     10 PTRIMMEDEBP STACK 172 displ mov     dword ptr [rbp+0ACh], 0
-            409110     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409110     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409112      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             409117      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             40911c     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
@@ -8427,14 +8427,14 @@
             40913c      3 INSTR BELONGTO 409130 
             40913f      2 INSTR BELONGTO 409130 
             40913f      2 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI RDI R8 R9 R10 R11 ZZ xor     ecx, ecx 
-            40913f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40913f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             409141      1 INSTR BELONGTO 409130 
             409141      1 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx 
             409142     -1 INSTR LOCAL MetadataUnused mov     esi, offset aApplication; "application" 
             409142      5 INSTR BELONGTO 409130 
             409147      2 INSTR BELONGTO 409130 
             409147      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            409147     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409147     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409149     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
             409149      5 INSTR BELONGTO 409130 
             409149      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_object_new 
@@ -8493,17 +8493,17 @@
             4091e5     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             4091ed     -1 INSTR LOCAL NoMetaUpdate call    _g_strfreev 
             4091f2      2 PTRIMMEDEBP STACK 0 displ mov     ecx, ebp
-            4091f4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            4091f6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4091f4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            4091f6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4091fe     -1 INSTR LOCAL NoMetaUpdate call    _gtk_drag_finish 
             409203      2 PTRIMMEDEBP STACK 0 displ mov     ecx, ebp
             409208      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
             40920d      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
             409211      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
-            409216     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409216     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409218      5 PTRIMMEDESP STACK 24 displ mov     r13, [rsp+18h]
             40921d      5 PTRIMMEDESP STACK 32 displ mov     r14, [rsp+20h]
-            409222     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409222     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409224     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
             409228     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_drag_finish 
             409230      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
@@ -8548,7 +8548,7 @@
             4092c3      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_instance_get_private 
             4092c8      4 INSTR BELONGTO 4092b0 
             4092c8      4 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, [rax+30h] 
-            4092cc     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4092cc     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4092cc      5 INSTR BELONGTO 4092b0 
             4092cc      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             4092d1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -8561,10 +8561,10 @@
             4092db      3 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI ZZ mov     rdi, rax 
             4092de      2 INSTR BELONGTO 4092b0 
             4092de      2 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI ZZ xor     ecx, ecx 
-            4092de     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4092de     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4092e0      2 INSTR BELONGTO 4092b0 
             4092e0      2 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ xor     eax, eax 
-            4092e0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4092e0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4092e2      5 INSTR BELONGTO 4092b0 
             4092e2      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, offset aYelpUri; "yelp-uri" 
             4092e7     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
@@ -8680,7 +8680,7 @@
             409398      2 INSTR BELONGTO 409350 
             40939a      2 INSTR BELONGTO 409350 
             40939a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            40939a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40939a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40939c      4 INSTR BELONGTO 409350 
             4093a0      3 INSTR BELONGTO 409350 
             4093a0      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 3682844e..3ebdf17d 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot
@@ -460,7 +460,7 @@
             401392      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_type_init 
             401397      5 INSTR BELONGTO 401380 
             401397      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, offset locale; locale 
-            40139c     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
+            40139c     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
             40139c      5 INSTR BELONGTO 401380 
             40139c      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     edi, 6          ; category 
             4013a1     -1 INSTR LOCAL NoMetaUpdate call    _setlocale 
@@ -539,7 +539,7 @@
             401420     -1 INSTR LOCAL NoMetaUpdate call    sub_401550 
             401420      5 INSTR BELONGTO 401380 
             401420      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 ZZ call    sub_401550 
-            401425     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 2 
+            401425     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 2 
             401425      5 INSTR BELONGTO 401380 
             401425      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ mov     eax, 2 
             40142a     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_401442 
@@ -550,11 +550,11 @@
             401431      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, offset aMain; "main" 
             401436      2 INSTR BELONGTO 401380 
             401436      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ xor     edi, edi 
-            401436     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401436     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401438     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             401438      5 INSTR BELONGTO 401380 
             401438      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_return_if_fail_warning 
-            40143d     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40143d     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40143d      5 INSTR BELONGTO 401380 
             40143d      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ mov     eax, 1 
             401442     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
@@ -712,7 +712,7 @@
             401529      3 INSTR BELONGTO 401520 
             40152c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401540 
             40152c      2 INSTR BELONGTO 401520 
-            40152e     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            40152e     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             40152e      5 INSTR BELONGTO 401520 
             401533     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             401533      3 INSTR BELONGTO 401520 
@@ -731,14 +731,14 @@
             401550      1 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ push    rbx 
             401550      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
             401550      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            401551     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            401551     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             401551      5 INSTR BELONGTO 401550 
             401551      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             401556      5 INSTR BELONGTO 401550 
             401556      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset msgid; "usage: gnome-keyring command [options]\"... 
             40155b      2 INSTR BELONGTO 401550 
             40155b      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; domainname 
-            40155b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40155b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40155d     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40155d      5 INSTR BELONGTO 401550 
             40155d      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _dcgettext 
@@ -746,16 +746,16 @@
             401562      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
             401565      2 INSTR BELONGTO 401550 
             401565      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            401565     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401565     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401567     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             401567      5 INSTR BELONGTO 401550 
             401567      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_printerr 
-            40156c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40156c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40156c      5 INSTR BELONGTO 401550 
             40156c      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             401571      2 INSTR BELONGTO 401550 
             401571      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     edi, edi        ; domainname 
-            401571     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            401571     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             401573      5 INSTR BELONGTO 401550 
             401573      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, offset aCommands; "commands: " 
             401578     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -777,18 +777,18 @@
             401593      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aSS ; "%s%s\n" 
             401598      2 INSTR BELONGTO 401550 
             401598      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            401598     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401598     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40159a     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             40159a      5 INSTR BELONGTO 401550 
             40159a      5 INSTR DEADREGS  EFLAGS ZZ call    _g_printerr 
             40159f     -1 INSTR LOCAL MetadataUnused add     rbx, 10h 
             40159f      4 INSTR BELONGTO 401550 
-            4015a3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4015a3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4015a3      5 INSTR BELONGTO 401550 
             4015a3      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             4015a8      2 INSTR BELONGTO 401550 
             4015a8      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            4015a8     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4015a8     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4015aa      5 INSTR BELONGTO 401550 
             4015aa      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset asc_40203B; "          " 
             4015af     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -866,7 +866,7 @@
             40162b      2 INSTR BELONGTO 4015c0 
             40162d      2 INSTR BELONGTO 4015c0 
             40162d      2 INSTR DEADREGS  EFLAGS RSI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ xor     ebp, ebp 
-            40162d     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40162d     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40162f     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             40162f      3 INSTR BELONGTO 4015c0 
             401632     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40166E 
@@ -927,7 +927,7 @@
             401692      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ mov     rsi, rbp 
             401695      2 INSTR BELONGTO 4015c0 
             401695      2 INSTR DEADREGS  EFLAGS RAX RDI R12 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ xor     eax, eax 
-            401695     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401695     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401697      5 INSTR BELONGTO 4015c0 
             401697      5 INSTR DEADREGS  EFLAGS RDI R12 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ mov     edi, offset word_402046 
             40169c     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
@@ -1020,7 +1020,7 @@
             401732      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rbx 
             401735      2 INSTR BELONGTO 4016e0 
             401735      2 INSTR DEADREGS  EFLAGS R12 R13 ZZ xor     ebp, ebp 
-            401735     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            401735     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             401737     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_parse 
             401737      5 INSTR BELONGTO 4016e0 
             401737      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_option_context_parse 
@@ -1033,7 +1033,7 @@
             401740      5 PTRIMMEDESP STACK 8 displ lea     rdi, [rsp+38h+var_30]
             401745     -1 INSTR LOCAL MetadataUnused xor     esi, esi 
             401745      2 INSTR BELONGTO 4016e0 
-            401747     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     bpl, 2 
+            401747     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     bpl, 2 
             401747      3 INSTR BELONGTO 4016e0 
             401747      3 INSTR DEADREGS  EFLAGS RSI R10 R11 R12 R13 ZZ mov     bpl, 2 
             40174a     -1 INSTR LOCAL NoMetaUpdate call    sub_4015C0 
@@ -1046,7 +1046,7 @@
             401752      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_option_context_free 
             401757      2 INSTR BELONGTO 4016e0 
             401757      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ mov     eax, ebp 
-            401757     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebp 
+            401757     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebp 
             401759      5 INSTR BELONGTO 4016e0 
             401759      5 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 ZZ mov     rbx, [rsp+38h+var_20] 
             401759      5 PTRIMMEDESP STACK 24 displ mov     rbx, [rsp+38h+var_20]
@@ -1072,8 +1072,8 @@
             401781      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 ZZ mov     rdi, rsi 
             401784      2 INSTR BELONGTO 401780 
             401784      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 ZZ xor     ecx, ecx 
-            401784     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            401786     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            401784     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            401786     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             401786      5 INSTR BELONGTO 401780 
             401786      5 INSTR DEADREGS  EFLAGS RDX RSI R8 ZZ mov     edx, 3 
             40178b      1 INSTR BELONGTO 401780 
@@ -1114,7 +1114,7 @@
             4017cc      5 INSTR BELONGTO 401780 
             4017cc      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ lea     rdx, [rsp+48h+var_20] 
             4017cc      5 PTRIMMEDESP STACK 40 displ lea     rdx, [rsp+48h+var_20]
-            4017d1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            4017d1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             4017d1      5 INSTR BELONGTO 401780 
             4017d1      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 3 
             4017d6      3 INSTR BELONGTO 401780 
@@ -1131,7 +1131,7 @@
             4017e6      5 PTRIMMEDESP STACK 24 displ lea     rdx, [rsp+48h+var_30]
             4017eb      2 INSTR BELONGTO 401780 
             4017eb      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            4017eb     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4017eb     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4017ed      3 INSTR BELONGTO 401780 
             4017ed      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rbx 
             4017f0     -1 INSTR LOCAL NoMetaUpdate call    _gck_attributes_find_ulong 
@@ -1145,7 +1145,7 @@
             4017f9      9 INSTR BELONGTO 401780 
             401802      3 INSTR BELONGTO 401780 
             401802      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            401805     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 102h 
+            401805     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 102h 
             401805      5 INSTR BELONGTO 401780 
             401805      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 102h 
             40180a     -1 INSTR LOCAL NoMetaUpdate call    _gck_attributes_find 
@@ -1166,7 +1166,7 @@
             401822      5 PTRIMMEDESP STACK 40 displ mov     rsi, [rsp+48h+var_20]
             401827      2 INSTR BELONGTO 401780 
             401827      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            401827     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401827     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401829     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             401829      5 INSTR BELONGTO 401780 
             401829      5 INSTR DEADREGS  EFLAGS ZZ call    _g_print 
@@ -1189,7 +1189,7 @@
             401848      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, rax 
             40184b      2 INSTR BELONGTO 401780 
             40184b      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40184b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40184b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40184d     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             40184d      5 INSTR BELONGTO 401780 
             40184d      5 INSTR DEADREGS  EFLAGS ZZ call    _g_print 
@@ -1238,7 +1238,7 @@
             4018a5      5 INSTR BELONGTO 401780 
             4018aa      2 INSTR BELONGTO 401780 
             4018aa      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R10 R11 ZZ xor     eax, eax 
-            4018aa     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4018aa     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4018ac     -1 INSTR LOCAL NoMetaUpdate call    sub_4015C0 
             4018ac      5 INSTR BELONGTO 401780 
             4018ac      5 INSTR DEADREGS  EFLAGS RBX RSI R10 R11 ZZ call    sub_4015C0 
@@ -1299,7 +1299,7 @@
             4018f4      2 INSTR BELONGTO 4018c0 
             4018f6      2 INSTR BELONGTO 4018c0 
             4018f6      2 INSTR DEADREGS  RBX R12 R13 R14 R15 ZZ mov     ebx, eax 
-            4018f6     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, eax 
+            4018f6     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     ebx, eax 
             4018f8     -1 INSTR LOCAL NoMetaUpdate jnz     loc_401A58 
             4018f8      6 INSTR BELONGTO 4018c0 
             4018fe      7 INSTR BELONGTO 4018c0 
@@ -1317,7 +1317,7 @@
             401918      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _gcr_importer_new 
             40191d      2 INSTR BELONGTO 4018c0 
             40191d      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ xor     esi, esi 
-            40191d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40191d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40191f      3 INSTR BELONGTO 4018c0 
             40191f      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ mov     rdi, rax 
             401922      3 INSTR BELONGTO 4018c0 
@@ -1369,7 +1369,7 @@
             40197b      5 PTRIMMEDESP STACK 40 displ lea     rcx, [rsp+68h+var_40]
             401980      2 INSTR BELONGTO 4018c0 
             401980      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            401980     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401980     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             401982      3 INSTR BELONGTO 4018c0 
             401982      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r12 
             401985      3 INSTR BELONGTO 4018c0 
@@ -1411,7 +1411,7 @@
             4019ba      2 INSTR BELONGTO 4018c0 
             4019bc     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rax+4], 2 
             4019bc      4 INSTR BELONGTO 4018c0 
-            4019c0     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            4019c0     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             4019c0      5 INSTR BELONGTO 4018c0 
             4019c0      5 INSTR DEADREGS  RBX RDI R12 R14 ZZ mov     ebx, 1 
             4019c5     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4019E1 
@@ -1425,8 +1425,8 @@
             4019d0      5 INSTR BELONGTO 4018c0 
             4019d5      2 INSTR BELONGTO 4018c0 
             4019d5      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R10 R11 R12 R14 ZZ xor     eax, eax 
-            4019d5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            4019d7     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            4019d5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            4019d7     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             4019d7      5 INSTR BELONGTO 4018c0 
             4019d7      5 INSTR DEADREGS  EFLAGS RBX RSI R10 R11 R12 R14 ZZ mov     ebx, 1 
             4019dc     -1 INSTR LOCAL NoMetaUpdate call    sub_4015C0 
@@ -1448,7 +1448,7 @@
             4019f3      5 PTRIMMEDESP STACK 40 displ lea     rdx, [rsp+68h+var_40]
             4019f8      2 INSTR BELONGTO 4018c0 
             4019f8      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 ZZ xor     esi, esi 
-            4019f8     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4019f8     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4019fa      3 INSTR BELONGTO 4018c0 
             4019fa      3 INSTR DEADREGS  EFLAGS RDI R12 R14 ZZ mov     rdi, rax 
             4019fd      3 INSTR BELONGTO 4018c0 
@@ -1481,12 +1481,12 @@
             401a28      5 PTRIMMEDESP STACK 40 displ lea     rdi, [rsp+68h+var_40]
             401a2d      2 INSTR BELONGTO 4018c0 
             401a2d      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R10 R11 R12 R14 ZZ xor     eax, eax 
-            401a2d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401a2d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401a2f     -1 INSTR LOCAL MetadataUnused add     r13, 8 
             401a2f      4 INSTR BELONGTO 4018c0 
             401a33     -1 INSTR LOCAL MetadataUnused mov     esi, offset aCouldnTReadFil; "couldn't read file: %s" 
             401a33      5 INSTR BELONGTO 4018c0 
-            401a38     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            401a38     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             401a38      5 INSTR BELONGTO 4018c0 
             401a38      5 INSTR DEADREGS  EFLAGS RBX RSI R10 R11 R12 R14 ZZ mov     ebx, 1 
             401a3d     -1 INSTR LOCAL NoMetaUpdate call    sub_4015C0 
@@ -1508,7 +1508,7 @@
             401a58      4 INSTR BELONGTO 4018c0 
             401a5c      2 INSTR BELONGTO 4018c0 
             401a5c      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     eax, ebx 
-            401a5c     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            401a5c     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             401a5c     56 DEALLOC STACK esp - 56 mov     eax, ebx
             401a5e      1 INSTR BELONGTO 4018c0 
             401a5e      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     rbx 
@@ -1528,14 +1528,14 @@
             401a70      5 INSTR BELONGTO 4018c0 
             401a75      2 INSTR BELONGTO 4018c0 
             401a75      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R10 R11 R12 R13 R14 R15 ZZ xor     edi, edi 
-            401a75     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401a75     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401a77      2 INSTR BELONGTO 4018c0 
             401a77      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R10 R11 R12 R13 R14 R15 ZZ xor     eax, eax 
-            401a77     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401a77     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401a79     -1 INSTR LOCAL NoMetaUpdate call    sub_4015C0 
             401a79      5 INSTR BELONGTO 4018c0 
             401a79      5 INSTR DEADREGS  EFLAGS RBX RSI R10 R11 R12 R13 R14 R15 ZZ call    sub_4015C0 
-            401a7e     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 2 
+            401a7e     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 2 
             401a7e      5 INSTR BELONGTO 4018c0 
             401a7e      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     ebx, 2 
             401a83     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_401A58 
@@ -1545,7 +1545,7 @@
             401a88      5 PTRIMMEDESP STACK 40 displ lea     rdx, [rsp+68h+var_40]
             401a8d      2 INSTR BELONGTO 4018c0 
             401a8d      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 ZZ xor     esi, esi 
-            401a8d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            401a8d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             401a8f      3 INSTR BELONGTO 4018c0 
             401a8f      3 INSTR DEADREGS  EFLAGS RDI R12 R14 ZZ mov     rdi, rbp 
             401a92     -1 INSTR LOCAL NoMetaUpdate call    _gcr_importer_import 
@@ -1561,8 +1561,8 @@
             401aa3      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 R14 R15 ZZ xor     r8d, r8d 
             401aa6      2 INSTR BELONGTO 4018c0 
             401aa6      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 R15 ZZ xor     ecx, ecx 
-            401aa6     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            401aa8     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_401780 
+            401aa6     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            401aa8     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_401780 
             401aa8      5 INSTR BELONGTO 4018c0 
             401aa8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, offset sub_401780 
             401aad      5 INSTR BELONGTO 4018c0 
@@ -1586,14 +1586,14 @@
             401ac4      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             401ac7      5 INSTR BELONGTO 401ac0 
             401ac7      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGkr_tool_trust; "gkr_tool_trust" 
-            401acc     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A6h 
+            401acc     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A6h 
             401acc      5 INSTR BELONGTO 401ac0 
             401acc      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 0A6h 
             401ad1      5 INSTR BELONGTO 401ac0 
             401ad1      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGkrToolTrust_c; "gkr-tool-trust.c" 
             401ad6      2 INSTR BELONGTO 401ac0 
             401ad6      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            401ad6     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401ad6     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401ad8     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message 
             401ad8      5 INSTR BELONGTO 401ac0 
             401ad8      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message 
@@ -1625,7 +1625,7 @@
             401aff      2 INSTR BELONGTO 401ac0 
             401b01      2 INSTR BELONGTO 401ac0 
             401b01      2 INSTR DEADREGS  RBX ZZ mov     ebx, eax 
-            401b01     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, eax 
+            401b01     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     ebx, eax 
             401b03     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401B16 
             401b03      2 INSTR BELONGTO 401ac0 
             401b05      5 INSTR BELONGTO 401ac0 
@@ -1634,7 +1634,7 @@
             401b0a      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aGnomeKeyringS; "gnome-keyring: %s\n" 
             401b0f      2 INSTR BELONGTO 401ac0 
             401b0f      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            401b0f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401b0f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401b11     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             401b11      5 INSTR BELONGTO 401ac0 
             401b11      5 INSTR DEADREGS  EFLAGS ZZ call    _g_print 
@@ -1642,7 +1642,7 @@
             401b16      4 INSTR BELONGTO 401ac0 
             401b1a      2 INSTR BELONGTO 401ac0 
             401b1a      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, ebx 
-            401b1a     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            401b1a     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             401b1a      8 DEALLOC STACK esp - 8 mov     eax, ebx
             401b1c      1 INSTR BELONGTO 401ac0 
             401b1c      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
@@ -1660,7 +1660,7 @@
             401b43     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401B6A 
             401b45     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             401b48     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401B6A 
-            401b58     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401b58     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401b5a     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             401b5f      9 PTRIMMEDESP STACK 16 displ mov     qword ptr [rsp+10h], 0
             401b68     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_401B99 
@@ -1669,7 +1669,7 @@
             401b70     -1 INSTR LOCAL NoMetaUpdate jz      loc_401CE0 
             401b76     -1 INSTR LOCAL NoMetaUpdate test    r12d, r12d 
             401b79     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401BAD 
-            401b89     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401b89     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401b8b     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             401b90      9 PTRIMMEDESP STACK 16 displ mov     qword ptr [rsp+10h], 0
             401b99      5 PTRIMMEDESP STACK 16 displ mov     rax, [rsp+10h]
@@ -1705,7 +1705,7 @@
             401c29     -2 INSTR LOCAL n R14 ZZ  AlwaysNUM xor     r14d, r14d 
             401c2c     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_401C4F 
             401c33     -2 INSTR LOCAL n R14 ZZ  NUMVia2ndSrcIMMEDNUM mov     r14b, 1 
-            401c36     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM shl     eax, 4 
+            401c36     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM shl     eax, 4 
             401c3d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbp, 1 
             401c41     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 1 
             401c45     -1 INSTR LOCAL NoMetaUpdate cmp     r15d, r12d 
@@ -1736,12 +1736,12 @@
             401cd0      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             401cd3     -1 INSTR LOCAL NoMetaUpdate call    _strlen 
             401cdb     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401BB7 
-            401cee     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401cee     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401cf0     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             401cf5      9 PTRIMMEDESP STACK 16 displ mov     qword ptr [rsp+10h], 0
             401cfe     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401B99 
-            401d13     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            401d18     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401d13     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            401d18     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             401d1a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401B20 
             401d20      2 INSTR BELONGTO 401f00 
             401d20      2 INSTR DEADREGS  EFLAGS ZZ push    r15 
@@ -1781,7 +1781,7 @@
             401d4e      7 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ lea     rsi, aEgg_hex_encode; "egg_hex_encode_full" 
             401d55      2 INSTR BELONGTO 401f00 
             401d55      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            401d55     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401d55     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401d57     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             401d57      5 INSTR BELONGTO 401f00 
             401d57      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_return_if_fail_warning 
@@ -1789,7 +1789,7 @@
             401d5c      4 INSTR BELONGTO 401f00 
             401d60      2 INSTR BELONGTO 401f00 
             401d60      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     eax, eax 
-            401d60     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401d60     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401d62      1 INSTR BELONGTO 401f00 
             401d62      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     rbx 
             401d63      1 INSTR BELONGTO 401f00 
@@ -1819,7 +1819,7 @@
             401d8c     -1 INSTR LOCAL NoMetaUpdate call    _g_string_sized_new 
             401d8c      5 INSTR BELONGTO 401f00 
             401d8c      5 INSTR DEADREGS  EFLAGS R12 R15 ZZ call    _g_string_sized_new 
-            401d91     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movsx   ecx, [rsp+48h+var_3D] 
+            401d91     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movsx   ecx, [rsp+48h+var_3D] 
             401d91      5 INSTR BELONGTO 401f00 
             401d91      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 R15 ZZ movsx   ecx, [rsp+48h+var_3D] 
             401d91      5 PTRIMMEDESP STACK 11 displ movsx   ecx, [rsp+48h+var_3D]
@@ -1841,7 +1841,7 @@
             401db6      3 INSTR BELONGTO 401f00 
             401db9     -1 INSTR LOCAL MetadataUnused movzx   eax, al 
             401db9      3 INSTR BELONGTO 401f00 
-            401dbc     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [r14+rax] 
+            401dbc     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [r14+rax] 
             401dbc      5 INSTR BELONGTO 401f00 
             401dbc      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ movzx   edx, byte ptr [r14+rax] 
             401dc1      5 INSTR BELONGTO 401f00 
@@ -1866,7 +1866,7 @@
             401dea      6 INSTR BELONGTO 401f00 
             401df0     -1 INSTR LOCAL MetadataUnused and     eax, 0Fh 
             401df0      3 INSTR BELONGTO 401f00 
-            401df3     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [r14+rax] 
+            401df3     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [r14+rax] 
             401df3      5 INSTR BELONGTO 401f00 
             401df3      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ movzx   edx, byte ptr [r14+rax] 
             401df8      5 INSTR BELONGTO 401f00 
@@ -1919,7 +1919,7 @@
             401e53      5 INSTR BELONGTO 401f00 
             401e58     -1 INSTR LOCAL NoMetaUpdate jnb     loc_401EE0 
             401e58      6 INSTR BELONGTO 401f00 
-            401e5e     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movzx   ecx, [rsp+48h+var_3D] 
+            401e5e     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movzx   ecx, [rsp+48h+var_3D] 
             401e5e      5 INSTR BELONGTO 401f00 
             401e5e      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ movzx   ecx, [rsp+48h+var_3D] 
             401e5e      5 PTRIMMEDESP STACK 11 displ movzx   ecx, [rsp+48h+var_3D]
@@ -1957,7 +1957,7 @@
             401e93     -1 INSTR LOCAL NoMetaUpdate jmp     _g_string_free 
             401e93      5 INSTR BELONGTO 401f00 
             401e93      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ jmp     _g_string_free 
-            401ea0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movsx   edx, dl 
+            401ea0     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movsx   edx, dl 
             401ea0      3 INSTR BELONGTO 401f00 
             401ea0      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ movsx   edx, dl 
             401ea3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -1970,7 +1970,7 @@
             401ead      5 INSTR DEADREGS  EFLAGS ZZ call    _g_string_insert_c 
             401eb2     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401E21 
             401eb2      5 INSTR BELONGTO 401f00 
-            401ec0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movsx   edx, dl 
+            401ec0     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movsx   edx, dl 
             401ec0      3 INSTR BELONGTO 401f00 
             401ec0      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ movsx   edx, dl 
             401ec3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -1983,7 +1983,7 @@
             401ecd      5 INSTR DEADREGS  EFLAGS ZZ call    _g_string_insert_c 
             401ed2     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401DEA 
             401ed2      5 INSTR BELONGTO 401f00 
-            401ee0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, [rsp+48h+var_3C] 
+            401ee0     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, [rsp+48h+var_3C] 
             401ee0      4 INSTR BELONGTO 401f00 
             401ee0      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, [rsp+48h+var_3C] 
             401ee0      4 PTRIMMEDESP STACK 12 displ mov     edx, [rsp+48h+var_3C]
@@ -2006,8 +2006,8 @@
             401f00      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
             401f03      2 INSTR BELONGTO 401f00 
             401f03      2 INSTR DEADREGS  EFLAGS RCX RDX ZZ xor     ecx, ecx 
-            401f03     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            401f05     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            401f03     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            401f05     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             401f05      5 INSTR BELONGTO 401f00 
             401f05      5 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, 1 
             401f0a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401D20 
@@ -2061,7 +2061,7 @@
             401f58      2 INSTR BELONGTO 401f10 
             401f5a      2 INSTR BELONGTO 401f10 
             401f5a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            401f5a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            401f5a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             401f5c      4 INSTR BELONGTO 401f10 
             401f60      3 INSTR BELONGTO 401f10 
             401f60      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 84c6fe52..cfb92049 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 @@
-181928260e98c4e7fc6bc718d99cdd23b14b0dee
\ No newline at end of file
+3536c66f9100e048225e97efe58e35919fd2c7d1
\ 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 3682844e..3ebdf17d 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot
@@ -460,7 +460,7 @@
             401392      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_type_init 
             401397      5 INSTR BELONGTO 401380 
             401397      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, offset locale; locale 
-            40139c     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
+            40139c     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
             40139c      5 INSTR BELONGTO 401380 
             40139c      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     edi, 6          ; category 
             4013a1     -1 INSTR LOCAL NoMetaUpdate call    _setlocale 
@@ -539,7 +539,7 @@
             401420     -1 INSTR LOCAL NoMetaUpdate call    sub_401550 
             401420      5 INSTR BELONGTO 401380 
             401420      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 ZZ call    sub_401550 
-            401425     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 2 
+            401425     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 2 
             401425      5 INSTR BELONGTO 401380 
             401425      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ mov     eax, 2 
             40142a     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_401442 
@@ -550,11 +550,11 @@
             401431      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, offset aMain; "main" 
             401436      2 INSTR BELONGTO 401380 
             401436      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ xor     edi, edi 
-            401436     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401436     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401438     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             401438      5 INSTR BELONGTO 401380 
             401438      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_return_if_fail_warning 
-            40143d     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40143d     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40143d      5 INSTR BELONGTO 401380 
             40143d      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ mov     eax, 1 
             401442     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
@@ -712,7 +712,7 @@
             401529      3 INSTR BELONGTO 401520 
             40152c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401540 
             40152c      2 INSTR BELONGTO 401520 
-            40152e     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            40152e     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             40152e      5 INSTR BELONGTO 401520 
             401533     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             401533      3 INSTR BELONGTO 401520 
@@ -731,14 +731,14 @@
             401550      1 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ push    rbx 
             401550      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
             401550      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            401551     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            401551     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             401551      5 INSTR BELONGTO 401550 
             401551      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             401556      5 INSTR BELONGTO 401550 
             401556      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset msgid; "usage: gnome-keyring command [options]\"... 
             40155b      2 INSTR BELONGTO 401550 
             40155b      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; domainname 
-            40155b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40155b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40155d     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40155d      5 INSTR BELONGTO 401550 
             40155d      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _dcgettext 
@@ -746,16 +746,16 @@
             401562      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
             401565      2 INSTR BELONGTO 401550 
             401565      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            401565     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401565     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401567     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             401567      5 INSTR BELONGTO 401550 
             401567      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_printerr 
-            40156c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40156c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40156c      5 INSTR BELONGTO 401550 
             40156c      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             401571      2 INSTR BELONGTO 401550 
             401571      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     edi, edi        ; domainname 
-            401571     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            401571     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             401573      5 INSTR BELONGTO 401550 
             401573      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, offset aCommands; "commands: " 
             401578     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -777,18 +777,18 @@
             401593      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aSS ; "%s%s\n" 
             401598      2 INSTR BELONGTO 401550 
             401598      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            401598     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401598     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40159a     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             40159a      5 INSTR BELONGTO 401550 
             40159a      5 INSTR DEADREGS  EFLAGS ZZ call    _g_printerr 
             40159f     -1 INSTR LOCAL MetadataUnused add     rbx, 10h 
             40159f      4 INSTR BELONGTO 401550 
-            4015a3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4015a3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4015a3      5 INSTR BELONGTO 401550 
             4015a3      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             4015a8      2 INSTR BELONGTO 401550 
             4015a8      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            4015a8     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4015a8     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4015aa      5 INSTR BELONGTO 401550 
             4015aa      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset asc_40203B; "          " 
             4015af     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -866,7 +866,7 @@
             40162b      2 INSTR BELONGTO 4015c0 
             40162d      2 INSTR BELONGTO 4015c0 
             40162d      2 INSTR DEADREGS  EFLAGS RSI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ xor     ebp, ebp 
-            40162d     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40162d     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40162f     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             40162f      3 INSTR BELONGTO 4015c0 
             401632     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40166E 
@@ -927,7 +927,7 @@
             401692      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ mov     rsi, rbp 
             401695      2 INSTR BELONGTO 4015c0 
             401695      2 INSTR DEADREGS  EFLAGS RAX RDI R12 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ xor     eax, eax 
-            401695     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401695     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401697      5 INSTR BELONGTO 4015c0 
             401697      5 INSTR DEADREGS  EFLAGS RDI R12 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ mov     edi, offset word_402046 
             40169c     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
@@ -1020,7 +1020,7 @@
             401732      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rbx 
             401735      2 INSTR BELONGTO 4016e0 
             401735      2 INSTR DEADREGS  EFLAGS R12 R13 ZZ xor     ebp, ebp 
-            401735     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            401735     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             401737     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_parse 
             401737      5 INSTR BELONGTO 4016e0 
             401737      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_option_context_parse 
@@ -1033,7 +1033,7 @@
             401740      5 PTRIMMEDESP STACK 8 displ lea     rdi, [rsp+38h+var_30]
             401745     -1 INSTR LOCAL MetadataUnused xor     esi, esi 
             401745      2 INSTR BELONGTO 4016e0 
-            401747     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     bpl, 2 
+            401747     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     bpl, 2 
             401747      3 INSTR BELONGTO 4016e0 
             401747      3 INSTR DEADREGS  EFLAGS RSI R10 R11 R12 R13 ZZ mov     bpl, 2 
             40174a     -1 INSTR LOCAL NoMetaUpdate call    sub_4015C0 
@@ -1046,7 +1046,7 @@
             401752      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_option_context_free 
             401757      2 INSTR BELONGTO 4016e0 
             401757      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ mov     eax, ebp 
-            401757     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebp 
+            401757     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebp 
             401759      5 INSTR BELONGTO 4016e0 
             401759      5 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 ZZ mov     rbx, [rsp+38h+var_20] 
             401759      5 PTRIMMEDESP STACK 24 displ mov     rbx, [rsp+38h+var_20]
@@ -1072,8 +1072,8 @@
             401781      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 ZZ mov     rdi, rsi 
             401784      2 INSTR BELONGTO 401780 
             401784      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 ZZ xor     ecx, ecx 
-            401784     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            401786     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            401784     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            401786     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             401786      5 INSTR BELONGTO 401780 
             401786      5 INSTR DEADREGS  EFLAGS RDX RSI R8 ZZ mov     edx, 3 
             40178b      1 INSTR BELONGTO 401780 
@@ -1114,7 +1114,7 @@
             4017cc      5 INSTR BELONGTO 401780 
             4017cc      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ lea     rdx, [rsp+48h+var_20] 
             4017cc      5 PTRIMMEDESP STACK 40 displ lea     rdx, [rsp+48h+var_20]
-            4017d1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            4017d1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             4017d1      5 INSTR BELONGTO 401780 
             4017d1      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 3 
             4017d6      3 INSTR BELONGTO 401780 
@@ -1131,7 +1131,7 @@
             4017e6      5 PTRIMMEDESP STACK 24 displ lea     rdx, [rsp+48h+var_30]
             4017eb      2 INSTR BELONGTO 401780 
             4017eb      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            4017eb     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4017eb     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4017ed      3 INSTR BELONGTO 401780 
             4017ed      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rbx 
             4017f0     -1 INSTR LOCAL NoMetaUpdate call    _gck_attributes_find_ulong 
@@ -1145,7 +1145,7 @@
             4017f9      9 INSTR BELONGTO 401780 
             401802      3 INSTR BELONGTO 401780 
             401802      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            401805     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 102h 
+            401805     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 102h 
             401805      5 INSTR BELONGTO 401780 
             401805      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 102h 
             40180a     -1 INSTR LOCAL NoMetaUpdate call    _gck_attributes_find 
@@ -1166,7 +1166,7 @@
             401822      5 PTRIMMEDESP STACK 40 displ mov     rsi, [rsp+48h+var_20]
             401827      2 INSTR BELONGTO 401780 
             401827      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            401827     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401827     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401829     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             401829      5 INSTR BELONGTO 401780 
             401829      5 INSTR DEADREGS  EFLAGS ZZ call    _g_print 
@@ -1189,7 +1189,7 @@
             401848      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, rax 
             40184b      2 INSTR BELONGTO 401780 
             40184b      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40184b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40184b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40184d     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             40184d      5 INSTR BELONGTO 401780 
             40184d      5 INSTR DEADREGS  EFLAGS ZZ call    _g_print 
@@ -1238,7 +1238,7 @@
             4018a5      5 INSTR BELONGTO 401780 
             4018aa      2 INSTR BELONGTO 401780 
             4018aa      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R10 R11 ZZ xor     eax, eax 
-            4018aa     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4018aa     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4018ac     -1 INSTR LOCAL NoMetaUpdate call    sub_4015C0 
             4018ac      5 INSTR BELONGTO 401780 
             4018ac      5 INSTR DEADREGS  EFLAGS RBX RSI R10 R11 ZZ call    sub_4015C0 
@@ -1299,7 +1299,7 @@
             4018f4      2 INSTR BELONGTO 4018c0 
             4018f6      2 INSTR BELONGTO 4018c0 
             4018f6      2 INSTR DEADREGS  RBX R12 R13 R14 R15 ZZ mov     ebx, eax 
-            4018f6     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, eax 
+            4018f6     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     ebx, eax 
             4018f8     -1 INSTR LOCAL NoMetaUpdate jnz     loc_401A58 
             4018f8      6 INSTR BELONGTO 4018c0 
             4018fe      7 INSTR BELONGTO 4018c0 
@@ -1317,7 +1317,7 @@
             401918      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _gcr_importer_new 
             40191d      2 INSTR BELONGTO 4018c0 
             40191d      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ xor     esi, esi 
-            40191d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40191d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40191f      3 INSTR BELONGTO 4018c0 
             40191f      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ mov     rdi, rax 
             401922      3 INSTR BELONGTO 4018c0 
@@ -1369,7 +1369,7 @@
             40197b      5 PTRIMMEDESP STACK 40 displ lea     rcx, [rsp+68h+var_40]
             401980      2 INSTR BELONGTO 4018c0 
             401980      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            401980     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401980     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             401982      3 INSTR BELONGTO 4018c0 
             401982      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r12 
             401985      3 INSTR BELONGTO 4018c0 
@@ -1411,7 +1411,7 @@
             4019ba      2 INSTR BELONGTO 4018c0 
             4019bc     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rax+4], 2 
             4019bc      4 INSTR BELONGTO 4018c0 
-            4019c0     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            4019c0     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             4019c0      5 INSTR BELONGTO 4018c0 
             4019c0      5 INSTR DEADREGS  RBX RDI R12 R14 ZZ mov     ebx, 1 
             4019c5     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4019E1 
@@ -1425,8 +1425,8 @@
             4019d0      5 INSTR BELONGTO 4018c0 
             4019d5      2 INSTR BELONGTO 4018c0 
             4019d5      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R10 R11 R12 R14 ZZ xor     eax, eax 
-            4019d5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            4019d7     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            4019d5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            4019d7     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             4019d7      5 INSTR BELONGTO 4018c0 
             4019d7      5 INSTR DEADREGS  EFLAGS RBX RSI R10 R11 R12 R14 ZZ mov     ebx, 1 
             4019dc     -1 INSTR LOCAL NoMetaUpdate call    sub_4015C0 
@@ -1448,7 +1448,7 @@
             4019f3      5 PTRIMMEDESP STACK 40 displ lea     rdx, [rsp+68h+var_40]
             4019f8      2 INSTR BELONGTO 4018c0 
             4019f8      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 ZZ xor     esi, esi 
-            4019f8     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4019f8     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4019fa      3 INSTR BELONGTO 4018c0 
             4019fa      3 INSTR DEADREGS  EFLAGS RDI R12 R14 ZZ mov     rdi, rax 
             4019fd      3 INSTR BELONGTO 4018c0 
@@ -1481,12 +1481,12 @@
             401a28      5 PTRIMMEDESP STACK 40 displ lea     rdi, [rsp+68h+var_40]
             401a2d      2 INSTR BELONGTO 4018c0 
             401a2d      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R10 R11 R12 R14 ZZ xor     eax, eax 
-            401a2d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401a2d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401a2f     -1 INSTR LOCAL MetadataUnused add     r13, 8 
             401a2f      4 INSTR BELONGTO 4018c0 
             401a33     -1 INSTR LOCAL MetadataUnused mov     esi, offset aCouldnTReadFil; "couldn't read file: %s" 
             401a33      5 INSTR BELONGTO 4018c0 
-            401a38     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            401a38     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             401a38      5 INSTR BELONGTO 4018c0 
             401a38      5 INSTR DEADREGS  EFLAGS RBX RSI R10 R11 R12 R14 ZZ mov     ebx, 1 
             401a3d     -1 INSTR LOCAL NoMetaUpdate call    sub_4015C0 
@@ -1508,7 +1508,7 @@
             401a58      4 INSTR BELONGTO 4018c0 
             401a5c      2 INSTR BELONGTO 4018c0 
             401a5c      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     eax, ebx 
-            401a5c     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            401a5c     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             401a5c     56 DEALLOC STACK esp - 56 mov     eax, ebx
             401a5e      1 INSTR BELONGTO 4018c0 
             401a5e      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     rbx 
@@ -1528,14 +1528,14 @@
             401a70      5 INSTR BELONGTO 4018c0 
             401a75      2 INSTR BELONGTO 4018c0 
             401a75      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R10 R11 R12 R13 R14 R15 ZZ xor     edi, edi 
-            401a75     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401a75     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401a77      2 INSTR BELONGTO 4018c0 
             401a77      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R10 R11 R12 R13 R14 R15 ZZ xor     eax, eax 
-            401a77     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401a77     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401a79     -1 INSTR LOCAL NoMetaUpdate call    sub_4015C0 
             401a79      5 INSTR BELONGTO 4018c0 
             401a79      5 INSTR DEADREGS  EFLAGS RBX RSI R10 R11 R12 R13 R14 R15 ZZ call    sub_4015C0 
-            401a7e     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 2 
+            401a7e     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 2 
             401a7e      5 INSTR BELONGTO 4018c0 
             401a7e      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     ebx, 2 
             401a83     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_401A58 
@@ -1545,7 +1545,7 @@
             401a88      5 PTRIMMEDESP STACK 40 displ lea     rdx, [rsp+68h+var_40]
             401a8d      2 INSTR BELONGTO 4018c0 
             401a8d      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 ZZ xor     esi, esi 
-            401a8d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            401a8d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             401a8f      3 INSTR BELONGTO 4018c0 
             401a8f      3 INSTR DEADREGS  EFLAGS RDI R12 R14 ZZ mov     rdi, rbp 
             401a92     -1 INSTR LOCAL NoMetaUpdate call    _gcr_importer_import 
@@ -1561,8 +1561,8 @@
             401aa3      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 R14 R15 ZZ xor     r8d, r8d 
             401aa6      2 INSTR BELONGTO 4018c0 
             401aa6      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 R15 ZZ xor     ecx, ecx 
-            401aa6     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            401aa8     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_401780 
+            401aa6     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            401aa8     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_401780 
             401aa8      5 INSTR BELONGTO 4018c0 
             401aa8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, offset sub_401780 
             401aad      5 INSTR BELONGTO 4018c0 
@@ -1586,14 +1586,14 @@
             401ac4      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             401ac7      5 INSTR BELONGTO 401ac0 
             401ac7      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGkr_tool_trust; "gkr_tool_trust" 
-            401acc     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A6h 
+            401acc     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A6h 
             401acc      5 INSTR BELONGTO 401ac0 
             401acc      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 0A6h 
             401ad1      5 INSTR BELONGTO 401ac0 
             401ad1      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGkrToolTrust_c; "gkr-tool-trust.c" 
             401ad6      2 INSTR BELONGTO 401ac0 
             401ad6      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            401ad6     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401ad6     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401ad8     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message 
             401ad8      5 INSTR BELONGTO 401ac0 
             401ad8      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message 
@@ -1625,7 +1625,7 @@
             401aff      2 INSTR BELONGTO 401ac0 
             401b01      2 INSTR BELONGTO 401ac0 
             401b01      2 INSTR DEADREGS  RBX ZZ mov     ebx, eax 
-            401b01     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, eax 
+            401b01     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     ebx, eax 
             401b03     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401B16 
             401b03      2 INSTR BELONGTO 401ac0 
             401b05      5 INSTR BELONGTO 401ac0 
@@ -1634,7 +1634,7 @@
             401b0a      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aGnomeKeyringS; "gnome-keyring: %s\n" 
             401b0f      2 INSTR BELONGTO 401ac0 
             401b0f      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            401b0f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401b0f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401b11     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             401b11      5 INSTR BELONGTO 401ac0 
             401b11      5 INSTR DEADREGS  EFLAGS ZZ call    _g_print 
@@ -1642,7 +1642,7 @@
             401b16      4 INSTR BELONGTO 401ac0 
             401b1a      2 INSTR BELONGTO 401ac0 
             401b1a      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, ebx 
-            401b1a     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            401b1a     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             401b1a      8 DEALLOC STACK esp - 8 mov     eax, ebx
             401b1c      1 INSTR BELONGTO 401ac0 
             401b1c      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
@@ -1660,7 +1660,7 @@
             401b43     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401B6A 
             401b45     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             401b48     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401B6A 
-            401b58     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401b58     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401b5a     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             401b5f      9 PTRIMMEDESP STACK 16 displ mov     qword ptr [rsp+10h], 0
             401b68     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_401B99 
@@ -1669,7 +1669,7 @@
             401b70     -1 INSTR LOCAL NoMetaUpdate jz      loc_401CE0 
             401b76     -1 INSTR LOCAL NoMetaUpdate test    r12d, r12d 
             401b79     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401BAD 
-            401b89     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401b89     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401b8b     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             401b90      9 PTRIMMEDESP STACK 16 displ mov     qword ptr [rsp+10h], 0
             401b99      5 PTRIMMEDESP STACK 16 displ mov     rax, [rsp+10h]
@@ -1705,7 +1705,7 @@
             401c29     -2 INSTR LOCAL n R14 ZZ  AlwaysNUM xor     r14d, r14d 
             401c2c     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_401C4F 
             401c33     -2 INSTR LOCAL n R14 ZZ  NUMVia2ndSrcIMMEDNUM mov     r14b, 1 
-            401c36     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM shl     eax, 4 
+            401c36     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM shl     eax, 4 
             401c3d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbp, 1 
             401c41     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     rbx, 1 
             401c45     -1 INSTR LOCAL NoMetaUpdate cmp     r15d, r12d 
@@ -1736,12 +1736,12 @@
             401cd0      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             401cd3     -1 INSTR LOCAL NoMetaUpdate call    _strlen 
             401cdb     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401BB7 
-            401cee     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401cee     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401cf0     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             401cf5      9 PTRIMMEDESP STACK 16 displ mov     qword ptr [rsp+10h], 0
             401cfe     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401B99 
-            401d13     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            401d18     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401d13     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            401d18     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             401d1a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401B20 
             401d20      2 INSTR BELONGTO 401f00 
             401d20      2 INSTR DEADREGS  EFLAGS ZZ push    r15 
@@ -1781,7 +1781,7 @@
             401d4e      7 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ lea     rsi, aEgg_hex_encode; "egg_hex_encode_full" 
             401d55      2 INSTR BELONGTO 401f00 
             401d55      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            401d55     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401d55     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401d57     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             401d57      5 INSTR BELONGTO 401f00 
             401d57      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_return_if_fail_warning 
@@ -1789,7 +1789,7 @@
             401d5c      4 INSTR BELONGTO 401f00 
             401d60      2 INSTR BELONGTO 401f00 
             401d60      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     eax, eax 
-            401d60     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401d60     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401d62      1 INSTR BELONGTO 401f00 
             401d62      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     rbx 
             401d63      1 INSTR BELONGTO 401f00 
@@ -1819,7 +1819,7 @@
             401d8c     -1 INSTR LOCAL NoMetaUpdate call    _g_string_sized_new 
             401d8c      5 INSTR BELONGTO 401f00 
             401d8c      5 INSTR DEADREGS  EFLAGS R12 R15 ZZ call    _g_string_sized_new 
-            401d91     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movsx   ecx, [rsp+48h+var_3D] 
+            401d91     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movsx   ecx, [rsp+48h+var_3D] 
             401d91      5 INSTR BELONGTO 401f00 
             401d91      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 R15 ZZ movsx   ecx, [rsp+48h+var_3D] 
             401d91      5 PTRIMMEDESP STACK 11 displ movsx   ecx, [rsp+48h+var_3D]
@@ -1841,7 +1841,7 @@
             401db6      3 INSTR BELONGTO 401f00 
             401db9     -1 INSTR LOCAL MetadataUnused movzx   eax, al 
             401db9      3 INSTR BELONGTO 401f00 
-            401dbc     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [r14+rax] 
+            401dbc     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [r14+rax] 
             401dbc      5 INSTR BELONGTO 401f00 
             401dbc      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ movzx   edx, byte ptr [r14+rax] 
             401dc1      5 INSTR BELONGTO 401f00 
@@ -1866,7 +1866,7 @@
             401dea      6 INSTR BELONGTO 401f00 
             401df0     -1 INSTR LOCAL MetadataUnused and     eax, 0Fh 
             401df0      3 INSTR BELONGTO 401f00 
-            401df3     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [r14+rax] 
+            401df3     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [r14+rax] 
             401df3      5 INSTR BELONGTO 401f00 
             401df3      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ movzx   edx, byte ptr [r14+rax] 
             401df8      5 INSTR BELONGTO 401f00 
@@ -1919,7 +1919,7 @@
             401e53      5 INSTR BELONGTO 401f00 
             401e58     -1 INSTR LOCAL NoMetaUpdate jnb     loc_401EE0 
             401e58      6 INSTR BELONGTO 401f00 
-            401e5e     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movzx   ecx, [rsp+48h+var_3D] 
+            401e5e     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movzx   ecx, [rsp+48h+var_3D] 
             401e5e      5 INSTR BELONGTO 401f00 
             401e5e      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ movzx   ecx, [rsp+48h+var_3D] 
             401e5e      5 PTRIMMEDESP STACK 11 displ movzx   ecx, [rsp+48h+var_3D]
@@ -1957,7 +1957,7 @@
             401e93     -1 INSTR LOCAL NoMetaUpdate jmp     _g_string_free 
             401e93      5 INSTR BELONGTO 401f00 
             401e93      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ jmp     _g_string_free 
-            401ea0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movsx   edx, dl 
+            401ea0     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movsx   edx, dl 
             401ea0      3 INSTR BELONGTO 401f00 
             401ea0      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ movsx   edx, dl 
             401ea3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -1970,7 +1970,7 @@
             401ead      5 INSTR DEADREGS  EFLAGS ZZ call    _g_string_insert_c 
             401eb2     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401E21 
             401eb2      5 INSTR BELONGTO 401f00 
-            401ec0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movsx   edx, dl 
+            401ec0     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movsx   edx, dl 
             401ec0      3 INSTR BELONGTO 401f00 
             401ec0      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ movsx   edx, dl 
             401ec3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -1983,7 +1983,7 @@
             401ecd      5 INSTR DEADREGS  EFLAGS ZZ call    _g_string_insert_c 
             401ed2     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401DEA 
             401ed2      5 INSTR BELONGTO 401f00 
-            401ee0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, [rsp+48h+var_3C] 
+            401ee0     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, [rsp+48h+var_3C] 
             401ee0      4 INSTR BELONGTO 401f00 
             401ee0      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, [rsp+48h+var_3C] 
             401ee0      4 PTRIMMEDESP STACK 12 displ mov     edx, [rsp+48h+var_3C]
@@ -2006,8 +2006,8 @@
             401f00      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
             401f03      2 INSTR BELONGTO 401f00 
             401f03      2 INSTR DEADREGS  EFLAGS RCX RDX ZZ xor     ecx, ecx 
-            401f03     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            401f05     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            401f03     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            401f05     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             401f05      5 INSTR BELONGTO 401f00 
             401f05      5 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, 1 
             401f0a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401D20 
@@ -2061,7 +2061,7 @@
             401f58      2 INSTR BELONGTO 401f10 
             401f5a      2 INSTR BELONGTO 401f10 
             401f5a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            401f5a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            401f5a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             401f5c      4 INSTR BELONGTO 401f10 
             401f60      3 INSTR BELONGTO 401f10 
             401f60      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 fa09b50b..a9b84822 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 @@
-e37211330fab27df2bb9d87a4bc54d5c1ea1d87f
\ No newline at end of file
+fedc79ebca8fabb7d6f995ffa566727b13187832
\ 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 93fd7705..7cb9c1d0 100644
--- a/tests/commit/trimmed-sorted-save-gnome-open.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-open.psexe.annot
@@ -186,7 +186,7 @@
             400b24      5 INSTR DEADREGS  EFLAGS RAX RDI R12 ZZ mov     edi, offset aGnomeUrlShow; "gnome-url-show" 
             400b29      2 INSTR BELONGTO 400af0 
             400b29      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            400b29     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            400b29     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             400b2b     -1 INSTR LOCAL NoMetaUpdate call    _gnome_program_init 
             400b2b      5 INSTR BELONGTO 400af0 
             400b2b      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _gnome_program_init 
@@ -208,7 +208,7 @@
             400b46      2 INSTR BELONGTO 400af0 
             400b48      4 INSTR BELONGTO 400af0 
             400b48      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     r12, [rbx+8] 
-            400b4c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            400b4c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             400b4c      5 INSTR BELONGTO 400af0 
             400b4c      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5 
             400b51      5 INSTR BELONGTO 400af0 
@@ -222,7 +222,7 @@
             400b5e      2 INSTR BELONGTO 400af0 
             400b60     -1 INSTR LOCAL NoMetaUpdate jnz     loc_400BEE 
             400b60      6 INSTR BELONGTO 400af0 
-            400b66     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 23h        ; c 
+            400b66     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 23h        ; c 
             400b66      5 INSTR BELONGTO 400af0 
             400b66      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 23h        ; c 
             400b6b      3 INSTR BELONGTO 400af0 
@@ -251,7 +251,7 @@
             400b8c      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+28h+var_20]
             400b91      2 INSTR BELONGTO 400af0 
             400b91      2 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ xor     esi, esi 
-            400b91     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            400b91     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             400b93      3 INSTR BELONGTO 400af0 
             400b93      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rbx 
             400b96     -1 INSTR LOCAL NoMetaUpdate call    _g_app_info_launch_default_for_uri 
@@ -259,7 +259,7 @@
             400b96      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_app_info_launch_default_for_uri 
             400b9b      2 INSTR BELONGTO 400af0 
             400b9b      2 INSTR DEADREGS  EFLAGS RDX RBX R12 ZZ xor     edx, edx 
-            400b9b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            400b9b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             400b9d     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             400b9d      2 INSTR BELONGTO 400af0 
             400b9f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_400BAC 
@@ -269,7 +269,7 @@
             400ba5     16 DEALLOC STACK esp - 16 mov     eax, edx
             400ba5      2 INSTR BELONGTO 400af0 
             400ba5      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ mov     eax, edx 
-            400ba5     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edx 
+            400ba5     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edx 
             400ba7      1 INSTR BELONGTO 400af0 
             400ba7      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
             400ba8      1 INSTR BELONGTO 400af0 
@@ -295,14 +295,14 @@
             400bc4      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     rdi, cs:stderr 
             400bcb      3 INSTR BELONGTO 400af0 
             400bcb      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 ZZ mov     rdx, rax 
-            400bce     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            400bce     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             400bce      5 INSTR BELONGTO 400af0 
             400bce      5 INSTR DEADREGS  EFLAGS RAX RCX RSI R12 ZZ mov     esi, 1 
             400bd3      3 INSTR BELONGTO 400af0 
             400bd3      3 INSTR DEADREGS  EFLAGS RAX RCX R12 ZZ mov     rcx, rbx 
             400bd6      2 INSTR BELONGTO 400af0 
             400bd6      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            400bd6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            400bd6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             400bd8     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             400bd8      5 INSTR BELONGTO 400af0 
             400bd8      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    ___fprintf_chk 
@@ -313,7 +313,7 @@
             400be2     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
             400be2      5 INSTR BELONGTO 400af0 
             400be2      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_error_free 
-            400be7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            400be7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             400be7      5 INSTR BELONGTO 400af0 
             400be7      5 INSTR DEADREGS  EFLAGS RAX RDX RBX R8 R9 R10 R11 R12 ZZ mov     edx, 1 
             400bec     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_400BA1 
@@ -333,16 +333,16 @@
             400bfe      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 ZZ mov     rdi, cs:stderr 
             400c05      5 INSTR BELONGTO 400af0 
             400c05      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 ZZ mov     edx, offset aUsageSUrl; "Usage: %s <url>\n" 
-            400c0a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            400c0a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             400c0a      5 INSTR BELONGTO 400af0 
             400c0a      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 ZZ mov     esi, 1 
             400c0f      2 INSTR BELONGTO 400af0 
             400c0f      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            400c0f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            400c0f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             400c11     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             400c11      5 INSTR BELONGTO 400af0 
             400c11      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    ___fprintf_chk 
-            400c16     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            400c16     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             400c16      5 INSTR BELONGTO 400af0 
             400c16      5 INSTR DEADREGS  EFLAGS RAX RDX RBX R8 R9 R10 R11 R12 ZZ mov     edx, 1 
             400c1b     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_400BA1 
@@ -473,7 +473,7 @@
             400ce9      3 INSTR BELONGTO 400ce0 
             400cec     -1 INSTR LOCAL NoMetaUpdate jz      short loc_400D00 
             400cec      2 INSTR BELONGTO 400ce0 
-            400cee     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            400cee     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             400cee      5 INSTR BELONGTO 400ce0 
             400cf3     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             400cf3      3 INSTR BELONGTO 400ce0 
@@ -533,7 +533,7 @@
             400d58      2 INSTR BELONGTO 400d10 
             400d5a      2 INSTR BELONGTO 400d10 
             400d5a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            400d5a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            400d5a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             400d5c      4 INSTR BELONGTO 400d10 
             400d60      3 INSTR BELONGTO 400d10 
             400d60      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 7b14d72b..ea3c2423 100644
--- a/tests/commit/trimmed-sorted-save-gnome-power-statistics.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-power-statistics.psexe.annot
@@ -1910,7 +1910,7 @@
             4049d8      4 PTRIMMEDESP STACK 12 displ mov     [rsp+28h+var_1C], edi
             4049dc     -1 INSTR LOCAL MetadataUnused mov     [rsp+28h+var_28], rsi 
             4049dc      4 INSTR BELONGTO 4049d0 
-            4049e0     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
+            4049e0     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
             4049e0      5 INSTR BELONGTO 4049d0 
             4049e0      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     edi, 6          ; category 
             4049e5      5 INSTR BELONGTO 4049d0 
@@ -1954,7 +1954,7 @@
             404a2e     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_new 
             404a2e      5 INSTR BELONGTO 4049d0 
             404a2e      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_settings_new 
-            404a33     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            404a33     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             404a33      5 INSTR BELONGTO 4049d0 
             404a33      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 8 
             404a38      5 INSTR BELONGTO 4049d0 
@@ -1974,8 +1974,8 @@
             404a4f      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 ZZ xor     r8d, r8d 
             404a52      2 INSTR BELONGTO 4049d0 
             404a52      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ xor     ecx, ecx 
-            404a52     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            404a54     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_408870 
+            404a52     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            404a54     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_408870 
             404a54      5 INSTR BELONGTO 4049d0 
             404a54      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, offset loc_408870 
             404a59      5 INSTR BELONGTO 4049d0 
@@ -1991,8 +1991,8 @@
             404a69      3 INSTR BELONGTO 4049d0 
             404a6c      2 INSTR BELONGTO 4049d0 
             404a6c      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ xor     ecx, ecx 
-            404a6c     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            404a6e     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_4052B0 
+            404a6c     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            404a6e     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_4052B0 
             404a6e      5 INSTR BELONGTO 4049d0 
             404a6e      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, offset loc_4052B0 
             404a73      3 INSTR BELONGTO 4049d0 
@@ -2197,7 +2197,7 @@
             404ba9      3 INSTR BELONGTO 404ba0 
             404bac     -1 INSTR LOCAL NoMetaUpdate jz      short loc_404BC0 
             404bac      2 INSTR BELONGTO 404ba0 
-            404bae     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            404bae     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             404bae      5 INSTR BELONGTO 404ba0 
             404bb3     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             404bb3      3 INSTR BELONGTO 404ba0 
@@ -2283,17 +2283,17 @@
             404c50      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             404c51      2 INSTR BELONGTO 404c50 
             404c51      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI ZZ mov     ecx, edi 
-            404c51     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, edi 
+            404c51     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, edi 
             404c53      2 INSTR BELONGTO 404c50 
             404c53      2 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     ebx, edi 
-            404c53     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, edi 
+            404c53     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     ebx, edi 
             404c55      2 INSTR BELONGTO 404c50 
             404c55      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     esi, esi 
-            404c55     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            404c57     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
+            404c55     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            404c57     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
             404c57      5 INSTR BELONGTO 404c50 
             404c57      5 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edx, 4 
-            404c5c     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            404c5c     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             404c5c      5 INSTR BELONGTO 404c50 
             404c5c      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 1 
             404c61     -1 INSTR LOCAL NoMetaUpdate call    _g_array_sized_new 
@@ -2309,7 +2309,7 @@
             404c6d      3 INSTR DEADREGS  EFLAGS RCX RDX R8 R9 R10 R11 ZZ mov     rcx, [rax] 
             404c70      2 INSTR BELONGTO 404c50 
             404c70      2 INSTR DEADREGS  EFLAGS RDX R8 R9 R10 R11 ZZ xor     edx, edx 
-            404c70     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            404c70     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             404c72      6 INSTR BELONGTO 404c50 
             404c78      7 INSTR BELONGTO 404c50 
             404c78      7 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ mov     dword ptr [rcx+rdx*4], 0 
@@ -2332,7 +2332,7 @@
             404c90      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             404c94      2 INSTR BELONGTO 404c90 
             404c94      2 INSTR DEADREGS  EFLAGS RCX ZZ mov     ecx, esi 
-            404c94     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, esi 
+            404c94     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, esi 
             404c96     -1 INSTR LOCAL NoMetaUpdate cmp     [rdi+8], ecx 
             404c96      3 INSTR BELONGTO 404c90 
             404c99     -1 INSTR LOCAL NoMetaUpdate jbe     short loc_404CB0 
@@ -2348,14 +2348,14 @@
             404ca7      8 DEALLOC STACK esp - 8 retn
             404cb0      5 INSTR BELONGTO 404c90 
             404cb0      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI XMM0 ZZ mov     edx, offset aAboveIndexI; "above index! (%i)" 
-            404cb5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            404cb5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             404cb5      5 INSTR BELONGTO 404c90 
             404cb5      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI XMM0 ZZ mov     esi, 4 
             404cba      5 INSTR BELONGTO 404c90 
             404cba      5 INSTR DEADREGS  EFLAGS RAX RBX RDI XMM0 ZZ mov     edi, offset aPowermanager; "PowerManager" 
             404cbf      2 INSTR BELONGTO 404c90 
             404cbf      2 INSTR DEADREGS  EFLAGS RAX RBX XMM0 ZZ xor     eax, eax 
-            404cbf     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404cbf     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404cc1     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             404cc1      5 INSTR BELONGTO 404c90 
             404cc1      5 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ call    _g_log 
@@ -2391,7 +2391,7 @@
             404d03     -1 INSTR LOCAL NoMetaUpdate xorps   xmm0, xmm0 
             404d06     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
             404d08     -1 INSTR LOCAL NoMetaUpdate jz      short loc_404D1D 
-            404d0d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404d0d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404d10     -1 INSTR LOCAL NoMetaUpdate addss   xmm0, dword ptr [rcx+rax*4] 
             404d15     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rax, 1 
             404d19     -1 INSTR LOCAL NoMetaUpdate cmp     edx, eax 
@@ -2447,16 +2447,16 @@
             404d62      3 INSTR BELONGTO 404d30 
             404d65      2 INSTR BELONGTO 404d30 
             404d65      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R15 ZZ xor     ebx, ebx 
-            404d65     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            404d65     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             404d67     -1 INSTR LOCAL NoMetaUpdate cvtps2pd xmm0, xmm0 
             404d67      3 INSTR BELONGTO 404d30 
-            404d6a     -2 INSTR LOCAL n EBP ZZ  NumericDEFs lea     ebp, [r14+1] 
+            404d6a     -2 INSTR LOCAL n RBP ZZ  NumericDEFs lea     ebp, [r14+1] 
             404d6a      4 INSTR BELONGTO 404d30 
             404d6a      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R15 ZZ lea     ebp, [r14+1] 
             404d6e     -1 INSTR LOCAL MetadataUnused movsd   [rsp+58h+var_40], xmm0 
             404d6e      6 INSTR BELONGTO 404d30 
             404d74      4 INSTR BELONGTO 404d30 
-            404d78     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, r14d 
+            404d78     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, r14d 
             404d78      3 INSTR BELONGTO 404d30 
             404d78      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R15 ZZ mov     eax, r14d 
             404d7b     -1 INSTR LOCAL MetadataUnused movsd   xmm1, [rsp+58h+var_40] 
@@ -2465,12 +2465,12 @@
             404d81      2 INSTR BELONGTO 404d30 
             404d83      2 INSTR BELONGTO 404d30 
             404d83      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ mov     ecx, ebp 
-            404d83     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, ebp 
+            404d83     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, ebp 
             404d85      5 INSTR BELONGTO 404d30 
             404d85      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     edx, offset aHalf_lengthIDi; "half_length=%i, div=%f, sigma=%f" 
             404d8a     -1 INSTR LOCAL NoMetaUpdate cvtsi2ss xmm2, rax 
             404d8a      5 INSTR BELONGTO 404d30 
-            404d8f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            404d8f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             404d8f      5 INSTR BELONGTO 404d30 
             404d8f      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R15 ZZ mov     esi, 80h 
             404d94      5 INSTR BELONGTO 404d30 
@@ -2530,7 +2530,7 @@
             404df5      3 INSTR DEADREGS  EFLAGS RBX RSI R14 R15 XMM1 ZZ mov     esi, [rdx+rcx*4] 
             404df8      2 INSTR BELONGTO 404d30 
             404df8      2 INSTR DEADREGS  EFLAGS RCX RBX R14 R15 XMM1 ZZ mov     ecx, ebp 
-            404df8     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, ebp 
+            404df8     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, ebp 
             404dfa     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     ebp, 1 
             404dfa      3 INSTR BELONGTO 404d30 
             404dfd     -1 INSTR LOCAL NoMetaUpdate cmp     r13d, ebp 
@@ -2611,12 +2611,12 @@
             404e7c      3 INSTR BELONGTO 404d30 
             404e7f      5 INSTR BELONGTO 404d30 
             404e7f      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R13 R14 R15 XMM1 XMM2 ZZ mov     edx, offset aGotWrongSumFPe; "got wrong sum (%f), perhaps sigma too h"... 
-            404e84     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            404e84     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             404e84      5 INSTR BELONGTO 404d30 
             404e84      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R13 R14 R15 XMM1 XMM2 ZZ mov     esi, 80h 
             404e89      5 INSTR BELONGTO 404d30 
             404e89      5 INSTR DEADREGS  EFLAGS RAX RBX RDI R13 R14 R15 XMM1 XMM2 ZZ mov     edi, offset aPowermanager; "PowerManager" 
-            404e8e     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            404e8e     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             404e8e      5 INSTR BELONGTO 404d30 
             404e8e      5 INSTR DEADREGS  EFLAGS RAX RBX R13 R14 R15 XMM1 XMM2 ZZ mov     eax, 1 
             404e93     -1 INSTR LOCAL NoMetaUpdate cvtps2pd xmm0, xmm0 
@@ -2637,7 +2637,7 @@
             404eb3     -1 INSTR LOCAL NoMetaUpdate xorps   xmm0, xmm0 
             404eb6     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
             404eb8     -1 INSTR LOCAL NoMetaUpdate jz      short locret_404ECD 
-            404ebd     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404ebd     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404ec0     -1 INSTR LOCAL NoMetaUpdate addss   xmm0, dword ptr [rcx+rax*4] 
             404ec5     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rax, 1 
             404ec9     -1 INSTR LOCAL NoMetaUpdate cmp     edx, eax 
@@ -2647,16 +2647,16 @@
             404ed6     -3 INSTR LOCAL NoWarn push    rbx 
             404eda     -1 INSTR LOCAL NoMetaUpdate test    ebp, ebp 
             404edc     -1 INSTR LOCAL NoMetaUpdate jz      short loc_404F0F 
-            404ede     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
-            404eeb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            404ede     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
+            404eeb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             404ef5     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm0, dword ptr [rax+rbx*4] 
-            404efa     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            404efa     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             404eff     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbx, 1 
             404f03     -1 INSTR LOCAL NoMetaUpdate cvtps2pd xmm0, xmm0 
             404f06     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             404f0b     -1 INSTR LOCAL NoMetaUpdate cmp     ebp, ebx 
             404f0d     -1 INSTR LOCAL NoMetaUpdate ja      short loc_404EE0 
-            404f11     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            404f11     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             404f20      0 FUNC FRAMERESTORE 0 0 4 1 0 4 2 0 1 3 -48 0 4 0 8 5 -40 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 -32 0 13 -24 0 14 -16 0 15 -8 0 ZZ
             404f20      0 FUNC MMSAFENESS SAFE
             404f20    243 FUNC GLOBAL sub_404F20 FUNC_UNSAFE NOFP RET             405012 
@@ -2761,16 +2761,16 @@
             404fae      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rdi, [rbx] 
             404fb1      4 INSTR BELONGTO 404f20 
             404fb1      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ mov     rsi, [r13+0] 
-            404fb5     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, r11d 
+            404fb5     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, r11d 
             404fb5      3 INSTR BELONGTO 404f20 
             404fb5      3 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ mov     edx, r11d 
             404fb8      2 INSTR BELONGTO 404f20 
             404fb8      2 INSTR DEADREGS  EFLAGS RAX RCX ZZ xor     eax, eax 
-            404fb8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404fb8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404fba      6 INSTR BELONGTO 404f20 
             404fc0      2 INSTR BELONGTO 404f20 
             404fc0      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-            404fc0     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            404fc0     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             404fc2     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
             404fc2      2 INSTR BELONGTO 404f20 
             404fc4     -1 INSTR LOCAL NoMetaUpdate js      short loc_404FD0 
@@ -2882,7 +2882,7 @@
             40509b      5 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 R14 R15 XMM1 ZZ call    sub_404C50 
             4050a0      3 INSTR BELONGTO 405070 
             4050a0      3 INSTR DEADREGS  EFLAGS RSI RDI R8 R9 R11 R13 R14 R15 XMM1 ZZ mov     edi, [rbx+8] 
-            4050a3     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, dword ptr [rsp+0B8h+var_40] 
+            4050a3     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, dword ptr [rsp+0B8h+var_40] 
             4050a3      4 INSTR BELONGTO 405070 
             4050a3      4 INSTR DEADREGS  EFLAGS RSI R8 R9 R11 R13 R14 R15 XMM1 ZZ mov     esi, dword ptr [rsp+0B8h+var_40] 
             4050a3      4 PTRIMMEDESP STACK 120 displ mov     esi, dword ptr [rsp+0B8h+var_40]
@@ -2910,7 +2910,7 @@
             4050c6      3 INSTR BELONGTO 405070 
             4050c9      2 INSTR BELONGTO 405070 
             4050c9      2 INSTR DEADREGS  EFLAGS RCX RDX R13 R14 XMM1 ZZ xor     edx, edx 
-            4050c9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4050c9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4050cb      5 INSTR BELONGTO 405070 
             4050d0      4 INSTR BELONGTO 405070 
             4050d0      4 INSTR DEADREGS  EFLAGS RCX R13 R14 XMM1 ZZ mov     ecx, [r9+rdx*4] 
@@ -2965,7 +2965,7 @@
             405121      3 INSTR BELONGTO 405070 
             405121      3 INSTR DEADREGS  EFLAGS R9 XMM1 ZZ mov     r9d, r11d 
             405124      4 INSTR BELONGTO 405070 
-            405128     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, r13d 
+            405128     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     ebp, r13d 
             405128      3 INSTR BELONGTO 405070 
             405128      3 INSTR DEADREGS  EFLAGS XMM1 ZZ mov     ebp, r13d 
             40512b     -1 INSTR LOCAL NoMetaUpdate lea     r12d, [r8+r13] 
@@ -2987,11 +2987,11 @@
             405145      3 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ mov     rsi, [rbx] 
             405148      2 INSTR BELONGTO 405070 
             405148      2 INSTR DEADREGS  EFLAGS RCX RDX ZZ mov     edx, ebp 
-            405148     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, ebp 
+            405148     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, ebp 
             40514a      6 INSTR BELONGTO 405070 
             405150      2 INSTR BELONGTO 405070 
             405150      2 INSTR DEADREGS  EFLAGS RCX ZZ mov     ecx, edx 
-            405150     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, edx 
+            405150     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, edx 
             405152     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     edx, 1 
             405152      3 INSTR BELONGTO 405070 
             405155     -1 INSTR LOCAL SafeIfNoIndexing movss   xmm0, dword ptr [rsi+rcx*4] 
@@ -3043,7 +3043,7 @@
             4051ae      2 INSTR BELONGTO 405070 
             4051b0      2 INSTR BELONGTO 405070 
             4051b0      2 INSTR DEADREGS  EFLAGS RDX XMM0 ZZ mov     edx, ebp 
-            4051b0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, ebp 
+            4051b0     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, ebp 
             4051b2     -1 INSTR LOCAL SafeIfNoIndexing movss   xmm5, dword ptr [rcx+rdx*4] 
             4051b2      5 INSTR BELONGTO 405070 
             4051b7     -1 INSTR LOCAL SafeIfNoIndexing movaps  xmm0, xmm5 
@@ -3072,7 +3072,7 @@
             4051d9      4 INSTR BELONGTO 405070 
             4051dd      3 INSTR BELONGTO 405070 
             4051dd      3 INSTR DEADREGS  EFLAGS RCX RDX ZZ mov     rdx, [rax] 
-            4051e0     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, r13d 
+            4051e0     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, r13d 
             4051e0      3 INSTR BELONGTO 405070 
             4051e0      3 INSTR DEADREGS  EFLAGS RCX ZZ mov     ecx, r13d 
             4051e3     -1 INSTR LOCAL NoMetaUpdate subss   xmm1, xmm7 
@@ -3110,7 +3110,7 @@
             405213      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ retn 
             405218     -1 INSTR LOCAL MetadataUnused mov     rcx, [rbx] 
             405218      3 INSTR BELONGTO 405070 
-            40521b     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, r13d 
+            40521b     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, r13d 
             40521b      3 INSTR BELONGTO 405070 
             40521b      3 INSTR DEADREGS  EFLAGS RDX RSI XMM1 ZZ mov     edx, r13d 
             40521e      3 INSTR BELONGTO 405070 
@@ -3132,7 +3132,7 @@
             405238      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ call    _g_return_if_fail_warning 
             40523d      2 INSTR BELONGTO 405070 
             40523d      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ xor     eax, eax 
-            40523d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40523d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40523f     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_405202 
             40523f      2 INSTR BELONGTO 405070 
             405241     -1 INSTR LOCAL MetadataUnused mov     [rsp+0B8h+var_AC], r14d 
@@ -3196,8 +3196,8 @@
             4052a8     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40518B 
             4052a8      5 INSTR BELONGTO 405070 
             4052b0     -3 INSTR LOCAL NoWarn push    r14 
-            4052b2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            4052b4     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 12h 
+            4052b2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            4052b4     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 12h 
             4052bc     -3 INSTR LOCAL NoWarn push    r13 
             4052be     -3 INSTR LOCAL NoWarn push    r12 
             4052c0     -3 INSTR LOCAL NoWarn push    rbp 
@@ -3217,19 +3217,19 @@
             40532d      5 PTRIMMEDESP STACK 72 displ mov     [rsp+48h], rax
             405332      9 PTRIMMEDESP STACK 80 displ mov     qword ptr [rsp+50h], offset qword_40BEA0
             40533b     -1 INSTR LOCAL NoMetaUpdate call    _g_application_command_line_get_arguments 
-            405340     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405340     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405342      8 PTRIMMEDESP STACK 176 displ mov     [rsp+0B0h], rax
             40534a     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_new 
-            40534f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            405357     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40534f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            405357     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40535e     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             405369     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_set_summary 
-            40536e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40536e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405370      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
             405376     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_add_main_entries 
             40537b      8 PTRIMMEDESP STACK 176 displ lea     rdx, [rsp+0B0h]
             405383      8 PTRIMMEDESP STACK 204 displ lea     rsi, [rsp+0CCh]
-            40538b     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40538b     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             405390     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_parse 
             405395     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             405399     -1 INSTR LOCAL NoMetaUpdate jz      loc_405585 
@@ -3246,13 +3246,13 @@
             4053f3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get_iter_first 
             4053f8     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             4053fa     -1 INSTR LOCAL NoMetaUpdate jz      loc_405488 
-            405400     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            405400     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             405412     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             405417      8 PTRIMMEDESP STACK 192 displ lea     rcx, [rsp+0C0h]
             40541f      8 PTRIMMEDESP STACK 144 displ lea     rsi, [rsp+90h]
             40542a     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            405430     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            405432     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            405430     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            405432     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             405437     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             40543c      8 PTRIMMEDESP STACK 192 displ mov     rdi, [rsp+0C0h]
             405447     -1 INSTR LOCAL NoMetaUpdate call    _g_strcmp0 
@@ -3266,9 +3266,9 @@
             40547a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_iter_next 
             40547f     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             405481     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_405408 
-            40548d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            405497     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            405499     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40548d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            405497     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            405499     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40549b     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4054a0     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40554C 
             4054a8      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
@@ -3280,15 +3280,15 @@
             4054e9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_type 
             4054f4     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4054f9     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4054fc     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4054fe     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4054fc     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4054fe     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405506     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_set_cursor_on_cell 
             40550b      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40550e     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             405516     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_path_free 
             40551b      8 PTRIMMEDESP STACK 192 displ mov     rdi, [rsp+0C0h]
             405523     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
-            405532     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            405532     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             405537     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40553c      8 PTRIMMEDESP STACK 144 displ lea     rsi, [rsp+90h]
             405547     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_iter_next 
@@ -3321,10 +3321,10 @@
             405600     98 FUNC GLOBAL sub_405600 FUNC_UNSAFE NOFP RET             405661 
             405604      2 INSTR BELONGTO 405600 
             405604      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ xor     eax, eax 
-            405604     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405604     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405606      2 INSTR BELONGTO 405600 
             405606      2 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ xor     ecx, ecx 
-            405606     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            405606     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             405608      5 INSTR BELONGTO 405600 
             405608      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ lea     rdx, [rsp+18h+var_10] 
             405608      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+18h+var_10]
@@ -3375,10 +3375,10 @@
             405670      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             405674      2 INSTR BELONGTO 405670 
             405674      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ xor     eax, eax 
-            405674     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405674     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405676      2 INSTR BELONGTO 405670 
             405676      2 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ xor     ecx, ecx 
-            405676     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            405676     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             405678      5 INSTR BELONGTO 405670 
             405678      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ lea     rdx, [rsp+18h+var_10] 
             405678      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+18h+var_10]
@@ -3479,10 +3479,10 @@
             405737      6 INSTR DEADREGS  EFLAGS RAX RDX RBX R8 ZZ mov     r8d, 1 
             40573d      2 INSTR BELONGTO 405700 
             40573d      2 INSTR DEADREGS  EFLAGS RAX RDX RBX ZZ xor     edx, edx 
-            40573d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40573d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40573f      2 INSTR BELONGTO 405700 
             40573f      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40573f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40573f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405741      7 INSTR BELONGTO 405700 
             405741      7 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+48h+var_48], 0FFFFFFFFh 
             405741      7 PTRIMMEDESP STACK 0 displ mov     [rsp+48h+var_48], 0FFFFFFFFh
@@ -3550,7 +3550,7 @@
             4057c0      5 INSTR DEADREGS  EFLAGS RSI RDI XMM1 ZZ mov     esi, offset msgid1; "%.1f day" 
             4057c5      2 INSTR BELONGTO 405760 
             4057c5      2 INSTR DEADREGS  EFLAGS RDI XMM1 ZZ xor     edi, edi        ; domainname 
-            4057c5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4057c5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4057c7     -1 INSTR LOCAL MetadataUnused movss   [rsp+18h+var_18], xmm0 
             4057c7      5 INSTR BELONGTO 405760 
             4057cc     -1 INSTR LOCAL NoMetaUpdate call    _dcngettext 
@@ -3562,7 +3562,7 @@
             4057d6      3 INSTR BELONGTO 405760 
             4057d9     -1 INSTR LOCAL NoMetaUpdate unpcklps xmm0, xmm0 
             4057d9      3 INSTR BELONGTO 405760 
-            4057dc     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4057dc     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4057dc      5 INSTR BELONGTO 405760 
             4057dc      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 XMM1 ZZ mov     eax, 1 
             4057e1     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
@@ -3574,8 +3574,8 @@
             4057e8      5 INSTR DEADREGS  EFLAGS RSI RDI R8 R9 R10 R11 XMM0 XMM1 ZZ jmp     _g_strdup_printf 
             4057f0      2 INSTR BELONGTO 405760 
             4057f0      2 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 ZZ xor     edi, edi        ; domainname 
-            4057f0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            4057f2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4057f0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4057f2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4057f2      5 INSTR BELONGTO 405760 
             4057f2      5 INSTR DEADREGS  EFLAGS RDX RSI XMM0 XMM1 ZZ mov     edx, 5          ; category 
             4057f7      5 INSTR BELONGTO 405760 
@@ -3761,7 +3761,7 @@
             405970      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ mov     rdx, rbx 
             405973      2 INSTR BELONGTO 405920 
             405973      2 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ xor     esi, esi 
-            405973     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            405973     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             405975      3 INSTR BELONGTO 405920 
             405975      3 INSTR DEADREGS  EFLAGS RCX RBX RDI R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ mov     rdi, rax 
             405978     -1 INSTR LOCAL NoMetaUpdate call    sub_40BAE0 
@@ -3799,7 +3799,7 @@
             4059a3      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ call    _g_type_check_instance_cast 
             4059a8      3 INSTR BELONGTO 405920 
             4059a8      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ mov     rdx, rbx 
-            4059ab     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            4059ab     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             4059ab      5 INSTR BELONGTO 405920 
             4059ab      5 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ mov     esi, 2 
             4059b0      3 INSTR BELONGTO 405920 
@@ -3828,10 +3828,10 @@
             4059d5      3 INSTR BELONGTO 405920 
             4059d8     -1 INSTR LOCAL MetadataUnused mov     rax, [rbx] 
             4059d8      3 INSTR BELONGTO 405920 
-            4059db     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, r12d 
+            4059db     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, r12d 
             4059db      3 INSTR BELONGTO 405920 
             4059db      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 ZZ mov     edx, r12d 
-            4059de     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, r12d 
+            4059de     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, r12d 
             4059de      3 INSTR BELONGTO 405920 
             4059de      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 ZZ mov     esi, r12d 
             4059e1      3 INSTR BELONGTO 405920 
@@ -3849,7 +3849,7 @@
             4059f6      4 INSTR BELONGTO 405920 
             4059fa     -1 INSTR LOCAL NoMetaUpdate jb      short loc_4059D8 
             4059fa      2 INSTR BELONGTO 405920 
-            4059fc     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            4059fc     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             4059fc      5 INSTR BELONGTO 405920 
             4059fc      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R15 ZZ mov     esi, 3 
             405a01     -1 INSTR LOCAL SafeIfNoIndexing movss   xmm0, cs:dword_40CFFC 
@@ -3861,7 +3861,7 @@
             405a0c      5 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 R12 R13 R15 ZZ call    sub_405070 
             405a11     -1 INSTR LOCAL MetadataRedundant movss   xmm0, cs:dword_60F718 
             405a11      8 INSTR BELONGTO 405920 
-            405a19     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Fh 
+            405a19     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Fh 
             405a19      5 INSTR BELONGTO 405920 
             405a19      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R15 ZZ mov     edi, 0Fh 
             405a1e      5 INSTR BELONGTO 405920 
@@ -3881,7 +3881,7 @@
             405a35     -1 INSTR LOCAL NoMetaUpdate call    sub_404F20 
             405a35      5 INSTR BELONGTO 405920 
             405a35      5 INSTR DEADREGS  EFLAGS R12 R13 R15 ZZ call    sub_404F20 
-            405a3a     -2 INSTR LOCAL n EDI ZZ  NumericDEFs mov     edi, offset loc_409930 
+            405a3a     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     edi, offset loc_409930 
             405a3a      5 INSTR BELONGTO 405920 
             405a3a      5 INSTR DEADREGS  EFLAGS RDI R12 R13 R15 ZZ mov     edi, offset loc_409930 
             405a3f      3 INSTR BELONGTO 405920 
@@ -3905,7 +3905,7 @@
             405a58      3 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ mov     rax, [rbx] 
             405a5b     -1 INSTR LOCAL MetadataUnused mov     edx, r13d 
             405a5b      3 INSTR BELONGTO 405920 
-            405a5e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ch 
+            405a5e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ch 
             405a5e      5 INSTR BELONGTO 405920 
             405a5e      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 0Ch 
             405a63      4 INSTR BELONGTO 405920 
@@ -3917,7 +3917,7 @@
             405a6b      5 INSTR DEADREGS  EFLAGS ZZ call    _g_malloc0 
             405a70     -1 INSTR LOCAL MetadataUnused mov     rdx, [rsp+58h+var_58] 
             405a70      4 INSTR BELONGTO 405920 
-            405a74     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, r13d 
+            405a74     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, r13d 
             405a74      3 INSTR BELONGTO 405920 
             405a74      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 R10 R11 ZZ mov     esi, r13d 
             405a77      3 INSTR BELONGTO 405920 
@@ -3996,7 +3996,7 @@
             405ae7      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 R13 R14 R15 XMM0 ZZ mov     rdx, r12 
             405aea      2 INSTR BELONGTO 405920 
             405aea      2 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI R8 R9 R10 R11 R13 R14 R15 XMM0 ZZ xor     esi, esi 
-            405aea     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            405aea     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             405aec      3 INSTR BELONGTO 405920 
             405aec      3 INSTR DEADREGS  EFLAGS RCX RBX RDI R8 R9 R10 R11 R13 R14 R15 XMM0 ZZ mov     rdi, rax 
             405aef     -1 INSTR LOCAL NoMetaUpdate call    sub_40BAE0 
@@ -4021,7 +4021,7 @@
             405b13      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM0 ZZ call    _g_type_check_instance_cast 
             405b18      3 INSTR BELONGTO 405920 
             405b18      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 R13 R14 R15 XMM0 ZZ mov     rdx, rbx 
-            405b1b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            405b1b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             405b1b      5 INSTR BELONGTO 405920 
             405b1b      5 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI R8 R9 R10 R11 R13 R14 R15 XMM0 ZZ mov     esi, 1 
             405b20      3 INSTR BELONGTO 405920 
@@ -4059,12 +4059,12 @@
             405b4c      3 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI ZZ mov     rcx, rax 
             405b4f      3 INSTR BELONGTO 405b30 
             405b4f      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rbp, rax 
-            405b52     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            405b52     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             405b52      5 INSTR BELONGTO 405b30 
             405b52      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     esi, 80h 
             405b57      2 INSTR BELONGTO 405b30 
             405b57      2 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ xor     eax, eax 
-            405b57     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405b57     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405b59      5 INSTR BELONGTO 405b30 
             405b59      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, offset aPowermanager; "PowerManager" 
             405b5e     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
@@ -4150,8 +4150,8 @@
             405be7      6 INSTR DEADREGS  EFLAGS RAX RDX RSI R8 ZZ mov     r8d, 0FFFFFFFFh 
             405bed      2 INSTR BELONGTO 405b30 
             405bed      2 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ xor     eax, eax 
-            405bed     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            405bef     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            405bed     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            405bef     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             405bef      5 INSTR BELONGTO 405b30 
             405bef      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 2 
             405bf4      3 INSTR BELONGTO 405b30 
@@ -4262,7 +4262,7 @@
             405c8f      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_type_check_instance_cast 
             405c94      2 INSTR BELONGTO 405c40 
             405c94      2 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ xor     esi, esi 
-            405c94     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            405c94     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             405c96      3 INSTR BELONGTO 405c40 
             405c96      3 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 ZZ mov     rdi, rax 
             405c99     -1 INSTR LOCAL NoMetaUpdate call    _gtk_notebook_get_nth_page 
@@ -4280,7 +4280,7 @@
             405cac     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             405cac      5 INSTR BELONGTO 405c40 
             405cac      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_type_check_instance_cast 
-            405cb1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            405cb1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             405cb1      5 INSTR BELONGTO 405c40 
             405cb1      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ mov     esi, 1 
             405cb6      3 INSTR BELONGTO 405c40 
@@ -4300,7 +4300,7 @@
             405ccc     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             405ccc      5 INSTR BELONGTO 405c40 
             405ccc      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_type_check_instance_cast 
-            405cd1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            405cd1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             405cd1      5 INSTR BELONGTO 405c40 
             405cd1      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ mov     esi, 2 
             405cd6      3 INSTR BELONGTO 405c40 
@@ -4320,7 +4320,7 @@
             405cec     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             405cec      5 INSTR BELONGTO 405c40 
             405cec      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_type_check_instance_cast 
-            405cf1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            405cf1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             405cf1      5 INSTR BELONGTO 405c40 
             405cf1      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     esi, 3 
             405cf6      3 INSTR BELONGTO 405c40 
@@ -4340,7 +4340,7 @@
             405d0d      5 PTRIMMEDESP STACK 120 displ lea     rdx, [rsp+0B8h+var_40]
             405d12      2 INSTR BELONGTO 405c40 
             405d12      2 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 R15 ZZ xor     esi, esi 
-            405d12     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            405d12     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             405d14     -1 INSTR LOCAL NoMetaUpdate call    _up_wakeups_get_total_sync 
             405d14      5 INSTR BELONGTO 405c40 
             405d14      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _up_wakeups_get_total_sync 
@@ -4405,10 +4405,10 @@
             405d7d      7 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     rdi, cs:qword_60F710 
             405d84      2 INSTR BELONGTO 405c40 
             405d84      2 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R14 R15 ZZ xor     edx, edx 
-            405d84     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405d84     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405d86      2 INSTR BELONGTO 405c40 
             405d86      2 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 R14 R15 ZZ xor     esi, esi 
-            405d86     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            405d86     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             405d88     -1 INSTR LOCAL NoMetaUpdate call    _up_wakeups_get_data_sync 
             405d88      5 INSTR BELONGTO 405c40 
             405d88      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _up_wakeups_get_data_sync 
@@ -4426,7 +4426,7 @@
             405d9e      6 INSTR BELONGTO 405c40 
             405da4      2 INSTR BELONGTO 405c40 
             405da4      2 INSTR DEADREGS  EFLAGS RAX RDX RDI R12 R13 R14 R15 ZZ xor     ebp, ebp 
-            405da4     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            405da4     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             405da6     10 INSTR BELONGTO 405c40 
             405db0      3 INSTR BELONGTO 405c40 
             405db0      3 INSTR DEADREGS  EFLAGS RAX RDX RDI R12 R13 R14 R15 ZZ mov     rax, [rbx] 
@@ -4468,7 +4468,7 @@
             405df5      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _up_wakeup_item_get_value 
             405dfa      5 INSTR BELONGTO 405c40 
             405dfa      5 INSTR DEADREGS  EFLAGS RAX RDI R13 R14 ZZ mov     edi, offset a_1f; "%.1f" 
-            405dff     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            405dff     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             405dff      5 INSTR BELONGTO 405c40 
             405dff      5 INSTR DEADREGS  EFLAGS RAX R13 R14 ZZ mov     eax, 1 
             405e04     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
@@ -4533,14 +4533,14 @@
             405e6c      2 INSTR BELONGTO 405c40 
             405e6e     -1 INSTR LOCAL NoMetaUpdate jnz     loc_4060F8 
             405e6e      6 INSTR BELONGTO 405c40 
-            405e74     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            405e74     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             405e74      5 INSTR BELONGTO 405c40 
             405e74      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     edx, 5          ; category 
             405e79      5 INSTR BELONGTO 405c40 
             405e79      5 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     esi, offset aKernelCore; "Kernel core" 
             405e7e      2 INSTR BELONGTO 405c40 
             405e7e      2 INSTR DEADREGS  EFLAGS RDI R13 ZZ xor     edi, edi        ; domainname 
-            405e7e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            405e7e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             405e80     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             405e80      5 INSTR BELONGTO 405c40 
             405e80      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _dcgettext 
@@ -4564,7 +4564,7 @@
             405ea4      5 INSTR DEADREGS  EFLAGS RAX RDI R13 ZZ mov     edi, offset aISI; "<i>%s</i>" 
             405ea9      2 INSTR BELONGTO 405c40 
             405ea9      2 INSTR DEADREGS  EFLAGS RAX R13 ZZ xor     eax, eax 
-            405ea9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405ea9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405eab     -1 INSTR LOCAL NoMetaUpdate call    _g_markup_printf_escaped 
             405eab      5 INSTR BELONGTO 405c40 
             405eab      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_markup_printf_escaped 
@@ -4592,7 +4592,7 @@
             405ed0      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strcmp0 
             405ed5     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             405ed5      2 INSTR BELONGTO 405c40 
-            405ed7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            405ed7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             405ed7      5 INSTR BELONGTO 405c40 
             405ed7      5 INSTR DEADREGS  RDX RSI RDI ZZ mov     edx, 5 
             405edc      5 INSTR BELONGTO 405c40 
@@ -4619,7 +4619,7 @@
             405f00      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strcmp0 
             405f05     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             405f05      2 INSTR BELONGTO 405c40 
-            405f07     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            405f07     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             405f07      5 INSTR BELONGTO 405c40 
             405f07      5 INSTR DEADREGS  RDX RSI RDI ZZ mov     edx, 5 
             405f0c      5 INSTR BELONGTO 405c40 
@@ -4635,7 +4635,7 @@
             405f1b      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strcmp0 
             405f20     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             405f20      2 INSTR BELONGTO 405c40 
-            405f22     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            405f22     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             405f22      5 INSTR BELONGTO 405c40 
             405f22      5 INSTR DEADREGS  RDX RSI RDI ZZ mov     edx, 5 
             405f27      5 INSTR BELONGTO 405c40 
@@ -4664,7 +4664,7 @@
             405f4c      2 INSTR BELONGTO 405c40 
             405f4e     -1 INSTR LOCAL NoMetaUpdate jnz     loc_406178 
             405f4e      6 INSTR BELONGTO 405c40 
-            405f54     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            405f54     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             405f54      5 INSTR BELONGTO 405c40 
             405f54      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 5          ; category 
             405f59      5 INSTR BELONGTO 405c40 
@@ -4673,7 +4673,7 @@
             405f5e      2 INSTR BELONGTO 405c40 
             405f60      2 INSTR BELONGTO 405c40 
             405f60      2 INSTR DEADREGS  EFLAGS RDI R12 ZZ xor     edi, edi        ; domainname 
-            405f60     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            405f60     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             405f62     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             405f62      5 INSTR BELONGTO 405c40 
             405f62      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _dcgettext 
@@ -4708,7 +4708,7 @@
             405f9a      6 INSTR DEADREGS  EFLAGS RCX RDX R8 ZZ mov     r8d, 2 
             405fa0      3 INSTR BELONGTO 405c40 
             405fa0      3 INSTR DEADREGS  EFLAGS RCX RDX ZZ mov     rcx, r15 
-            405fa3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            405fa3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             405fa3      5 INSTR BELONGTO 405c40 
             405fa3      5 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, 1 
             405fa8     -1 INSTR LOCAL MetadataUnused mov     [rsp+0B8h+var_88], 0FFFFFFFFh 
@@ -4719,7 +4719,7 @@
             405fb8      5 INSTR BELONGTO 405c40 
             405fbd      2 INSTR BELONGTO 405c40 
             405fbd      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            405fbd     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405fbd     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405fbf     -1 INSTR LOCAL MetadataUnused mov     [rsp+0B8h+var_A0], r12 
             405fbf      5 INSTR BELONGTO 405c40 
             405fc4     -1 INSTR LOCAL MetadataUnused mov     [rsp+0B8h+var_A8], 4 
@@ -4780,8 +4780,8 @@
             40601f      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
             406020      2 INSTR BELONGTO 405c40 
             406020      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ xor     edi, edi        ; domainname 
-            406020     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            406022     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406020     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406022     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406022      5 INSTR BELONGTO 405c40 
             406022      5 INSTR DEADREGS  EFLAGS RDX RSI R13 ZZ mov     edx, 5          ; category 
             406027      5 INSTR BELONGTO 405c40 
@@ -4824,7 +4824,7 @@
             406072      2 INSTR DEADREGS  EFLAGS RSI R13 R14 R15 ZZ mov     esi, eax 
             406074      2 INSTR BELONGTO 405c40 
             406074      2 INSTR DEADREGS  EFLAGS RAX R13 R14 R15 ZZ xor     eax, eax 
-            406074     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406074     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406076     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             406076      5 INSTR BELONGTO 405c40 
             406076      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_strdup_printf 
@@ -4845,7 +4845,7 @@
             40609d      2 INSTR DEADREGS  EFLAGS RSI R13 R14 R15 ZZ mov     esi, eax 
             40609f      2 INSTR BELONGTO 405c40 
             40609f      2 INSTR DEADREGS  EFLAGS RAX R13 R14 R15 ZZ xor     eax, eax 
-            40609f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40609f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4060a1     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             4060a1      5 INSTR BELONGTO 405c40 
             4060a1      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_strdup_printf 
@@ -4855,21 +4855,21 @@
             4060af      3 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 ZZ mov     r15, rax 
             4060b2     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405DF2 
             4060b2      5 INSTR BELONGTO 405c40 
-            4060c0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4060c0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             4060c0      5 INSTR BELONGTO 405c40 
             4060c0      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 5 
             4060c5      5 INSTR BELONGTO 405c40 
             4060c5      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aAcpi_0; "ACPI" 
             4060ca     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405F60 
             4060ca      5 INSTR BELONGTO 405c40 
-            4060d0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4060d0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4060d0      5 INSTR BELONGTO 405c40 
             4060d0      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     edx, 5          ; category 
             4060d5      5 INSTR BELONGTO 405c40 
             4060d5      5 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     esi, offset aNoData; "No data" 
             4060da      2 INSTR BELONGTO 405c40 
             4060da      2 INSTR DEADREGS  EFLAGS RDI R13 ZZ xor     edi, edi        ; domainname 
-            4060da     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4060da     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4060dc     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4060dc      5 INSTR BELONGTO 405c40 
             4060dc      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _dcgettext 
@@ -4912,14 +4912,14 @@
             406126      2 INSTR BELONGTO 405c40 
             406128     -1 INSTR LOCAL NoMetaUpdate jnz     loc_4062E0 
             406128      6 INSTR BELONGTO 405c40 
-            40612e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40612e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40612e      5 INSTR BELONGTO 405c40 
             40612e      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     edx, 5          ; category 
             406133      5 INSTR BELONGTO 405c40 
             406133      5 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     esi, offset aInterrupt_0; "Interrupt" 
             406138      2 INSTR BELONGTO 405c40 
             406138      2 INSTR DEADREGS  EFLAGS RDI R13 ZZ xor     edi, edi        ; domainname 
-            406138     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406138     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40613a     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40613a      5 INSTR BELONGTO 405c40 
             40613a      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _dcgettext 
@@ -4930,14 +4930,14 @@
             406148      3 INSTR DEADREGS  EFLAGS RDI R13 ZZ mov     r13, rax 
             40614b     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405E91 
             40614b      5 INSTR BELONGTO 405c40 
-            406150     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406150     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406150      5 INSTR BELONGTO 405c40 
             406150      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     edx, 5          ; category 
             406155      5 INSTR BELONGTO 405c40 
             406155      5 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     esi, offset aInterprocessor; "Interprocessor " 
             40615a      2 INSTR BELONGTO 405c40 
             40615a      2 INSTR DEADREGS  EFLAGS RDI R13 ZZ xor     edi, edi        ; domainname 
-            40615a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40615a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40615c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40615c      5 INSTR BELONGTO 405c40 
             40615c      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _dcgettext 
@@ -4979,7 +4979,7 @@
             4061aa      5 INSTR DEADREGS  EFLAGS ZZ call    _g_str_has_prefix 
             4061af     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             4061af      2 INSTR BELONGTO 405c40 
-            4061b1     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4061b1     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             4061b1      5 INSTR BELONGTO 405c40 
             4061b1      5 INSTR DEADREGS  RDX RSI RDI ZZ mov     edx, 5 
             4061b6      5 INSTR BELONGTO 405c40 
@@ -5039,7 +5039,7 @@
             40621d      5 INSTR DEADREGS  EFLAGS ZZ call    _g_str_has_prefix 
             406222     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             406222      2 INSTR BELONGTO 405c40 
-            406224     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            406224     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             406224      5 INSTR BELONGTO 405c40 
             406224      5 INSTR DEADREGS  RDX RSI RDI ZZ mov     edx, 5 
             406229      5 INSTR BELONGTO 405c40 
@@ -5144,7 +5144,7 @@
             4062eb     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
             4062eb      5 INSTR BELONGTO 405c40 
             4062eb      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_strdup 
-            4062f0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3Ah        ; c 
+            4062f0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3Ah        ; c 
             4062f0      5 INSTR BELONGTO 405c40 
             4062f0      5 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     esi, 3Ah        ; c 
             4062f5      3 INSTR BELONGTO 405c40 
@@ -5164,7 +5164,7 @@
             40630a      5 INSTR BELONGTO 405c40 
             40630a      5 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     rdi, [rsp+0B8h+s]; s 
             40630a      5 PTRIMMEDESP STACK 64 displ mov     rdi, [rsp+0B8h+s]; s
-            40630f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h        ; c 
+            40630f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h        ; c 
             40630f      5 INSTR BELONGTO 405c40 
             40630f      5 INSTR DEADREGS  EFLAGS RSI R13 ZZ mov     esi, 20h        ; c 
             406314     -1 INSTR LOCAL NoMetaUpdate call    _strchr 
@@ -5193,7 +5193,7 @@
             406338      6 INSTR BELONGTO 405c40 
             40633e      3 INSTR BELONGTO 405c40 
             40633e      3 INSTR DEADREGS  RCX RDX RSI RDI ZZ mov     rsi, r13 
-            406341     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 5 
+            406341     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 5 
             406341      5 INSTR BELONGTO 405c40 
             406341      5 INSTR DEADREGS  RCX RDX RDI R13 ZZ mov     ecx, 5 
             406346      5 INSTR BELONGTO 405c40 
@@ -5204,7 +5204,7 @@
             40634d      4 INSTR DEADREGS  RCX RDX RDI R13 ZZ lea     r13, [rax+1] 
             406351     -1 INSTR LOCAL MetadataRedundant setnbe  cl 
             406351      3 INSTR BELONGTO 405c40 
-            406354     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setb    dl 
+            406354     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setb    dl 
             406354      3 INSTR BELONGTO 405c40 
             406354      3 INSTR DEADREGS  RDX RDI ZZ setb    dl 
             406357     -1 INSTR LOCAL NoMetaUpdate cmp     cl, dl 
@@ -5214,14 +5214,14 @@
             406359      6 PTRIMMEDESP STACK 64 displ cmovz   r13, [rsp+0B8h+s]
             40635f     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405E91 
             40635f      5 INSTR BELONGTO 405c40 
-            406368     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406368     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406368      5 INSTR BELONGTO 405c40 
             406368      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             40636d      5 INSTR BELONGTO 405c40 
             40636d      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aTimerS; "Timer %s" 
             406372      2 INSTR BELONGTO 405c40 
             406372      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            406372     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406372     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406374     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             406374      5 INSTR BELONGTO 405c40 
             406374      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -5231,7 +5231,7 @@
             40637e      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             406381      2 INSTR BELONGTO 405c40 
             406381      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            406381     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406381     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406383     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             406383      5 INSTR BELONGTO 405c40 
             406383      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_strdup_printf 
@@ -5272,14 +5272,14 @@
             4063bd      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_free 
             4063c2     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405D71 
             4063c2      5 INSTR BELONGTO 405c40 
-            4063c7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4063c7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4063c7      5 INSTR BELONGTO 405c40 
             4063c7      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             4063cc      5 INSTR BELONGTO 405c40 
             4063cc      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aTimerS; "Timer %s" 
             4063d1      2 INSTR BELONGTO 405c40 
             4063d1      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            4063d1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4063d1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4063d3     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4063d3      5 INSTR BELONGTO 405c40 
             4063d3      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -5289,7 +5289,7 @@
             4063dd      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             4063e0      2 INSTR BELONGTO 405c40 
             4063e0      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            4063e0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4063e0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4063e2     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             4063e2      5 INSTR BELONGTO 405c40 
             4063e2      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_strdup_printf 
@@ -5297,14 +5297,14 @@
             4063e7      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     r12, rax 
             4063ea     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405F72 
             4063ea      5 INSTR BELONGTO 405c40 
-            4063ef     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4063ef     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4063ef      5 INSTR BELONGTO 405c40 
             4063ef      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             4063f4      5 INSTR BELONGTO 405c40 
             4063f4      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aTimerS; "Timer %s" 
             4063f9      2 INSTR BELONGTO 405c40 
             4063f9      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            4063f9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4063f9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4063fb     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4063fb      5 INSTR BELONGTO 405c40 
             4063fb      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -5314,7 +5314,7 @@
             406405      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             406408      2 INSTR BELONGTO 405c40 
             406408      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            406408     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406408     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40640a     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40640a      5 INSTR BELONGTO 405c40 
             40640a      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_strdup_printf 
@@ -5322,14 +5322,14 @@
             40640f      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     r12, rax 
             406412     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405F72 
             406412      5 INSTR BELONGTO 405c40 
-            406417     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406417     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406417      5 INSTR BELONGTO 405c40 
             406417      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             40641c      5 INSTR BELONGTO 405c40 
             40641c      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aWorkQueueS; "Work queue %s" 
             406421      2 INSTR BELONGTO 405c40 
             406421      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            406421     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406421     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406423     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             406423      5 INSTR BELONGTO 405c40 
             406423      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -5339,7 +5339,7 @@
             40642d      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             406430      2 INSTR BELONGTO 405c40 
             406430      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            406430     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406430     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406432     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             406432      5 INSTR BELONGTO 405c40 
             406432      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_strdup_printf 
@@ -5347,14 +5347,14 @@
             406437      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     r12, rax 
             40643a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405F72 
             40643a      5 INSTR BELONGTO 405c40 
-            40643f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40643f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40643f      5 INSTR BELONGTO 405c40 
             40643f      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             406444      5 INSTR BELONGTO 405c40 
             406444      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aSleepS; "Sleep %s" 
             406449      2 INSTR BELONGTO 405c40 
             406449      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            406449     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406449     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40644b     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40644b      5 INSTR BELONGTO 405c40 
             40644b      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -5364,7 +5364,7 @@
             406455      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             406458      2 INSTR BELONGTO 405c40 
             406458      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            406458     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406458     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40645a     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40645a      5 INSTR BELONGTO 405c40 
             40645a      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_strdup_printf 
@@ -5372,14 +5372,14 @@
             40645f      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     r12, rax 
             406462     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405F72 
             406462      5 INSTR BELONGTO 405c40 
-            406467     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406467     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406467      5 INSTR BELONGTO 405c40 
             406467      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             40646c      5 INSTR BELONGTO 405c40 
             40646c      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aNewTaskS; "New task %s" 
             406471      2 INSTR BELONGTO 405c40 
             406471      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            406471     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406471     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406473     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             406473      5 INSTR BELONGTO 405c40 
             406473      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -5389,7 +5389,7 @@
             40647d      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             406480      2 INSTR BELONGTO 405c40 
             406480      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            406480     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406480     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406482     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             406482      5 INSTR BELONGTO 405c40 
             406482      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_strdup_printf 
@@ -5397,14 +5397,14 @@
             406487      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     r12, rax 
             40648a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405F72 
             40648a      5 INSTR BELONGTO 405c40 
-            40648f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40648f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40648f      5 INSTR BELONGTO 405c40 
             40648f      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             406494      5 INSTR BELONGTO 405c40 
             406494      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aNetworkRouteFl; "Network route flush %s" 
             406499      2 INSTR BELONGTO 405c40 
             406499      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            406499     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406499     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40649b     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40649b      5 INSTR BELONGTO 405c40 
             40649b      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -5414,7 +5414,7 @@
             4064a5      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             4064a8      2 INSTR BELONGTO 405c40 
             4064a8      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            4064a8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4064a8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4064aa     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             4064aa      5 INSTR BELONGTO 405c40 
             4064aa      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_strdup_printf 
@@ -5422,14 +5422,14 @@
             4064af      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     r12, rax 
             4064b2     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405F72 
             4064b2      5 INSTR BELONGTO 405c40 
-            4064b7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4064b7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4064b7      5 INSTR BELONGTO 405c40 
             4064b7      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             4064bc      5 INSTR BELONGTO 405c40 
             4064bc      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aUsbActivityS; "USB activity %s" 
             4064c1      2 INSTR BELONGTO 405c40 
             4064c1      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            4064c1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4064c1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4064c3     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4064c3      5 INSTR BELONGTO 405c40 
             4064c3      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -5439,7 +5439,7 @@
             4064cd      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             4064d0      2 INSTR BELONGTO 405c40 
             4064d0      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            4064d0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4064d0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4064d2     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             4064d2      5 INSTR BELONGTO 405c40 
             4064d2      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_strdup_printf 
@@ -5447,14 +5447,14 @@
             4064d7      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     r12, rax 
             4064da     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405F72 
             4064da      5 INSTR BELONGTO 405c40 
-            4064df     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4064df     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4064df      5 INSTR BELONGTO 405c40 
             4064df      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             4064e4      5 INSTR BELONGTO 405c40 
             4064e4      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aWorkQueueS; "Work queue %s" 
             4064e9      2 INSTR BELONGTO 405c40 
             4064e9      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            4064e9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4064e9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4064eb     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4064eb      5 INSTR BELONGTO 405c40 
             4064eb      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -5464,7 +5464,7 @@
             4064f5      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             4064f8      2 INSTR BELONGTO 405c40 
             4064f8      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            4064f8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4064f8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4064fa     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             4064fa      5 INSTR BELONGTO 405c40 
             4064fa      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_strdup_printf 
@@ -5472,14 +5472,14 @@
             4064ff      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     r12, rax 
             406502     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405F72 
             406502      5 INSTR BELONGTO 405c40 
-            406507     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406507     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406507      5 INSTR BELONGTO 405c40 
             406507      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             40650c      5 INSTR BELONGTO 405c40 
             40650c      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aWakeupS; "Wakeup %s" 
             406511      2 INSTR BELONGTO 405c40 
             406511      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            406511     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406511     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406513     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             406513      5 INSTR BELONGTO 405c40 
             406513      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -5489,7 +5489,7 @@
             40651d      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             406520      2 INSTR BELONGTO 405c40 
             406520      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            406520     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406520     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406522     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             406522      5 INSTR BELONGTO 405c40 
             406522      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_strdup_printf 
@@ -5497,14 +5497,14 @@
             406527      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     r12, rax 
             40652a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405F72 
             40652a      5 INSTR BELONGTO 405c40 
-            40652f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40652f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             40652f      5 INSTR BELONGTO 405c40 
             40652f      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 5 
             406534      5 INSTR BELONGTO 405c40 
             406534      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aReschedulingIn; "Rescheduling interrupts" 
             406539     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405F60 
             406539      5 INSTR BELONGTO 405c40 
-            40653e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40653e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             40653e      5 INSTR BELONGTO 405c40 
             40653e      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 5 
             406543      5 INSTR BELONGTO 405c40 
@@ -5589,7 +5589,7 @@
             4065b7     -1 INSTR LOCAL NoMetaUpdate call    _g_application_release 
             4065b7      5 INSTR BELONGTO 4065a0 
             4065b7      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_application_release 
-            4065bc     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4065bc     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4065bc      5 INSTR BELONGTO 4065a0 
             4065bc      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
             4065c1      1 INSTR BELONGTO 4065a0 
@@ -5602,7 +5602,7 @@
             4065d0      2 INSTR BELONGTO 4065d0 
             4065d0     36 FUNC GLOBAL sub_4065D0 FUNC_UNSAFE NOFP RET             4065f3 
             4065d0      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
-            4065d2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4065d2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             4065d2      5 INSTR BELONGTO 4065d0 
             4065d2      5 INSTR DEADREGS  RDX RDI ZZ mov     edx, 5 
             4065d7     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4065E8 
@@ -5640,12 +5640,12 @@
             40660a      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edi, offset aPowermanager; "PowerManager" 
             40660f      5 INSTR BELONGTO 406600 
             40660f      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aEnumUnrecognis; "enum unrecognised: %i" 
-            406614     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            406614     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             406614      5 INSTR BELONGTO 406600 
             406614      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 10h 
             406619      2 INSTR BELONGTO 406600 
             406619      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            406619     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406619     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40661b     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40661b      5 INSTR BELONGTO 406600 
             40661b      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -5665,7 +5665,7 @@
             406640      1 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx             ; jumptable 0000000000406632 case 11 
             406641     -1 INSTR LOCAL MetadataUnused mov     r8d, 5 
             406641      6 INSTR BELONGTO 406600 
-            406647     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            406647     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             406647      5 INSTR BELONGTO 406600 
             406647      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 1 
             40664c      5 INSTR BELONGTO 406600 
@@ -5681,7 +5681,7 @@
             406660      1 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx             ; jumptable 0000000000406632 case 1 
             406661     -1 INSTR LOCAL MetadataUnused mov     r8d, 5 
             406661      6 INSTR BELONGTO 406600 
-            406667     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            406667     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             406667      5 INSTR BELONGTO 406600 
             406667      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 1 
             40666c      5 INSTR BELONGTO 406600 
@@ -5697,7 +5697,7 @@
             406680      1 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx             ; jumptable 0000000000406632 case 2 
             406681     -1 INSTR LOCAL MetadataUnused mov     r8d, 5 
             406681      6 INSTR BELONGTO 406600 
-            406687     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            406687     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             406687      5 INSTR BELONGTO 406600 
             406687      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 1 
             40668c      5 INSTR BELONGTO 406600 
@@ -5713,7 +5713,7 @@
             4066a0      1 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx             ; jumptable 0000000000406632 case 3 
             4066a1     -1 INSTR LOCAL MetadataUnused mov     r8d, 5 
             4066a1      6 INSTR BELONGTO 406600 
-            4066a7     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            4066a7     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             4066a7      5 INSTR BELONGTO 406600 
             4066a7      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 1 
             4066ac      5 INSTR BELONGTO 406600 
@@ -5729,7 +5729,7 @@
             4066c0      1 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx             ; jumptable 0000000000406632 case 4 
             4066c1     -1 INSTR LOCAL MetadataUnused mov     r8d, 5 
             4066c1      6 INSTR BELONGTO 406600 
-            4066c7     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            4066c7     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             4066c7      5 INSTR BELONGTO 406600 
             4066c7      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 1 
             4066cc      5 INSTR BELONGTO 406600 
@@ -5745,7 +5745,7 @@
             4066e0      1 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx             ; jumptable 0000000000406632 case 5 
             4066e1     -1 INSTR LOCAL MetadataUnused mov     r8d, 5 
             4066e1      6 INSTR BELONGTO 406600 
-            4066e7     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            4066e7     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             4066e7      5 INSTR BELONGTO 406600 
             4066e7      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 1 
             4066ec      5 INSTR BELONGTO 406600 
@@ -5761,7 +5761,7 @@
             406700      1 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx             ; jumptable 0000000000406632 case 6 
             406701     -1 INSTR LOCAL MetadataUnused mov     r8d, 5 
             406701      6 INSTR BELONGTO 406600 
-            406707     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            406707     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             406707      5 INSTR BELONGTO 406600 
             406707      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 1 
             40670c      5 INSTR BELONGTO 406600 
@@ -5777,7 +5777,7 @@
             406720      1 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx             ; jumptable 0000000000406632 case 7 
             406721     -1 INSTR LOCAL MetadataUnused mov     r8d, 5 
             406721      6 INSTR BELONGTO 406600 
-            406727     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            406727     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             406727      5 INSTR BELONGTO 406600 
             406727      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 1 
             40672c      5 INSTR BELONGTO 406600 
@@ -5793,7 +5793,7 @@
             406740      1 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx             ; jumptable 0000000000406632 case 8 
             406741     -1 INSTR LOCAL MetadataUnused mov     r8d, 5 
             406741      6 INSTR BELONGTO 406600 
-            406747     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            406747     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             406747      5 INSTR BELONGTO 406600 
             406747      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 1 
             40674c      5 INSTR BELONGTO 406600 
@@ -5809,7 +5809,7 @@
             406760      1 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx             ; jumptable 0000000000406632 case 9 
             406761     -1 INSTR LOCAL MetadataUnused mov     r8d, 5 
             406761      6 INSTR BELONGTO 406600 
-            406767     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            406767     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             406767      5 INSTR BELONGTO 406600 
             406767      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 1 
             40676c      5 INSTR BELONGTO 406600 
@@ -5825,7 +5825,7 @@
             406780      1 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx             ; jumptable 0000000000406632 case 10 
             406781     -1 INSTR LOCAL MetadataUnused mov     r8d, 5 
             406781      6 INSTR BELONGTO 406600 
-            406787     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            406787     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             406787      5 INSTR BELONGTO 406600 
             406787      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 1 
             40678c      5 INSTR BELONGTO 406600 
@@ -6060,7 +6060,7 @@
             4069f0      4 PTRIMMEDESP STACK 0 displ mov     [rsp+2E8h+var_2E8], rax
             4069f4      2 INSTR BELONGTO 4067a0 
             4069f4      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4069f4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4069f4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4069f6     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             4069f6      5 INSTR BELONGTO 4067a0 
             4069f6      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_get 
@@ -6082,7 +6082,7 @@
             406a20      3 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ mov     rcx, rax        ; tp 
             406a23      5 INSTR BELONGTO 4067a0 
             406a23      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, offset format; "%c" 
-            406a28     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 100h       ; maxsize 
+            406a28     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 100h       ; maxsize 
             406a28      5 INSTR BELONGTO 4067a0 
             406a28      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 100h       ; maxsize 
             406a2d     -1 INSTR LOCAL NoMetaUpdate call    _strftime 
@@ -6092,7 +6092,7 @@
             406a32      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rbx 
             406a35      2 INSTR BELONGTO 4067a0 
             406a35      2 INSTR DEADREGS  EFLAGS RBX ZZ xor     ebx, ebx 
-            406a35     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            406a35     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             406a37     -1 INSTR LOCAL NoMetaUpdate call    _up_device_get_object_path 
             406a37      5 INSTR BELONGTO 4067a0 
             406a37      5 INSTR DEADREGS  EFLAGS ZZ call    _up_device_get_object_path 
@@ -6107,12 +6107,12 @@
             406a44      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_filename_display_basename 
             406a49      3 INSTR BELONGTO 4067a0 
             406a49      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rbx, rax 
-            406a4c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406a4c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406a4c      5 INSTR BELONGTO 4067a0 
             406a4c      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             406a51      2 INSTR BELONGTO 4067a0 
             406a51      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            406a51     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406a51     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406a53      5 INSTR BELONGTO 4067a0 
             406a53      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aDevice_0; "Device" 
             406a58     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -6138,10 +6138,10 @@
             406a77      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ call    sub_406600 
             406a7c      2 INSTR BELONGTO 4067a0 
             406a7c      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edi, edi        ; domainname 
-            406a7c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406a7c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406a7e      3 INSTR BELONGTO 4067a0 
             406a7e      3 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     rbx, rax 
-            406a81     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406a81     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406a81      5 INSTR BELONGTO 4067a0 
             406a81      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             406a86      5 INSTR BELONGTO 4067a0 
@@ -6204,7 +6204,7 @@
             406aee      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rbx, rax 
             406af1      2 INSTR BELONGTO 4067a0 
             406af1      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            406af1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406af1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406af3      5 INSTR BELONGTO 4067a0 
             406af3      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aSupply; "Supply" 
             406af8     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -6219,7 +6219,7 @@
             406b03      5 INSTR DEADREGS  EFLAGS RBX ZZ call    sub_405700 
             406b08      2 INSTR BELONGTO 4067a0 
             406b08      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; timer 
-            406b08     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; timer 
+            406b08     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; timer 
             406b0a     -1 INSTR LOCAL NoMetaUpdate call    _time 
             406b0a      5 INSTR BELONGTO 4067a0 
             406b0a      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _time 
@@ -6235,7 +6235,7 @@
             406b1e      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     edx, offset aDSeconds; "%d seconds" 
             406b23      2 INSTR BELONGTO 4067a0 
             406b23      2 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ xor     edi, edi        ; domainname 
-            406b23     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406b23     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406b25      5 INSTR BELONGTO 4067a0 
             406b25      5 INSTR DEADREGS  EFLAGS RCX RSI ZZ mov     esi, offset aDSecond; "%d second" 
             406b2a      2 INSTR BELONGTO 4067a0 
@@ -6249,18 +6249,18 @@
             406b33      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
             406b36      2 INSTR BELONGTO 4067a0 
             406b36      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            406b36     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406b36     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406b38     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             406b38      5 INSTR BELONGTO 4067a0 
             406b38      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_strdup_printf 
-            406b3d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406b3d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406b3d      5 INSTR BELONGTO 4067a0 
             406b3d      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             406b42      3 INSTR BELONGTO 4067a0 
             406b42      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rbx, rax 
             406b45      2 INSTR BELONGTO 4067a0 
             406b45      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            406b45     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406b45     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406b47      5 INSTR BELONGTO 4067a0 
             406b47      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aRefreshed; "Refreshed" 
             406b4c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -6375,20 +6375,20 @@
             406c28      9 INSTR BELONGTO 4067a0 
             406c31      5 INSTR BELONGTO 4067a0 
             406c31      5 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     edi, offset a_1f_0; "%.1f%%" 
-            406c36     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            406c36     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             406c36      5 INSTR BELONGTO 4067a0 
             406c36      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     eax, 1 
             406c3b     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             406c3b      5 INSTR BELONGTO 4067a0 
             406c3b      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_strdup_printf 
-            406c40     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406c40     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406c40      5 INSTR BELONGTO 4067a0 
             406c40      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             406c45      3 INSTR BELONGTO 4067a0 
             406c45      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rbx, rax 
             406c48      2 INSTR BELONGTO 4067a0 
             406c48      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            406c48     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406c48     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406c4a      5 INSTR BELONGTO 4067a0 
             406c4a      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aPercentage_0; "Percentage" 
             406c4f     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -6417,20 +6417,20 @@
             406c77      9 INSTR BELONGTO 4067a0 
             406c80      5 INSTR BELONGTO 4067a0 
             406c80      5 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     edi, offset a_1f_0; "%.1f%%" 
-            406c85     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            406c85     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             406c85      5 INSTR BELONGTO 4067a0 
             406c85      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     eax, 1 
             406c8a     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             406c8a      5 INSTR BELONGTO 4067a0 
             406c8a      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_strdup_printf 
-            406c8f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406c8f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406c8f      5 INSTR BELONGTO 4067a0 
             406c8f      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             406c94      3 INSTR BELONGTO 4067a0 
             406c94      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rbx, rax 
             406c97      2 INSTR BELONGTO 4067a0 
             406c97      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            406c97     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406c97     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406c99      5 INSTR BELONGTO 4067a0 
             406c99      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aCapacity_0; "Capacity" 
             406c9e     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -6465,7 +6465,7 @@
             406cd4      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 ZZ xor     r8d, r8d        ; jumptable 000000000040718C default case 
             406cd7      5 INSTR BELONGTO 4067a0 
             406cd7      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     ecx, offset aGpm_device_tec; "gpm_device_technology_to_localised_stri"... 
-            406cdc     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 178h 
+            406cdc     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 178h 
             406cdc      5 INSTR BELONGTO 4067a0 
             406cdc      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 178h 
             406ce1      5 INSTR BELONGTO 4067a0 
@@ -6483,7 +6483,7 @@
             406cf7      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI ZZ call    sub_4065D0 
             406cfc      2 INSTR BELONGTO 4067a0 
             406cfc      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edi, edi        ; domainname 
-            406cfc     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406cfc     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406cfe      3 INSTR BELONGTO 4067a0 
             406cfe      3 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     rbx, rax 
             406d01     -1 INSTR LOCAL MetadataRedundant mov     edx, 5          ; category 
@@ -6523,7 +6523,7 @@
             406d3c      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI ZZ call    sub_4065D0 
             406d41      2 INSTR BELONGTO 4067a0 
             406d41      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edi, edi        ; domainname 
-            406d41     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406d41     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406d43      3 INSTR BELONGTO 4067a0 
             406d43      3 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     rbx, rax 
             406d46     -1 INSTR LOCAL MetadataRedundant mov     edx, 5          ; category 
@@ -6557,7 +6557,7 @@
             406d7e      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 ZZ xor     r8d, r8d        ; jumptable 0000000000406F47 default case 
             406d81      5 INSTR BELONGTO 4067a0 
             406d81      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     ecx, offset aGpm_device_sta; "gpm_device_state_to_localised_string" 
-            406d86     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1A0h 
+            406d86     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1A0h 
             406d86      5 INSTR BELONGTO 4067a0 
             406d86      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 1A0h 
             406d8b      5 INSTR BELONGTO 4067a0 
@@ -6572,20 +6572,20 @@
             406da0      9 INSTR BELONGTO 4067a0 
             406da9      5 INSTR BELONGTO 4067a0 
             406da9      5 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     edi, offset a_1fW; "%.1f W" 
-            406dae     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            406dae     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             406dae      5 INSTR BELONGTO 4067a0 
             406dae      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     eax, 1 
             406db3     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             406db3      5 INSTR BELONGTO 4067a0 
             406db3      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_strdup_printf 
-            406db8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406db8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406db8      5 INSTR BELONGTO 4067a0 
             406db8      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             406dbd      3 INSTR BELONGTO 4067a0 
             406dbd      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rbx, rax 
             406dc0      2 INSTR BELONGTO 4067a0 
             406dc0      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            406dc0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406dc0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406dc2      5 INSTR BELONGTO 4067a0 
             406dc2      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aRate; "Rate" 
             406dc7     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -6616,20 +6616,20 @@
             406df2      9 INSTR BELONGTO 4067a0 
             406dfb      5 INSTR BELONGTO 4067a0 
             406dfb      5 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     edi, offset a_1fV; "%.1f V" 
-            406e00     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            406e00     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             406e00      5 INSTR BELONGTO 4067a0 
             406e00      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     eax, 1 
             406e05     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             406e05      5 INSTR BELONGTO 4067a0 
             406e05      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_strdup_printf 
-            406e0a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406e0a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406e0a      5 INSTR BELONGTO 4067a0 
             406e0a      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             406e0f      3 INSTR BELONGTO 4067a0 
             406e0f      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rbx, rax 
             406e12      2 INSTR BELONGTO 4067a0 
             406e12      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            406e12     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406e12     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406e14      5 INSTR BELONGTO 4067a0 
             406e14      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aVoltage_0; "Voltage" 
             406e19     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -6666,7 +6666,7 @@
             406e51     -1 INSTR LOCAL NoMetaUpdate call    sub_405760 
             406e51      5 INSTR BELONGTO 4067a0 
             406e51      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ call    sub_405760 
-            406e56     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406e56     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406e56      5 INSTR BELONGTO 4067a0 
             406e56      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             406e5b     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     rbx, rax 
@@ -6676,7 +6676,7 @@
             406e5e      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aTimeToFull_0; "Time to full" 
             406e63      2 INSTR BELONGTO 4067a0 
             406e63      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            406e63     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406e63     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406e65     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             406e65      5 INSTR BELONGTO 4067a0 
             406e65      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -6704,7 +6704,7 @@
             406e8a     -1 INSTR LOCAL NoMetaUpdate call    sub_405760 
             406e8a      5 INSTR BELONGTO 4067a0 
             406e8a      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ call    sub_405760 
-            406e8f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406e8f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406e8f      5 INSTR BELONGTO 4067a0 
             406e8f      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             406e94     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     rbx, rax 
@@ -6714,7 +6714,7 @@
             406e97      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aTimeToEmpty_0; "Time to empty" 
             406e9c      2 INSTR BELONGTO 4067a0 
             406e9c      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            406e9c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406e9c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406e9e     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             406e9e      5 INSTR BELONGTO 4067a0 
             406e9e      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -6739,8 +6739,8 @@
             406ebd      5 INSTR BELONGTO 4067a0 
             406ec8      2 INSTR BELONGTO 4067a0 
             406ec8      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edi, edi        ; domainname 
-            406ec8     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            406eca     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406ec8     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406eca     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406eca      5 INSTR BELONGTO 4067a0 
             406eca      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             406ecf      5 INSTR BELONGTO 4067a0 
@@ -6760,8 +6760,8 @@
             406ee4      5 INSTR BELONGTO 4067a0 
             406ef0      2 INSTR BELONGTO 4067a0 
             406ef0      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edi, edi        ; domainname 
-            406ef0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            406ef2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406ef0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406ef2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406ef2      5 INSTR BELONGTO 4067a0 
             406ef2      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             406ef7      5 INSTR BELONGTO 4067a0 
@@ -6781,8 +6781,8 @@
             406f0c      5 INSTR BELONGTO 4067a0 
             406f18      2 INSTR BELONGTO 4067a0 
             406f18      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edi, edi        ; domainname 
-            406f18     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            406f1a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406f18     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406f1a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406f1a      5 INSTR BELONGTO 4067a0 
             406f1a      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             406f1f      5 INSTR BELONGTO 4067a0 
@@ -6806,14 +6806,14 @@
             406f47     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_40CDA0[rax*8]; switch jump 
             406f47      7 INSTR BELONGTO 4067a0 
             406f47      7 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ jmp     ds:off_40CDA0[rax*8]; switch jump 
-            406f50     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; jumptable 0000000000406F47 case 6 
+            406f50     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; jumptable 0000000000406F47 case 6 
             406f50      5 INSTR BELONGTO 4067a0 
             406f50      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; jumptable 0000000000406F47 case 6 
             406f55      5 INSTR BELONGTO 4067a0 
             406f55      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aWaitingToDisch; "Waiting to discharge" 
             406f5a      2 INSTR BELONGTO 4067a0 
             406f5a      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; domainname 
-            406f5a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406f5a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406f5c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             406f5c      5 INSTR BELONGTO 4067a0 
             406f5c      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _dcgettext 
@@ -6822,8 +6822,8 @@
             406f64      4 INSTR BELONGTO 4067a0 
             406f68      2 INSTR BELONGTO 4067a0 
             406f68      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edi, edi        ; domainname 
-            406f68     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            406f6a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406f68     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406f6a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406f6a      5 INSTR BELONGTO 4067a0 
             406f6a      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             406f6f      5 INSTR BELONGTO 4067a0 
@@ -6849,13 +6849,13 @@
             406f94      9 INSTR BELONGTO 4067a0 
             406f9d      5 INSTR BELONGTO 4067a0 
             406f9d      5 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     edi, offset a_1fWh; "%.1f Wh" 
-            406fa2     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            406fa2     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             406fa2      5 INSTR BELONGTO 4067a0 
             406fa2      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     eax, 1 
             406fa7     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             406fa7      5 INSTR BELONGTO 4067a0 
             406fa7      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_strdup_printf 
-            406fac     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406fac     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406fac      5 INSTR BELONGTO 4067a0 
             406fac      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             406fb1      3 INSTR BELONGTO 4067a0 
@@ -6864,7 +6864,7 @@
             406fb4      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aEnergy_0; "Energy" 
             406fb9      2 INSTR BELONGTO 4067a0 
             406fb9      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            406fb9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406fb9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406fbb     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             406fbb      5 INSTR BELONGTO 4067a0 
             406fbb      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -6884,13 +6884,13 @@
             406fd3      9 INSTR BELONGTO 4067a0 
             406fdc      5 INSTR BELONGTO 4067a0 
             406fdc      5 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     edi, offset a_1fWh; "%.1f Wh" 
-            406fe1     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            406fe1     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             406fe1      5 INSTR BELONGTO 4067a0 
             406fe1      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     eax, 1 
             406fe6     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             406fe6      5 INSTR BELONGTO 4067a0 
             406fe6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_strdup_printf 
-            406feb     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406feb     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406feb      5 INSTR BELONGTO 4067a0 
             406feb      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             406ff0      3 INSTR BELONGTO 4067a0 
@@ -6899,7 +6899,7 @@
             406ff3      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aEnergyWhenEmpt; "Energy when empty" 
             406ff8      2 INSTR BELONGTO 4067a0 
             406ff8      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            406ff8     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406ff8     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406ffa     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             406ffa      5 INSTR BELONGTO 4067a0 
             406ffa      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -6919,13 +6919,13 @@
             407012      9 INSTR BELONGTO 4067a0 
             40701b      5 INSTR BELONGTO 4067a0 
             40701b      5 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     edi, offset a_1fWh; "%.1f Wh" 
-            407020     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            407020     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             407020      5 INSTR BELONGTO 4067a0 
             407020      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     eax, 1 
             407025     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             407025      5 INSTR BELONGTO 4067a0 
             407025      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_strdup_printf 
-            40702a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40702a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40702a      5 INSTR BELONGTO 4067a0 
             40702a      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             40702f      3 INSTR BELONGTO 4067a0 
@@ -6934,7 +6934,7 @@
             407032      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aEnergyWhen; "Energy when " 
             407037      2 INSTR BELONGTO 4067a0 
             407037      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            407037     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407037     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407039     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             407039      5 INSTR BELONGTO 4067a0 
             407039      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -6954,13 +6954,13 @@
             407051      9 INSTR BELONGTO 4067a0 
             40705a      5 INSTR BELONGTO 4067a0 
             40705a      5 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     edi, offset a_1fWh; "%.1f Wh" 
-            40705f     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40705f     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40705f      5 INSTR BELONGTO 4067a0 
             40705f      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     eax, 1 
             407064     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             407064      5 INSTR BELONGTO 4067a0 
             407064      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_strdup_printf 
-            407069     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407069     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407069      5 INSTR BELONGTO 4067a0 
             407069      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             40706e      3 INSTR BELONGTO 4067a0 
@@ -6969,7 +6969,7 @@
             407071      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aEnergyDesign; "Energy (design)" 
             407076      2 INSTR BELONGTO 4067a0 
             407076      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            407076     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407076     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407078     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             407078      5 INSTR BELONGTO 4067a0 
             407078      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -6990,14 +6990,14 @@
             407090      7 PTRIMMEDESP STACK 436 displ mov     eax, [rsp+2E8h+var_134]
             407097     -1 INSTR LOCAL NoMetaUpdate jmp     loc_406BA1 
             407097      5 INSTR BELONGTO 4067a0 
-            4070a0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; jumptable 0000000000406F47 case 4 
+            4070a0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; jumptable 0000000000406F47 case 4 
             4070a0      5 INSTR BELONGTO 4067a0 
             4070a0      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; jumptable 0000000000406F47 case 4 
             4070a5      5 INSTR BELONGTO 4067a0 
             4070a5      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aCharged; "Charged" 
             4070aa      2 INSTR BELONGTO 4067a0 
             4070aa      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; domainname 
-            4070aa     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4070aa     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4070ac     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4070ac      5 INSTR BELONGTO 4067a0 
             4070ac      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _dcgettext 
@@ -7005,14 +7005,14 @@
             4070b1      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rbx, rax 
             4070b4     -1 INSTR LOCAL NoMetaUpdate jmp     loc_406F68 
             4070b4      5 INSTR BELONGTO 4067a0 
-            4070c0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; jumptable 0000000000406F47 case 3 
+            4070c0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; jumptable 0000000000406F47 case 3 
             4070c0      5 INSTR BELONGTO 4067a0 
             4070c0      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; jumptable 0000000000406F47 case 3 
             4070c5      5 INSTR BELONGTO 4067a0 
             4070c5      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aEmpty; "Empty" 
             4070ca      2 INSTR BELONGTO 4067a0 
             4070ca      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; domainname 
-            4070ca     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4070ca     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4070cc     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4070cc      5 INSTR BELONGTO 4067a0 
             4070cc      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _dcgettext 
@@ -7020,14 +7020,14 @@
             4070d1      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rbx, rax 
             4070d4     -1 INSTR LOCAL NoMetaUpdate jmp     loc_406F68 
             4070d4      5 INSTR BELONGTO 4067a0 
-            4070e0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; jumptable 0000000000406F47 case 2 
+            4070e0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; jumptable 0000000000406F47 case 2 
             4070e0      5 INSTR BELONGTO 4067a0 
             4070e0      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; jumptable 0000000000406F47 case 2 
             4070e5      5 INSTR BELONGTO 4067a0 
             4070e5      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aDischarging; "Discharging" 
             4070ea      2 INSTR BELONGTO 4067a0 
             4070ea      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; domainname 
-            4070ea     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4070ea     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4070ec     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4070ec      5 INSTR BELONGTO 4067a0 
             4070ec      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _dcgettext 
@@ -7035,14 +7035,14 @@
             4070f1      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rbx, rax 
             4070f4     -1 INSTR LOCAL NoMetaUpdate jmp     loc_406F68 
             4070f4      5 INSTR BELONGTO 4067a0 
-            407100     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; jumptable 0000000000406F47 case 1 
+            407100     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; jumptable 0000000000406F47 case 1 
             407100      5 INSTR BELONGTO 4067a0 
             407100      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; jumptable 0000000000406F47 case 1 
             407105      5 INSTR BELONGTO 4067a0 
             407105      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aCharging; "Charging" 
             40710a      2 INSTR BELONGTO 4067a0 
             40710a      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; domainname 
-            40710a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40710a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40710c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40710c      5 INSTR BELONGTO 4067a0 
             40710c      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _dcgettext 
@@ -7050,14 +7050,14 @@
             407111      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rbx, rax 
             407114     -1 INSTR LOCAL NoMetaUpdate jmp     loc_406F68 
             407114      5 INSTR BELONGTO 4067a0 
-            407120     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; jumptable 0000000000406F47 case 5 
+            407120     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; jumptable 0000000000406F47 case 5 
             407120      5 INSTR BELONGTO 4067a0 
             407120      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; jumptable 0000000000406F47 case 5 
             407125      5 INSTR BELONGTO 4067a0 
             407125      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aWaitingToCharg; "Waiting to charge" 
             40712a      2 INSTR BELONGTO 4067a0 
             40712a      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; domainname 
-            40712a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40712a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40712c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40712c      5 INSTR BELONGTO 4067a0 
             40712c      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _dcgettext 
@@ -7079,7 +7079,7 @@
             407157      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI XMM0 ZZ call    sub_4065D0 
             40715c      2 INSTR BELONGTO 4067a0 
             40715c      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            40715c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40715c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40715e      3 INSTR BELONGTO 4067a0 
             40715e      3 INSTR DEADREGS  EFLAGS RDX RBX RSI XMM0 ZZ mov     rbx, rax 
             407161     -1 INSTR LOCAL MetadataRedundant mov     edx, 5          ; category 
@@ -7101,7 +7101,7 @@
             407180      7 INSTR BELONGTO 4067a0 
             407180      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI XMM0 ZZ mov     eax, [rsp+2E8h+var_12C] 
             407180      7 PTRIMMEDESP STACK 444 displ mov     eax, [rsp+2E8h+var_12C]
-            407187     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407187     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407187      5 INSTR BELONGTO 4067a0 
             407187      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI XMM0 ZZ mov     edx, 5          ; category 
             40718c     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_40CDD8[rax*8]; switch jump 
@@ -7111,21 +7111,21 @@
             407193      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM0 ZZ mov     esi, offset aNickelCadmium; jumptable 000000000040718C case 5 
             407198      2 INSTR BELONGTO 4067a0 
             407198      2 INSTR DEADREGS  EFLAGS RBX RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            407198     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407198     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40719a     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40719a      5 INSTR BELONGTO 4067a0 
             40719a      5 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ call    _dcgettext 
             40719f      3 INSTR BELONGTO 4067a0 
             40719f      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI XMM0 ZZ mov     rbx, rax 
             4071a2      6 INSTR BELONGTO 4067a0 
-            4071a8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4071a8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4071a8      5 INSTR BELONGTO 4067a0 
             4071a8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 ZZ mov     edx, 5          ; category 
             4071ad      5 INSTR BELONGTO 4067a0 
             4071ad      5 INSTR DEADREGS  EFLAGS RSI RDI XMM0 ZZ mov     esi, offset aTechnology_0; "Technology" 
             4071b2      2 INSTR BELONGTO 4067a0 
             4071b2      2 INSTR DEADREGS  EFLAGS RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            4071b2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4071b2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4071b4     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4071b4      5 INSTR BELONGTO 4067a0 
             4071b4      5 INSTR DEADREGS  EFLAGS XMM0 ZZ call    _dcgettext 
@@ -7145,7 +7145,7 @@
             4071d0      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM0 ZZ mov     esi, offset aLeadAcid; jumptable 000000000040718C case 4 
             4071d5      2 INSTR BELONGTO 4067a0 
             4071d5      2 INSTR DEADREGS  EFLAGS RBX RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            4071d5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4071d5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4071d7     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4071d7      5 INSTR BELONGTO 4067a0 
             4071d7      5 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ call    _dcgettext 
@@ -7157,7 +7157,7 @@
             4071e1      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM0 ZZ mov     esi, offset aLithiumIronPho; jumptable 000000000040718C case 3 
             4071e6      2 INSTR BELONGTO 4067a0 
             4071e6      2 INSTR DEADREGS  EFLAGS RBX RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            4071e6     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4071e6     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4071e8     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4071e8      5 INSTR BELONGTO 4067a0 
             4071e8      5 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ call    _dcgettext 
@@ -7169,7 +7169,7 @@
             4071f2      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM0 ZZ mov     esi, offset aLithiumPolymer; jumptable 000000000040718C case 2 
             4071f7      2 INSTR BELONGTO 4067a0 
             4071f7      2 INSTR DEADREGS  EFLAGS RBX RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            4071f7     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4071f7     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4071f9     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4071f9      5 INSTR BELONGTO 4067a0 
             4071f9      5 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ call    _dcgettext 
@@ -7181,7 +7181,7 @@
             407203      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM0 ZZ mov     esi, offset aLithiumIon; jumptable 000000000040718C case 1 
             407208      2 INSTR BELONGTO 4067a0 
             407208      2 INSTR DEADREGS  EFLAGS RBX RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            407208     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407208     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40720a     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40720a      5 INSTR BELONGTO 4067a0 
             40720a      5 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ call    _dcgettext 
@@ -7193,7 +7193,7 @@
             407214      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM0 ZZ mov     esi, offset aUnknown; jumptable 000000000040718C case 0 
             407219      2 INSTR BELONGTO 4067a0 
             407219      2 INSTR DEADREGS  EFLAGS RBX RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            407219     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407219     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40721b     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40721b      5 INSTR BELONGTO 4067a0 
             40721b      5 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ call    _dcgettext 
@@ -7205,7 +7205,7 @@
             407225      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM0 ZZ mov     esi, offset aNickelMetalHyd; jumptable 000000000040718C case 6 
             40722a      2 INSTR BELONGTO 4067a0 
             40722a      2 INSTR DEADREGS  EFLAGS RBX RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            40722a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40722a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40722c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40722c      5 INSTR BELONGTO 4067a0 
             40722c      5 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ call    _dcgettext 
@@ -7283,11 +7283,11 @@
             4072f9     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 2 
             4072f9      6 INSTR BELONGTO 407240 
             4072ff      5 INSTR BELONGTO 407240 
-            407304     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            407304     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             407304      5 INSTR BELONGTO 407240 
             407309      5 INSTR BELONGTO 407240 
             40730e      2 INSTR BELONGTO 407240 
-            40730e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40730e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407310     -2 INSTR LOCAL n R13 ZZ  NUMVia2ndSrcIMMEDNUM mov     r13d, 1 
             407310      6 INSTR BELONGTO 407240 
             407316      9 INSTR BELONGTO 407240 
@@ -7312,9 +7312,9 @@
             40735b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40735b      5 INSTR BELONGTO 407240 
             407360      2 INSTR BELONGTO 407240 
-            407360     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            407360     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             407362      2 INSTR BELONGTO 407240 
-            407362     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407362     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407364      3 INSTR BELONGTO 407240 
             407367      3 INSTR BELONGTO 407240 
             40736a      3 INSTR BELONGTO 407240 
@@ -7470,7 +7470,7 @@
             40753a     -1 INSTR LOCAL NoMetaUpdate jnz     loc_4078C0 
             40753a      6 INSTR BELONGTO 407240 
             407540      2 INSTR BELONGTO 407240 
-            407540     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM neg     eax 
+            407540     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM neg     eax 
             407542      9 INSTR BELONGTO 407240 
             407542      9 PTRIMMEDESP STACK 8 displ mov     [rsp+0C8h+var_C0], offset aStartX; "start-x"
             40754b      7 INSTR BELONGTO 407240 
@@ -7482,11 +7482,11 @@
             40755c      6 INSTR BELONGTO 407240 
             407562      7 INSTR BELONGTO 407240 
             407569      5 INSTR BELONGTO 407240 
-            40756e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            40756e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             40756e      5 INSTR BELONGTO 407240 
             407573      5 INSTR BELONGTO 407240 
             407578      2 INSTR BELONGTO 407240 
-            407578     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407578     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40757a     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             40757a      5 INSTR BELONGTO 407240 
             40757f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
@@ -7507,7 +7507,7 @@
             4075b3     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             4075b3      3 INSTR BELONGTO 407240 
             4075b6      3 INSTR BELONGTO 407240 
-            4075b9     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 96h 
+            4075b9     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 96h 
             4075b9      5 INSTR BELONGTO 407240 
             4075be      3 INSTR BELONGTO 407240 
             4075c1     -1 INSTR LOCAL NoMetaUpdate call    _up_device_get_history_sync 
@@ -7597,7 +7597,7 @@
             4076b3     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
             4076b3      6 INSTR BELONGTO 407240 
             4076b9      5 INSTR BELONGTO 407240 
-            4076be     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            4076be     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             4076be      5 INSTR BELONGTO 407240 
             4076c3      5 INSTR BELONGTO 407240 
             4076c8      9 INSTR BELONGTO 407240 
@@ -7605,7 +7605,7 @@
             4076d1      8 INSTR BELONGTO 407240 
             4076d1      8 PTRIMMEDESP STACK 80 displ mov     [rsp+0C8h+var_78], 64h
             4076d9      2 INSTR BELONGTO 407240 
-            4076d9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM neg     eax 
+            4076d9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM neg     eax 
             4076db      9 INSTR BELONGTO 407240 
             4076db      9 PTRIMMEDESP STACK 72 displ mov     [rsp+0C8h+var_80], offset aStopY; "stop-y"
             4076e4      8 INSTR BELONGTO 407240 
@@ -7613,7 +7613,7 @@
             4076ec      4 INSTR BELONGTO 407240 
             4076ec      4 PTRIMMEDESP STACK 16 displ mov     [rsp+0C8h+var_B8], eax
             4076f0      2 INSTR BELONGTO 407240 
-            4076f0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4076f0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4076f2      9 INSTR BELONGTO 407240 
             4076f2      9 PTRIMMEDESP STACK 56 displ mov     [rsp+0C8h+var_90], offset aStartY; "start-y"
             4076fb      8 INSTR BELONGTO 407240 
@@ -7719,11 +7719,11 @@
             40785b     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
             40785b      6 INSTR BELONGTO 407240 
             407861      5 INSTR BELONGTO 407240 
-            407866     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            407866     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             407866      5 INSTR BELONGTO 407240 
             40786b      5 INSTR BELONGTO 407240 
             407870      2 INSTR BELONGTO 407240 
-            407870     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407870     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407872      9 INSTR BELONGTO 407240 
             407872      9 PTRIMMEDESP STACK 24 displ mov     [rsp+0C8h+var_B0], 0
             40787b      8 INSTR BELONGTO 407240 
@@ -7750,7 +7750,7 @@
             4078b7     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40768A 
             4078b7      5 INSTR BELONGTO 407240 
             4078c0      2 INSTR BELONGTO 407240 
-            4078c0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM neg     eax 
+            4078c0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM neg     eax 
             4078c2      9 INSTR BELONGTO 407240 
             4078c2      9 PTRIMMEDESP STACK 8 displ mov     [rsp+0C8h+var_C0], offset aStartX; "start-x"
             4078cb      7 INSTR BELONGTO 407240 
@@ -7805,7 +7805,7 @@
             407972     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             407972      3 INSTR BELONGTO 407240 
             407975      5 INSTR BELONGTO 407240 
-            40797a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3ECh 
+            40797a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3ECh 
             40797a      5 INSTR BELONGTO 407240 
             40797f      5 INSTR BELONGTO 407240 
             407984      5 INSTR BELONGTO 407240 
@@ -7819,7 +7819,7 @@
             407994      5 INSTR BELONGTO 407240 
             407999      5 INSTR BELONGTO 407240 
             40799e      2 INSTR BELONGTO 407240 
-            40799e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40799e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4079a0      1 INSTR BELONGTO 407240 
             4079a1      3 INSTR BELONGTO 407240 
             4079a4      4 INSTR BELONGTO 407240 
@@ -7841,7 +7841,7 @@
             4079d6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4079d6      5 INSTR BELONGTO 407240 
             4079db      2 INSTR BELONGTO 407240 
-            4079db     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4079db     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4079dd      3 INSTR BELONGTO 407240 
             4079e0      3 INSTR BELONGTO 407240 
             4079e3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_notebook_get_nth_page 
@@ -7850,7 +7850,7 @@
             4079eb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             4079eb      5 INSTR BELONGTO 407240 
             4079f0      3 INSTR BELONGTO 407240 
-            4079f3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4079f3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4079f3      5 INSTR BELONGTO 407240 
             4079f8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_notebook_get_nth_page 
             4079f8      5 INSTR BELONGTO 407240 
@@ -7864,7 +7864,7 @@
             407a0a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             407a0a      5 INSTR BELONGTO 407240 
             407a0f      3 INSTR BELONGTO 407240 
-            407a12     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            407a12     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             407a12      5 INSTR BELONGTO 407240 
             407a17     -1 INSTR LOCAL NoMetaUpdate call    _gtk_notebook_get_nth_page 
             407a17      5 INSTR BELONGTO 407240 
@@ -7877,7 +7877,7 @@
             407a27      2 INSTR BELONGTO 407240 
             407a29     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_hide 
             407a29      5 INSTR BELONGTO 407240 
-            407a2e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            407a2e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             407a2e      5 INSTR BELONGTO 407240 
             407a33      3 INSTR BELONGTO 407240 
             407a36     -1 INSTR LOCAL NoMetaUpdate call    _gtk_notebook_get_nth_page 
@@ -7942,8 +7942,8 @@
             407aae      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edx, offset aChangedS; "changed:   %s" 
             407ab3      2 INSTR BELONGTO 407a80 
             407ab3      2 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ xor     eax, eax 
-            407ab3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            407ab5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            407ab3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            407ab5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             407ab5      5 INSTR BELONGTO 407a80 
             407ab5      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 80h 
             407aba      5 INSTR BELONGTO 407a80 
@@ -8000,10 +8000,10 @@
             407b1d      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI ZZ mov     rbx, rax 
             407b20      2 INSTR BELONGTO 407b10 
             407b20      2 INSTR DEADREGS  EFLAGS RCX RDX RDI ZZ xor     ecx, ecx 
-            407b20     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            407b20     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             407b22      2 INSTR BELONGTO 407b10 
             407b22      2 INSTR DEADREGS  EFLAGS RDX RDI ZZ xor     edx, edx 
-            407b22     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407b22     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407b24      3 INSTR BELONGTO 407b10 
             407b24      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             407b27     -1 INSTR LOCAL NoMetaUpdate call    _up_device_set_object_path_sync 
@@ -8047,10 +8047,10 @@
             407b57      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _gtk_combo_box_text_get_active_text 
             407b5c      2 INSTR BELONGTO 407b40 
             407b5c      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edi, edi        ; domainname 
-            407b5c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407b5c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407b5e      3 INSTR BELONGTO 407b40 
             407b5e      3 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     rbx, rax 
-            407b61     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407b61     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407b61      5 INSTR BELONGTO 407b40 
             407b61      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             407b66      5 INSTR BELONGTO 407b40 
@@ -8071,7 +8071,7 @@
             407b7d      2 INSTR BELONGTO 407b40 
             407b7f     10 INSTR BELONGTO 407b40 
             407b7f     10 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     cs:dword_60F700, 258h 
-            407b89     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 258h 
+            407b89     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 258h 
             407b89      5 INSTR BELONGTO 407b40 
             407b89      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 258h 
             407b8e      7 INSTR BELONGTO 407b40 
@@ -8093,8 +8093,8 @@
             407ba8      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_free 
             407bb0      2 INSTR BELONGTO 407b40 
             407bb0      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edi, edi        ; domainname 
-            407bb0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            407bb2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407bb0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407bb2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407bb2      5 INSTR BELONGTO 407b40 
             407bb2      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             407bb7      5 INSTR BELONGTO 407b40 
@@ -8115,15 +8115,15 @@
             407bce      2 INSTR BELONGTO 407b40 
             407bd0     10 INSTR BELONGTO 407b40 
             407bd0     10 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     cs:dword_60F700, 1C20h 
-            407bda     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1C20h 
+            407bda     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1C20h 
             407bda      5 INSTR BELONGTO 407b40 
             407bda      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 1C20h 
             407bdf     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_407B8E 
             407bdf      2 INSTR BELONGTO 407b40 
             407be8      2 INSTR BELONGTO 407b40 
             407be8      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edi, edi        ; domainname 
-            407be8     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            407bea     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407be8     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407bea     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407bea      5 INSTR BELONGTO 407b40 
             407bea      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             407bef      5 INSTR BELONGTO 407b40 
@@ -8144,15 +8144,15 @@
             407c06      2 INSTR BELONGTO 407b40 
             407c08     10 INSTR BELONGTO 407b40 
             407c08     10 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     cs:dword_60F700, 5460h 
-            407c12     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5460h 
+            407c12     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5460h 
             407c12      5 INSTR BELONGTO 407b40 
             407c12      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5460h 
             407c17     -1 INSTR LOCAL NoMetaUpdate jmp     loc_407B8E 
             407c17      5 INSTR BELONGTO 407b40 
             407c20      2 INSTR BELONGTO 407b40 
             407c20      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edi, edi        ; domainname 
-            407c20     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            407c22     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407c20     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407c22     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407c22      5 INSTR BELONGTO 407b40 
             407c22      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             407c27      5 INSTR BELONGTO 407b40 
@@ -8173,15 +8173,15 @@
             407c3e      2 INSTR BELONGTO 407b40 
             407c40     10 INSTR BELONGTO 407b40 
             407c40     10 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     cs:dword_60F700, 15180h 
-            407c4a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 15180h 
+            407c4a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 15180h 
             407c4a      5 INSTR BELONGTO 407b40 
             407c4a      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 15180h 
             407c4f     -1 INSTR LOCAL NoMetaUpdate jmp     loc_407B8E 
             407c4f      5 INSTR BELONGTO 407b40 
             407c58      2 INSTR BELONGTO 407b40 
             407c58      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edi, edi        ; domainname 
-            407c58     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            407c5a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407c58     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407c5a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407c5a      5 INSTR BELONGTO 407b40 
             407c5a      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             407c5f      5 INSTR BELONGTO 407b40 
@@ -8202,7 +8202,7 @@
             407c76      2 INSTR BELONGTO 407b40 
             407c78     10 INSTR BELONGTO 407b40 
             407c78     10 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     cs:dword_60F700, 93A80h 
-            407c82     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 93A80h 
+            407c82     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 93A80h 
             407c82      5 INSTR BELONGTO 407b40 
             407c82      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 93A80h 
             407c87     -1 INSTR LOCAL NoMetaUpdate jmp     loc_407B8E 
@@ -8211,7 +8211,7 @@
             407c8c      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 ZZ mov     r8d, offset aFalse; "FALSE" 
             407c92      5 INSTR BELONGTO 407b40 
             407c92      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     ecx, offset aGpm_stats_rang; "gpm_stats_range_combo_changed" 
-            407c97     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6AAh 
+            407c97     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6AAh 
             407c97      5 INSTR BELONGTO 407b40 
             407c97      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 6AAh 
             407c9c      5 INSTR BELONGTO 407b40 
@@ -8260,10 +8260,10 @@
             407ce8      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _gtk_combo_box_text_get_active_text 
             407ced      2 INSTR BELONGTO 407cb0 
             407ced      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            407ced     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407ced     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407cef      3 INSTR BELONGTO 407cb0 
             407cef      3 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R14 R15 ZZ mov     rbx, rax 
-            407cf2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407cf2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407cf2      5 INSTR BELONGTO 407cb0 
             407cf2      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             407cf7      5 INSTR BELONGTO 407cb0 
@@ -8284,8 +8284,8 @@
             407d0e      6 INSTR BELONGTO 407cb0 
             407d14      2 INSTR BELONGTO 407cb0 
             407d14      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            407d14     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            407d16     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407d14     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407d16     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407d16      5 INSTR BELONGTO 407cb0 
             407d16      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             407d1b      5 INSTR BELONGTO 407cb0 
@@ -8306,8 +8306,8 @@
             407d32      6 INSTR BELONGTO 407cb0 
             407d38      2 INSTR BELONGTO 407cb0 
             407d38      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            407d38     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            407d3a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407d38     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407d3a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407d3a      5 INSTR BELONGTO 407cb0 
             407d3a      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             407d3f      5 INSTR BELONGTO 407cb0 
@@ -8328,8 +8328,8 @@
             407d56      6 INSTR BELONGTO 407cb0 
             407d5c      2 INSTR BELONGTO 407cb0 
             407d5c      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            407d5c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            407d5e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407d5c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407d5e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407d5e      5 INSTR BELONGTO 407cb0 
             407d5e      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             407d63      5 INSTR BELONGTO 407cb0 
@@ -8350,18 +8350,18 @@
             407d7a      6 INSTR BELONGTO 407cb0 
             407d80     11 INSTR BELONGTO 407cb0 
             407d80     11 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     cs:qword_60F708, offset byte_40C6A9 
-            407d8b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407d8b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407d8b      5 INSTR BELONGTO 407cb0 
             407d8b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             407d90      5 INSTR BELONGTO 407cb0 
             407d90      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aCell; "Cell " 
             407d95      2 INSTR BELONGTO 407cb0 
             407d95      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            407d95     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407d95     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407d97     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             407d97      5 INSTR BELONGTO 407cb0 
             407d97      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _dcgettext 
-            407d9c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407d9c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407d9c      5 INSTR BELONGTO 407cb0 
             407d9c      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             407da1      5 INSTR BELONGTO 407cb0 
@@ -8481,18 +8481,18 @@
             407e83      5 INSTR BELONGTO 407cb0 
             407e90     11 INSTR BELONGTO 407cb0 
             407e90     11 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     cs:qword_60F708, offset aChargeData; "charge-data" 
-            407e9b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407e9b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407e9b      5 INSTR BELONGTO 407cb0 
             407e9b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             407ea0      5 INSTR BELONGTO 407cb0 
             407ea0      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aCell; "Cell " 
             407ea5      2 INSTR BELONGTO 407cb0 
             407ea5      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            407ea5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407ea5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407ea7     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             407ea7      5 INSTR BELONGTO 407cb0 
             407ea7      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _dcgettext 
-            407eac     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407eac     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407eac      5 INSTR BELONGTO 407cb0 
             407eac      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             407eb1      5 INSTR BELONGTO 407cb0 
@@ -8516,7 +8516,7 @@
             407edd      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 R13 R14 R15 ZZ mov     r8d, offset aFalse; "FALSE" 
             407ee3      5 INSTR BELONGTO 407cb0 
             407ee3      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     ecx, offset aGpm_stats_type; "gpm_stats_type_combo_changed_cb" 
-            407ee8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 687h 
+            407ee8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 687h 
             407ee8      5 INSTR BELONGTO 407cb0 
             407ee8      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 687h 
             407eed      5 INSTR BELONGTO 407cb0 
@@ -8565,10 +8565,10 @@
             407f38      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _gtk_combo_box_text_get_active_text 
             407f3d      2 INSTR BELONGTO 407f00 
             407f3d      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            407f3d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407f3d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407f3f      3 INSTR BELONGTO 407f00 
             407f3f      3 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R14 R15 ZZ mov     rbx, rax 
-            407f42     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407f42     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407f42      5 INSTR BELONGTO 407f00 
             407f42      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             407f47      5 INSTR BELONGTO 407f00 
@@ -8589,8 +8589,8 @@
             407f5e      6 INSTR BELONGTO 407f00 
             407f64      2 INSTR BELONGTO 407f00 
             407f64      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            407f64     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            407f66     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407f64     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407f66     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407f66      5 INSTR BELONGTO 407f00 
             407f66      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             407f6b      5 INSTR BELONGTO 407f00 
@@ -8611,8 +8611,8 @@
             407f82      6 INSTR BELONGTO 407f00 
             407f88      2 INSTR BELONGTO 407f00 
             407f88      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            407f88     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            407f8a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407f88     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407f8a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407f8a      5 INSTR BELONGTO 407f00 
             407f8a      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             407f8f      5 INSTR BELONGTO 407f00 
@@ -8633,8 +8633,8 @@
             407fa6      6 INSTR BELONGTO 407f00 
             407fac      2 INSTR BELONGTO 407f00 
             407fac      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            407fac     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            407fae     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407fac     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407fae     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407fae      5 INSTR BELONGTO 407f00 
             407fae      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             407fb3      5 INSTR BELONGTO 407f00 
@@ -8655,18 +8655,18 @@
             407fca      6 INSTR BELONGTO 407f00 
             407fd0     11 INSTR BELONGTO 407f00 
             407fd0     11 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     cs:qword_60F6F8, offset aTimeEmpty; "time-empty" 
-            407fdb     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407fdb     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407fdb      5 INSTR BELONGTO 407f00 
             407fdb      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             407fe0      5 INSTR BELONGTO 407f00 
             407fe0      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aTimeElapsed; "Time elapsed" 
             407fe5      2 INSTR BELONGTO 407f00 
             407fe5      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            407fe5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407fe5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407fe7     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             407fe7      5 INSTR BELONGTO 407f00 
             407fe7      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _dcgettext 
-            407fec     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407fec     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407fec      5 INSTR BELONGTO 407f00 
             407fec      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             407ff1      5 INSTR BELONGTO 407f00 
@@ -8780,20 +8780,20 @@
             4080bc     56 DEALLOC STACK esp - 56 jmp     _g_settings_set_string
             4080bc      5 INSTR BELONGTO 407f00 
             4080bc      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ jmp     _g_settings_set_string 
-            4080c8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4080c8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4080c8      5 INSTR BELONGTO 407f00 
             4080c8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             4080cd      5 INSTR BELONGTO 407f00 
             4080cd      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aTimeElapsed; "Time elapsed" 
             4080d2      2 INSTR BELONGTO 407f00 
             4080d2      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            4080d2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4080d2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4080d4     11 INSTR BELONGTO 407f00 
             4080d4     11 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ mov     cs:qword_60F6F8, offset aCharge; "charge" 
             4080df     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4080df      5 INSTR BELONGTO 407f00 
             4080df      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _dcgettext 
-            4080e4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4080e4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4080e4      5 INSTR BELONGTO 407f00 
             4080e4      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             4080e9      5 INSTR BELONGTO 407f00 
@@ -8809,20 +8809,20 @@
             4080f8      3 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ mov     r14, rax 
             4080fb     -1 INSTR LOCAL NoMetaUpdate jmp     loc_408003 
             4080fb      5 INSTR BELONGTO 407f00 
-            408100     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            408100     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             408100      5 INSTR BELONGTO 407f00 
             408100      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             408105      5 INSTR BELONGTO 407f00 
             408105      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aTimeElapsed; "Time elapsed" 
             40810a      2 INSTR BELONGTO 407f00 
             40810a      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            40810a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40810a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40810c     11 INSTR BELONGTO 407f00 
             40810c     11 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ mov     cs:qword_60F6F8, 40C389h 
             408117     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408117      5 INSTR BELONGTO 407f00 
             408117      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _dcgettext 
-            40811c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40811c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40811c      5 INSTR BELONGTO 407f00 
             40811c      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             408121      5 INSTR BELONGTO 407f00 
@@ -8846,7 +8846,7 @@
             408150      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 R14 R15 ZZ mov     r8d, offset aFalse; "FALSE" 
             408156      5 INSTR BELONGTO 407f00 
             408156      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 R15 ZZ mov     ecx, offset aGpm_stats_hist; "gpm_stats_history_type_combo_changed_cb" 
-            40815b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 654h 
+            40815b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 654h 
             40815b      5 INSTR BELONGTO 407f00 
             40815b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 654h 
             408160      5 INSTR BELONGTO 407f00 
@@ -9042,8 +9042,8 @@
             4082a1      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI ZZ mov     ecx, offset qword_60F6B8 
             4082a6      2 INSTR BELONGTO 408270 
             4082a6      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ xor     eax, eax 
-            4082a6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            4082a8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            4082a6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            4082a8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             4082a8      5 INSTR BELONGTO 408270 
             4082a8      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, 2 
             4082ad      3 INSTR BELONGTO 408270 
@@ -9065,10 +9065,10 @@
             4082cd      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI ZZ mov     rcx, cs:qword_60F6B8 
             4082d4      2 INSTR BELONGTO 408270 
             4082d4      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ xor     eax, eax 
-            4082d4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4082d4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4082d6      5 INSTR BELONGTO 408270 
             4082d6      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, offset aSelectedRowIsS; "selected row is: %s" 
-            4082db     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            4082db     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             4082db      5 INSTR BELONGTO 408270 
             4082db      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 80h 
             4082e0      5 INSTR BELONGTO 408270 
@@ -9098,14 +9098,14 @@
             408309      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             408310      5 INSTR BELONGTO 408270 
             408310      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     edx, offset aNoRowSelected; "no row selected" 
-            408315     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            408315     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             408315      5 INSTR BELONGTO 408270 
             408315      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     esi, 80h 
             40831a      5 INSTR BELONGTO 408270 
             40831a      5 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     edi, offset aPowermanager; "PowerManager" 
             40831f      2 INSTR BELONGTO 408270 
             40831f      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40831f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40831f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408321     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             408321      5 INSTR BELONGTO 408270 
             408321      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -9124,10 +9124,10 @@
             40833c      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI ZZ mov     rbx, rax 
             40833f      2 INSTR BELONGTO 408270 
             40833f      2 INSTR DEADREGS  EFLAGS RCX RDX RDI ZZ xor     ecx, ecx 
-            40833f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40833f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408341      2 INSTR BELONGTO 408270 
             408341      2 INSTR DEADREGS  EFLAGS RDX RDI ZZ xor     edx, edx 
-            408341     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            408341     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408343      3 INSTR BELONGTO 408270 
             408343      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             408346     -1 INSTR LOCAL NoMetaUpdate call    _up_device_set_object_path_sync 
@@ -9164,15 +9164,15 @@
             4083b7      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], offset aDeviceInformat; "Device Information"
             4083bf      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], offset aDeviceHistory; "Device History"
             4083c8      9 PTRIMMEDESP STACK 16 displ mov     qword ptr [rsp+10h], offset aDeviceProfile; "Device Profile"
-            4083d1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4083d1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4083d3      9 PTRIMMEDESP STACK 24 displ mov     qword ptr [rsp+18h], offset aProcessorWakeu; "Processor Wakeups"
             4083dc      4 PTRIMMEDESP STACK 0 displ mov     rsi, [rsp+rax*8]
-            4083e0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4083e0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             4083e5     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            4083ea     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            4083ef     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4083ea     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            4083ef     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             4083f9     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            408409     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408409     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40840b     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             408410      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             408419     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_title 
@@ -9185,8 +9185,8 @@
             408451     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_408460 
             408453     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 20h 
             408460     -1 INSTR LOCAL NoMetaUpdate call    _up_device_new 
-            40846f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            408471     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40846f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            408471     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408476     -1 INSTR LOCAL NoMetaUpdate call    _up_device_set_object_path_sync 
             40847d      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             408480     -1 INSTR LOCAL NoMetaUpdate call    sub_407240 
@@ -9206,7 +9206,7 @@
             4084a5      5 PTRIMMEDESP STACK -40 displ mov     [rsp+var_28], rbp
             4084aa      2 INSTR BELONGTO 4084a0 
             4084aa      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI ZZ xor     ecx, ecx 
-            4084aa     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4084aa     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4084ac     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_20], r12 
             4084ac      5 INSTR BELONGTO 4084a0 
             4084b1     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_18], r13 
@@ -9229,7 +9229,7 @@
             4084cf      5 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 R14 R15 ZZ mov     esi, offset aKind; "kind" 
             4084d4      2 INSTR BELONGTO 4084a0 
             4084d4      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 ZZ xor     eax, eax 
-            4084d4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4084d4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4084d6     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             4084d6      5 INSTR BELONGTO 4084a0 
             4084d6      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_object_get 
@@ -9286,13 +9286,13 @@
             408539      4 PTRIMMEDESP STACK 0 displ mov     [rsp+98h+var_98], rax
             40853d      2 INSTR BELONGTO 4084a0 
             40853d      2 INSTR DEADREGS  EFLAGS RAX R13 R14 R15 ZZ xor     eax, eax 
-            40853d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40853d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40853f     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             40853f      5 INSTR BELONGTO 4084a0 
             40853f      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_object_get 
             408544      2 INSTR BELONGTO 4084a0 
             408544      2 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 ZZ xor     edi, edi 
-            408544     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408544     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408546     -1 INSTR LOCAL NoMetaUpdate call    _g_string_new 
             408546      5 INSTR BELONGTO 4084a0 
             408546      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_string_new 
@@ -9356,20 +9356,20 @@
             4085b8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R14 R15 ZZ mov     rcx, [r13+0] 
             4085bc      5 INSTR BELONGTO 4084a0 
             4085bc      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R14 R15 ZZ mov     edx, offset aGotFilenameS; "got filename: %s" 
-            4085c1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            4085c1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             4085c1      5 INSTR BELONGTO 4084a0 
             4085c1      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R14 R15 ZZ mov     esi, 80h 
             4085c6      5 INSTR BELONGTO 4084a0 
             4085c6      5 INSTR DEADREGS  EFLAGS RAX RBX RDI R14 R15 ZZ mov     edi, offset aPowermanager; "PowerManager" 
             4085cb      2 INSTR BELONGTO 4084a0 
             4085cb      2 INSTR DEADREGS  EFLAGS RAX RBX R14 R15 ZZ xor     eax, eax 
-            4085cb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4085cb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4085cd     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4085cd      5 INSTR BELONGTO 4084a0 
             4085cd      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ call    _g_log 
             4085d2      4 INSTR BELONGTO 4084a0 
             4085d2      4 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R14 R15 ZZ mov     rdi, [r13+0] 
-            4085d6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            4085d6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             4085d6      5 INSTR BELONGTO 4084a0 
             4085d6      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R14 R15 ZZ mov     edx, 0FFFFFFFFh 
             4085db      5 INSTR BELONGTO 4084a0 
@@ -9377,7 +9377,7 @@
             4085e0     -1 INSTR LOCAL NoMetaUpdate call    _g_strsplit 
             4085e0      5 INSTR BELONGTO 4084a0 
             4085e0      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ call    _g_strsplit 
-            4085e5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
+            4085e5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
             4085e5      5 INSTR BELONGTO 4084a0 
             4085e5      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R14 R15 ZZ mov     esi, 0FFFFFFFFh 
             4085ea      3 INSTR BELONGTO 4084a0 
@@ -9394,7 +9394,7 @@
             4085fb     -1 INSTR LOCAL NoMetaUpdate call    _g_strfreev 
             4085fb      5 INSTR BELONGTO 4084a0 
             4085fb      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _g_strfreev 
-            408600     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            408600     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             408600      5 INSTR BELONGTO 4084a0 
             408600      5 INSTR DEADREGS  EFLAGS RSI RDI R14 R15 ZZ mov     esi, 1 
             408605      3 INSTR BELONGTO 4084a0 
@@ -9422,12 +9422,12 @@
             408630     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
             408630      6 INSTR BELONGTO 4084a0 
             408630      6 INSTR DEADREGS  EFLAGS RAX RDX R8 R12 R13 R14 R15 ZZ mov     r8d, 1 
-            408636     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            408636     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             408636      5 INSTR BELONGTO 4084a0 
             408636      5 INSTR DEADREGS  EFLAGS RAX RDX R12 R13 R14 R15 ZZ mov     edx, 2 
             40863b      2 INSTR BELONGTO 4084a0 
             40863b      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 ZZ xor     eax, eax 
-            40863b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40863b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40863d      5 INSTR BELONGTO 4084a0 
             40863d      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ mov     [rsp+98h+var_90], rbx 
             40863d      5 PTRIMMEDESP STACK 8 displ mov     [rsp+98h+var_90], rbx
@@ -9466,14 +9466,14 @@
             40868c      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
             408690      5 INSTR BELONGTO 4084a0 
             408690      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R14 R15 ZZ mov     edx, offset aNothingMatched; "nothing matched, falling back to defaul"... 
-            408695     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            408695     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             408695      5 INSTR BELONGTO 4084a0 
             408695      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R14 R15 ZZ mov     esi, 10h 
             40869a      5 INSTR BELONGTO 4084a0 
             40869a      5 INSTR DEADREGS  EFLAGS RAX RBX RDI R14 R15 ZZ mov     edi, offset aPowermanager; "PowerManager" 
             40869f      2 INSTR BELONGTO 4084a0 
             40869f      2 INSTR DEADREGS  EFLAGS RAX RBX R14 R15 ZZ xor     eax, eax 
-            40869f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40869f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4086a1     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4086a1      5 INSTR BELONGTO 4084a0 
             4086a1      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ call    _g_log 
@@ -9501,7 +9501,7 @@
             4086db      3 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R15 ZZ mov     rdi, r13 
             4086de      2 INSTR BELONGTO 4084a0 
             4086de      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R15 ZZ xor     eax, eax 
-            4086de     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4086de     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4086e0      5 INSTR BELONGTO 4084a0 
             4086e0      5 INSTR DEADREGS  EFLAGS RBX RSI R15 ZZ mov     esi, offset aGpmSMissing; "gpm-%s-missing;" 
             4086e5     -1 INSTR LOCAL NoMetaUpdate call    _g_string_append_printf 
@@ -9515,7 +9515,7 @@
             4086f0      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R14 R15 ZZ mov     esi, offset aGpmS000; "gpm-%s-000;" 
             4086f5      2 INSTR BELONGTO 4084a0 
             4086f5      2 INSTR DEADREGS  EFLAGS RAX RBX R14 R15 ZZ xor     eax, eax 
-            4086f5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4086f5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4086f7     -1 INSTR LOCAL NoMetaUpdate call    _g_string_append_printf 
             4086f7      5 INSTR BELONGTO 4084a0 
             4086f7      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ call    _g_string_append_printf 
@@ -9539,7 +9539,7 @@
             40871f      5 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ call    _g_return_if_fail_warning 
             408724      2 INSTR BELONGTO 4084a0 
             408724      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 R14 R15 ZZ xor     ebx, ebx 
-            408724     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            408724     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             408726     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40860D 
             408726      5 INSTR BELONGTO 4084a0 
             408730      4 INSTR BELONGTO 4084a0 
@@ -9554,7 +9554,7 @@
             408743      3 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R15 ZZ mov     rdi, r13 
             408746      2 INSTR BELONGTO 4084a0 
             408746      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R15 ZZ xor     eax, eax 
-            408746     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408746     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408748      5 INSTR BELONGTO 4084a0 
             408748      5 INSTR DEADREGS  EFLAGS RBX RSI R15 ZZ mov     esi, offset aGpmSFull; "gpm-%s-full;" 
             40874d     -1 INSTR LOCAL NoMetaUpdate call    _g_string_append_printf 
@@ -9566,7 +9566,7 @@
             408755      3 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R14 R15 ZZ mov     rdi, r13 
             408758      2 INSTR BELONGTO 4084a0 
             408758      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R14 R15 ZZ xor     eax, eax 
-            408758     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408758     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40875a      5 INSTR BELONGTO 4084a0 
             40875a      5 INSTR DEADREGS  EFLAGS RBX RSI R14 R15 ZZ mov     esi, offset aGpmS100; "gpm-%s-100;" 
             40875f     -1 INSTR LOCAL NoMetaUpdate call    _g_string_append_printf 
@@ -9594,7 +9594,7 @@
             40878b      3 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R15 ZZ mov     rdi, r13 
             40878e      2 INSTR BELONGTO 4084a0 
             40878e      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R15 ZZ xor     eax, eax 
-            40878e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40878e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408790      5 INSTR BELONGTO 4084a0 
             408790      5 INSTR DEADREGS  EFLAGS RBX RSI R15 ZZ mov     esi, offset aGpmSEmpty; "gpm-%s-empty;" 
             408795     -1 INSTR LOCAL NoMetaUpdate call    _g_string_append_printf 
@@ -9608,7 +9608,7 @@
             4087a0      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R14 R15 ZZ mov     esi, offset aGpmS000; "gpm-%s-000;" 
             4087a5      2 INSTR BELONGTO 4084a0 
             4087a5      2 INSTR DEADREGS  EFLAGS RAX RBX R14 R15 ZZ xor     eax, eax 
-            4087a5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4087a5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4087a7     -1 INSTR LOCAL NoMetaUpdate call    _g_string_append_printf 
             4087a7      5 INSTR BELONGTO 4084a0 
             4087a7      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ call    _g_string_append_printf 
@@ -9641,7 +9641,7 @@
             4087d9      3 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R14 ZZ mov     rdi, r13 
             4087dc      2 INSTR BELONGTO 4084a0 
             4087dc      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R14 ZZ xor     eax, eax 
-            4087dc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4087dc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4087de      5 INSTR BELONGTO 4084a0 
             4087de      5 INSTR DEADREGS  EFLAGS RBX RSI R14 ZZ mov     esi, offset aGpmSS; "gpm-%s-%s;" 
             4087e3     -1 INSTR LOCAL NoMetaUpdate call    _g_string_append_printf 
@@ -9655,7 +9655,7 @@
             4087f0      3 INSTR DEADREGS  EFLAGS RAX RBX RDI R14 R15 ZZ mov     rdi, r13 
             4087f3      2 INSTR BELONGTO 4084a0 
             4087f3      2 INSTR DEADREGS  EFLAGS RAX RBX R14 R15 ZZ xor     eax, eax 
-            4087f3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4087f3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4087f5     -1 INSTR LOCAL NoMetaUpdate call    _g_string_append_printf 
             4087f5      5 INSTR BELONGTO 4084a0 
             4087f5      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ call    _g_string_append_printf 
@@ -9681,7 +9681,7 @@
             408819      3 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R14 ZZ mov     rdi, r13 
             40881c      2 INSTR BELONGTO 4084a0 
             40881c      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R14 ZZ xor     eax, eax 
-            40881c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40881c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40881e      5 INSTR BELONGTO 4084a0 
             40881e      5 INSTR DEADREGS  EFLAGS RBX RSI R14 ZZ mov     esi, offset aGpmSSCharging; "gpm-%s-%s-charging;" 
             408823     -1 INSTR LOCAL NoMetaUpdate call    _g_string_append_printf 
@@ -9695,7 +9695,7 @@
             408830      3 INSTR DEADREGS  EFLAGS RAX RBX RDI R14 R15 ZZ mov     rdi, r13 
             408833      2 INSTR BELONGTO 4084a0 
             408833      2 INSTR DEADREGS  EFLAGS RAX RBX R14 R15 ZZ xor     eax, eax 
-            408833     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408833     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408835     -1 INSTR LOCAL NoMetaUpdate call    _g_string_append_printf 
             408835      5 INSTR BELONGTO 4084a0 
             408835      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ call    _g_string_append_printf 
@@ -9721,12 +9721,12 @@
             408851      3 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ mov     rcx, rax 
             408854      5 INSTR BELONGTO 408840 
             408854      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aAddedS; "added:     %s" 
-            408859     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            408859     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             408859      5 INSTR BELONGTO 408840 
             408859      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 80h 
             40885e      2 INSTR BELONGTO 408840 
             40885e      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40885e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40885e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408860     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             408860      5 INSTR BELONGTO 408840 
             408860      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -9754,23 +9754,23 @@
             4088cf     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4088d7     -1 INSTR LOCAL NoMetaUpdate call    sub_40BBF0 
             4088dc     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4088df     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            4088df     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             4088e7      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-            4088ea     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4088ea     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4088f6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
-            408902     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FAh 
-            408907     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 190h 
+            408902     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FAh 
+            408907     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 190h 
             40890c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_size_request 
             408918     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             408929     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             408934     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40893c     -1 INSTR LOCAL NoMetaUpdate call    sub_40BBF0 
             408941     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            408944     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40894f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            408944     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40894f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40895b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
-            408967     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FAh 
-            40896c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 190h 
+            408967     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FAh 
+            40896c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 190h 
             408971     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_size_request 
             40897d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             408982     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
@@ -9779,8 +9779,8 @@
             4089a9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_application_get_type 
             4089b7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4089c2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_application 
-            4089c7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1F4h 
-            4089cf     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 320h 
+            4089c7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1F4h 
+            4089cf     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 320h 
             4089d4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_default_size 
             4089d9      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             4089df     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -9809,7 +9809,7 @@
             408ac3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_set_active 
             408ac8     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             408acb     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            408ace     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408ace     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408add     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             408aee     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             408af3      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
@@ -9819,7 +9819,7 @@
             408b26     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_set_active 
             408b2b     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             408b2e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            408b31     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408b31     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408b40     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             408b51     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             408b56      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
@@ -9829,7 +9829,7 @@
             408b89     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_set_active 
             408b8e     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             408b91     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            408b94     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408b94     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408ba3     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             408bb4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             408bb9      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
@@ -9839,7 +9839,7 @@
             408bec     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_set_active 
             408bf1     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             408bf4     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            408bf7     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408bf7     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408c06     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             408c17     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             408c1c      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
@@ -9850,26 +9850,26 @@
             408c54     -1 INSTR LOCAL NoMetaUpdate call    _gtk_notebook_set_current_page 
             408c59     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             408c5c     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            408c5f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408c5f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408c6e     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            408c73     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40h 
-            408c78     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
-            408c7d     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
-            408c82     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408c73     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40h 
+            408c78     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
+            408c7d     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            408c82     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408c84     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_new 
             408c90     -1 INSTR LOCAL NoMetaUpdate call    _g_icon_get_type 
-            408c95     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 40h 
-            408c9d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40h 
-            408ca2     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
-            408ca7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408c95     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 40h 
+            408c9d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40h 
+            408ca2     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
+            408ca7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408ca9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_new 
             408cae     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 40h 
             408cb4     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 40h 
-            408cba     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 40h 
-            408cbf     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40h 
-            408ccb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
-            408cd0     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 5 
-            408cd5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408cba     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 40h 
+            408cbf     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40h 
+            408ccb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
+            408cd0     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 5 
+            408cd5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408cd7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_new 
             408cef     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             408cf4      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
@@ -9881,23 +9881,23 @@
             408d35     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_set_model 
             408d40     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             408d48     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_text_new 
-            408d4d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            408d52     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            408d4d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            408d52     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             408d5c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408d61     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            408d64     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            408d71     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408d64     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            408d71     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408d73     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new_with_attributes 
-            408d78     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            408d78     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             408d80     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_set_sort_column_id 
             408d8b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
             408d90     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_text_new 
-            408d95     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            408d9a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            408d95     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            408d9a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             408da4     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408da9     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            408dac     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            408dbc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408dac     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            408dbc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408dbe     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new_with_attributes 
             408dc9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
             408dd4     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -9912,34 +9912,34 @@
             408e36     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_selection 
             408e3b     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             408e3e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            408e41     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408e41     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408e50     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             408e5b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             408e63     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_pixbuf_new 
-            408e68     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            408e70     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            408e75     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408e68     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            408e70     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            408e75     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408e7c     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
-            408e81     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            408e83     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            408e81     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            408e83     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             408e8d     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408e92     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            408e95     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            408ea2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408e95     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            408ea2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408ea4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new_with_attributes 
             408eaf     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
             408eb4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_text_new 
-            408eb9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            408ebe     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            408eb9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            408ebe     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             408ec8     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408ecd     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            408ed0     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            408ee0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408ed0     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            408ee0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408ee2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new_with_attributes 
-            408ee7     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            408ee7     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             408eef     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_set_sort_column_id 
             408efa     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
-            408f02     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            408f02     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             408f07     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_set_expand 
             408f12     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             408f1a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_columns_autosize 
@@ -9951,61 +9951,61 @@
             408f61     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_set_model 
             408f6c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             408f74     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_pixbuf_new 
-            408f79     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            408f81     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
-            408f86     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408f79     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            408f81     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
+            408f86     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408f8d     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
-            408f92     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            408f94     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            408f92     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            408f94     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             408f9e     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408fa3     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            408fab     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            408fb3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408fab     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            408fb3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408fb5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new_with_attributes 
             408fc0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
             408fc5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_text_new 
-            408fca     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            408fcf     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            408fca     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            408fcf     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             408fd9     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408fde     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            408fe1     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            408ff1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408fe1     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            408ff1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408ff3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new_with_attributes 
             409001     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
-            409009     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            409009     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40900e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_set_expand 
             409013     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_text_new 
-            409018     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40901d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            409018     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40901d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             409027     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40902c     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40902f     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
-            40903f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40902f     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            40903f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409041     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new_with_attributes 
             40904f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
-            409057     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            409057     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40905c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_set_expand 
             409061     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_text_new 
-            409066     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40906b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            409066     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40906b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             409075     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40907a     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40907d     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
-            40908d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40907d     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
+            40908d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40908f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new_with_attributes 
             40909d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
-            4090a5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4090a5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4090aa     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_set_expand 
             4090af     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_text_new 
-            4090b4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            4090b9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4090b4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            4090b9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             4090c3     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4090c8     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4090cb     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 4 
-            4090db     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4090cb     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 4 
+            4090db     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4090dd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new_with_attributes 
             4090eb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
-            4090f0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4090f0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4090f8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_set_expand 
             409103     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40910b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_columns_autosize 
@@ -10020,24 +10020,24 @@
             40918b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             409190      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             409196     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40919b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            4091a3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40919b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4091a3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4091aa     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4091b2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_get_type 
             4091c0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4091cb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_append_text 
-            4091d0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            4091d5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4091d0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4091d5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4091dc     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4091ea     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4091f5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_append_text 
-            4091fa     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            4091ff     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4091fa     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4091ff     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409206     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409214     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40921f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_append_text 
-            409224     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            409229     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409224     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            409229     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409230     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40923e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409249     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_append_text 
@@ -10046,34 +10046,34 @@
             409261     -1 INSTR LOCAL NoMetaUpdate jnz     loc_4095D0 
             409267     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_get_type 
             409272     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409277     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409277     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40927c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_set_active 
-            409284     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            409284     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             409289     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40928e     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             409291     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            409294     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            409294     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4092a3     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             4092b4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             4092b9      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             4092bf     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4092c4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            4092cc     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4092c4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4092cc     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4092d3     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4092e1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4092ec     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_append_text 
-            4092f1     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            4092f6     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4092f1     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4092f6     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4092fd     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40930b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409316     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_append_text 
-            40931b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            409320     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40931b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            409320     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409327     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409335     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409340     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_append_text 
-            409345     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40934a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409345     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40934a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409351     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40935f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40936a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_append_text 
@@ -10085,72 +10085,72 @@
             409397     -1 INSTR LOCAL NoMetaUpdate jnz     loc_4095F2 
             40939d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_get_type 
             4093a8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4093ad     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4093ad     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4093b5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_set_active 
             4093ba     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4093DA 
             4093c0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_get_type 
             4093cb     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4093d0     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4093d0     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4093d5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_set_active 
-            4093dd     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4093dd     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4093e2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4093e7     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             4093ea     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4093ed     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4093ed     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4093fc     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             40940d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             409412      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             409418     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40941d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            409425     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40941d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            409425     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40942c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40943a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409445     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_append_text 
-            40944a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40944f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40944a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40944f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409456     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409464     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40946f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_append_text 
-            409474     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            409479     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409474     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            409479     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409480     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40948e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409499     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_append_text 
-            40949e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            4094a3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40949e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4094a3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4094aa     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4094b8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4094c3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_append_text 
-            4094c8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            4094cd     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4094c8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4094cd     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4094d4     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4094e2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4094ed     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_append_text 
             4094f2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_get_type 
             409500     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409505     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            409505     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40950d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_set_active 
             40951e     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 258h 
             409523     -1 INSTR LOCAL NoMetaUpdate jz      loc_40981A 
             409529     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 1C20h 
             40952e     -1 INSTR LOCAL NoMetaUpdate jz      loc_4097D1 
             409534     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409539     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            409539     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             409541     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_set_active 
-            409546     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            409546     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40954e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409553     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             409556     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            409559     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            409559     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             409568     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             40956d     -1 INSTR LOCAL NoMetaUpdate call    _up_wakeups_new 
             409572     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             409575     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            409578     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            409578     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40958e     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             409593     -1 INSTR LOCAL NoMetaUpdate call    _up_client_new 
-            409598     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40959a     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409598     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40959a     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4095a2     -1 INSTR LOCAL NoMetaUpdate call    _up_client_enumerate_devices_sync 
             4095a7     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             4095a9     -1 INSTR LOCAL NoMetaUpdate jnz     loc_409646 
@@ -10158,7 +10158,7 @@
             4095b7     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 58h 
             4095d0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_get_type 
             4095db     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4095e0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4095e0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4095e8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_set_active 
             4095ed     -1 INSTR LOCAL NoMetaUpdate jmp     loc_409281 
             4095fe     -1 INSTR LOCAL NoMetaUpdate call    _g_strcmp0 
@@ -10169,22 +10169,22 @@
             40961e     -1 INSTR LOCAL NoMetaUpdate jz      loc_4093C0 
             409624     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_get_type 
             40962f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409634     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            409634     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             40963c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_set_active 
             409641     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4093DA 
             409649     -2 INSTR LOCAL n R14 ZZ  AlwaysNUM xor     r14d, r14d 
             40964c     -1 INSTR LOCAL NoMetaUpdate call    _up_client_get_devices 
             409651     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             409654     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            409657     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            409657     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             409669     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             40966e     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             409671     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            409674     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            409674     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             409683     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             409688     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40968b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40968e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40968e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40969d     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             4096a8     -2 INSTR LOCAL n R12 ZZ  AlwaysNUM xor     r12d, r12d 
             4096ab     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
@@ -10193,9 +10193,9 @@
             4096bb     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     r12d, 1 
             4096bf     -1 INSTR LOCAL NoMetaUpdate cmp     eax, r12d 
             4096c2     -1 INSTR LOCAL NoMetaUpdate jbe     short loc_409700 
-            4096ca     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4096ca     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4096d5      5 PTRIMMEDESP STACK 76 displ lea     rdx, [rsp+4Ch]
-            4096da     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4096da     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4096df     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             4096e4     -1 INSTR LOCAL NoMetaUpdate cmp     [rsp+4Ch], r14d 
             4096e4      5 PTRIMMEDESP STACK 76 displ cmp     [rsp+4Ch], r14d
@@ -10216,12 +10216,12 @@
             40973a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             40973f      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             409745     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40974a     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40974a     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40974f     -1 INSTR LOCAL NoMetaUpdate call    sub_407F00 
             409760     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             409765      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40976b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409770     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409770     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409775     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
             409786     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             40978b      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
@@ -10229,36 +10229,36 @@
             409799     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40979e     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4095AF 
             4097a3      5 PTRIMMEDESP STACK 64 displ mov     rax, [rsp+40h]
-            4097ad     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            4097bb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4097ad     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4097bb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4097bd     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4097c2      5 PTRIMMEDESP STACK 64 displ mov     rdi, [rsp+40h]
             4097c7     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
             4097cc     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4088B0 
             4097d1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4097d6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4097d6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4097de     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_set_active 
             4097e3     -1 INSTR LOCAL NoMetaUpdate jmp     loc_409546 
             4097e8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_get_type 
             4097f3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4097f8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            4097f8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             409800     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_set_active 
             409805     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4093DA 
             409815     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40914D 
             40981a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40981f     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40981f     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409824     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_set_active 
             409829     -1 INSTR LOCAL NoMetaUpdate jmp     loc_409546 
             409833     -1 INSTR LOCAL NoMetaUpdate call    _g_themed_icon_new 
             40983f      5 PTRIMMEDESP STACK 32 displ lea     rsi, [rsp+20h]
             409847     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_append 
-            40984c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40984e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40984c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40984e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             409858     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409864      5 PTRIMMEDESP STACK 32 displ lea     rsi, [rsp+20h]
             40986c     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-            409877     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
-            40987c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409877     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40987c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40987e      8 PTRIMMEDESP STACK 16 displ mov     dword ptr [rsp+10h], 0FFFFFFFFh
             409886      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], r12
             40988b      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [rsp], 0
@@ -10279,7 +10279,7 @@
             4098e0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4098e1     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
             4098e1      3 INSTR BELONGTO 4098e0 
-            4098e4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ch 
+            4098e4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ch 
             4098e4      5 INSTR BELONGTO 4098e0 
             4098e4      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 0Ch 
             4098e9     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc0 
@@ -10308,7 +10308,7 @@
             409900      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 8 
             409900      8 DATAREF STACK 707 esp + 0 PARENT LocalFrame LOCALFRAME
             409900      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            409904     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ch 
+            409904     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ch 
             409904      5 INSTR BELONGTO 409900 
             409904      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 0Ch 
             409909     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc0 
@@ -10316,7 +10316,7 @@
             409909      5 INSTR DEADREGS  EFLAGS ZZ call    _g_malloc0 
             40990e      2 INSTR BELONGTO 409900 
             40990e      2 INSTR DEADREGS  EFLAGS RDX R8 R9 R10 R11 ZZ xor     edx, edx 
-            40990e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40990e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409910      7 INSTR BELONGTO 409900 
             409910      7 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ mov     dword ptr [rax+8], 0 
             409917      2 INSTR BELONGTO 409900 
@@ -10339,93 +10339,93 @@
             40996c      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             409972     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             409977      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-            40997d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40997d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             409982     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             409993      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-            4099ae     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 70h 
+            4099ae     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 70h 
             4099b6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_add_private 
-            4099bb     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4099bb     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4099bd     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 3 
-            4099c3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            4099c5     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4099c3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            4099c5     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4099cc     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_boolean 
-            4099d7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4099d7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4099dc     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
             4099e1     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 3 
-            4099e7     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            4099ec     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            4099ee     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4099e7     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            4099ec     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            4099ee     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4099f5     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_boolean 
-            409a00     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            409a00     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             409a05     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
-            409a0a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            409a0a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             409a0c     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 3 
             409a12     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 6 
-            409a18     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            409a1a     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409a18     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            409a1a     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409a21      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [rsp], 3
             409a28     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_uint 
-            409a33     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            409a33     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             409a38     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
             409a3d     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 1 
-            409a43     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            409a43     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             409a45     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 6 
-            409a4b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            409a4d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409a4b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            409a4d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409a54      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [rsp], 3
             409a5b     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_uint 
-            409a66     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            409a66     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             409a6b     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
             409a70     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 3 
-            409a76     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            409a7b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            409a7d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409a76     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            409a7b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            409a7d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409a84     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_boolean 
-            409a8f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+            409a8f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
             409a94     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
             409a99     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 3 
-            409a9f     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            409aa4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            409aa6     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409a9f     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            409aa4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            409aa6     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409aad     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_boolean 
-            409ab8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            409ab8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             409abd     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
             409ac2     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             409ac5     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 7FFFFFFFh 
-            409acb     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 80000000h 
-            409ad0     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            409ad2     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409acb     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 80000000h 
+            409ad0     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            409ad2     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409ad9      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [rsp], 3
             409ae0     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_int 
-            409aeb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
+            409aeb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
             409af0     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
             409af5     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             409af8     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 7FFFFFFFh 
-            409afe     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 80000000h 
-            409b03     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            409b05     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409afe     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 80000000h 
+            409b03     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            409b05     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409b0c      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [rsp], 3
             409b13     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_int 
-            409b1e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            409b1e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             409b23     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
             409b28     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 3Ch 
             409b2e     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 7FFFFFFFh 
-            409b34     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 80000000h 
-            409b39     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            409b3b     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409b34     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 80000000h 
+            409b39     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            409b3b     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409b42      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [rsp], 3
             409b49     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_int 
-            409b54     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 9 
+            409b54     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 9 
             409b59     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
-            409b5e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            409b60     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409b5e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            409b60     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409b67     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 64h 
             409b6d     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 7FFFFFFFh 
-            409b73     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 80000000h 
+            409b73     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 80000000h 
             409b78      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [rsp], 3
             409b7f     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_int 
             409b84     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
-            409b92     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
+            409b92     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
             409b97     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_class_install_property 
             409ba0      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 1 3 -16 0 4 0 0 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             409ba0      0 FUNC MMSAFENESS SAFE
@@ -10451,7 +10451,7 @@
             409bae      6 INSTR BELONGTO 409ba0 
             409bb4     -1 INSTR LOCAL NoMetaUpdate cmp     edi, 4 
             409bb4      3 INSTR BELONGTO 409ba0 
-            409bb7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            409bb7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             409bb7      5 INSTR BELONGTO 409ba0 
             409bb7      5 INSTR DEADREGS  RDX RBX RSI ZZ mov     edx, 5 
             409bbc      5 INSTR BELONGTO 409ba0 
@@ -10474,7 +10474,7 @@
             409be2      4 INSTR BELONGTO 409ba0 
             409be6      2 INSTR BELONGTO 409ba0 
             409be6      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 XMM0 ZZ xor     eax, eax 
-            409be6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409be6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409be8      1 INSTR BELONGTO 409ba0 
             409be8      1 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 XMM0 ZZ pop     rbx 
             409be9      1 INSTR BELONGTO 409ba0 
@@ -10484,15 +10484,15 @@
             409bea      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 XMM0 ZZ jmp     _g_strdup_printf 
             409bf0     -1 INSTR LOCAL AlwaysNUM cvttss2si edi, xmm0 
             409bf0      4 INSTR BELONGTO 409ba0 
-            409bf4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 88888889h 
+            409bf4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 88888889h 
             409bf4      5 INSTR BELONGTO 409ba0 
             409bf4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI XMM0 ZZ mov     esi, 88888889h 
-            409bf9     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 2AAAAAABh 
+            409bf9     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 2AAAAAABh 
             409bf9      5 INSTR BELONGTO 409ba0 
             409bf9      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX XMM0 ZZ mov     ebx, 2AAAAAABh 
             409bfe      2 INSTR BELONGTO 409ba0 
             409bfe      2 INSTR DEADREGS  EFLAGS RAX RCX RDX XMM0 ZZ mov     eax, edi 
-            409bfe     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edi 
+            409bfe     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edi 
             409c00     -1 INSTR LOCAL MetadataRedundant sar     eax, 1Fh 
             409c00      3 INSTR BELONGTO 409ba0 
             409c03     -1 INSTR LOCAL MetadataRedundant xor     edi, eax 
@@ -10503,12 +10503,12 @@
             409c07      2 INSTR BELONGTO 409ba0 
             409c09      2 INSTR BELONGTO 409ba0 
             409c09      2 INSTR DEADREGS  EFLAGS RCX RDX XMM0 ZZ imul    esi 
-            409c09     -2 INSTR LOCAL n EAX EDX ZZ  AlwaysNUM imul    esi 
+            409c09     -2 INSTR LOCAL n RAX RDX ZZ  AlwaysNUM imul    esi 
             409c0b     -1 INSTR LOCAL MetadataRedundant mov     eax, edi 
             409c0b      2 INSTR BELONGTO 409ba0 
             409c0d     -1 INSTR LOCAL MetadataRedundant sar     eax, 1Fh 
             409c0d      3 INSTR BELONGTO 409ba0 
-            409c10     -2 INSTR LOCAL n ECX ZZ  NumericDEFs lea     ecx, [rdx+rdi] 
+            409c10     -2 INSTR LOCAL n RCX ZZ  NumericDEFs lea     ecx, [rdx+rdi] 
             409c10      3 INSTR BELONGTO 409ba0 
             409c10      3 INSTR DEADREGS  EFLAGS RCX XMM0 ZZ lea     ecx, [rdx+rdi] 
             409c13     -1 INSTR LOCAL MetadataRedundant sar     ecx, 5 
@@ -10533,7 +10533,7 @@
             409c29      2 INSTR BELONGTO 409ba0 
             409c2b      2 INSTR BELONGTO 409ba0 
             409c2b      2 INSTR DEADREGS  EFLAGS RDX XMM0 ZZ mov     ebp, esi 
-            409c2b     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, esi 
+            409c2b     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     ebp, esi 
             409c2d     -1 INSTR LOCAL MetadataRedundant imul    ebx 
             409c2d      2 INSTR BELONGTO 409ba0 
             409c2f     -1 INSTR LOCAL MetadataRedundant mov     eax, esi 
@@ -10558,7 +10558,7 @@
             409c45      6 INSTR BELONGTO 409ba0 
             409c4b     -1 INSTR LOCAL NoMetaUpdate test    ebp, ebp 
             409c4b      2 INSTR BELONGTO 409ba0 
-            409c4d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409c4d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409c4d      5 INSTR BELONGTO 409ba0 
             409c4d      5 INSTR DEADREGS  RDX RSI RDI XMM0 ZZ mov     edx, 5          ; category 
             409c52     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409CB0 
@@ -10567,13 +10567,13 @@
             409c54      5 INSTR DEADREGS  EFLAGS RSI RDI XMM0 ZZ mov     esi, offset aId02ih; "%id%02ih" 
             409c59      2 INSTR BELONGTO 409ba0 
             409c59      2 INSTR DEADREGS  EFLAGS RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            409c59     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409c59     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409c5b     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409c5b      5 INSTR BELONGTO 409ba0 
             409c5b      5 INSTR DEADREGS  EFLAGS XMM0 ZZ call    _dcgettext 
             409c60      2 INSTR BELONGTO 409ba0 
             409c60      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R9 R10 R11 XMM0 ZZ mov     edx, ebp 
-            409c60     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, ebp 
+            409c60     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, ebp 
             409c62     -1 INSTR LOCAL MetadataUnused mov     esi, ebx 
             409c62      2 INSTR BELONGTO 409ba0 
             409c64     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
@@ -10582,7 +10582,7 @@
             409c68      3 INSTR BELONGTO 409ba0 
             409c6b      2 INSTR BELONGTO 409ba0 
             409c6b      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 XMM0 ZZ xor     eax, eax 
-            409c6b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409c6b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409c6d      1 INSTR BELONGTO 409ba0 
             409c6d      1 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 XMM0 ZZ pop     rbx 
             409c6e      1 INSTR BELONGTO 409ba0 
@@ -10590,14 +10590,14 @@
             409c6f     -1 INSTR LOCAL NoMetaUpdate jmp     _g_strdup_printf 
             409c6f      5 INSTR BELONGTO 409ba0 
             409c6f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 XMM0 ZZ jmp     _g_strdup_printf 
-            409c78     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409c78     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409c78      5 INSTR BELONGTO 409ba0 
             409c78      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             409c7d      5 INSTR BELONGTO 409ba0 
             409c7d      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset a_1fv; "%.1fV" 
             409c82      2 INSTR BELONGTO 409ba0 
             409c82      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; domainname 
-            409c82     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409c82     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409c84     -1 INSTR LOCAL MetadataUnused movss   [rsp+28h+var_28], xmm0 
             409c84      5 INSTR BELONGTO 409ba0 
             409c89     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -10613,7 +10613,7 @@
             409c99      3 INSTR BELONGTO 409ba0 
             409c9c     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             409c9c      4 INSTR BELONGTO 409ba0 
-            409ca0     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            409ca0     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             409ca0      5 INSTR BELONGTO 409ba0 
             409ca0      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 XMM0 ZZ mov     eax, 1 
             409ca5      1 INSTR BELONGTO 409ba0 
@@ -10627,7 +10627,7 @@
             409cb0      5 INSTR DEADREGS  EFLAGS RSI RDI XMM0 ZZ mov     esi, offset aId_0; "%id" 
             409cb5      2 INSTR BELONGTO 409ba0 
             409cb5      2 INSTR DEADREGS  EFLAGS RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            409cb5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409cb5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409cb7     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409cb7      5 INSTR BELONGTO 409ba0 
             409cb7      5 INSTR DEADREGS  EFLAGS XMM0 ZZ call    _dcgettext 
@@ -10644,14 +10644,14 @@
             409cc6      1 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 XMM0 ZZ pop     rbp 
             409cc7      2 INSTR BELONGTO 409ba0 
             409cc7      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 XMM0 ZZ xor     eax, eax 
-            409cc7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409cc7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409cc9     -1 INSTR LOCAL NoMetaUpdate jmp     _g_strdup_printf 
             409cc9      5 INSTR BELONGTO 409ba0 
             409cc9      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 XMM0 ZZ jmp     _g_strdup_printf 
             409cd0      2 INSTR BELONGTO 409ba0 
             409cd0      2 INSTR DEADREGS  EFLAGS RDX RBX XMM0 ZZ mov     ebx, esi 
-            409cd0     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, esi 
-            409cd2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFC4h 
+            409cd0     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     ebx, esi 
+            409cd2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFC4h 
             409cd2      5 INSTR BELONGTO 409ba0 
             409cd2      5 INSTR DEADREGS  EFLAGS RDX RSI XMM0 ZZ mov     edx, 0FFFFFFC4h 
             409cd7     -1 INSTR LOCAL MetadataRedundant imul    ebx, edx 
@@ -10664,7 +10664,7 @@
             409cde      2 INSTR BELONGTO 409ba0 
             409ce0     -1 INSTR LOCAL NoMetaUpdate test    ebx, ebx 
             409ce0      2 INSTR BELONGTO 409ba0 
-            409ce2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409ce2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409ce2      5 INSTR BELONGTO 409ba0 
             409ce2      5 INSTR DEADREGS  RDX RSI RDI XMM0 ZZ mov     edx, 5          ; category 
             409ce7     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_409D40 
@@ -10673,7 +10673,7 @@
             409ce9      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM0 ZZ mov     esi, offset aIh ; "%ih" 
             409cee      2 INSTR BELONGTO 409ba0 
             409cee      2 INSTR DEADREGS  EFLAGS RBX RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            409cee     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409cee     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409cf0     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409cf0      5 INSTR BELONGTO 409ba0 
             409cf0      5 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ call    _dcgettext 
@@ -10687,8 +10687,8 @@
             409d00      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     esi, offset aI  ; "%i%%" 
             409d05      2 INSTR BELONGTO 409ba0 
             409d05      2 INSTR DEADREGS  EFLAGS RDX RBX RDI ZZ xor     edi, edi        ; domainname 
-            409d05     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            409d07     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409d05     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409d07     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409d07      5 INSTR BELONGTO 409ba0 
             409d07      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 5          ; category 
             409d0c     -1 INSTR LOCAL MetadataUnused movss   [rsp+28h+var_28], xmm0 
@@ -10716,29 +10716,29 @@
             409d40      5 INSTR DEADREGS  EFLAGS RSI RDI XMM0 ZZ mov     esi, offset aIh02im; "%ih%02im" 
             409d45      2 INSTR BELONGTO 409ba0 
             409d45      2 INSTR DEADREGS  EFLAGS RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            409d45     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409d45     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409d47     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409d47      5 INSTR BELONGTO 409ba0 
             409d47      5 INSTR DEADREGS  EFLAGS XMM0 ZZ call    _dcgettext 
             409d4c      2 INSTR BELONGTO 409ba0 
             409d4c      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R9 R10 R11 XMM0 ZZ mov     edx, ebx 
-            409d4c     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, ebx 
+            409d4c     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, ebx 
             409d4e     -1 INSTR LOCAL MetadataUnused mov     esi, ebp 
             409d4e      2 INSTR BELONGTO 409ba0 
             409d50     -1 INSTR LOCAL NoMetaUpdate jmp     loc_409C64 
             409d50      5 INSTR BELONGTO 409ba0 
-            409d58     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFC4h 
+            409d58     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFC4h 
             409d58      5 INSTR BELONGTO 409ba0 
             409d58      5 INSTR DEADREGS  EFLAGS RAX RDX RSI XMM0 ZZ mov     eax, 0FFFFFFC4h 
-            409d5d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409d5d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409d5d      5 INSTR BELONGTO 409ba0 
             409d5d      5 INSTR DEADREGS  EFLAGS RDX RSI XMM0 ZZ mov     edx, 5          ; category 
-            409d62     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM imul    ecx, eax 
+            409d62     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM imul    ecx, eax 
             409d62      3 INSTR BELONGTO 409ba0 
             409d62      3 INSTR DEADREGS  EFLAGS RSI XMM0 ZZ imul    ecx, eax 
             409d65     -1 INSTR LOCAL NoMetaUpdate test    ebx, ebx 
             409d65      2 INSTR BELONGTO 409ba0 
-            409d67     -2 INSTR LOCAL n EBP ZZ  NumericDEFs lea     ebp, [rcx+rdi] 
+            409d67     -2 INSTR LOCAL n RBP ZZ  NumericDEFs lea     ebp, [rcx+rdi] 
             409d67      3 INSTR BELONGTO 409ba0 
             409d67      3 INSTR DEADREGS  RSI XMM0 ZZ lea     ebp, [rcx+rdi] 
             409d6a     -1 INSTR LOCAL NoMetaUpdate jle     short loc_409D9B 
@@ -10751,7 +10751,7 @@
             409d70      5 INSTR DEADREGS  EFLAGS RSI RDI XMM0 ZZ mov     esi, offset a2im; "%2im" 
             409d75      2 INSTR BELONGTO 409ba0 
             409d75      2 INSTR DEADREGS  EFLAGS RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            409d75     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409d75     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409d77     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409d77      5 INSTR BELONGTO 409ba0 
             409d77      5 INSTR DEADREGS  EFLAGS XMM0 ZZ call    _dcgettext 
@@ -10765,13 +10765,13 @@
             409d86      5 INSTR DEADREGS  EFLAGS RSI RDI XMM0 ZZ mov     esi, offset a2im02i; "%2im%02i" 
             409d8b      2 INSTR BELONGTO 409ba0 
             409d8b      2 INSTR DEADREGS  EFLAGS RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            409d8b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409d8b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409d8d     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409d8d      5 INSTR BELONGTO 409ba0 
             409d8d      5 INSTR DEADREGS  EFLAGS XMM0 ZZ call    _dcgettext 
             409d92      2 INSTR BELONGTO 409ba0 
             409d92      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R9 R10 R11 XMM0 ZZ mov     edx, ebp 
-            409d92     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, ebp 
+            409d92     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, ebp 
             409d94     -1 INSTR LOCAL MetadataUnused mov     esi, ebx 
             409d94      2 INSTR BELONGTO 409ba0 
             409d96     -1 INSTR LOCAL NoMetaUpdate jmp     loc_409C64 
@@ -10780,7 +10780,7 @@
             409d9b      5 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM0 ZZ mov     esi, offset a2is; "%2is" 
             409da0      2 INSTR BELONGTO 409ba0 
             409da0      2 INSTR DEADREGS  EFLAGS RBX RDI XMM0 ZZ xor     edi, edi        ; domainname 
-            409da0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409da0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409da2     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409da2      5 INSTR BELONGTO 409ba0 
             409da2      5 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ call    _dcgettext 
@@ -10804,7 +10804,7 @@
             409dcd      4 INSTR BELONGTO 409dc0 
             409dd1     -1 INSTR LOCAL MetadataUnused shr     esi, 10h 
             409dd1      3 INSTR BELONGTO 409dc0 
-            409dd4     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, dh 
+            409dd4     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, dh 
             409dd4      3 INSTR BELONGTO 409dc0 
             409dd4      3 INSTR DEADREGS  EFLAGS RAX ZZ movzx   eax, dh 
             409dd7     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm0, esi 
@@ -11077,7 +11077,7 @@
             409fe0     -3 INSTR LOCAL NoWarn push    rbx 
             409fe1      2 INSTR BELONGTO 409fe0 
             409fe1      2 INSTR DEADREGS  EFLAGS RBX ZZ xor     ebx, ebx 
-            409fe1     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            409fe1     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             409fe3     16 DATAREF STACK 711 esp + 0 PARENT LocalFrame LOCALFRAME
             409fe3      4 INSTR BELONGTO 409fe0 
             409fe3      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 10h 
@@ -11121,17 +11121,17 @@
             40a029      4 INSTR BELONGTO 409fe0 
             40a02d      2 INSTR BELONGTO 409fe0 
             40a02d      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 XMM0 XMM1 XMM2 ZZ mov     eax, ebx 
-            40a02d     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            40a02d     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             40a02f      1 INSTR BELONGTO 409fe0 
             40a02f      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 XMM0 XMM1 XMM2 ZZ pop     rbx 
             40a030      1 INSTR BELONGTO 409fe0 
             40a030      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 XMM0 XMM1 XMM2 ZZ retn 
             40a038      2 INSTR BELONGTO 409fe0 
             40a038      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI XMM0 XMM1 XMM2 ZZ xor     eax, eax 
-            40a038     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a038     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a03a      5 INSTR BELONGTO 409fe0 
             40a03a      5 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     edx, offset aDivisorZero; "divisor zero" 
-            40a03f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40a03f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40a03f      5 INSTR BELONGTO 409fe0 
             40a03f      5 INSTR DEADREGS  EFLAGS RSI RDI XMM0 XMM1 XMM2 ZZ mov     esi, 10h 
             40a044      5 INSTR BELONGTO 409fe0 
@@ -11144,7 +11144,7 @@
             40a052     16 DEALLOC STACK esp - 16 mov     eax, ebx
             40a052      2 INSTR BELONGTO 409fe0 
             40a052      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 XMM0 XMM1 XMM2 ZZ mov     eax, ebx 
-            40a052     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            40a052     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             40a054      1 INSTR BELONGTO 409fe0 
             40a054      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 XMM0 XMM1 XMM2 ZZ pop     rbx 
             40a055      1 INSTR BELONGTO 409fe0 
@@ -11157,7 +11157,7 @@
             40a060     -3 INSTR LOCAL NoWarn push    rbx 
             40a061      2 INSTR BELONGTO 40a060 
             40a061      2 INSTR DEADREGS  EFLAGS RBX ZZ xor     ebx, ebx 
-            40a061     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40a061     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40a063     16 DATAREF STACK 712 esp + 0 PARENT LocalFrame LOCALFRAME
             40a063      4 INSTR BELONGTO 40a060 
             40a063      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 10h 
@@ -11201,17 +11201,17 @@
             40a0a9      4 INSTR BELONGTO 40a060 
             40a0ad      2 INSTR BELONGTO 40a060 
             40a0ad      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 XMM0 XMM1 XMM2 ZZ mov     eax, ebx 
-            40a0ad     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            40a0ad     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             40a0af      1 INSTR BELONGTO 40a060 
             40a0af      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 XMM0 XMM1 XMM2 ZZ pop     rbx 
             40a0b0      1 INSTR BELONGTO 40a060 
             40a0b0      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 XMM0 XMM1 XMM2 ZZ retn 
             40a0b8      2 INSTR BELONGTO 40a060 
             40a0b8      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI XMM0 XMM1 XMM2 ZZ xor     eax, eax 
-            40a0b8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a0b8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a0ba      5 INSTR BELONGTO 40a060 
             40a0ba      5 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     edx, offset aDivisorZero; "divisor zero" 
-            40a0bf     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40a0bf     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40a0bf      5 INSTR BELONGTO 40a060 
             40a0bf      5 INSTR DEADREGS  EFLAGS RSI RDI XMM0 XMM1 XMM2 ZZ mov     esi, 10h 
             40a0c4      5 INSTR BELONGTO 40a060 
@@ -11224,7 +11224,7 @@
             40a0d2     16 DEALLOC STACK esp - 16 mov     eax, ebx
             40a0d2      2 INSTR BELONGTO 40a060 
             40a0d2      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 XMM0 XMM1 XMM2 ZZ mov     eax, ebx 
-            40a0d2     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            40a0d2     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             40a0d4      1 INSTR BELONGTO 40a060 
             40a0d4      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 XMM0 XMM1 XMM2 ZZ pop     rbx 
             40a0d5      1 INSTR BELONGTO 40a060 
@@ -11287,10 +11287,10 @@
             40a134     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 30h 
             40a134      6 INSTR BELONGTO 40a0e0 
             40a134      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 30h 
-            40a13a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset loc_409950 
+            40a13a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset loc_409950 
             40a13a      5 INSTR BELONGTO 40a0e0 
             40a13a      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset loc_409950 
-            40a13f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 358h 
+            40a13f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 358h 
             40a13f      5 INSTR BELONGTO 40a0e0 
             40a13f      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 358h 
             40a144      7 INSTR BELONGTO 40a0e0 
@@ -11321,10 +11321,10 @@
             40a1b9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             40a1be      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
             40a1c7      3 PTRIMMEDEBP STACK 0 displ mov     r9d, ebp
-            40a1da     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40a1da     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40a1e4      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], r12
             40a1e9      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-            40a1ed     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a1ed     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a1ef     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40a1f8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
             40a206     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -11383,10 +11383,10 @@
             40a38f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             40a39e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             40a3a3      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-            40a3bf     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40a3bf     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40a3c9      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
             40a3ce      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-            40a3d2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a3d2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a3d4     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40a3d9      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
             40a3de      5 PTRIMMEDESP STACK 48 displ mov     rbp, [rsp+30h]
@@ -11437,7 +11437,7 @@
             40a53f     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40A570 
             40a550     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40a555     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 0F8h 
-            40a55c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a55c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a570     -1 INSTR LOCAL NoMetaUpdate call    sub_40A0E0 
             40a57b     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40a57e     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40A589 
@@ -11459,10 +11459,10 @@
             40a5ec      8 PTRIMMEDESP STACK 152 displ mov     rdx, [rsp+98h]
             40a5f7     -1 INSTR LOCAL NoMetaUpdate test    esi, esi 
             40a5f9     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40B05E 
-            40a607     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 66666667h 
-            40a60e     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM sar     esi, 1Fh 
-            40a611     -2 INSTR LOCAL n EAX EDX ZZ  AlwaysNUM imul    edx 
-            40a613     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM sar     edx, 2 
+            40a607     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 66666667h 
+            40a60e     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM sar     esi, 1Fh 
+            40a611     -2 INSTR LOCAL n RAX RDX ZZ  AlwaysNUM imul    edx 
+            40a613     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM sar     edx, 2 
             40a618     -1 INSTR LOCAL NoMetaUpdate cvtsi2ss xmm1, edx 
             40a61c      8 PTRIMMEDESP STACK 152 displ mov     rax, [rsp+98h]
             40a624     11 PTRIMMEDESP STACK 136 displ mov     dword ptr [rsp+88h], 0
@@ -11477,10 +11477,10 @@
             40a667     -1 INSTR LOCAL NoMetaUpdate mulss   xmm0, xmm1 
             40a66b     -1 INSTR LOCAL NoMetaUpdate cvtsi2ss xmm1, ecx 
             40a66f     -1 INSTR LOCAL NoMetaUpdate addss   xmm0, xmm1 
-            40a673     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM cvttss2si edx, xmm0 
+            40a673     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM cvttss2si edx, xmm0 
             40a677     -1 INSTR LOCAL NoMetaUpdate cvtsi2ss xmm0, edx 
             40a67b     -1 INSTR LOCAL NoMetaUpdate call    sub_409BA0 
-            40a68b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            40a68b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             40a690      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
             40a695     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_set_text 
             40a6a8     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_get_pixel_extents 
@@ -11554,7 +11554,7 @@
             40a877      6 PTRIMMEDESP STACK 80 displ movss   dword ptr [rsp+50h], xmm2
             40a87d     -1 INSTR LOCAL NoMetaUpdate call    sub_409BA0 
             40a882      8 PTRIMMEDESP STACK 136 displ mov     [rsp+88h], rax
-            40a88e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            40a88e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             40a893      8 PTRIMMEDESP STACK 136 displ mov     rsi, [rsp+88h]
             40a89f     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_set_text 
             40a8b2     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_get_pixel_extents 
@@ -11603,7 +11603,7 @@
             40a9a1     -1 INSTR LOCAL NoMetaUpdate addss   xmm0, xmm1 
             40a9a5     -1 INSTR LOCAL NoMetaUpdate call    sub_409BA0 
             40a9aa      8 PTRIMMEDESP STACK 136 displ mov     [rsp+88h], rax
-            40a9b6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            40a9b6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             40a9bb      8 PTRIMMEDESP STACK 136 displ mov     rsi, [rsp+88h]
             40a9c7     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_set_text 
             40a9da     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_get_pixel_extents 
@@ -11646,7 +11646,7 @@
             40aa92     -1 INSTR LOCAL NoMetaUpdate call    _cairo_save 
             40aaa3     -1 INSTR LOCAL NoMetaUpdate test    edi, edi 
             40aaa5     -1 INSTR LOCAL NoMetaUpdate jz      loc_40ACF5 
-            40aaab     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40aaab     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40aaad     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm7, cs:dword_40BE84 
             40aab5     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm6, cs:dword_40D3E4 
             40aacd     -1 INSTR LOCAL NoMetaUpdate test    esi, esi 
@@ -11781,7 +11781,7 @@
             40ad17      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40ad1a     -1 INSTR LOCAL NoMetaUpdate call    _cairo_restore 
             40ad1f     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40A555 
-            40ad28     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFDh 
+            40ad28     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFDh 
             40ad30     11 PTRIMMEDESP STACK 172 displ mov     dword ptr [rsp+0ACh], 0
             40ad3b      7 PTRIMMEDESP STACK 184 displ add     ecx, [rsp+0B8h]
             40ad42     11 PTRIMMEDESP STACK 168 displ mov     dword ptr [rsp+0A8h], 0
@@ -11793,7 +11793,7 @@
             40ad79      8 PTRIMMEDESP STACK 192 displ lea     r13, [rsp+0C0h]
             40ad81     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40ADDB 
             40ad93     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_nth_data 
-            40ada0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            40ada0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             40ada5      8 PTRIMMEDESP STACK 148 displ add     dword ptr [rsp+94h], 11h
             40adb1     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_set_text 
             40adc4     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_get_pixel_extents 
@@ -11836,8 +11836,8 @@
             40ae75      6 PTRIMMEDESP STACK 96 displ movss   xmm4, dword ptr [rsp+60h]
             40ae7b      4 PTRIMMEDESP STACK 8 displ mov     eax, [rsp+8]
             40ae7f     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40AB30 
-            40ae8d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-            40ae97     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ae8d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40ae97     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ae99     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40ae9e     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40ACFD 
             40aea3     -1 INSTR LOCAL NoMetaUpdate cvtsi2ss xmm1, dword ptr [rax+30h] 
@@ -11860,7 +11860,7 @@
             40af0f     -1 INSTR LOCAL NoMetaUpdate call    _cairo_set_line_width 
             40af14     -1 INSTR LOCAL NoMetaUpdate xorpd   xmm0, xmm0 
             40af18      8 PTRIMMEDESP STACK 224 displ lea     rsi, [rsp+0E0h]
-            40af20     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40af20     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40af25      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40af28     -1 INSTR LOCAL NoMetaUpdate call    _cairo_set_dash 
             40af2d     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm0, cs:qword_40D398 
@@ -11876,7 +11876,7 @@
             40af60      9 PTRIMMEDESP STACK 136 displ mulss   xmm1, dword ptr [rsp+88h]
             40af69     -1 INSTR LOCAL NoMetaUpdate addss   xmm0, xmm1 
             40af6d     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm1, dword ptr [rax+2Ch] 
-            40af72     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM cvttss2si edx, xmm0 
+            40af72     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM cvttss2si edx, xmm0 
             40af76     -1 INSTR LOCAL NoMetaUpdate cvtsi2ss xmm2, edx 
             40af7a     -1 INSTR LOCAL NoMetaUpdate addss   xmm2, cs:dword_40D3C8 
             40af82     -1 INSTR LOCAL NoMetaUpdate unpcklps xmm2, xmm2 
@@ -11902,7 +11902,7 @@
             40afe8     -1 INSTR LOCAL NoMetaUpdate mulss   xmm1, dword ptr [rsp+90h] 
             40afe8      9 PTRIMMEDESP STACK 144 displ mulss   xmm1, dword ptr [rsp+90h]
             40aff1     -1 INSTR LOCAL NoMetaUpdate addss   xmm0, xmm1 
-            40aff5     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM cvttss2si edx, xmm0 
+            40aff5     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM cvttss2si edx, xmm0 
             40aff9     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm0, dword ptr [rax+28h] 
             40affe     -1 INSTR LOCAL NoMetaUpdate cvtsi2ss xmm2, edx 
             40b002     -1 INSTR LOCAL NoMetaUpdate addss   xmm2, cs:dword_40D3C8 
@@ -11929,7 +11929,7 @@
             40b071     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40B0A9 
             40b07c     -1 INSTR LOCAL NoMetaUpdate test    ecx, ecx 
             40b07e     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40B313 
-            40b088     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b088     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b08a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM shl     rcx, 3 
             40b08e     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40B0A4 
             40b095     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rax, 8 
@@ -11937,18 +11937,18 @@
             40b09e     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40B313 
             40b0a4     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rcx 
             40b0a7     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40B090 
-            40b0ae     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            40b0b0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40b0ae     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            40b0b0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             40b0ba     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
-            40b0c3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            40b0c8     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b0c3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b0c8     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b0ca      8 PTRIMMEDESP STACK 152 displ mov     [rsp+98h], rax
             40b0e0     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40A618 
             40b0ed     -1 INSTR LOCAL NoMetaUpdate test    r9d, r9d 
             40b0f0     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40B125 
             40b0fc     -1 INSTR LOCAL NoMetaUpdate test    r10d, r10d 
             40b0ff     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40B173 
-            40b105     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b105     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b107     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM shl     rcx, 3 
             40b10b     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40B120 
             40b115     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rax, 8 
@@ -11956,19 +11956,19 @@
             40b11e     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40B173 
             40b120     -1 INSTR LOCAL NoMetaUpdate cmp     rax, rcx 
             40b123     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40B110 
-            40b125     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            40b12c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40b125     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            40b12c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             40b136     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40b13f      8 PTRIMMEDESP STACK 152 displ mov     [rsp+98h], rax
             40b155     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40A5EC 
             40b169     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40b16e     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40A555 
             40b173     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm3, cs:dword_40D3CC 
-            40b17b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b17b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b17d     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm2, cs:dword_40D3D0 
             40b191     -1 INSTR LOCAL NoMetaUpdate test    ecx, ecx 
             40b193     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40B1C1 
-            40b198     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b198     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b1a4     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rax, 1 
             40b1a8     -1 INSTR LOCAL NoMetaUpdate cmp     ecx, eax 
             40b1aa     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm0, dword ptr [rdx] 
@@ -11983,8 +11983,8 @@
             40b1c7     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40B188 
             40b1c9     -1 INSTR LOCAL NoMetaUpdate unpcklps xmm3, xmm3 
             40b1d1     -1 INSTR LOCAL NoMetaUpdate unpcklps xmm2, xmm2 
-            40b1d4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-            40b1de     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 2 
+            40b1d4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40b1de     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 2 
             40b1e3     -1 INSTR LOCAL NoMetaUpdate cvtps2pd xmm0, xmm3 
             40b1e6     -1 INSTR LOCAL NoMetaUpdate cvtps2pd xmm1, xmm2 
             40b1e9      6 PTRIMMEDESP STACK 80 displ movss   dword ptr [rsp+50h], xmm2
@@ -12030,24 +12030,24 @@
             40b299      5 PTRIMMEDESP STACK 40 displ mov     [rsp+28h], rdx
             40b29e     -1 INSTR LOCAL NoMetaUpdate call    sub_40A060 
             40b2a3      5 PTRIMMEDESP STACK 40 displ mov     rdx, [rsp+28h]
-            40b2a8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-            40b2c5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b2a8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40b2c5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b2c7     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40b2d3     -1 INSTR LOCAL NoMetaUpdate cmp     edx, 1 
             40b2d6     -1 INSTR LOCAL NoMetaUpdate jz      loc_40B6FD 
             40b2dc     -1 INSTR LOCAL NoMetaUpdate cmp     edx, 3 
             40b2e2     -1 INSTR LOCAL NoMetaUpdate jz      loc_40B735 
-            40b2f1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            40b2f3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40b2f1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            40b2f3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             40b2fd     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40b306      8 PTRIMMEDESP STACK 152 displ mov     [rsp+98h], rax
             40b30e     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40A5EC 
             40b313     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm3, cs:dword_40D3CC 
-            40b31b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b31b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b31d     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm2, cs:dword_40D3D0 
             40b331     -1 INSTR LOCAL NoMetaUpdate test    ecx, ecx 
             40b333     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40B362 
-            40b338     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b338     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b344     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rax, 1 
             40b348     -1 INSTR LOCAL NoMetaUpdate cmp     ecx, eax 
             40b34a     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm0, dword ptr [rdx+4] 
@@ -12062,8 +12062,8 @@
             40b368     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40B328 
             40b36a     -1 INSTR LOCAL NoMetaUpdate unpcklps xmm3, xmm3 
             40b372     -1 INSTR LOCAL NoMetaUpdate unpcklps xmm2, xmm2 
-            40b375     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-            40b37f     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 2 
+            40b375     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40b37f     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 2 
             40b384     -1 INSTR LOCAL NoMetaUpdate cvtps2pd xmm0, xmm3 
             40b387     -1 INSTR LOCAL NoMetaUpdate cvtps2pd xmm1, xmm2 
             40b38a      6 PTRIMMEDESP STACK 80 displ movss   dword ptr [rsp+50h], xmm2
@@ -12111,15 +12111,15 @@
             40b444      5 PTRIMMEDESP STACK 40 displ mov     rdx, [rsp+28h]
             40b450     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rax+44h], 2 
             40b45b     -1 INSTR LOCAL NoMetaUpdate jz      loc_40B6D4 
-            40b461     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            40b468     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40b461     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            40b468     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             40b472     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40b47e     -1 INSTR LOCAL NoMetaUpdate cmp     edx, 1 
             40b481     -1 INSTR LOCAL NoMetaUpdate jz      loc_40B6AA 
             40b487     -1 INSTR LOCAL NoMetaUpdate cmp     edx, 3 
             40b48d     -1 INSTR LOCAL NoMetaUpdate jz      loc_40B727 
-            40b497     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-            40b49c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b497     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40b49c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b4a8     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40b4b1      8 PTRIMMEDESP STACK 152 displ mov     [rsp+98h], rax
             40b4bf     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40A605 
@@ -12142,11 +12142,11 @@
             40b539      4 PTRIMMEDESP STACK 112 displ mov     [rsp+70h], esi
             40b53d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     r13d, 1 
             40b541     -1 INSTR LOCAL NoMetaUpdate subss   xmm0, cs:dword_40BE84 
-            40b549     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM cvttss2si edx, xmm0 
+            40b549     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM cvttss2si edx, xmm0 
             40b54d     -1 INSTR LOCAL NoMetaUpdate cvtsi2ss xmm0, r15d 
             40b552     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm5, edx 
             40b556     -1 INSTR LOCAL NoMetaUpdate subss   xmm0, cs:dword_40D3E8 
-            40b55e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM cvttss2si edx, xmm0 
+            40b55e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM cvttss2si edx, xmm0 
             40b562     -1 INSTR LOCAL NoMetaUpdate addsd   xmm5, cs:qword_40D3C0 
             40b56a     -1 INSTR LOCAL NUMViaFPRegDest movapd  xmm1, xmm5 
             40b56e      6 PTRIMMEDESP STACK 80 displ movsd   qword ptr [rsp+50h], xmm5
@@ -12187,7 +12187,7 @@
             40b62e     -1 INSTR LOCAL NUMViaFPRegDest movapd  xmm0, xmm2 
             40b632     -1 INSTR LOCAL NoMetaUpdate call    _cairo_set_source_rgb 
             40b637      5 PTRIMMEDESP STACK 8 displ mov     rax, [rsp+8]
-            40b63c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            40b63c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             40b64d     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_set_text 
             40b65d     -1 INSTR LOCAL NoMetaUpdate call    _pango_cairo_show_layout 
             40b66a     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_length 
@@ -12196,28 +12196,28 @@
             40b683     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_nth_data 
             40b688     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40b68b     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40B510 
-            40b696     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40b696     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40b6a0     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40b6a5     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40AD17 
             40b6aa     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rax+1Ch], 59h 
             40b6ae     -1 INSTR LOCAL NoMetaUpdate jle     short loc_40B6B7 
             40b6bd     -1 INSTR LOCAL NoMetaUpdate cmp     edx, 9 
             40b6c0     -1 INSTR LOCAL NoMetaUpdate ja      loc_40B493 
-            40b6cd     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b6cd     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b6cf     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40B493 
-            40b6d9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM sar     edx, 1Fh 
-            40b6dc     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM sar     edi, 1Fh 
-            40b6e1     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, r8d 
-            40b6e8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, ecx 
+            40b6d9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM sar     edx, 1Fh 
+            40b6dc     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM sar     edi, 1Fh 
+            40b6e1     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, r8d 
+            40b6e8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, ecx 
             40b6ec     -1 INSTR LOCAL NoMetaUpdate cmp     esi, edx 
             40b6ee     -1 INSTR LOCAL NoMetaUpdate jle     short loc_40B746 
-            40b6f3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM neg     ecx 
+            40b6f3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM neg     ecx 
             40b6f8     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40B461 
             40b6fd     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rax+18h], 59h 
             40b701     -1 INSTR LOCAL NoMetaUpdate jle     short loc_40B70A 
             40b710     -1 INSTR LOCAL NoMetaUpdate cmp     edx, 9 
             40b713     -1 INSTR LOCAL NoMetaUpdate ja      loc_40B2E8 
-            40b720     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b720     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b722     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40B2E8 
             40b727     -1 INSTR LOCAL NoMetaUpdate cmp     ecx, 258h 
             40b72d     -1 INSTR LOCAL NoMetaUpdate jg      loc_40B493 
@@ -12236,7 +12236,7 @@
             40b770     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm0, cs:dword_40D3DC 
             40b778     -2 INSTR LOCAL n R15 ZZ  NUMVia2ndSrcIMMEDNUM mov     r15w, 258h 
             40b77d     -1 INSTR LOCAL NoMetaUpdate ucomiss xmm0, xmm2 
-            40b780     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     ax, 12Ch 
+            40b780     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     ax, 12Ch 
             40b788     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40B40C 
             40b78d     -1 INSTR LOCAL NUMViaFPRegDest movaps  xmm0, xmm2 
             40b790     -2 INSTR LOCAL n R15 ZZ  NUMVia2ndSrcIMMEDNUM mov     r15b, 96h 
@@ -12247,7 +12247,7 @@
             40b7a8     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm1, cs:dword_40D3DC 
             40b7b0     -2 INSTR LOCAL n R15 ZZ  NUMVia2ndSrcIMMEDNUM mov     r15w, 258h 
             40b7b5     -1 INSTR LOCAL NoMetaUpdate ucomiss xmm1, xmm0 
-            40b7b8     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     ax, 12Ch 
+            40b7b8     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     ax, 12Ch 
             40b7c0     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40B26B 
             40b7d0     -3 INSTR LOCAL NoWarn push    r12 
             40b7d2     -3 INSTR LOCAL NoWarn push    rbp 
@@ -12261,7 +12261,7 @@
             40b84c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
             40b857     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40b85f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_pango_context 
-            40b864     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            40b864     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             40b86f     -1 INSTR LOCAL NoMetaUpdate call    _pango_context_set_base_gravity 
             40b878      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40b87b     -1 INSTR LOCAL NoMetaUpdate call    _pango_layout_new 
@@ -12285,22 +12285,22 @@
             40b8f3     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40b8f5     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40B930 
             40b906     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-            40b90b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b90b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b90d      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             40b912      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             40b917      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
             40b91c      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
             40b921     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
             40b930      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-            40b938     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-            40b942     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b938     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40b942     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b944     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
-            40b949     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
+            40b949     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
             40b94e     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc0 
             40b953      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40b95c     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
             40b970     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_append 
-            40b979     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40b979     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40b97e     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40B90D 
             40b980      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             40b980      0 FUNC MMSAFENESS SAFE
@@ -12350,7 +12350,7 @@
             40b9b9      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             40b9be      2 INSTR BELONGTO 40b980 
             40b9be      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40b9be     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b9be     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b9c0      1 INSTR BELONGTO 40b980 
             40b9c0      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40b9c1      1 INSTR BELONGTO 40b980 
@@ -12359,7 +12359,7 @@
             40b9c8      4 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rax, [rbx+28h] 
             40b9cc      2 INSTR BELONGTO 40b980 
             40b9cc      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            40b9cc     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40b9cc     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40b9ce      4 INSTR BELONGTO 40b980 
             40b9ce      4 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, [rax+60h] 
             40b9d2     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_set_size 
@@ -12374,7 +12374,7 @@
             40b9e1     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_set_size 
             40b9e1      5 INSTR BELONGTO 40b980 
             40b9e1      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_ptr_array_set_size 
-            40b9e6     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40b9e6     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40b9e6      5 INSTR BELONGTO 40b980 
             40b9e6      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
             40b9eb      1 INSTR BELONGTO 40b980 
@@ -12399,10 +12399,10 @@
             40ba41     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_unref 
             40ba4e     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_unref 
             40ba5b     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
-            40ba67     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40ba67     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40ba6c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             40ba7c     -1 INSTR LOCAL NoMetaUpdate jmp     rax 
-            40ba80     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40ba80     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40ba82     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40BAA6 
             40ba88      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
             40ba8a     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     ebp, 1 
@@ -12435,7 +12435,7 @@
             40baec     -3 INSTR LOCAL NoWarn push    rbp 
             40baed      2 INSTR BELONGTO 40bae0 
             40baed      2 INSTR DEADREGS  R12 R14 ZZ mov     ebp, esi 
-            40baed     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, esi 
+            40baed     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     ebp, esi 
             40baef      1 INSTR BELONGTO 40bae0 
             40baef      1 INSTR DEADREGS  R12 R14 ZZ push    rbx 
             40baef     40 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
@@ -12491,12 +12491,12 @@
             40bb37      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 R13 R14 ZZ pop     r13 
             40bb39      2 INSTR BELONGTO 40bae0 
             40bb39      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 R13 R14 ZZ xor     eax, eax 
-            40bb39     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bb39     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bb3b      2 INSTR BELONGTO 40bae0 
             40bb3b      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 ZZ pop     r14 
             40bb3d      1 INSTR BELONGTO 40bae0 
             40bb3d      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 ZZ retn 
-            40bb40     -2 INSTR LOCAL n EDI ZZ  NumericDEFs mov     edi, offset loc_409930 
+            40bb40     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     edi, offset loc_409930 
             40bb40      5 INSTR BELONGTO 40bae0 
             40bb40      5 INSTR DEADREGS  EFLAGS RDI R12 R14 ZZ mov     edi, offset loc_409930 
             40bb45     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_new_with_free_func 
@@ -12516,7 +12516,7 @@
             40bb58      8 INSTR BELONGTO 40bae0 
             40bb60      4 INSTR BELONGTO 40bae0 
             40bb60      4 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ mov     rax, [r13+0] 
-            40bb64     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, r12d 
+            40bb64     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, r12d 
             40bb64      3 INSTR BELONGTO 40bae0 
             40bb64      3 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edx, r12d 
             40bb67     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     r12d, 1 
@@ -12550,7 +12550,7 @@
             40bb95      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 R14 ZZ mov     rax, [rbx+28h] 
             40bb99      2 INSTR BELONGTO 40bae0 
             40bb99      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 ZZ mov     esi, ebp 
-            40bb99     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, ebp 
+            40bb99     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, ebp 
             40bb9b      4 INSTR BELONGTO 40bae0 
             40bb9b      4 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 ZZ mov     rdi, [rax+68h] 
             40bb9f     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_add 
@@ -12579,7 +12579,7 @@
             40bbbe      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 R13 R14 ZZ pop     r12 
             40bbc0      2 INSTR BELONGTO 40bae0 
             40bbc0      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 R13 R14 ZZ pop     r13 
-            40bbc2     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40bbc2     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40bbc2      5 INSTR BELONGTO 40bae0 
             40bbc2      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 R13 R14 ZZ mov     eax, 1 
             40bbc7      2 INSTR BELONGTO 40bae0 
@@ -12605,7 +12605,7 @@
             40bbe8      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 R13 R14 ZZ pop     r13 
             40bbea      2 INSTR BELONGTO 40bae0 
             40bbea      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 R13 R14 ZZ xor     eax, eax 
-            40bbea     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bbea     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bbec      2 INSTR BELONGTO 40bae0 
             40bbec      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 ZZ pop     r14 
             40bbee      1 INSTR BELONGTO 40bae0 
@@ -12628,7 +12628,7 @@
             40bbfe      4 INSTR BELONGTO 40bbf0 
             40bc02      2 INSTR BELONGTO 40bbf0 
             40bc02      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            40bc02     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bc02     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bc02      8 DEALLOC STACK esp - 8 xor     eax, eax
             40bc04     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
             40bc04      5 INSTR BELONGTO 40bbf0 
@@ -12681,7 +12681,7 @@
             40bc58      2 INSTR BELONGTO 40bc10 
             40bc5a      2 INSTR BELONGTO 40bc10 
             40bc5a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            40bc5a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40bc5a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40bc5c      4 INSTR BELONGTO 40bc10 
             40bc60      3 INSTR BELONGTO 40bc10 
             40bc60      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 44856f89..f4ea90fe 100644
--- a/tests/commit/trimmed-sorted-save-gnome-screensaver-command.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-screensaver-command.psexe.annot
@@ -436,7 +436,7 @@
             401022      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_set_prgname 
             401027      5 INSTR BELONGTO 400fe0 
             401027      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, (offset aTheScreensaver+1Ah); locale 
-            40102c     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
+            40102c     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
             40102c      5 INSTR BELONGTO 400fe0 
             40102c      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 6          ; category 
             401031     -1 INSTR LOCAL NoMetaUpdate call    _setlocale 
@@ -448,7 +448,7 @@
             401039      6 INSTR BELONGTO 400fe0 
             40103f      2 INSTR BELONGTO 400fe0 
             40103f      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            40103f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40103f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401041      9 INSTR BELONGTO 400fe0 
             401041      9 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+38h+var_20], 0 
             401041      9 PTRIMMEDESP STACK 24 displ mov     [rsp+38h+var_20], 0
@@ -457,7 +457,7 @@
             40104a      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_option_context_new 
             40104f      2 INSTR BELONGTO 400fe0 
             40104f      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edx, edx 
-            40104f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40104f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             401051      3 INSTR BELONGTO 400fe0 
             401051      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rax 
             401054      5 INSTR BELONGTO 400fe0 
@@ -503,8 +503,8 @@
             401090      5 PTRIMMEDESP STACK 24 displ lea     rdx, [rsp+38h+var_20]
             401095      2 INSTR BELONGTO 400fe0 
             401095      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            401095     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            401097     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            401095     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            401097     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             401097      5 INSTR BELONGTO 400fe0 
             401097      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 2 
             40109c     -1 INSTR LOCAL NoMetaUpdate call    _g_bus_get_sync 
@@ -518,7 +518,7 @@
             4010a7      6 INSTR BELONGTO 400fe0 
             4010ad      3 INSTR BELONGTO 400fe0 
             4010ad      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-            4010b0     -2 INSTR LOCAL n EDI ZZ  NumericDEFs mov     edi, offset sub_401520 
+            4010b0     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     edi, offset sub_401520 
             4010b0      5 INSTR BELONGTO 400fe0 
             4010b0      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, offset sub_401520 
             4010b5     -1 INSTR LOCAL NoMetaUpdate call    _g_idle_add 
@@ -526,10 +526,10 @@
             4010b5      5 INSTR DEADREGS  EFLAGS ZZ call    _g_idle_add 
             4010ba      2 INSTR BELONGTO 400fe0 
             4010ba      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            4010ba     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4010ba     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4010bc      2 INSTR BELONGTO 400fe0 
             4010bc      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            4010bc     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4010bc     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4010be     -1 INSTR LOCAL NoMetaUpdate call    _g_main_loop_new 
             4010be      5 INSTR BELONGTO 400fe0 
             4010be      5 INSTR DEADREGS  EFLAGS ZZ call    _g_main_loop_new 
@@ -547,7 +547,7 @@
             4010d5      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_object_unref 
             4010da      2 INSTR BELONGTO 400fe0 
             4010da      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            4010da     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4010da     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4010dc     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
             4010dc      4 INSTR BELONGTO 400fe0 
             4010e0      1 INSTR BELONGTO 400fe0 
@@ -567,30 +567,30 @@
             4010f1      3 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     rsi, [rax] 
             4010f4      2 INSTR BELONGTO 400fe0 
             4010f4      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            4010f4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4010f4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4010f6     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             4010f6      5 INSTR BELONGTO 400fe0 
             4010f6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_print 
             4010fb      2 INSTR BELONGTO 400fe0 
             4010fb      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            4010fb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4010fb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4010fd     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4010DC 
             4010fd      2 INSTR BELONGTO 400fe0 
             4010ff     -1 INSTR LOCAL MetadataUnused mov     rax, [rsp+38h+var_20] 
             4010ff      5 INSTR BELONGTO 400fe0 
             401104      5 INSTR BELONGTO 400fe0 
             401104      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     edx, (offset aUnableToSendMe+18h); "%s" 
-            401109     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            401109     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             401109      5 INSTR BELONGTO 400fe0 
             401109      5 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI ZZ mov     esi, 10h 
             40110e      4 INSTR BELONGTO 400fe0 
             40110e      4 INSTR DEADREGS  EFLAGS RCX RBX RDI ZZ mov     rcx, [rax+8] 
             401112      2 INSTR BELONGTO 400fe0 
             401112      2 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ xor     eax, eax 
-            401112     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401112     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401114      2 INSTR BELONGTO 400fe0 
             401114      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            401114     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401114     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401116     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             401116      5 INSTR BELONGTO 400fe0 
             401116      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -599,19 +599,19 @@
             401120     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
             401120      5 INSTR BELONGTO 400fe0 
             401120      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_error_free 
-            401125     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            401125     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             401125      5 INSTR BELONGTO 400fe0 
             401125      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
             40112a     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4010DC 
             40112a      2 INSTR BELONGTO 400fe0 
             40112c      5 INSTR BELONGTO 400fe0 
             40112c      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, offset aLocaleNotUnder; "Locale not understood by C library, int"... 
-            401131     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            401131     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             401131      5 INSTR BELONGTO 400fe0 
             401131      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 10h 
             401136      2 INSTR BELONGTO 400fe0 
             401136      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            401136     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401136     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401138     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             401138      5 INSTR BELONGTO 400fe0 
             401138      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -621,7 +621,7 @@
             401142      5 INSTR BELONGTO 400fe0 
             401147      5 INSTR BELONGTO 400fe0 
             401147      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     edx, offset aFailedToGetSes; "Failed to get session bus: %s" 
-            40114c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
+            40114c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
             40114c      5 INSTR BELONGTO 400fe0 
             40114c      5 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI ZZ mov     esi, 20h 
             401151      4 INSTR BELONGTO 400fe0 
@@ -754,7 +754,7 @@
             401219      3 INSTR BELONGTO 401210 
             40121c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401230 
             40121c      2 INSTR BELONGTO 401210 
-            40121e     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            40121e     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             40121e      5 INSTR BELONGTO 401210 
             401223     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             401223      3 INSTR BELONGTO 401210 
@@ -829,12 +829,12 @@
             4012a9     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             4012a9      3 INSTR BELONGTO 401240 
             4012a9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 ZZ xor     r8d, r8d 
-            4012ac     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFFh 
+            4012ac     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFFh 
             4012ac      5 INSTR BELONGTO 401240 
             4012ac      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ mov     ecx, 0FFFFFFFFh 
             4012b1      2 INSTR BELONGTO 401240 
             4012b1      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ xor     edx, edx 
-            4012b1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4012b1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4012b3      3 INSTR BELONGTO 401240 
             4012b3      3 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     rsi, rax 
             4012b6      3 INSTR BELONGTO 401240 
@@ -859,15 +859,15 @@
             4012cf      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, [rax+8] 
             4012d3      2 INSTR BELONGTO 401240 
             4012d3      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     edi, edi 
-            4012d3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4012d3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4012d5      5 INSTR BELONGTO 401240 
             4012d5      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aUnableToSendMe; "unable to send message: %s" 
-            4012da     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4012da     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             4012da      5 INSTR BELONGTO 401240 
             4012da      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 10h 
             4012df      2 INSTR BELONGTO 401240 
             4012df      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4012df     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4012df     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4012e1     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4012e1      5 INSTR BELONGTO 401240 
             4012e1      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -878,7 +878,7 @@
             4012e9      5 INSTR DEADREGS  EFLAGS ZZ call    _g_clear_error 
             4012ee      2 INSTR BELONGTO 401240 
             4012ee      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     esi, esi 
-            4012ee     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4012ee     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4012f0      3 INSTR BELONGTO 401240 
             4012f0      3 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     rdx, rbx 
             4012f3      3 INSTR BELONGTO 401240 
@@ -898,15 +898,15 @@
             401305      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, [rax+8] 
             401309      2 INSTR BELONGTO 401240 
             401309      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     edi, edi 
-            401309     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401309     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40130b      5 INSTR BELONGTO 401240 
             40130b      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aUnableToFlushM; "unable to flush message queue: %s" 
-            401310     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            401310     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             401310      5 INSTR BELONGTO 401240 
             401310      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 10h 
             401315      2 INSTR BELONGTO 401240 
             401315      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            401315     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401315     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401317     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             401317      5 INSTR BELONGTO 401240 
             401317      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -941,10 +941,10 @@
             401350      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 ZZ mov     r8, rbx 
             401353      2 INSTR BELONGTO 401240 
             401353      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ xor     ecx, ecx 
-            401353     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            401353     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             401355      2 INSTR BELONGTO 401240 
             401355      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ xor     edx, edx 
-            401355     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401355     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             401357      3 INSTR BELONGTO 401240 
             401357      3 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     rsi, rax 
             40135a      3 INSTR BELONGTO 401240 
@@ -963,7 +963,7 @@
             401375      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, offset aScreensaver_se; "screensaver_send_message_void" 
             40137a      2 INSTR BELONGTO 401240 
             40137a      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ xor     edi, edi 
-            40137a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40137a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40137c     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40137c      5 INSTR BELONGTO 401240 
             40137c      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_return_if_fail_warning 
@@ -978,7 +978,7 @@
             401395      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, offset aScreensaver_se; "screensaver_send_message_void" 
             40139a      2 INSTR BELONGTO 401240 
             40139a      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ xor     edi, edi 
-            40139a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40139a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40139c     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40139c      5 INSTR BELONGTO 401240 
             40139c      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_return_if_fail_warning 
@@ -989,15 +989,15 @@
             4013a4      2 INSTR BELONGTO 401240 
             4013a6      5 INSTR BELONGTO 401240 
             4013a6      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 ZZ mov     edx, offset aCouldnTAllocat; "Couldn't allocate the dbus message" 
-            4013ab     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4013ab     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             4013ab      5 INSTR BELONGTO 401240 
             4013ab      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 R13 ZZ mov     esi, 10h 
             4013b0      2 INSTR BELONGTO 401240 
             4013b0      2 INSTR DEADREGS  EFLAGS RAX RBX RDI R12 R13 ZZ xor     edi, edi 
-            4013b0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4013b0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4013b2      2 INSTR BELONGTO 401240 
             4013b2      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-            4013b2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4013b2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4013b4     -2 INSTR LOCAL n R13 ZZ  AlwaysNUM xor     r13d, r13d 
             4013b4      3 INSTR BELONGTO 401240 
             4013b4      3 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ xor     r13d, r13d 
@@ -1016,7 +1016,7 @@
             4013d5      5 INSTR BELONGTO 4013d0 
             4013da      2 INSTR BELONGTO 4013d0 
             4013da      2 INSTR DEADREGS  EFLAGS RDX R12 ZZ mov     ebp, esi 
-            4013da     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, esi 
+            4013da     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     ebp, esi 
             4013dc      5 INSTR BELONGTO 4013d0 
             4013dc      5 INSTR DEADREGS  EFLAGS RDX RSI R12 ZZ mov     [rsp+var_20], rbx 
             4013dc      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], rbx
@@ -1052,12 +1052,12 @@
             401413      6 INSTR BELONGTO 4013d0 
             401419      2 INSTR BELONGTO 4013d0 
             401419      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R13 ZZ mov     esi, ebp 
-            401419     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, ebp 
+            401419     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, ebp 
             40141b      5 INSTR BELONGTO 4013d0 
             40141b      5 INSTR DEADREGS  EFLAGS RAX RDI R13 ZZ mov     edi, offset aB  ; "(b)" 
             401420      2 INSTR BELONGTO 4013d0 
             401420      2 INSTR DEADREGS  EFLAGS RAX R13 ZZ xor     eax, eax 
-            401420     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401420     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401422     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_new 
             401422      5 INSTR BELONGTO 4013d0 
             401422      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_variant_new 
@@ -1079,8 +1079,8 @@
             40143a      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 ZZ xor     r8d, r8d 
             40143d      2 INSTR BELONGTO 4013d0 
             40143d      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ xor     edx, edx 
-            40143d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40143f     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFFh 
+            40143d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40143f     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFFh 
             40143f      5 INSTR BELONGTO 4013d0 
             40143f      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R13 ZZ mov     ecx, 0FFFFFFFFh 
             401444      3 INSTR BELONGTO 4013d0 
@@ -1110,15 +1110,15 @@
             401469      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, [rax+8] 
             40146d      2 INSTR BELONGTO 4013d0 
             40146d      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     edi, edi 
-            40146d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40146d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40146f      5 INSTR BELONGTO 4013d0 
             40146f      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aUnableToSendMe; "unable to send message: %s" 
-            401474     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            401474     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             401474      5 INSTR BELONGTO 4013d0 
             401474      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 10h 
             401479      2 INSTR BELONGTO 4013d0 
             401479      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            401479     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401479     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40147b     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40147b      5 INSTR BELONGTO 4013d0 
             40147b      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -1129,7 +1129,7 @@
             401483      5 INSTR DEADREGS  EFLAGS ZZ call    _g_clear_error 
             401488      2 INSTR BELONGTO 4013d0 
             401488      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     esi, esi 
-            401488     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            401488     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40148a      3 INSTR BELONGTO 4013d0 
             40148a      3 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     rdx, rbp 
             40148d      3 INSTR BELONGTO 4013d0 
@@ -1149,15 +1149,15 @@
             40149f      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     rcx, [rax+8] 
             4014a3      2 INSTR BELONGTO 4013d0 
             4014a3      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 ZZ xor     edi, edi 
-            4014a3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4014a3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4014a5      5 INSTR BELONGTO 4013d0 
             4014a5      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 ZZ mov     edx, offset aUnableToFlushM; "unable to flush message queue: %s" 
-            4014aa     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4014aa     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             4014aa      5 INSTR BELONGTO 4013d0 
             4014aa      5 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ mov     esi, 10h 
             4014af      2 INSTR BELONGTO 4013d0 
             4014af      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            4014af     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4014af     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4014b1     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4014b1      5 INSTR BELONGTO 4013d0 
             4014b1      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_log 
@@ -1194,7 +1194,7 @@
             4014ed      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, offset aScreensaver__0; "screensaver_send_message_bool" 
             4014f2      2 INSTR BELONGTO 4013d0 
             4014f2      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ xor     edi, edi 
-            4014f2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4014f2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4014f4     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             4014f4      5 INSTR BELONGTO 4013d0 
             4014f4      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_return_if_fail_warning 
@@ -1205,15 +1205,15 @@
             4014fc      2 INSTR BELONGTO 4013d0 
             401500      5 INSTR BELONGTO 4013d0 
             401500      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 ZZ mov     edx, offset aCouldnTAllocat; "Couldn't allocate the dbus message" 
-            401505     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            401505     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             401505      5 INSTR BELONGTO 4013d0 
             401505      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 R13 ZZ mov     esi, 10h 
             40150a      2 INSTR BELONGTO 4013d0 
             40150a      2 INSTR DEADREGS  EFLAGS RAX RBX RDI R12 R13 ZZ xor     edi, edi 
-            40150a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40150a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40150c      2 INSTR BELONGTO 4013d0 
             40150c      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-            40150c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40150c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40150e     -2 INSTR LOCAL n R13 ZZ  AlwaysNUM xor     r13d, r13d 
             40150e      3 INSTR BELONGTO 4013d0 
             40150e      3 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ xor     r13d, r13d 
@@ -1261,7 +1261,7 @@
             401557      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aS  ; "(s)" 
             40155c      2 INSTR BELONGTO 401520 
             40155c      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40155c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40155c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40155e     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_new 
             40155e      5 INSTR BELONGTO 401520 
             40155e      5 INSTR DEADREGS  EFLAGS ZZ call    _g_variant_new 
@@ -1301,7 +1301,7 @@
             4015b7     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_unref 
             4015b7      5 INSTR BELONGTO 401520 
             4015b7      5 INSTR DEADREGS  EFLAGS ZZ call    _g_variant_unref 
-            4015bc     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4015bc     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4015bc      5 INSTR BELONGTO 401520 
             4015bc      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edx, 1 
             4015c1     -1 INSTR LOCAL MetadataUnused mov     esi, offset aGetactive; "GetActive" 
@@ -1331,7 +1331,7 @@
             4015ec      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             4015ef      2 INSTR BELONGTO 401520 
             4015ef      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4015ef     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4015ef     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4015f1     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_get 
             4015f1      5 INSTR BELONGTO 401520 
             4015f1      5 INSTR DEADREGS  EFLAGS ZZ call    _g_variant_get 
@@ -1343,7 +1343,7 @@
             4015fe      5 INSTR BELONGTO 401520 
             4015fe      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 ZZ mov     r8d, [rsp+58h+var_20] 
             4015fe      5 PTRIMMEDESP STACK 56 displ mov     r8d, [rsp+58h+var_20]
-            401603     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            401603     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             401603      5 INSTR BELONGTO 401520 
             401603      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             401608      5 INSTR BELONGTO 401520 
@@ -1356,7 +1356,7 @@
             401612      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset msgid; "The screensaver is inactive\n" 
             401617      2 INSTR BELONGTO 401520 
             401617      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            401617     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            401617     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             401619     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             401619      5 INSTR BELONGTO 401520 
             401619      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -1364,7 +1364,7 @@
             40161e      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             401621      2 INSTR BELONGTO 401520 
             401621      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            401621     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401621     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401623     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             401623      5 INSTR BELONGTO 401520 
             401623      5 INSTR DEADREGS  EFLAGS ZZ call    _g_print 
@@ -1401,7 +1401,7 @@
             401664      4 INSTR BELONGTO 401520 
             401668      2 INSTR BELONGTO 401520 
             401668      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            401668     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401668     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401668     72 DEALLOC STACK esp - 72 xor     eax, eax
             40166a      1 INSTR BELONGTO 401520 
             40166a      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
@@ -1411,7 +1411,7 @@
             40166c      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             401670      2 INSTR BELONGTO 401520 
             401670      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ xor     esi, esi 
-            401670     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            401670     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             401672      3 INSTR BELONGTO 401520 
             401672      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ mov     rdi, rbx 
             401675     -1 INSTR LOCAL NoMetaUpdate call    sub_4013D0 
@@ -1430,7 +1430,7 @@
             40168b      2 INSTR BELONGTO 401520 
             401690      2 INSTR BELONGTO 401520 
             401690      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ xor     edx, edx 
-            401690     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401690     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             401692     -1 INSTR LOCAL MetadataUnused mov     esi, offset aQuit; "Quit" 
             401692      5 INSTR BELONGTO 401520 
             401697     -1 INSTR LOCAL NoMetaUpdate call    sub_401240 
@@ -1438,7 +1438,7 @@
             401697      5 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI R8 R9 R10 R11 ZZ call    sub_401240 
             40169c     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_401658 
             40169c      2 INSTR BELONGTO 401520 
-            4016a0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4016a0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4016a0      5 INSTR BELONGTO 401520 
             4016a0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edx, 1 
             4016a5     -1 INSTR LOCAL MetadataUnused mov     esi, offset aGetactive; "GetActive" 
@@ -1468,7 +1468,7 @@
             4016d0      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             4016d3      2 INSTR BELONGTO 401520 
             4016d3      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4016d3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4016d3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4016d5     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_get 
             4016d5      5 INSTR BELONGTO 401520 
             4016d5      5 INSTR DEADREGS  EFLAGS ZZ call    _g_variant_get 
@@ -1483,7 +1483,7 @@
             4016e6      2 INSTR BELONGTO 401520 
             4016e8     -1 INSTR LOCAL NoMetaUpdate jz      loc_4017E0 
             4016e8      6 INSTR BELONGTO 401520 
-            4016ee     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4016ee     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4016ee      5 INSTR BELONGTO 401520 
             4016ee      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edx, 1 
             4016f3     -1 INSTR LOCAL MetadataUnused mov     esi, offset aGetactivetime; "GetActiveTime" 
@@ -1513,7 +1513,7 @@
             40171e      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             401721      2 INSTR BELONGTO 401520 
             401721      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            401721     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401721     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401723     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_get 
             401723      5 INSTR BELONGTO 401520 
             401723      5 INSTR DEADREGS  EFLAGS ZZ call    _g_variant_get 
@@ -1527,7 +1527,7 @@
             401730      4 PTRIMMEDESP STACK 60 displ mov     ebp, [rsp+58h+var_1C]
             401734      2 INSTR BELONGTO 401520 
             401734      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     edi, edi        ; domainname 
-            401734     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            401734     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             401736     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 5          ; category 
             401736      6 INSTR BELONGTO 401520 
             401736      6 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 ZZ mov     r8d, 5          ; category 
@@ -1547,13 +1547,13 @@
             401750      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             401753      2 INSTR BELONGTO 401520 
             401753      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            401753     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401753     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401755     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             401755      5 INSTR BELONGTO 401520 
             401755      5 INSTR DEADREGS  EFLAGS ZZ call    _g_print 
             40175a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401632 
             40175a      5 INSTR BELONGTO 401520 
-            401760     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            401760     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             401760      5 INSTR BELONGTO 401520 
             401760      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edx, 1 
             401765     -1 INSTR LOCAL MetadataUnused mov     esi, offset aLock; "Lock" 
@@ -1578,7 +1578,7 @@
             401785      2 INSTR BELONGTO 401520 
             401787     -1 INSTR LOCAL NoMetaUpdate jz      loc_40164E 
             401787      6 INSTR BELONGTO 401520 
-            40178d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40178d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40178d      5 INSTR BELONGTO 401520 
             40178d      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     esi, 1 
             401792      3 INSTR BELONGTO 401520 
@@ -1605,12 +1605,12 @@
             4017b5      5 INSTR BELONGTO 401520 
             4017c0      5 INSTR BELONGTO 401520 
             4017c0      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, offset aDidNotReceiveA; "Did not receive a reply from the screen"... 
-            4017c5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
+            4017c5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
             4017c5      5 INSTR BELONGTO 401520 
             4017c5      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 20h 
             4017ca      2 INSTR BELONGTO 401520 
             4017ca      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            4017ca     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4017ca     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4017cc     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4017cc      5 INSTR BELONGTO 401520 
             4017cc      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -1618,8 +1618,8 @@
             4017d1      5 INSTR BELONGTO 401520 
             4017e0      2 INSTR BELONGTO 401520 
             4017e0      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edi, edi        ; domainname 
-            4017e0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            4017e2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4017e0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4017e2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4017e2      5 INSTR BELONGTO 401520 
             4017e2      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             4017e7      5 INSTR BELONGTO 401520 
@@ -1631,7 +1631,7 @@
             4017f1      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             4017f4      2 INSTR BELONGTO 401520 
             4017f4      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4017f4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4017f4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4017f6     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             4017f6      5 INSTR BELONGTO 401520 
             4017f6      5 INSTR DEADREGS  EFLAGS ZZ call    _g_print 
@@ -1643,21 +1643,21 @@
             401805      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aScreensaver_is; "screensaver_is_running" 
             40180a      2 INSTR BELONGTO 401520 
             40180a      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            40180a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40180a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40180c     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40180c      5 INSTR BELONGTO 401520 
             40180c      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             401811      5 INSTR BELONGTO 401520 
             401811      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     edx, offset aScreensaverIsN; "Screensaver is not running!" 
-            401816     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
+            401816     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
             401816      5 INSTR BELONGTO 401520 
             401816      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     esi, 20h 
             40181b      2 INSTR BELONGTO 401520 
             40181b      2 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ xor     edi, edi 
-            40181b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40181b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40181d      2 INSTR BELONGTO 401520 
             40181d      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40181d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40181d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40181f     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40181f      5 INSTR BELONGTO 401520 
             40181f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -1665,15 +1665,15 @@
             401824      5 INSTR BELONGTO 401520 
             401830      5 INSTR BELONGTO 401520 
             401830      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     edx, offset aDidNotReceiveA; "Did not receive a reply from the screen"... 
-            401835     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
+            401835     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
             401835      5 INSTR BELONGTO 401520 
             401835      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     esi, 20h 
             40183a      2 INSTR BELONGTO 401520 
             40183a      2 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ xor     edi, edi 
-            40183a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40183a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40183c      2 INSTR BELONGTO 401520 
             40183c      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40183c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40183c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40183e     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40183e      5 INSTR BELONGTO 401520 
             40183e      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -1727,7 +1727,7 @@
             401898      2 INSTR BELONGTO 401850 
             40189a      2 INSTR BELONGTO 401850 
             40189a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            40189a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40189a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40189c      4 INSTR BELONGTO 401850 
             4018a0      3 INSTR BELONGTO 401850 
             4018a0      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 044d1d03..bb1a71a8 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 @@
-0069b60430f52e172e83ea785404f1c7526925c9
\ No newline at end of file
+c1b3734b96c8ba20e98ad718ba13f68847dd5afc
\ 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 db9c2f56..7c08f1dc 100644
--- a/tests/commit/trimmed-sorted-save-gnome-screenshot.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-screenshot.psexe.annot
@@ -2534,7 +2534,7 @@
             407579      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_init 
             40757e      5 INSTR BELONGTO 407570 
             40757e      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset locale; locale 
-            407583     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
+            407583     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
             407583      5 INSTR BELONGTO 407570 
             407583      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 6          ; category 
             407588     -1 INSTR LOCAL NoMetaUpdate call    _setlocale 
@@ -2726,7 +2726,7 @@
             4076a9      3 INSTR BELONGTO 4076a0 
             4076ac     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4076C0 
             4076ac      2 INSTR BELONGTO 4076a0 
-            4076ae     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            4076ae     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             4076ae      5 INSTR BELONGTO 4076a0 
             4076b3     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             4076b3      3 INSTR BELONGTO 4076a0 
@@ -2746,7 +2746,7 @@
             4076d0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4076d1      3 INSTR BELONGTO 4076d0 
             4076d4      7 INSTR BELONGTO 4076d0 
-            4076db     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4076db     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4076db      5 INSTR BELONGTO 4076d0 
             4076e0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             4076e0      5 INSTR BELONGTO 4076d0 
@@ -2755,7 +2755,7 @@
             4076ea     -1 INSTR LOCAL NoMetaUpdate jz      short loc_407710 
             4076ea      2 INSTR BELONGTO 4076d0 
             4076ec      7 INSTR BELONGTO 4076d0 
-            4076f3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4076f3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4076f3      5 INSTR BELONGTO 4076d0 
             4076f8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             4076f8      5 INSTR BELONGTO 4076d0 
@@ -2786,7 +2786,7 @@
             407731      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
             407736      3 INSTR BELONGTO 407720 
             407736      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            407739     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            407739     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             407739      5 INSTR BELONGTO 407720 
             407739      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             40773e      7 INSTR BELONGTO 407720 
@@ -2830,7 +2830,7 @@
             407787     -1 INSTR LOCAL NoMetaUpdate call    _cairo_fill 
             407787      5 INSTR BELONGTO 407780 
             407787      5 INSTR DEADREGS  EFLAGS ZZ call    _cairo_fill 
-            40778c     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40778c     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40778c      5 INSTR BELONGTO 407780 
             40778c      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, 1 
             407791     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
@@ -2881,15 +2881,15 @@
             4077de     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 18h 
             4077de      6 INSTR BELONGTO 4077a0 
             4077de      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 18h 
-            4077e4     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_407720 
+            4077e4     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_407720 
             4077e4      5 INSTR BELONGTO 4077a0 
             4077e4      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset sub_407720 
-            4077e9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 88h 
+            4077e9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 88h 
             4077e9      5 INSTR BELONGTO 4077a0 
             4077e9      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 88h 
             4077ee      3 INSTR BELONGTO 4077a0 
             4077ee      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-            4077f1     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+            4077f1     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
             4077f1      5 INSTR BELONGTO 4077a0 
             4077f1      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
             4077f6      7 INSTR BELONGTO 4077a0 
@@ -2962,15 +2962,15 @@
             407868      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 ZZ mov     r8d, offset _g_object_unref 
             40786e      3 INSTR BELONGTO 407820 
             40786e      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     rcx, rax 
-            407871     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_4078C0 
+            407871     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_4078C0 
             407871      5 INSTR BELONGTO 407820 
             407871      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, offset sub_4078C0 
-            407876     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            407876     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             407876      5 INSTR BELONGTO 407820 
             407876      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 8 
             40787b      2 INSTR BELONGTO 407820 
             40787b      2 INSTR DEADREGS  EFLAGS RDI R12 ZZ xor     edi, edi 
-            40787b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40787b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40787d     -1 INSTR LOCAL NoMetaUpdate call    _g_timeout_add_full 
             40787d      5 INSTR BELONGTO 407820 
             40787d      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_timeout_add_full 
@@ -2978,7 +2978,7 @@
             407882      3 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ mov     [rbx+0Ch], eax 
             407885      2 INSTR BELONGTO 407820 
             407885      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            407885     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407885     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407887      4 INSTR BELONGTO 407820 
             407887      4 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+18h+var_18] 
             407887      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp+18h+var_18]
@@ -3054,7 +3054,7 @@
             4078fb      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_window_set_opacity 
             407900     -1 INSTR LOCAL MetadataUnused movsd   xmm0, cs:qword_40CF98 
             407900      8 INSTR BELONGTO 4078c0 
-            407908     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            407908     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             407908      5 INSTR BELONGTO 4078c0 
             407908      5 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, 1 
             40790d     -1 INSTR LOCAL MetadataUnused movsd   xmm1, [rsp+18h+var_18] 
@@ -3080,7 +3080,7 @@
             40792b      5 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ call    _gtk_widget_hide 
             407930      2 INSTR BELONGTO 4078c0 
             407930      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 XMM0 ZZ xor     eax, eax 
-            407930     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407930     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407932     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
             407932      4 INSTR BELONGTO 4078c0 
             407936     16 DEALLOC STACK esp - 16 pop     rbx
@@ -3099,11 +3099,11 @@
             40797c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407984     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_destroy 
             407989      8 PTRIMMEDEBP STACK 0 displ mov     qword ptr [rbp+0], 0
-            407998     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            407998     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40799d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             4079a2     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+28h], 0 
             4079a7     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4079D8 
-            4079b0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4079b0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4079b5     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             4079c1      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
             4079c5      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
@@ -3122,22 +3122,22 @@
             4079fb     -1 INSTR LOCAL NoMetaUpdate call    sub_4077A0 
             407a06     -1 INSTR LOCAL NoMetaUpdate call    _g_type_instance_get_private 
             407a1c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
-            407a21     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            407a21     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             407a29     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_new 
             407a34     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            407a39     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407a39     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407a41     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_decorated 
-            407a46     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            407a46     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             407a4e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_skip_taskbar_hint 
-            407a53     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            407a53     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             407a5b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_skip_pager_hint 
-            407a60     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            407a60     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             407a68     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_keep_above 
-            407a6d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Bh 
+            407a6d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Bh 
             407a75     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_type_hint 
-            407a7a     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407a7a     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407a7f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_accept_focus 
-            407a84     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407a84     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407a89     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_focus_on_map 
             407a8e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
             407a9c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -3152,15 +3152,15 @@
             407ae9     -1 INSTR LOCAL NoMetaUpdate call    _cairo_region_create 
             407af7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407aff     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_window 
-            407b04     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            407b06     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407b04     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            407b06     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407b0e     -1 INSTR LOCAL NoMetaUpdate call    _gdk_window_input_shape_combine_region 
             407b16     -1 INSTR LOCAL NoMetaUpdate call    _cairo_region_destroy 
-            407b1e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            407b1e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             407b23     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407b28     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             407b2b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            407b2e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            407b2e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             407b3d     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             407b42      4 PTRIMMEDEBP STACK 0 displ mov     [rbp+0], rbx
             407b53     -1 INSTR LOCAL NoMetaUpdate call    _gdk_screen_get_system_visual 
@@ -3268,15 +3268,15 @@
             407bfe      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 XMM0 ZZ mov     r8d, offset _g_object_unref 
             407c04      3 INSTR BELONGTO 407b60 
             407c04      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 XMM0 ZZ mov     rcx, rax 
-            407c07     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_407820 
+            407c07     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_407820 
             407c07      5 INSTR BELONGTO 407b60 
             407c07      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 XMM0 ZZ mov     edx, offset sub_407820 
-            407c0c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 96h 
+            407c0c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 96h 
             407c0c      5 INSTR BELONGTO 407b60 
             407c0c      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 ZZ mov     esi, 96h 
             407c11      2 INSTR BELONGTO 407b60 
             407c11      2 INSTR DEADREGS  EFLAGS RDI R12 R13 XMM0 ZZ xor     edi, edi 
-            407c11     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407c11     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407c13     -1 INSTR LOCAL NoMetaUpdate call    _g_timeout_add_full 
             407c13      5 INSTR BELONGTO 407b60 
             407c13      5 INSTR DEADREGS  EFLAGS R12 R13 XMM0 ZZ call    _g_timeout_add_full 
@@ -3320,7 +3320,7 @@
             407c5e      4 INSTR BELONGTO 407c50 
             407c62      2 INSTR BELONGTO 407c50 
             407c62      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            407c62     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407c62     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407c62      8 DEALLOC STACK esp - 8 xor     eax, eax
             407c64     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
             407c64      5 INSTR BELONGTO 407c50 
@@ -3346,7 +3346,7 @@
             407c79      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
             407c7e      3 INSTR BELONGTO 407c70 
             407c7e      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            407c81     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            407c81     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             407c81      5 INSTR BELONGTO 407c70 
             407c81      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             407c86      7 INSTR BELONGTO 407c70 
@@ -3398,7 +3398,7 @@
             407ce4     -1 INSTR LOCAL NoMetaUpdate call    _gdk_display_get_default 
             407ce4      5 INSTR BELONGTO 407ce0 
             407ce4      5 INSTR DEADREGS  EFLAGS ZZ call    _gdk_display_get_default 
-            407ce9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 45h 
+            407ce9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 45h 
             407ce9      5 INSTR BELONGTO 407ce0 
             407ce9      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 45h 
             407cee      3 INSTR BELONGTO 407ce0 
@@ -3466,7 +3466,7 @@
             407d4a      2 INSTR BELONGTO 407d10 
             407d4c      3 INSTR BELONGTO 407d10 
             407d4c      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rbx 
-            407d4f     -2 INSTR LOCAL n EDI ZZ  NumericDEFs mov     edi, offset loc_407F80 
+            407d4f     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     edi, offset loc_407F80 
             407d4f      5 INSTR BELONGTO 407d10 
             407d4f      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, offset loc_407F80 
             407d54     -1 INSTR LOCAL NoMetaUpdate call    sub_40A2A0 
@@ -3523,8 +3523,8 @@
             407da8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     esi, offset aScreenshotTake; "Screenshot taken" 
             407dad      2 INSTR BELONGTO 407d10 
             407dad      2 INSTR DEADREGS  EFLAGS RDX RDI ZZ xor     edi, edi        ; domainname 
-            407dad     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            407daf     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407dad     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407daf     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407daf      5 INSTR BELONGTO 407d10 
             407daf      5 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, 5          ; category 
             407db4     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -3576,18 +3576,18 @@
             407dfe      5 INSTR BELONGTO 407d10 
             407e08      5 INSTR BELONGTO 407d10 
             407e08      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset aUnableToCaptur; "Unable to capture a screenshot of any w"... 
-            407e0d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            407e0d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             407e0d      5 INSTR BELONGTO 407d10 
             407e0d      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 8 
             407e12      2 INSTR BELONGTO 407d10 
             407e12      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            407e12     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407e12     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407e14     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             407e14      5 INSTR BELONGTO 407d10 
             407e14      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
             407e19      7 INSTR BELONGTO 407d10 
             407e19      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rax, cs:qword_60FAD8 
-            407e20     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407e20     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407e20      5 INSTR BELONGTO 407d10 
             407e20      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             407e25     -1 INSTR LOCAL MetadataUnused mov     esi, [rax+34h] 
@@ -3598,7 +3598,7 @@
             407e2a      2 INSTR BELONGTO 407d10 
             407e2c      2 INSTR BELONGTO 407d10 
             407e2c      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            407e2c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407e2c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407e2e      5 INSTR BELONGTO 407d10 
             407e2e      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aAllPossibleMet; "All possible methods failed" 
             407e33     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -3608,7 +3608,7 @@
             407e38      2 INSTR BELONGTO 407d10 
             407e3a      3 INSTR BELONGTO 407d10 
             407e3a      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rbp, rax 
-            407e3d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407e3d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407e3d      5 INSTR BELONGTO 407d10 
             407e3d      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             407e42      5 INSTR BELONGTO 407d10 
@@ -3620,10 +3620,10 @@
             407e4c      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     r8, rbp 
             407e4f      3 INSTR BELONGTO 407d10 
             407e4f      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R9 R10 R11 ZZ mov     rcx, rax 
-            407e52     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            407e52     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             407e52      5 INSTR BELONGTO 407d10 
             407e52      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R9 R10 R11 ZZ mov     edx, 1 
-            407e57     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            407e57     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             407e57      5 INSTR BELONGTO 407d10 
             407e57      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R9 R10 R11 ZZ mov     esi, 3 
             407e5c     -1 INSTR LOCAL MetadataRedundant xor     edi, edi 
@@ -3635,7 +3635,7 @@
             407e63      5 INSTR BELONGTO 407d10 
             407e70      2 INSTR BELONGTO 407d10 
             407e70      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            407e70     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407e70     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407e72      5 INSTR BELONGTO 407d10 
             407e72      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aUnableToCapt_0; "Unable to capture a screenshot" 
             407e77     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -3667,7 +3667,7 @@
             407ea2      2 INSTR BELONGTO 407e90 
             407ea4      2 INSTR BELONGTO 407e90 
             407ea4      2 INSTR DEADREGS  EFLAGS RSI ZZ xor     esi, esi 
-            407ea4     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407ea4     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407ea6     -1 INSTR LOCAL NoMetaUpdate call    sub_407D10 
             407ea6      5 INSTR BELONGTO 407e90 
             407ea6      5 INSTR DEADREGS  EFLAGS ZZ call    sub_407D10 
@@ -3676,14 +3676,14 @@
             407eab      5 INSTR DEADREGS  EFLAGS ZZ call    sub_4099D0 
             407eb0      2 INSTR BELONGTO 407e90 
             407eb0      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ xor     eax, eax 
-            407eb0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407eb0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407eb2     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             407eb2      4 INSTR BELONGTO 407e90 
             407eb6      1 INSTR BELONGTO 407e90 
             407eb6      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             407ec0      3 INSTR BELONGTO 407e90 
             407ec0      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, rdi 
-            407ec3     -2 INSTR LOCAL n EDI ZZ  NumericDEFs mov     edi, offset loc_408B40 
+            407ec3     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     edi, offset loc_408B40 
             407ec3      5 INSTR BELONGTO 407e90 
             407ec3      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, offset loc_408B40 
             407ec8     -1 INSTR LOCAL NoMetaUpdate call    sub_4094F0 
@@ -3694,7 +3694,7 @@
             407ecd      5 INSTR DEADREGS  EFLAGS ZZ call    sub_4099D0 
             407ed2      2 INSTR BELONGTO 407e90 
             407ed2      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ xor     eax, eax 
-            407ed2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407ed2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407ed4     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             407ed4      4 INSTR BELONGTO 407e90 
             407ed8      1 INSTR BELONGTO 407e90 
@@ -3725,7 +3725,7 @@
             407ef1      3 INSTR BELONGTO 407ee0 
             407ef4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_407F04 
             407ef4      2 INSTR BELONGTO 407ee0 
-            407ef6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            407ef6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             407ef6      5 INSTR BELONGTO 407ee0 
             407ef6      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             407efb     -1 INSTR LOCAL NoMetaUpdate call    sub_40A200 
@@ -3757,13 +3757,13 @@
             407f23      6 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 ZZ mov     r8d, offset loc_4083F0 
             407f29      2 INSTR BELONGTO 407ee0 
             407f29      2 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ xor     ecx, ecx 
-            407f29     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            407f29     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             407f2b      2 INSTR BELONGTO 407ee0 
             407f2b      2 INSTR DEADREGS  EFLAGS RDX RSI ZZ xor     edx, edx 
-            407f2b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407f2b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407f2d      2 INSTR BELONGTO 407ee0 
             407f2d      2 INSTR DEADREGS  EFLAGS RSI ZZ xor     esi, esi 
-            407f2d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407f2d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407f2f     -1 INSTR LOCAL NoMetaUpdate call    _g_file_create_async 
             407f2f      5 INSTR BELONGTO 407ee0 
             407f2f      5 INSTR DEADREGS  EFLAGS ZZ call    _g_file_create_async 
@@ -3788,13 +3788,13 @@
             407f4e      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 ZZ xor     r8d, r8d 
             407f51      2 INSTR BELONGTO 407ee0 
             407f51      2 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ xor     ecx, ecx 
-            407f51     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            407f51     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             407f53      2 INSTR BELONGTO 407ee0 
             407f53      2 INSTR DEADREGS  EFLAGS RDX RSI ZZ xor     edx, edx 
-            407f53     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407f53     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407f55      2 INSTR BELONGTO 407ee0 
             407f55      2 INSTR DEADREGS  EFLAGS RSI ZZ xor     esi, esi 
-            407f55     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407f55     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407f57      5 INSTR BELONGTO 407ee0 
             407f57      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+28h+var_20], rbp 
             407f57      5 PTRIMMEDESP STACK 8 displ mov     [rsp+28h+var_20], rbp
@@ -3829,31 +3829,31 @@
             407fc4      5 PTRIMMEDESP STACK 8 displ mov     rax, [rsp+8]
             407fc9     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             407fcc     -1 INSTR LOCAL NoMetaUpdate jz      loc_408070 
-            407fdb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            407fdd     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            407fdf     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            407fdb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            407fdd     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            407fdf     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             407fe4     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             407fe9      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
             407fee     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
-            407ffa     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            407ffa     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             408003     -1 INSTR LOCAL NoMetaUpdate test    r11d, r11d 
             408006     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_408030 
-            40800d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40800d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40800f     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40801c     -1 INSTR LOCAL NoMetaUpdate call    sub_40BE70 
             408021     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
-            408035     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408035     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408037     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            40803c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            408049     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40803c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            408049     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40804b     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            408056     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            40805b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
-            408060     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408056     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40805b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            408060     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408062     -1 INSTR LOCAL NoMetaUpdate call    sub_40CC70 
             408067     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
-            408070     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            408075     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408070     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            408075     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40807c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408089     -1 INSTR LOCAL NoMetaUpdate call    sub_40BE70 
             408093     -1 INSTR LOCAL NoMetaUpdate call    _g_getenv 
@@ -3942,7 +3942,7 @@
             4081c2      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    sub_40A070 
             4081c7      2 INSTR BELONGTO 408160 
             4081c7      2 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ xor     esi, esi 
-            4081c7     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4081c7     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4081c9      3 INSTR BELONGTO 408160 
             4081c9      3 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 ZZ mov     rdi, rbx 
             4081cc      5 INSTR BELONGTO 408160 
@@ -3954,7 +3954,7 @@
             4081d6     -1 INSTR LOCAL NoMetaUpdate call    _g_io_error_quark 
             4081d6      5 INSTR BELONGTO 408160 
             4081d6      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_io_error_quark 
-            4081db     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            4081db     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             4081db      5 INSTR BELONGTO 408160 
             4081db      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 ZZ mov     edx, 2 
             4081e0      2 INSTR BELONGTO 408160 
@@ -3976,18 +3976,18 @@
             4081f6      3 INSTR BELONGTO 408160 
             4081f9     -1 INSTR LOCAL NoMetaUpdate jz      loc_4082E0 
             4081f9      6 INSTR BELONGTO 408160 
-            4081ff     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4081ff     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4081ff      5 INSTR BELONGTO 408160 
             4081ff      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             408204      5 INSTR BELONGTO 408160 
             408204      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aErrorCreatin_0; "Error creating file. Please choose anot"... 
             408209      2 INSTR BELONGTO 408160 
             408209      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            408209     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            408209     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40820b     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40820b      5 INSTR BELONGTO 408160 
             40820b      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _dcgettext 
-            408210     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            408210     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             408210      5 INSTR BELONGTO 408160 
             408210      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             408215      5 INSTR BELONGTO 408160 
@@ -4018,10 +4018,10 @@
             40823c      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R9 R10 R11 R12 R13 R14 R15 ZZ mov     rdi, rax 
             40823f      3 INSTR BELONGTO 408160 
             40823f      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R9 R10 R11 R12 R13 R14 R15 ZZ mov     rcx, rbp 
-            408242     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            408242     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             408242      5 INSTR BELONGTO 408160 
             408242      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R9 R10 R11 R12 R13 R14 R15 ZZ mov     edx, 1 
-            408247     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            408247     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             408247      5 INSTR BELONGTO 408160 
             408247      5 INSTR DEADREGS  EFLAGS RAX RSI R9 R10 R11 R12 R13 R14 R15 ZZ mov     esi, 3 
             40824c     -1 INSTR LOCAL NoMetaUpdate call    sub_40CC70 
@@ -4046,14 +4046,14 @@
             408276     -1 INSTR LOCAL NoMetaUpdate jmp     sub_40A060 
             408276      5 INSTR BELONGTO 408160 
             408276      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ jmp     sub_40A060 
-            408280     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            408280     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             408280      5 INSTR BELONGTO 408160 
             408280      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             408285      5 INSTR BELONGTO 408160 
             408285      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aUnableToCapt_0; "Unable to capture a screenshot" 
             40828a      2 INSTR BELONGTO 408160 
             40828a      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            40828a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40828a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40828c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40828c      5 INSTR BELONGTO 408160 
             40828c      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _dcgettext 
@@ -4107,7 +4107,7 @@
             4082ee      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_path_get_basename 
             4082f3      2 INSTR BELONGTO 408160 
             4082f3      2 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ xor     esi, esi 
-            4082f3     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4082f3     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4082f5      3 INSTR BELONGTO 408160 
             4082f5      3 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 ZZ mov     rdi, rax 
             4082f8      3 INSTR BELONGTO 408160 
@@ -4124,7 +4124,7 @@
             408306      5 INSTR DEADREGS  EFLAGS R15 ZZ call    sub_40A0D0 
             40830b      2 INSTR BELONGTO 408160 
             40830b      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ xor     edi, edi        ; domainname 
-            40830b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40830b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40830d      3 INSTR BELONGTO 408160 
             40830d      3 INSTR DEADREGS  EFLAGS RDX RSI R15 ZZ mov     r15, rax 
             408310     -1 INSTR LOCAL MetadataRedundant mov     edx, 5          ; category 
@@ -4142,16 +4142,16 @@
             408325      3 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     rsi, r15 
             408328      2 INSTR BELONGTO 408160 
             408328      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            408328     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408328     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40832a     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40832a      5 INSTR BELONGTO 408160 
             40832a      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strdup_printf 
-            40832f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40832f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40832f      5 INSTR BELONGTO 408160 
             40832f      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             408334      2 INSTR BELONGTO 408160 
             408334      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            408334     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            408334     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             408336      5 INSTR BELONGTO 408160 
             408336      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aOverwriteExist; "Overwrite existing file?" 
             40833b      5 INSTR BELONGTO 408160 
@@ -4180,10 +4180,10 @@
             408361      5 INSTR BELONGTO 408160 
             408361      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R9 R10 R11 ZZ mov     rcx, [rsp+58h+var_50] 
             408361      5 PTRIMMEDESP STACK 8 displ mov     rcx, [rsp+58h+var_50]
-            408366     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
+            408366     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
             408366      5 INSTR BELONGTO 408160 
             408366      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R9 R10 R11 ZZ mov     edx, 4 
-            40836b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40836b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40836b      5 INSTR BELONGTO 408160 
             40836b      5 INSTR DEADREGS  EFLAGS RSI RDI R9 R10 R11 ZZ mov     esi, 1 
             408370      3 INSTR BELONGTO 408160 
@@ -4220,7 +4220,7 @@
             4083a1     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             4083a1      5 INSTR BELONGTO 408160 
             4083a1      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_free 
-            4083a6     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, dword ptr [rsp+58h+var_50] 
+            4083a6     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, dword ptr [rsp+58h+var_50] 
             4083a6      4 INSTR BELONGTO 408160 
             4083a6      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     eax, dword ptr [rsp+58h+var_50] 
             4083a6      4 PTRIMMEDESP STACK 8 displ mov     eax, dword ptr [rsp+58h+var_50]
@@ -4287,8 +4287,8 @@
             4084bd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4084c2      4 PTRIMMEDEBP STACK 40 displ mov     rdx, [rbp+28h]
             4084c9      3 PTRIMMEDEBP STACK 0 displ mov     r9, rbp
-            4084d2     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4084d4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4084d2     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4084d4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4084df      9 PTRIMMEDESP STACK 32 displ mov     qword ptr [rsp+20h], 0
             4084e8      9 PTRIMMEDESP STACK 24 displ mov     qword ptr [rsp+18h], offset domainname; "gnome-screenshot"
             4084f1      9 PTRIMMEDESP STACK 16 displ mov     qword ptr [rsp+10h], offset aTextSoftware; "tEXt::Software"
@@ -4301,8 +4301,8 @@
             40852b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             408530      4 PTRIMMEDEBP STACK 40 displ mov     rdx, [rbp+28h]
             408537      3 PTRIMMEDEBP STACK 0 displ mov     r9, rbp
-            408540     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            408542     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408540     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            408542     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40854d      9 PTRIMMEDESP STACK 16 displ mov     qword ptr [rsp+10h], 0
             408556      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], offset domainname; "gnome-screenshot"
             40855f      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], offset aTextSoftware; "tEXt::Software"
@@ -4326,15 +4326,15 @@
             4085d7      5 PTRIMMEDESP STACK 88 displ mov     r12, [rsp+58h]
             4085dc      5 PTRIMMEDESP STACK 96 displ mov     r13, [rsp+60h]
             4085e1     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 68h 
-            4085f0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4085f0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4085fa     -1 INSTR LOCAL NoMetaUpdate call    _g_app_info_get_default_for_type 
             4085ff     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             408605     -1 INSTR LOCAL NoMetaUpdate jz      loc_408690 
             40860b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_recent_manager_get_default 
             408610      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             408616     -1 INSTR LOCAL NoMetaUpdate call    _g_app_info_get_executable 
-            40861b     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40862a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40861b     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40862a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40862c     -1 INSTR LOCAL NoMetaUpdate call    _g_strjoin 
             408634      5 PTRIMMEDESP STACK 32 displ mov     [rsp+20h], rax
             40863d      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp
@@ -4362,8 +4362,8 @@
             4086fd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_destroy 
             408702     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4085CD 
             408710     -3 INSTR LOCAL NoWarn push    r12 
-            408715     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            408717     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 36h 
+            408715     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            408717     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 36h 
             40871c     -3 INSTR LOCAL NoWarn push    rbp 
             408720     -3 INSTR LOCAL NoWarn push    rbx 
             408728      5 PTRIMMEDESP STACK 16 displ lea     rdi, [rsp+10h]
@@ -4423,15 +4423,15 @@
             40892a     12 PTRIMMEDESP STACK 464 displ mov     qword ptr [rsp+1D0h], 0
             408936     11 PTRIMMEDESP STACK 508 displ mov     dword ptr [rsp+1FCh], 0
             408941     -1 INSTR LOCAL NoMetaUpdate call    _g_strv_length 
-            408946     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            408950     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408946     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            408950     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408952      7 PTRIMMEDESP STACK 508 displ mov     [rsp+1FCh], eax
             408959     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408961     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_new 
             408966      5 PTRIMMEDESP STACK 16 displ lea     rsi, [rsp+10h]
-            40896b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40896b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408973     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_add_main_entries 
-            408978     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            408978     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40897d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_get_option_group 
             408988     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_add_group 
             40898d      8 PTRIMMEDESP STACK 464 displ lea     rcx, [rsp+1D0h]
@@ -4456,22 +4456,22 @@
             4089ff      7 PTRIMMEDEBP STACK 0 displ mov     dword ptr [rbp+0], 1
             408a09     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_free 
             408a0e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 200h 
-            408a15     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            408a15     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             408a20      8 PTRIMMEDESP STACK 464 displ lea     rdx, [rsp+1D0h]
-            408a28     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            408a28     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             408a2d     -1 INSTR LOCAL NoMetaUpdate call    _g_application_register 
             408a32     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             408a34     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_408A06 
             408a36      8 PTRIMMEDESP STACK 464 displ mov     rax, [rsp+1D0h]
-            408a47     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408a47     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408a49     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             408a4e      8 PTRIMMEDESP STACK 464 displ mov     rdi, [rsp+1D0h]
             408a56     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
             408a5b     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4089FF 
             408a60      8 PTRIMMEDESP STACK 464 displ mov     rax, [rsp+1D0h]
-            408a6d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
-            408a72     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            408a78     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408a6d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            408a72     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            408a78     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408a7a     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             408a7f      8 PTRIMMEDESP STACK 464 displ mov     rdi, [rsp+1D0h]
             408a87     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
@@ -4609,8 +4609,8 @@
             408c82     -1 INSTR LOCAL NoMetaUpdate cmp     ebx, 0FFFFFFFAh 
             408c85     -1 INSTR LOCAL NoMetaUpdate jz      short loc_408CA0 
             408c87     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            408c8f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 266h 
-            408c99     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408c8f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 266h 
+            408c99     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408c9b     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message 
             408ca0      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             408ca5      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
@@ -4678,10 +4678,10 @@
             408d24     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 30h 
             408d24      6 INSTR BELONGTO 408cd0 
             408d24      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 30h 
-            408d2a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_407C70 
+            408d2a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_407C70 
             408d2a      5 INSTR BELONGTO 408cd0 
             408d2a      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset sub_407C70 
-            408d2f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1A8h 
+            408d2f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1A8h 
             408d2f      5 INSTR BELONGTO 408cd0 
             408d2f      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 1A8h 
             408d34      7 INSTR BELONGTO 408cd0 
@@ -4721,7 +4721,7 @@
             408d68      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_408CD0 
             408d6d      2 INSTR BELONGTO 408d50 
             408d6d      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            408d6d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408d6d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408d6f      3 INSTR BELONGTO 408d50 
             408d6f      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rax 
             408d72      5 INSTR BELONGTO 408d50 
@@ -4730,7 +4730,7 @@
             408d77      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, offset aApplicationId; "application-id" 
             408d7c      2 INSTR BELONGTO 408d50 
             408d7c      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            408d7c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408d7c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408d7e     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             408d7e      5 INSTR BELONGTO 408d50 
             408d7e      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_new 
@@ -4765,15 +4765,15 @@
             408e4e     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             408e53      4 PTRIMMEDEBP STACK 40 displ mov     rbx, [rbp+28h]
             408e57      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+8]
-            408e5c     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            408e5e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            408e5c     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            408e5e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             408e63     -1 INSTR LOCAL NoMetaUpdate call    _g_bus_get_sync 
             408e6b      5 PTRIMMEDESP STACK 8 displ mov     rax, [rsp+8]
             408e70     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             408e73     -1 INSTR LOCAL NoMetaUpdate jz      short loc_408EB8 
-            408e79     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            408e80     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
-            408e85     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408e79     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            408e80     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            408e85     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408e87     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             408e8c      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
             408e91     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
@@ -4821,7 +4821,7 @@
             408f49      4 INSTR BELONGTO 408f30 
             408f4d      3 INSTR BELONGTO 408f30 
             408f50      2 INSTR BELONGTO 408f30 
-            408f50     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408f50     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408f52     -1 INSTR LOCAL NoMetaUpdate mfence 
             408f52      3 INSTR BELONGTO 408f30 
             408f55      3 INSTR BELONGTO 408f30 
@@ -4837,7 +4837,7 @@
             408f67      5 INSTR BELONGTO 408f30 
             408f6c      4 INSTR BELONGTO 408f30 
             408f70      2 INSTR BELONGTO 408f30 
-            408f70     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408f70     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408f72      4 INSTR BELONGTO 408f30 
             408f76     -1 INSTR LOCAL NoMetaUpdate mfence 
             408f76      3 INSTR BELONGTO 408f30 
@@ -4861,7 +4861,7 @@
             408fa6     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             408fa6      5 INSTR BELONGTO 408f30 
             408fab      7 INSTR BELONGTO 408f30 
-            408fb2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            408fb2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             408fb2      5 INSTR BELONGTO 408f30 
             408fb7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             408fb7      5 INSTR BELONGTO 408f30 
@@ -4934,7 +4934,7 @@
             409049     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_app_paintable 
             40904e     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             409050     -1 INSTR LOCAL NoMetaUpdate jz      loc_4090FE 
-            409056     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            409056     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40905e     -1 INSTR LOCAL NoMetaUpdate call    _cairo_set_operator 
             409063     -1 INSTR LOCAL NoMetaUpdate xorpd   xmm3, xmm3 
             40906a     -1 INSTR LOCAL NUMViaFPRegDest movapd  xmm2, xmm3 
@@ -4964,7 +4964,7 @@
             4090f1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_render_frame 
             4090f6      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4090f9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_style_context_restore 
-            4090fe     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4090fe     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             409103      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             409108      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             40910d      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
@@ -4989,12 +4989,12 @@
             40912d      2 INSTR BELONGTO 409120 
             40912f      2 INSTR BELONGTO 409120 
             40912f      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40912f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40912f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409131     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [rbx+10h] 
             409131      3 INSTR BELONGTO 409120 
             409134      3 INSTR BELONGTO 409120 
             409134      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rbx 
-            409137     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
+            409137     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
             409137      5 INSTR BELONGTO 409120 
             409137      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 28h 
             40913c     -1 INSTR LOCAL NoMetaUpdate call    _g_slice_free1 
@@ -5002,7 +5002,7 @@
             40913c      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_slice_free1 
             409141      2 INSTR BELONGTO 409120 
             409141      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            409141     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409141     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409143      1 INSTR BELONGTO 409120 
             409143      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             409144      1 INSTR BELONGTO 409120 
@@ -5016,9 +5016,9 @@
             409165     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_409185 
             409167     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm0, qword ptr [rsi+40h] 
             409173     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm1, qword ptr [rsi+48h] 
-            409178     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM cvttsd2si eax, xmm0 
-            40917e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM cvttsd2si eax, xmm1 
-            409185     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            409178     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cvttsd2si eax, xmm0 
+            40917e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cvttsd2si eax, xmm1 
+            409185     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             409190      5 PTRIMMEDESP STACK -48 displ mov     [rsp-30h], rbx
             409195      5 PTRIMMEDESP STACK -40 displ mov     [rsp-28h], rbp
             40919d      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], r12
@@ -5034,7 +5034,7 @@
             4091d1     -1 INSTR LOCAL NoMetaUpdate subsd   xmm0, xmm2 
             4091d5     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm5, xmm0 
             4091d9     -1 INSTR LOCAL NoMetaUpdate ja      loc_4092B0 
-            4091df     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM cvttsd2si ebp, xmm0 
+            4091df     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM cvttsd2si ebp, xmm0 
             4091e3     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm1, dword ptr [rdx+4] 
             4091e8     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm0, qword ptr [rsi+48h] 
             4091ed     -1 INSTR LOCAL NUMViaFPRegDest movapd  xmm4, xmm1 
@@ -5063,7 +5063,7 @@
             40927b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_app_paintable 
             409280     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             409282     -1 INSTR LOCAL NoMetaUpdate jz      loc_409340 
-            409288     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            409288     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40928d      5 PTRIMMEDESP STACK 24 displ mov     rbx, [rsp+18h]
             409292      5 PTRIMMEDESP STACK 32 displ mov     rbp, [rsp+20h]
             409297      5 PTRIMMEDESP STACK 40 displ mov     r12, [rsp+28h]
@@ -5073,7 +5073,7 @@
             4092ab     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
             4092b0     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm1, qword ptr cs:xmmword_40D4D0 
             4092b8     -1 INSTR LOCAL NoMetaUpdate xorpd   xmm0, xmm1 
-            4092bc     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM cvttsd2si ebp, xmm0 
+            4092bc     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM cvttsd2si ebp, xmm0 
             4092c0     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4091E3 
             4092c8     -2 INSTR LOCAL n R15 ZZ  AlwaysNUM cvttsd2si r15d, xmm0 
             4092cd     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40922E 
@@ -5083,12 +5083,12 @@
             4092ed     -1 INSTR LOCAL NoMetaUpdate jmp     loc_409210 
             4092f8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             409306     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40930b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFF9Ch 
+            40930b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFF9Ch 
             409315     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_move 
             40931a      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             409320     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409325     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0Ah 
-            40932a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
+            409325     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0Ah 
+            40932a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
             409332     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_resize 
             409337     -1 INSTR LOCAL NoMetaUpdate jmp     loc_409288 
             409343     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_window 
@@ -5096,9 +5096,9 @@
             40934e     -1 INSTR LOCAL NoMetaUpdate jle     short loc_409356 
             409350     -1 INSTR LOCAL NoMetaUpdate cmp     r12d, 2 
             409354     -1 INSTR LOCAL NoMetaUpdate jg      short loc_409370 
-            409356     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            409358     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40935a     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409356     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            409358     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40935a     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40935f     -1 INSTR LOCAL NoMetaUpdate call    _gdk_window_shape_combine_region 
             409364     -1 INSTR LOCAL NoMetaUpdate jmp     loc_409288 
             409370      3 PTRIMMEDESP STACK 0 displ mov     rdi, rsp
@@ -5113,8 +5113,8 @@
             4093a2      5 PTRIMMEDESP STACK 8 displ sub     dword ptr [rsp+8], 2
             4093a7      5 PTRIMMEDESP STACK 12 displ sub     dword ptr [rsp+0Ch], 2
             4093ac     -1 INSTR LOCAL NoMetaUpdate call    _cairo_region_subtract_rectangle 
-            4093b4     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4093b6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4093b4     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4093b6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4093b8      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             4093bb     -1 INSTR LOCAL NoMetaUpdate call    _gdk_window_shape_combine_region 
             4093c0      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -5127,7 +5127,7 @@
             4093d0      4 INSTR DEADREGS  EFLAGS RAX XMM0 XMM4 ZZ sub     rsp, 8 
             4093d0      8 DATAREF STACK 577 esp + 0 PARENT LocalFrame LOCALFRAME
             4093d0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            4093d4     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rdx+10h] 
+            4093d4     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rdx+10h] 
             4093d4      3 INSTR BELONGTO 4093d0 
             4093d4      3 INSTR DEADREGS  EFLAGS RAX XMM0 XMM4 ZZ mov     eax, [rdx+10h] 
             4093d7     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
@@ -5191,7 +5191,7 @@
             409441     -1 INSTR LOCAL NoMetaUpdate call    _gtk_main_quit 
             409441      5 INSTR BELONGTO 4093d0 
             409441      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ call    _gtk_main_quit 
-            409446     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            409446     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             409446      5 INSTR BELONGTO 4093d0 
             409446      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     eax, 1 
             40944b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
@@ -5230,7 +5230,7 @@
             409494      7 INSTR BELONGTO 409490 
             40949b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4094B0 
             40949b      2 INSTR BELONGTO 409490 
-            40949d     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40949d     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40949d      5 INSTR BELONGTO 409490 
             40949d      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, 1 
             4094a2     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
@@ -5250,7 +5250,7 @@
             4094d2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_main_quit 
             4094d2      5 INSTR BELONGTO 409490 
             4094d2      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_main_quit 
-            4094d7     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4094d7     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4094d7      5 INSTR BELONGTO 409490 
             4094d7      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, 1 
             4094dc     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
@@ -5310,7 +5310,7 @@
             40953d     -1 INSTR LOCAL NoMetaUpdate call    _gdk_screen_get_rgba_visual 
             40953d      5 INSTR BELONGTO 4094f0 
             40953d      5 INSTR DEADREGS  EFLAGS RBX R14 ZZ call    _gdk_screen_get_rgba_visual 
-            409542     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            409542     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             409542      5 INSTR BELONGTO 4094f0 
             409542      5 INSTR DEADREGS  EFLAGS RBX RDI R14 ZZ mov     edi, 1 
             409547      3 INSTR BELONGTO 4094f0 
@@ -5340,7 +5340,7 @@
             409569     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_visual 
             409569      5 INSTR BELONGTO 4094f0 
             409569      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _gtk_widget_set_visual 
-            40956e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40956e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40956e      5 INSTR BELONGTO 4094f0 
             40956e      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 ZZ mov     esi, 1 
             409573      3 INSTR BELONGTO 4094f0 
@@ -5356,8 +5356,8 @@
             40957e      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R14 ZZ xor     r8d, r8d 
             409581      2 INSTR BELONGTO 4094f0 
             409581      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 ZZ xor     ecx, ecx 
-            409581     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            409583     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_409020 
+            409581     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            409583     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_409020 
             409583      5 INSTR BELONGTO 4094f0 
             409583      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 ZZ mov     edx, offset loc_409020 
             409588      3 INSTR BELONGTO 4094f0 
@@ -5379,14 +5379,14 @@
             4095a3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4095a3      5 INSTR BELONGTO 4094f0 
             4095a3      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _g_type_check_instance_cast 
-            4095a8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFF9Ch 
+            4095a8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFF9Ch 
             4095a8      5 INSTR BELONGTO 4094f0 
             4095a8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 ZZ mov     edx, 0FFFFFF9Ch 
             4095ad      3 INSTR BELONGTO 4094f0 
             4095ad      3 INSTR DEADREGS  EFLAGS RSI RDI R14 ZZ mov     rdi, rax 
             4095b0      2 INSTR BELONGTO 4094f0 
             4095b0      2 INSTR DEADREGS  EFLAGS RSI R14 ZZ mov     esi, edx 
-            4095b0     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, edx 
+            4095b0     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, edx 
             4095b2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_move 
             4095b2      5 INSTR BELONGTO 4094f0 
             4095b2      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _gtk_window_move 
@@ -5397,10 +5397,10 @@
             4095bd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4095bd      5 INSTR BELONGTO 4094f0 
             4095bd      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _g_type_check_instance_cast 
-            4095c2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0Ah 
+            4095c2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0Ah 
             4095c2      5 INSTR BELONGTO 4094f0 
             4095c2      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 ZZ mov     edx, 0Ah 
-            4095c7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
+            4095c7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
             4095c7      5 INSTR BELONGTO 4094f0 
             4095c7      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 ZZ mov     esi, 0Ah 
             4095cc      3 INSTR BELONGTO 4094f0 
@@ -5413,7 +5413,7 @@
             4095d7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             4095d7      5 INSTR BELONGTO 4094f0 
             4095d7      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _gtk_widget_show 
-            4095dc     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
+            4095dc     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
             4095dc      5 INSTR BELONGTO 4094f0 
             4095dc      5 INSTR DEADREGS  EFLAGS RDI R13 R14 ZZ mov     edi, 28h 
             4095e1      5 INSTR BELONGTO 4094f0 
@@ -5438,7 +5438,7 @@
             4095fb      4 INSTR DEADREGS  EFLAGS RDX RBX RSI R13 R14 ZZ mov     [rax+10h], rbp 
             4095ff      4 INSTR BELONGTO 4094f0 
             4095ff      4 INSTR DEADREGS  EFLAGS RDX RBX RSI R13 R14 ZZ mov     [rax+18h], r12 
-            409603     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_409490 
+            409603     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_409490 
             409603      5 INSTR BELONGTO 4094f0 
             409603      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R14 ZZ mov     edx, offset sub_409490 
             409608      5 INSTR BELONGTO 4094f0 
@@ -5458,7 +5458,7 @@
             40961f      3 INSTR BELONGTO 4094f0 
             409622     -1 INSTR LOCAL MetadataRedundant xor     r8d, r8d 
             409622      3 INSTR BELONGTO 4094f0 
-            409625     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_409160 
+            409625     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_409160 
             409625      5 INSTR BELONGTO 4094f0 
             409625      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 ZZ mov     edx, offset loc_409160 
             40962a      5 INSTR BELONGTO 4094f0 
@@ -5476,7 +5476,7 @@
             40963e      3 INSTR BELONGTO 4094f0 
             409641     -1 INSTR LOCAL MetadataRedundant xor     r8d, r8d 
             409641      3 INSTR BELONGTO 4094f0 
-            409644     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_4093D0 
+            409644     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_4093D0 
             409644      5 INSTR BELONGTO 4094f0 
             409644      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 ZZ mov     edx, offset sub_4093D0 
             409649      5 INSTR BELONGTO 4094f0 
@@ -5494,7 +5494,7 @@
             40965d      3 INSTR BELONGTO 4094f0 
             409660     -1 INSTR LOCAL MetadataRedundant xor     r8d, r8d 
             409660      3 INSTR BELONGTO 4094f0 
-            409663     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_409190 
+            409663     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_409190 
             409663      5 INSTR BELONGTO 4094f0 
             409663      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 ZZ mov     edx, offset loc_409190 
             409668      5 INSTR BELONGTO 4094f0 
@@ -5502,7 +5502,7 @@
             40966d     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             40966d      5 INSTR BELONGTO 4094f0 
             40966d      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _g_signal_connect_data 
-            409672     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 22h 
+            409672     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 22h 
             409672      5 INSTR BELONGTO 4094f0 
             409672      5 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 ZZ mov     edi, 22h 
             409677     -1 INSTR LOCAL NoMetaUpdate call    _gdk_cursor_new 
@@ -5540,10 +5540,10 @@
             4096a7      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _gtk_widget_get_window 
             4096ac      2 INSTR BELONGTO 4094f0 
             4096ac      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R14 ZZ xor     ecx, ecx 
-            4096ac     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4096ac     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4096ae      2 INSTR BELONGTO 4094f0 
             4096ae      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R9 R14 ZZ xor     edx, edx 
-            4096ae     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4096ae     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4096b0      3 INSTR BELONGTO 4094f0 
             4096b0      3 INSTR DEADREGS  EFLAGS RSI RDI R8 R9 R14 ZZ mov     r9, r12 
             4096b3     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 304h 
@@ -5574,10 +5574,10 @@
             4096d9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R14 ZZ xor     r9d, r9d 
             4096dc      2 INSTR BELONGTO 4094f0 
             4096dc      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R14 ZZ xor     ecx, ecx 
-            4096dc     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4096dc     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4096de      2 INSTR BELONGTO 4094f0 
             4096de      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R14 ZZ xor     edx, edx 
-            4096de     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4096de     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4096e0     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0C00h 
             4096e0      6 INSTR BELONGTO 4094f0 
             4096e0      6 INSTR DEADREGS  EFLAGS RSI RDI R8 R14 ZZ mov     r8d, 0C00h 
@@ -5600,7 +5600,7 @@
             4096fc      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _gtk_main 
             409701      2 INSTR BELONGTO 4094f0 
             409701      2 INSTR DEADREGS  EFLAGS RSI RDI R14 ZZ xor     esi, esi 
-            409701     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409701     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409703      3 INSTR BELONGTO 4094f0 
             409703      3 INSTR DEADREGS  EFLAGS RDI R14 ZZ mov     rdi, rbp 
             409706     -1 INSTR LOCAL NoMetaUpdate call    _gdk_device_ungrab 
@@ -5631,7 +5631,7 @@
             40972c      2 INSTR BELONGTO 4094f0 
             409730      2 INSTR BELONGTO 4094f0 
             409730      2 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 ZZ xor     esi, esi 
-            409730     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409730     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409732      3 INSTR BELONGTO 4094f0 
             409732      3 INSTR DEADREGS  EFLAGS RDI R13 R14 ZZ mov     rdi, rbp 
             409735     -1 INSTR LOCAL NoMetaUpdate call    _gdk_device_ungrab 
@@ -5642,16 +5642,16 @@
             40973d     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             40973d      5 INSTR BELONGTO 4094f0 
             40973d      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _g_object_unref 
-            409742     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rsp+68h+var_38] 
+            409742     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rsp+68h+var_38] 
             409742      4 INSTR BELONGTO 4094f0 
             409742      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 R14 ZZ mov     eax, [rsp+68h+var_38] 
             409742      4 PTRIMMEDESP STACK 48 displ mov     eax, [rsp+68h+var_38]
             409746      3 INSTR BELONGTO 4094f0 
             409746      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ mov     rdx, rbx 
-            409749     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_409120 
+            409749     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_409120 
             409749      5 INSTR BELONGTO 4094f0 
             409749      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 ZZ mov     esi, offset sub_409120 
-            40974e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0C8h 
+            40974e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0C8h 
             40974e      5 INSTR BELONGTO 4094f0 
             40974e      5 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 ZZ mov     edi, 0C8h 
             409753      3 INSTR BELONGTO 4094f0 
@@ -5726,7 +5726,7 @@
             4097ba      6 INSTR BELONGTO 409780 
             4097c0     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
             4097c0      2 INSTR BELONGTO 409780 
-            4097c2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setnz   al 
+            4097c2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setnz   al 
             4097c2      3 INSTR BELONGTO 409780 
             4097c2      3 INSTR DEADREGS  RAX RDI ZZ setnz   al 
             4097c5     -1 INSTR LOCAL NoMetaUpdate jnz     loc_409940 
@@ -5740,7 +5740,7 @@
             4097d1      5 INSTR BELONGTO 409780 
             4097d6     -1 INSTR LOCAL NoMetaUpdate jnz     loc_409970 
             4097d6      6 INSTR BELONGTO 409780 
-            4097dc     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 38h 
+            4097dc     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 38h 
             4097dc      5 INSTR BELONGTO 409780 
             4097dc      5 INSTR DEADREGS  EFLAGS RDI R14 ZZ mov     edi, 38h 
             4097e1      4 INSTR BELONGTO 409780 
@@ -5798,7 +5798,7 @@
             40983d      2 INSTR BELONGTO 409780 
             40983f     -1 INSTR LOCAL NoMetaUpdate test    r15d, r15d 
             40983f      3 INSTR BELONGTO 409780 
-            409842     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setz    al 
+            409842     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setz    al 
             409842      3 INSTR BELONGTO 409780 
             409842      3 INSTR DEADREGS  RAX RDI R13 R15 ZZ setz    al 
             409845     -1 INSTR LOCAL NoMetaUpdate test    r9, r9 
@@ -5847,7 +5847,7 @@
             40989a     -2 INSTR LOCAL n R14 ZZ  NUMVia2ndSrcIMMEDNUM mov     r14d, 1 
             40989a      6 INSTR BELONGTO 409780 
             40989a      6 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     r14d, 1 
-            4098a0     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, r14d 
+            4098a0     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, r14d 
             4098a0      3 INSTR BELONGTO 409780 
             4098a0      3 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R15 ZZ mov     eax, r14d 
             4098a3      5 INSTR BELONGTO 409780 
@@ -5904,14 +5904,14 @@
             409909      4 PTRIMMEDESP STACK 0 displ mov     r9, [rsp+48h+var_48]
             40990d     -1 INSTR LOCAL NoMetaUpdate test    r13d, r13d 
             40990d      3 INSTR BELONGTO 409780 
-            409910     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            409910     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             409910      5 INSTR BELONGTO 409780 
             409910      5 INSTR DEADREGS  RDX RDI R13 ZZ mov     edx, 1 
             409915      3 INSTR BELONGTO 409780 
             409915      3 INSTR DEADREGS  RDI R13 ZZ cmovz   edx, eax 
             409918      2 INSTR BELONGTO 409780 
             409918      2 INSTR DEADREGS  EFLAGS RAX RDI R13 ZZ xor     eax, eax 
-            409918     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409918     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40991a     -1 INSTR LOCAL NoMetaUpdate test    r15d, r15d 
             40991a      3 INSTR BELONGTO 409780 
             40991d      3 INSTR BELONGTO 409780 
@@ -5939,8 +5939,8 @@
             409942      6 INSTR BELONGTO 409780 
             409948      2 INSTR BELONGTO 409780 
             409948      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R15 ZZ xor     edi, edi        ; domainname 
-            409948     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            40994a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409948     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40994a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40994a      5 INSTR BELONGTO 409780 
             40994a      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R15 ZZ mov     edx, 5          ; category 
             40994f      5 INSTR BELONGTO 409780 
@@ -5952,7 +5952,7 @@
             409959      3 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R15 ZZ mov     rdi, rax 
             40995c      2 INSTR BELONGTO 409780 
             40995c      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 R15 ZZ xor     eax, eax 
-            40995c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40995c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40995e     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             40995e      5 INSTR BELONGTO 409780 
             40995e      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R15 ZZ call    _g_printerr 
@@ -5962,14 +5962,14 @@
             409970      2 INSTR BELONGTO 409780 
             409972     -1 INSTR LOCAL NoMetaUpdate jz      loc_4097DC 
             409972      6 INSTR BELONGTO 409780 
-            409978     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409978     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409978      5 INSTR BELONGTO 409780 
             409978      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             40997d      5 INSTR BELONGTO 409780 
             40997d      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aConflictingO_0; "Conflicting options: --area and --delay"... 
             409982      2 INSTR BELONGTO 409780 
             409982      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            409982     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409982     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409984     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409984      5 INSTR BELONGTO 409780 
             409984      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _dcgettext 
@@ -5977,7 +5977,7 @@
             409989      3 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ mov     rdi, rax 
             40998c      2 INSTR BELONGTO 409780 
             40998c      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 R14 R15 ZZ xor     eax, eax 
-            40998c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40998c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40998e     -2 INSTR LOCAL n R14 ZZ  AlwaysNUM xor     r14d, r14d 
             40998e      3 INSTR BELONGTO 409780 
             40998e      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ xor     r14d, r14d 
@@ -5988,7 +5988,7 @@
             409996      5 INSTR BELONGTO 409780 
             4099a0      2 INSTR BELONGTO 409780 
             4099a0      2 INSTR DEADREGS  EFLAGS RDI R13 R15 ZZ xor     edi, edi 
-            4099a0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4099a0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4099a2     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
             4099a2      5 INSTR BELONGTO 409780 
             4099a2      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    _g_strdup 
@@ -6050,11 +6050,11 @@
             409a34      5 INSTR BELONGTO 4099d0 
             409a40      6 INSTR BELONGTO 4099d0 
             409a46      5 INSTR BELONGTO 4099d0 
-            409a4b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 86h 
+            409a4b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 86h 
             409a4b      5 INSTR BELONGTO 4099d0 
             409a50      5 INSTR BELONGTO 4099d0 
             409a55      2 INSTR BELONGTO 4099d0 
-            409a55     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409a55     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409a57     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             409a57      5 INSTR BELONGTO 4099d0 
             409a5c      1 INSTR BELONGTO 4099d0 
@@ -6065,27 +6065,27 @@
             409a60      5 INSTR BELONGTO 4099d0 
             409a65     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm1, qword ptr [rsi+20h] 
             409a65      5 INSTR BELONGTO 4099d0 
-            409a6a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM cvttsd2si eax, xmm0 
+            409a6a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cvttsd2si eax, xmm0 
             409a6a      4 INSTR BELONGTO 4099d0 
             409a6e      3 INSTR BELONGTO 4099d0 
-            409a71     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM cvttsd2si eax, xmm1 
+            409a71     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cvttsd2si eax, xmm1 
             409a71      4 INSTR BELONGTO 4099d0 
             409a75      3 INSTR BELONGTO 4099d0 
             409a78      2 INSTR BELONGTO 4099d0 
-            409a78     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409a78     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409a7a      1 INSTR BELONGTO 4099d0 
-            409a8e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409a8e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409aaf     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_drag_set_icon_pixbuf 
             409ac0      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbx
             409ac5      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], rbp
             409ad8     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             409adb     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409AEF 
-            409add     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            409add     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             409ae2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409aea     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             409aef      3 PTRIMMEDEBP STACK 32 displ mov     edx, [rbp+20h]
             409af2      3 PTRIMMEDEBP STACK 28 displ mov     esi, [rbp+1Ch]
-            409af5     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            409af5     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             409afe     -1 INSTR LOCAL NoMetaUpdate call    _gdk_pixbuf_scale_simple 
             409b03      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             409b0c      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
@@ -6110,9 +6110,9 @@
             409b95     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_style_context_restore 
             409ba0     -1 INSTR LOCAL NoMetaUpdate test    ecx, ecx 
             409ba2     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409BC0 
-            409ba9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            409bae     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            409bb0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409ba9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            409bae     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            409bb0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409bb2     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
             409bc7     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_selection_data_set_pixbuf 
             409bd0      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 -48 0 4 0 8 5 -40 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 -32 0 13 -24 0 14 -16 0 15 -8 0 ZZ
@@ -6181,7 +6181,7 @@
             409c18     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             409c18      5 INSTR BELONGTO 409bd0 
             409c18      5 INSTR DEADREGS  EFLAGS RBX R15 ZZ call    _g_object_unref 
-            409c1d     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 30h 
+            409c1d     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 30h 
             409c1d      5 INSTR BELONGTO 409bd0 
             409c1d      5 INSTR DEADREGS  EFLAGS RBX RDI R15 ZZ mov     edi, 30h 
             409c22     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc0 
@@ -6194,7 +6194,7 @@
             409c2a      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _gtk_builder_new 
             409c2f      2 INSTR BELONGTO 409bd0 
             409c2f      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ xor     edx, edx 
-            409c2f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409c2f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409c31      3 INSTR BELONGTO 409bd0 
             409c31      3 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     [rbx], rax 
             409c34      5 INSTR BELONGTO 409bd0 
@@ -6323,12 +6323,12 @@
             409d08     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409d08      5 INSTR BELONGTO 409bd0 
             409d08      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-            409d0d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409d0d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409d0d      5 INSTR BELONGTO 409bd0 
             409d0d      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             409d12      2 INSTR BELONGTO 409bd0 
             409d12      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            409d12     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409d12     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409d14      5 INSTR BELONGTO 409bd0 
             409d14      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aSelectAFolder; "Select a folder" 
             409d19      5 INSTR BELONGTO 409bd0 
@@ -6337,7 +6337,7 @@
             409d1e     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409d1e      5 INSTR BELONGTO 409bd0 
             409d1e      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
-            409d23     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            409d23     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             409d23      5 INSTR BELONGTO 409bd0 
             409d23      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 2 
             409d28      3 INSTR BELONGTO 409bd0 
@@ -6366,7 +6366,7 @@
             409d4b      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
             409d50      2 INSTR BELONGTO 409bd0 
             409d50      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            409d50     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409d50     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409d52      3 INSTR BELONGTO 409bd0 
             409d52      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             409d55     -1 INSTR LOCAL NoMetaUpdate call    _gtk_file_chooser_set_local_only 
@@ -6430,10 +6430,10 @@
             409db2      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 ZZ xor     r8d, r8d 
             409db5      3 INSTR BELONGTO 409bd0 
             409db5      3 INSTR DEADREGS  EFLAGS RCX RDX RDI ZZ mov     rdi, rax 
-            409db8     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            409db8     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             409db8      5 INSTR BELONGTO 409bd0 
             409db8      5 INSTR DEADREGS  EFLAGS RCX RDX ZZ mov     ecx, 1 
-            409dbd     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            409dbd     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             409dbd      5 INSTR BELONGTO 409bd0 
             409dbd      5 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, 1 
             409dc2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
@@ -6444,10 +6444,10 @@
             409dca     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             409dca      5 INSTR BELONGTO 409bd0 
             409dca      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _g_free 
-            409dcf     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 66666667h 
+            409dcf     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 66666667h 
             409dcf      5 INSTR BELONGTO 409bd0 
             409dcf      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R9 R14 ZZ mov     esi, 66666667h 
-            409dd4     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, r15d 
+            409dd4     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, r15d 
             409dd4      3 INSTR BELONGTO 409bd0 
             409dd4      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R9 R14 ZZ mov     eax, r15d 
             409dd7     -2 INSTR LOCAL n R9 ZZ  NumericDEFs mov     r9d, [rsp+78h+var_78] 
@@ -6456,14 +6456,14 @@
             409dd7      4 PTRIMMEDESP STACK 0 displ mov     r9d, [rsp+78h+var_78]
             409ddb      2 INSTR BELONGTO 409bd0 
             409ddb      2 INSTR DEADREGS  EFLAGS RCX RDX RDI R14 ZZ imul    esi 
-            409ddb     -2 INSTR LOCAL n EAX EDX ZZ  AlwaysNUM imul    esi 
+            409ddb     -2 INSTR LOCAL n RAX RDX ZZ  AlwaysNUM imul    esi 
             409ddd      3 INSTR BELONGTO 409bd0 
             409ddd      3 INSTR DEADREGS  EFLAGS RAX RCX RDI R14 ZZ mov     rdi, rbp 
             409de0     -1 INSTR LOCAL MetadataRedundant mov     eax, r9d 
             409de0      3 INSTR BELONGTO 409bd0 
             409de3      2 INSTR BELONGTO 409bd0 
             409de3      2 INSTR DEADREGS  EFLAGS RCX R14 ZZ mov     ecx, edx 
-            409de3     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, edx 
+            409de3     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, edx 
             409de5     -1 INSTR LOCAL MetadataRedundant sar     ecx, 1 
             409de5      2 INSTR BELONGTO 409bd0 
             409de7     -1 INSTR LOCAL MetadataRedundant sar     r15d, 1Fh 
@@ -6520,7 +6520,7 @@
             409e39      3 INSTR BELONGTO 409bd0 
             409e3c      2 INSTR BELONGTO 409bd0 
             409e3c      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 XMM0 ZZ xor     esi, esi 
-            409e3c     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409e3c     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409e3e     -1 INSTR LOCAL MetadataUnused movss   xmm2, [rsp+78h+var_78] 
             409e3e      5 INSTR BELONGTO 409bd0 
             409e43      3 INSTR BELONGTO 409bd0 
@@ -6538,7 +6538,7 @@
             409e56      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R14 R15 XMM0 XMM1 XMM2 ZZ xor     r8d, r8d 
             409e59      3 INSTR BELONGTO 409bd0 
             409e59      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     rcx, rbx 
-            409e5c     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_409B20 
+            409e5c     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_409B20 
             409e5c      5 INSTR BELONGTO 409bd0 
             409e5c      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     edx, offset loc_409B20 
             409e61      5 INSTR BELONGTO 409bd0 
@@ -6554,7 +6554,7 @@
             409e71      3 INSTR BELONGTO 409bd0 
             409e74      3 INSTR BELONGTO 409bd0 
             409e74      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     rcx, rbx 
-            409e77     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_409A60 
+            409e77     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_409A60 
             409e77      5 INSTR BELONGTO 409bd0 
             409e77      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     edx, offset loc_409A60 
             409e7c      5 INSTR BELONGTO 409bd0 
@@ -6570,7 +6570,7 @@
             409e8c      3 INSTR BELONGTO 409bd0 
             409e8f      3 INSTR BELONGTO 409bd0 
             409e8f      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     rcx, rbx 
-            409e92     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_409A80 
+            409e92     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_409A80 
             409e92      5 INSTR BELONGTO 409bd0 
             409e92      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     edx, offset loc_409A80 
             409e97      5 INSTR BELONGTO 409bd0 
@@ -6586,7 +6586,7 @@
             409ea7      3 INSTR BELONGTO 409bd0 
             409eaa      3 INSTR BELONGTO 409bd0 
             409eaa      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     rcx, rbx 
-            409ead     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_409AC0 
+            409ead     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_409AC0 
             409ead      5 INSTR BELONGTO 409bd0 
             409ead      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     edx, offset loc_409AC0 
             409eb2      5 INSTR BELONGTO 409bd0 
@@ -6598,12 +6598,12 @@
             409eba      5 INSTR DEADREGS  EFLAGS R12 R14 R15 XMM0 XMM1 XMM2 ZZ call    _g_signal_connect_data 
             409ebf     -1 INSTR LOCAL MetadataRedundant mov     r8d, 2 
             409ebf      6 INSTR BELONGTO 409bd0 
-            409ec5     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            409ec5     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             409ec5      5 INSTR BELONGTO 409bd0 
             409ec5      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     ecx, 1 
             409eca      5 INSTR BELONGTO 409bd0 
             409eca      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     edx, offset off_60FA50 
-            409ecf     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 500h 
+            409ecf     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 500h 
             409ecf      5 INSTR BELONGTO 409bd0 
             409ecf      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     esi, 500h 
             409ed4      3 INSTR BELONGTO 409bd0 
@@ -6630,7 +6630,7 @@
             409efb     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409efb      5 INSTR BELONGTO 409bd0 
             409efb      5 INSTR DEADREGS  EFLAGS R12 R14 R15 XMM0 XMM1 XMM2 ZZ call    _g_type_check_instance_cast 
-            409f00     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            409f00     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             409f00      5 INSTR BELONGTO 409bd0 
             409f00      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     esi, 1 
             409f05      3 INSTR BELONGTO 409bd0 
@@ -6640,7 +6640,7 @@
             409f08      5 INSTR DEADREGS  EFLAGS R12 R14 R15 XMM0 XMM1 XMM2 ZZ call    _gtk_frame_set_shadow_type 
             409f0d      3 INSTR BELONGTO 409bd0 
             409f0d      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     rdi, rbp 
-            409f10     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            409f10     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             409f10      5 INSTR BELONGTO 409bd0 
             409f10      5 INSTR DEADREGS  EFLAGS RSI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     esi, 50h 
             409f15     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -6654,7 +6654,7 @@
             409f1d      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R14 R15 XMM0 XMM1 XMM2 ZZ xor     r8d, r8d 
             409f20      3 INSTR BELONGTO 409bd0 
             409f20      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     rcx, rbx 
-            409f23     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_409AA0 
+            409f23     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_409AA0 
             409f23      5 INSTR BELONGTO 409bd0 
             409f23      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     edx, offset loc_409AA0 
             409f28      5 INSTR BELONGTO 409bd0 
@@ -6666,10 +6666,10 @@
             409f30      5 INSTR DEADREGS  EFLAGS R12 R14 R15 XMM0 XMM1 XMM2 ZZ call    _g_signal_connect_data 
             409f35      3 INSTR BELONGTO 409bd0 
             409f35      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     rdi, rbp 
-            409f38     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            409f38     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             409f38      5 INSTR BELONGTO 409bd0 
             409f38      5 INSTR DEADREGS  EFLAGS RSI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     esi, 50h 
-            409f3d     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 0FFFFFFFFh 
+            409f3d     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 0FFFFFFFFh 
             409f3d      5 INSTR BELONGTO 409bd0 
             409f3d      5 INSTR DEADREGS  EFLAGS R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     ebp, 0FFFFFFFFh 
             409f42     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -6683,7 +6683,7 @@
             409f4a      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R14 R15 XMM0 XMM1 XMM2 ZZ xor     r8d, r8d 
             409f4d      3 INSTR BELONGTO 409bd0 
             409f4d      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     rcx, rbx 
-            409f50     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_409BA0 
+            409f50     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_409BA0 
             409f50      5 INSTR BELONGTO 409bd0 
             409f50      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     edx, offset loc_409BA0 
             409f55      5 INSTR BELONGTO 409bd0 
@@ -6699,7 +6699,7 @@
             409f67     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show_all 
             409f67      5 INSTR BELONGTO 409bd0 
             409f67      5 INSTR DEADREGS  EFLAGS R12 R14 R15 XMM0 XMM1 XMM2 ZZ call    _gtk_widget_show_all 
-            409f6c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2Eh 
+            409f6c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2Eh 
             409f6c      5 INSTR BELONGTO 409bd0 
             409f6c      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     edx, 2Eh 
             409f71     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -6747,12 +6747,12 @@
             409fb7      5 INSTR DEADREGS  EFLAGS R12 R14 R15 XMM0 XMM1 XMM2 ZZ call    _g_type_check_instance_cast 
             409fbc      2 INSTR BELONGTO 409bd0 
             409fbc      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     edx, ebp 
-            409fbc     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, ebp 
+            409fbc     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, ebp 
             409fbe      3 INSTR BELONGTO 409bd0 
             409fbe      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     rdi, rax 
             409fc1      2 INSTR BELONGTO 409bd0 
             409fc1      2 INSTR DEADREGS  EFLAGS RSI R12 R14 R15 XMM0 XMM1 XMM2 ZZ xor     esi, esi 
-            409fc1     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409fc1     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409fc3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_editable_select_region 
             409fc3      5 INSTR BELONGTO 409bd0 
             409fc3      5 INSTR DEADREGS  EFLAGS R12 R14 R15 XMM0 XMM1 XMM2 ZZ call    _gtk_editable_select_region 
@@ -6793,7 +6793,7 @@
             409ff5      5 INSTR DEADREGS  EFLAGS R12 R14 R15 XMM0 XMM1 XMM2 ZZ call    _g_type_check_instance_cast 
             409ffa      2 INSTR BELONGTO 409bd0 
             409ffa      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ xor     esi, esi 
-            409ffa     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409ffa     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409ffc      3 INSTR BELONGTO 409bd0 
             409ffc      3 INSTR DEADREGS  EFLAGS RDI R12 R14 R15 XMM0 XMM1 XMM2 ZZ mov     rdi, rax 
             409fff     -1 INSTR LOCAL NoMetaUpdate call    _gtk_frame_set_shadow_type 
@@ -6801,33 +6801,33 @@
             409fff      5 INSTR DEADREGS  EFLAGS R12 R14 R15 XMM0 XMM1 XMM2 ZZ call    _gtk_frame_set_shadow_type 
             40a004     -1 INSTR LOCAL NoMetaUpdate jmp     loc_409F0D 
             40a004      5 INSTR BELONGTO 409bd0 
-            40a009     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40a009     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40a009      5 INSTR BELONGTO 409bd0 
             40a009      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ mov     edx, 5          ; category 
             40a00e      5 INSTR BELONGTO 409bd0 
             40a00e      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ mov     esi, offset aUiDefinitionFi; "UI definition file for the screenshot p"... 
             40a013      2 INSTR BELONGTO 409bd0 
             40a013      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ xor     edi, edi        ; domainname 
-            40a013     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40a013     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40a015     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a015      5 INSTR BELONGTO 409bd0 
             40a015      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ call    _dcgettext 
-            40a01a     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40a01a     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40a01a      5 INSTR BELONGTO 409bd0 
             40a01a      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ mov     ecx, 1 
             40a01f      3 INSTR BELONGTO 409bd0 
             40a01f      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ mov     r8, rax 
-            40a022     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            40a022     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             40a022      5 INSTR BELONGTO 409bd0 
             40a022      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ mov     edx, 3 
             40a027      2 INSTR BELONGTO 409bd0 
             40a027      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ xor     esi, esi 
-            40a027     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a027     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a029     -1 INSTR LOCAL MetadataRedundant xor     edi, edi 
             40a029      2 INSTR BELONGTO 409bd0 
             40a02b      2 INSTR BELONGTO 409bd0 
             40a02b      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ xor     eax, eax 
-            40a02b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a02b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a02d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             40a02d      5 INSTR BELONGTO 409bd0 
             40a02d      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ call    _gtk_message_dialog_new 
@@ -6853,7 +6853,7 @@
             40a050     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_destroy 
             40a050      5 INSTR BELONGTO 409bd0 
             40a050      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ call    _gtk_widget_destroy 
-            40a055     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
+            40a055     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
             40a055      5 INSTR BELONGTO 409bd0 
             40a055      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ mov     edi, 1          ; status 
             40a05a     -1 INSTR LOCAL NoMetaUpdate call    _exit 
@@ -6966,10 +6966,10 @@
             40a0f1      5 PTRIMMEDESP STACK 8 displ lea     r8, [rsp+18h+var_10]
             40a0f6      2 INSTR BELONGTO 40a0d0 
             40a0f6      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ xor     edx, edx 
-            40a0f6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a0f6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a0f8      2 INSTR BELONGTO 40a0d0 
             40a0f8      2 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI ZZ xor     ecx, ecx 
-            40a0f8     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a0f8     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40a0fa     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             40a0fa      7 INSTR BELONGTO 40a0d0 
             40a0fa      7 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -6997,15 +6997,15 @@
             40a123      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rcx, rbx 
             40a126      5 INSTR BELONGTO 40a0d0 
             40a126      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     edx, offset aUnableToConver; "Unable to convert `%s' to valid UTF-8: "... 
-            40a12b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40a12b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40a12b      5 INSTR BELONGTO 40a0d0 
             40a12b      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     esi, 10h 
             40a130      2 INSTR BELONGTO 40a0d0 
             40a130      2 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ xor     eax, eax 
-            40a130     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a130     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a132      2 INSTR BELONGTO 40a0d0 
             40a132      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            40a132     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a132     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a134     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40a134      5 INSTR BELONGTO 40a0d0 
             40a134      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -7016,7 +7016,7 @@
             40a13e      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_error_free 
             40a143     -1 INSTR LOCAL MetadataRedundant xor     edi, edi        ; domainname 
             40a143      2 INSTR BELONGTO 40a0d0 
-            40a145     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40a145     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40a145      5 INSTR BELONGTO 40a0d0 
             40a145      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, 5          ; category 
             40a14a      5 INSTR BELONGTO 40a0d0 
@@ -7081,7 +7081,7 @@
             40a1ac      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     r12, rax 
             40a1af      2 INSTR BELONGTO 40a170 
             40a1af      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            40a1af     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a1af     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a1b1      3 INSTR BELONGTO 40a170 
             40a1b1      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
             40a1b4     -1 INSTR LOCAL NoMetaUpdate call    _g_uri_escape_string 
@@ -7098,12 +7098,12 @@
             40a1c4      3 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 ZZ mov     rsi, rbx 
             40a1c7      2 INSTR BELONGTO 40a170 
             40a1c7      2 INSTR DEADREGS  EFLAGS RAX RDX RDI R12 ZZ xor     edx, edx 
-            40a1c7     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a1c7     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a1c9      3 INSTR BELONGTO 40a170 
             40a1c9      3 INSTR DEADREGS  EFLAGS RAX RDI R12 ZZ mov     rdi, rbp 
             40a1cc      2 INSTR BELONGTO 40a170 
             40a1cc      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            40a1cc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a1cc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a1ce     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40a1ce      5 INSTR BELONGTO 40a170 
             40a1ce      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_build_filename 
@@ -7169,7 +7169,7 @@
             40a22f      2 INSTR BELONGTO 40a200 
             40a231      2 INSTR BELONGTO 40a200 
             40a231      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ xor     esi, esi 
-            40a231     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a231     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a233      3 INSTR BELONGTO 40a200 
             40a233      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rax 
             40a236     -1 INSTR LOCAL NoMetaUpdate call    _gdk_window_set_cursor 
@@ -7181,7 +7181,7 @@
             40a23d      2 INSTR BELONGTO 40a200 
             40a23f      3 INSTR BELONGTO 40a200 
             40a23f      3 INSTR DEADREGS  RSI RDI R12 R13 ZZ mov     rdi, rbx 
-            40a242     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setz    sil 
+            40a242     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setz    sil 
             40a242      4 INSTR BELONGTO 40a200 
             40a242      4 INSTR DEADREGS  RBX RSI R12 R13 ZZ setz    sil 
             40a246     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
@@ -7201,7 +7201,7 @@
             40a263     40 DEALLOC STACK esp - 40 jmp     _gdk_flush
             40a263      5 INSTR BELONGTO 40a200 
             40a263      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ jmp     _gdk_flush 
-            40a270     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 96h 
+            40a270     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 96h 
             40a270      5 INSTR BELONGTO 40a200 
             40a270      5 INSTR DEADREGS  EFLAGS RDI R13 ZZ mov     edi, 96h 
             40a275     -1 INSTR LOCAL NoMetaUpdate call    _gdk_cursor_new 
@@ -7237,7 +7237,7 @@
             40a2ad      5 INSTR BELONGTO 40a2a0 
             40a2b2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_18], r13 
             40a2b2      5 INSTR BELONGTO 40a2a0 
-            40a2b7     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
+            40a2b7     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
             40a2b7      5 INSTR BELONGTO 40a2a0 
             40a2b7      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     edi, 28h 
             40a2bc     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
@@ -7270,7 +7270,7 @@
             40a2ec      3 INSTR DEADREGS  R13 R14 ZZ mov     r13, rax 
             40a2ef     -1 INSTR LOCAL NoMetaUpdate jz      loc_40A390 
             40a2ef      6 INSTR BELONGTO 40a2a0 
-            40a2f5     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 4 
+            40a2f5     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 4 
             40a2f5      5 INSTR BELONGTO 40a2a0 
             40a2f5      5 INSTR DEADREGS  EFLAGS RDI R14 R15 ZZ mov     edi, 4 
             40a2fa      3 INSTR BELONGTO 40a2a0 
@@ -7280,14 +7280,14 @@
             40a2fd      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_get_user_special_dir 
             40a302      2 INSTR BELONGTO 40a2a0 
             40a302      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 ZZ xor     edx, edx 
-            40a302     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a302     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a304      3 INSTR BELONGTO 40a2a0 
             40a304      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ mov     rsi, rax 
             40a307      5 INSTR BELONGTO 40a2a0 
             40a307      5 INSTR DEADREGS  EFLAGS RAX RDI R13 R14 R15 ZZ mov     edi, offset aFile; "file://" 
             40a30c      2 INSTR BELONGTO 40a2a0 
             40a30c      2 INSTR DEADREGS  EFLAGS RAX R13 R14 R15 ZZ xor     eax, eax 
-            40a30c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a30c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a30e     -1 INSTR LOCAL NoMetaUpdate call    _g_strconcat 
             40a30e      5 INSTR BELONGTO 40a2a0 
             40a30e      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_strconcat 
@@ -7298,14 +7298,14 @@
             40a317      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_get_home_dir 
             40a31c      2 INSTR BELONGTO 40a2a0 
             40a31c      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 ZZ xor     edx, edx 
-            40a31c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a31c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a31e      3 INSTR BELONGTO 40a2a0 
             40a31e      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ mov     rsi, rax 
             40a321      5 INSTR BELONGTO 40a2a0 
             40a321      5 INSTR DEADREGS  EFLAGS RAX RDI R13 R14 R15 ZZ mov     edi, offset aFile; "file://" 
             40a326      2 INSTR BELONGTO 40a2a0 
             40a326      2 INSTR DEADREGS  EFLAGS RAX R13 R14 R15 ZZ xor     eax, eax 
-            40a326     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a326     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a328     -1 INSTR LOCAL NoMetaUpdate call    _g_strconcat 
             40a328      5 INSTR BELONGTO 40a2a0 
             40a328      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_strconcat 
@@ -7314,12 +7314,12 @@
             40a330     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     rsi, rbp 
             40a330      3 INSTR BELONGTO 40a2a0 
             40a330      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 R13 R14 R15 ZZ mov     rsi, rbp 
-            40a333     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_40A2A0 
+            40a333     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_40A2A0 
             40a333      5 INSTR BELONGTO 40a2a0 
             40a333      5 INSTR DEADREGS  EFLAGS RCX RDI R12 R13 R14 R15 ZZ mov     ecx, offset sub_40A2A0 
             40a338      2 INSTR BELONGTO 40a2a0 
             40a338      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            40a338     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a338     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a33a      4 INSTR BELONGTO 40a2a0 
             40a33a      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ mov     [rbx+10h], rax 
             40a33e      7 INSTR BELONGTO 40a2a0 
@@ -7347,12 +7347,12 @@
             40a36f      5 INSTR BELONGTO 40a2a0 
             40a374      2 INSTR BELONGTO 40a2a0 
             40a374      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     ecx, ecx 
-            40a374     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a374     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40a376     -1 INSTR LOCAL MetadataUnused mov     r15, [rsp+48h+var_8] 
             40a376      5 INSTR BELONGTO 40a2a0 
             40a37b      2 INSTR BELONGTO 40a2a0 
             40a37b      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     edx, edx 
-            40a37b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a37b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a37d     -1 INSTR LOCAL MetadataUnused mov     edi, offset sub_40A470 
             40a37d      5 INSTR BELONGTO 40a2a0 
             40a382     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
@@ -7361,7 +7361,7 @@
             40a386      5 INSTR BELONGTO 40a2a0 
             40a386      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ jmp     _g_io_scheduler_push_job 
             40a386     72 DEALLOC STACK esp - 72 jmp     _g_io_scheduler_push_job
-            40a390     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [r15+1] 
+            40a390     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [r15+1] 
             40a390      5 INSTR BELONGTO 40a2a0 
             40a390      5 INSTR DEADREGS  EFLAGS RAX R14 ZZ movzx   eax, byte ptr [r15+1] 
             40a395     -1 INSTR LOCAL NoMetaUpdate test    al, al 
@@ -7374,7 +7374,7 @@
             40a39f      6 INSTR BELONGTO 40a2a0 
             40a3a5      4 INSTR BELONGTO 40a2a0 
             40a3a5      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 ZZ lea     rdx, [r15+1] 
-            40a3a9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2Fh        ; c 
+            40a3a9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2Fh        ; c 
             40a3a9      5 INSTR BELONGTO 40a2a0 
             40a3a9      5 INSTR DEADREGS  EFLAGS RSI RDI R14 ZZ mov     esi, 2Fh        ; c 
             40a3ae      3 INSTR BELONGTO 40a2a0 
@@ -7441,10 +7441,10 @@
             40a40f      3 INSTR DEADREGS  EFLAGS RAX RDX RSI R15 ZZ mov     rsi, r14 
             40a412      2 INSTR BELONGTO 40a2a0 
             40a412      2 INSTR DEADREGS  EFLAGS RAX RDX R14 R15 ZZ xor     edx, edx 
-            40a412     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a412     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a414      2 INSTR BELONGTO 40a2a0 
             40a414      2 INSTR DEADREGS  EFLAGS RAX R14 R15 ZZ xor     eax, eax 
-            40a414     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a414     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a416     -1 INSTR LOCAL NoMetaUpdate call    _g_strconcat 
             40a416      5 INSTR BELONGTO 40a2a0 
             40a416      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _g_strconcat 
@@ -7468,10 +7468,10 @@
             40a439      3 INSTR DEADREGS  EFLAGS RDX RDI R14 R15 ZZ mov     rdi, rax 
             40a43c      2 INSTR BELONGTO 40a2a0 
             40a43c      2 INSTR DEADREGS  EFLAGS RAX RDX R14 R15 ZZ xor     edx, edx 
-            40a43c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a43c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a43e      2 INSTR BELONGTO 40a2a0 
             40a43e      2 INSTR DEADREGS  EFLAGS RAX R14 R15 ZZ xor     eax, eax 
-            40a43e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a43e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a440     -1 INSTR LOCAL NoMetaUpdate call    _g_strconcat 
             40a440      5 INSTR BELONGTO 40a2a0 
             40a440      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _g_strconcat 
@@ -7563,7 +7563,7 @@
             40a4c5      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _g_date_time_unref 
             40a4ca      4 INSTR BELONGTO 40a470 
             40a4ca      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 ZZ mov     r14d, [rbx+18h] 
-            40a4ce     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40a4ce     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40a4ce      5 INSTR BELONGTO 40a470 
             40a4ce      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             40a4d3     -1 INSTR LOCAL NoMetaUpdate test    r14d, r14d 
@@ -7574,7 +7574,7 @@
             40a4dc      5 INSTR DEADREGS  EFLAGS RSI RDI R14 ZZ mov     esi, offset msgid; "Screenshot from %s.png" 
             40a4e1      2 INSTR BELONGTO 40a470 
             40a4e1      2 INSTR DEADREGS  EFLAGS RDI R14 ZZ xor     edi, edi        ; domainname 
-            40a4e1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40a4e1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40a4e3     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a4e3      5 INSTR BELONGTO 40a470 
             40a4e3      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _dcgettext 
@@ -7584,7 +7584,7 @@
             40a4eb      3 INSTR DEADREGS  EFLAGS RDI R14 ZZ mov     rdi, rax 
             40a4ee      2 INSTR BELONGTO 40a470 
             40a4ee      2 INSTR DEADREGS  EFLAGS RAX R14 ZZ xor     eax, eax 
-            40a4ee     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a4ee     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a4f0     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40a4f0      5 INSTR BELONGTO 40a470 
             40a4f0      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _g_strdup_printf 
@@ -7592,14 +7592,14 @@
             40a4f5      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 ZZ mov     r14, rax 
             40a4f8      2 INSTR BELONGTO 40a470 
             40a4f8      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     edx, edx 
-            40a4f8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a4f8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a4fa      3 INSTR BELONGTO 40a470 
             40a4fa      3 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rsi, r14 
             40a4fd      3 INSTR BELONGTO 40a470 
             40a4fd      3 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     rdi, rbp 
             40a500      2 INSTR BELONGTO 40a470 
             40a500      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40a500     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a500     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a502     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40a502      5 INSTR BELONGTO 40a470 
             40a502      5 INSTR DEADREGS  EFLAGS ZZ call    _g_build_filename 
@@ -7629,7 +7629,7 @@
             40a52b      5 PTRIMMEDESP STACK 8 displ lea     r8, [rsp+38h+var_30]
             40a530      2 INSTR BELONGTO 40a470 
             40a530      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 ZZ xor     edx, edx 
-            40a530     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a530     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a532      3 INSTR BELONGTO 40a470 
             40a532      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 R14 ZZ mov     rcx, r13 
             40a535      5 INSTR BELONGTO 40a470 
@@ -7670,7 +7670,7 @@
             40a570      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aScreenshotFr_0; "Screenshot from %s - %d.png" 
             40a575      2 INSTR BELONGTO 40a470 
             40a575      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            40a575     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40a575     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40a577     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a577      5 INSTR BELONGTO 40a470 
             40a577      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -7682,7 +7682,7 @@
             40a582      3 INSTR DEADREGS  EFLAGS RAX RSI R14 ZZ mov     rsi, r12 
             40a585      2 INSTR BELONGTO 40a470 
             40a585      2 INSTR DEADREGS  EFLAGS RAX R14 ZZ xor     eax, eax 
-            40a585     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a585     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a587     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40a587      5 INSTR BELONGTO 40a470 
             40a587      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _g_strdup_printf 
@@ -7747,7 +7747,7 @@
             40a5fb      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _g_file_get_parent 
             40a600      2 INSTR BELONGTO 40a470 
             40a600      2 INSTR DEADREGS  EFLAGS RSI RDI R14 ZZ xor     esi, esi 
-            40a600     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a600     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a602      3 INSTR BELONGTO 40a470 
             40a602      3 INSTR DEADREGS  EFLAGS RDI R14 ZZ mov     rdi, rax 
             40a605      3 INSTR BELONGTO 40a470 
@@ -7806,10 +7806,10 @@
             40a662      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ mov     rdi, [rbx+20h] 
             40a666      2 INSTR BELONGTO 40a470 
             40a666      2 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 ZZ xor     edx, edx 
-            40a666     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a666     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a668      2 INSTR BELONGTO 40a470 
             40a668      2 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 ZZ xor     esi, esi 
-            40a668     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a668     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a66a     -1 INSTR LOCAL NoMetaUpdate call    _g_simple_async_result_set_op_res_gpointer 
             40a66a      5 INSTR BELONGTO 40a470 
             40a66a      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _g_simple_async_result_set_op_res_gpointer 
@@ -7826,10 +7826,10 @@
             40a680      5 INSTR DEADREGS  EFLAGS RAX RCX RDX R12 R13 R14 ZZ mov     ecx, (offset aUnableToParseA+1Bh); "%s" 
             40a685      2 INSTR BELONGTO 40a470 
             40a685      2 INSTR DEADREGS  EFLAGS RAX RDX R12 R13 R14 ZZ xor     edx, edx 
-            40a685     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a685     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a687      2 INSTR BELONGTO 40a470 
             40a687      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 ZZ xor     eax, eax 
-            40a687     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a687     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a689     -1 INSTR LOCAL NoMetaUpdate call    _g_simple_async_result_set_error 
             40a689      5 INSTR BELONGTO 40a470 
             40a689      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _g_simple_async_result_set_error 
@@ -7857,7 +7857,7 @@
             40a6b1      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R12 R13 R14 ZZ lea     rdx, [rbx+20h] 
             40a6b5      2 INSTR BELONGTO 40a470 
             40a6b5      2 INSTR DEADREGS  EFLAGS RAX RCX RDI R12 R13 R14 ZZ xor     ecx, ecx 
-            40a6b5     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a6b5     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40a6b7     -1 INSTR LOCAL NoMetaUpdate mfence 
             40a6b7      3 INSTR BELONGTO 40a470 
             40a6ba      4 INSTR BELONGTO 40a470 
@@ -7878,7 +7878,7 @@
             40a6cd      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _g_object_unref 
             40a6d2      3 INSTR BELONGTO 40a470 
             40a6d2      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 ZZ mov     rsi, rbx 
-            40a6d5     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
+            40a6d5     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
             40a6d5      5 INSTR BELONGTO 40a470 
             40a6d5      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 ZZ mov     edi, 28h 
             40a6da     -1 INSTR LOCAL NoMetaUpdate call    _g_slice_free1 
@@ -7889,7 +7889,7 @@
             40a6e3     16 DEALLOC STACK esp - 16 xor     eax, eax
             40a6e3      2 INSTR BELONGTO 40a470 
             40a6e3      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 ZZ xor     eax, eax 
-            40a6e3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a6e3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a6e5      1 INSTR BELONGTO 40a470 
             40a6e5      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 ZZ pop     rbx 
             40a6e6      1 INSTR BELONGTO 40a470 
@@ -7923,7 +7923,7 @@
             40a708      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ mov     rdi, [rbx+20h] 
             40a70c      2 INSTR BELONGTO 40a470 
             40a70c      2 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 ZZ xor     edx, edx 
-            40a70c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a70c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a70e      3 INSTR BELONGTO 40a470 
             40a70e      3 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 ZZ mov     rsi, rbp 
             40a711     -1 INSTR LOCAL NoMetaUpdate call    _g_simple_async_result_set_op_res_gpointer 
@@ -7995,7 +7995,7 @@
             40a77b      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ jmp     _g_simple_async_result_get_op_res_gpointer 
             40a780      2 INSTR BELONGTO 40a720 
             40a780      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            40a780     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a780     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a782      4 INSTR BELONGTO 40a720 
             40a782      4 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+18h+var_18] 
             40a782      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp+18h+var_18]
@@ -8033,12 +8033,12 @@
             40a7d6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_get_active 
             40a7db     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40a7dd     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40A84E 
-            40a7e8     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40a7e8     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40a7ea     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 1 
-            40a7ed     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM setz    bl 
-            40a7f0     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40a7ed     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM setz    bl 
+            40a7f0     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40a7f2     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 2 
-            40a7f7     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM setz    bpl 
+            40a7f7     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM setz    bpl 
             40a7fb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
             40a809      3 PTRIMMEDEBP STACK 0 displ mov     r12d, ebp
             40a80c     -2 INSTR LOCAL n R12 ZZ  AlwaysNUM xor     r12d, 1 
@@ -8112,12 +8112,12 @@
             40a8d8      5 INSTR BELONGTO 40a8b0 
             40a8d8      5 PTRIMMEDESP STACK 40 displ lea     rcx, [rsp+38h+var_10]
             40a8dd      2 INSTR BELONGTO 40a8b0 
-            40a8dd     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a8dd     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a8df      3 INSTR BELONGTO 40a8b0 
             40a8e2     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
             40a8e2      6 INSTR BELONGTO 40a8b0 
             40a8e8      2 INSTR BELONGTO 40a8b0 
-            40a8e8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a8e8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a8ea      3 INSTR BELONGTO 40a8b0 
             40a8ea      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
             40a8ed     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
@@ -8141,17 +8141,17 @@
             40a91f      1 INSTR BELONGTO 40a8b0 
             40a920      6 INSTR BELONGTO 40a8b0 
             40a926      5 INSTR BELONGTO 40a8b0 
-            40a92b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 84h 
+            40a92b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 84h 
             40a92b      5 INSTR BELONGTO 40a8b0 
             40a930      5 INSTR BELONGTO 40a8b0 
             40a935      2 INSTR BELONGTO 40a8b0 
-            40a935     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a935     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a937     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40a937      5 INSTR BELONGTO 40a8b0 
             40a93c      4 INSTR BELONGTO 40a8b0 
             40a940      4 INSTR BELONGTO 40a8b0 
             40a944      2 INSTR BELONGTO 40a8b0 
-            40a944     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a944     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a946     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rsi+1Ch], 0FFBEh 
             40a946      7 INSTR BELONGTO 40a8b0 
             40a94d     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40A958 
@@ -8171,7 +8171,7 @@
             40a96f      3 INSTR BELONGTO 40a8b0 
             40a972     -1 INSTR LOCAL NoMetaUpdate call    sub_40CDF0 
             40a972      5 INSTR BELONGTO 40a8b0 
-            40a977     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40a977     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40a977      5 INSTR BELONGTO 40a8b0 
             40a97c     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             40a97c      4 INSTR BELONGTO 40a8b0 
@@ -8235,7 +8235,7 @@
             40aa0b      5 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 XMM2 ZZ call    _g_type_check_instance_cast 
             40aa10      2 INSTR BELONGTO 40a9e0 
             40aa10      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 R14 R15 XMM2 ZZ xor     esi, esi 
-            40aa10     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40aa10     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40aa12      3 INSTR BELONGTO 40a9e0 
             40aa12      3 INSTR DEADREGS  EFLAGS RBX RDI R13 R14 R15 XMM2 ZZ mov     rdi, rax 
             40aa15     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_resizable 
@@ -8255,7 +8255,7 @@
             40aa2c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40aa2c      5 INSTR BELONGTO 40a9e0 
             40aa2c      5 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 XMM2 ZZ call    _g_type_check_instance_cast 
-            40aa31     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+            40aa31     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
             40aa31      5 INSTR BELONGTO 40a9e0 
             40aa31      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 R14 R15 XMM2 ZZ mov     esi, 5 
             40aa36      3 INSTR BELONGTO 40a9e0 
@@ -8296,7 +8296,7 @@
             40aa6e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40aa6e      5 INSTR BELONGTO 40a9e0 
             40aa6e      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM2 ZZ call    _g_type_check_instance_cast 
-            40aa73     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40aa73     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40aa73      5 INSTR BELONGTO 40a9e0 
             40aa73      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 XMM2 ZZ mov     esi, 2 
             40aa78      3 INSTR BELONGTO 40a9e0 
@@ -8304,12 +8304,12 @@
             40aa7b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_set_spacing 
             40aa7b      5 INSTR BELONGTO 40a9e0 
             40aa7b      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM2 ZZ call    _gtk_box_set_spacing 
-            40aa80     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40aa80     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40aa80      5 INSTR BELONGTO 40a9e0 
             40aa80      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 XMM2 ZZ mov     edx, 5          ; category 
             40aa85      2 INSTR BELONGTO 40a9e0 
             40aa85      2 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 XMM2 ZZ xor     edi, edi        ; domainname 
-            40aa85     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40aa85     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40aa87      5 INSTR BELONGTO 40a9e0 
             40aa87      5 INSTR DEADREGS  EFLAGS RSI R13 R14 R15 XMM2 ZZ mov     esi, offset aTakeScreensh_0; "Take Screenshot" 
             40aa8c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -8332,10 +8332,10 @@
             40aaa7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_title 
             40aaa7      5 INSTR BELONGTO 40a9e0 
             40aaa7      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM2 ZZ call    _gtk_window_set_title 
-            40aaac     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 12h 
+            40aaac     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 12h 
             40aaac      5 INSTR BELONGTO 40a9e0 
             40aaac      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 XMM2 ZZ mov     esi, 12h 
-            40aab1     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40aab1     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40aab1      5 INSTR BELONGTO 40a9e0 
             40aab1      5 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 XMM2 ZZ mov     edi, 1 
             40aab6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
@@ -8351,7 +8351,7 @@
             40aac6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40aac6      5 INSTR BELONGTO 40a9e0 
             40aac6      5 INSTR DEADREGS  EFLAGS R12 R13 R15 XMM2 ZZ call    _g_type_check_instance_cast 
-            40aacb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+            40aacb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
             40aacb      5 INSTR BELONGTO 40a9e0 
             40aacb      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 XMM2 ZZ mov     esi, 5 
             40aad0      3 INSTR BELONGTO 40a9e0 
@@ -8369,12 +8369,12 @@
             40aae3     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40aae3      3 INSTR BELONGTO 40a9e0 
             40aae3      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 R15 XMM2 ZZ xor     r8d, r8d 
-            40aae6     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40aae6     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40aae6      5 INSTR BELONGTO 40a9e0 
             40aae6      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R15 XMM2 ZZ mov     ecx, 1 
             40aaeb      3 INSTR BELONGTO 40a9e0 
             40aaeb      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R15 XMM2 ZZ mov     rdi, rax 
-            40aaee     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40aaee     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40aaee      5 INSTR BELONGTO 40a9e0 
             40aaee      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R15 XMM2 ZZ mov     edx, 1 
             40aaf3      3 INSTR BELONGTO 40a9e0 
@@ -8387,18 +8387,18 @@
             40aafe     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40aafe      5 INSTR BELONGTO 40a9e0 
             40aafe      5 INSTR DEADREGS  EFLAGS R12 R13 R15 XMM2 ZZ call    _gtk_widget_show 
-            40ab03     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40ab03     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40ab03      5 INSTR BELONGTO 40a9e0 
             40ab03      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R15 XMM2 ZZ mov     edx, 5          ; category 
             40ab08      2 INSTR BELONGTO 40a9e0 
             40ab08      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 XMM2 ZZ xor     edi, edi        ; domainname 
-            40ab08     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40ab08     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40ab0a      5 INSTR BELONGTO 40a9e0 
             40ab0a      5 INSTR DEADREGS  EFLAGS RSI R12 R13 R15 XMM2 ZZ mov     esi, offset aTakeScreensh_0; "Take Screenshot" 
             40ab0f     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40ab0f      5 INSTR BELONGTO 40a9e0 
             40ab0f      5 INSTR DEADREGS  EFLAGS R12 R13 R15 XMM2 ZZ call    _dcgettext 
-            40ab14     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            40ab14     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             40ab14      5 INSTR BELONGTO 40a9e0 
             40ab14      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 XMM2 ZZ mov     esi, 6 
             40ab19     -1 INSTR LOCAL MetadataRedundant mov     edi, 1 
@@ -8426,10 +8426,10 @@
             40ab3a      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R13 R15 XMM2 ZZ mov     rdi, rax 
             40ab3d      2 INSTR BELONGTO 40a9e0 
             40ab3d      2 INSTR DEADREGS  EFLAGS RCX RDX R13 R15 XMM2 ZZ xor     ecx, ecx 
-            40ab3d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ab3d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40ab3f      2 INSTR BELONGTO 40a9e0 
             40ab3f      2 INSTR DEADREGS  EFLAGS RDX R13 R15 XMM2 ZZ xor     edx, edx 
-            40ab3f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ab3f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ab41     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40ab41      5 INSTR BELONGTO 40a9e0 
             40ab41      5 INSTR DEADREGS  EFLAGS R13 R15 XMM2 ZZ call    _gtk_box_pack_start 
@@ -8440,7 +8440,7 @@
             40ab49      5 INSTR DEADREGS  EFLAGS R13 R15 XMM2 ZZ call    _gtk_widget_show 
             40ab4e      2 INSTR BELONGTO 40a9e0 
             40ab4e      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R13 R15 XMM2 ZZ xor     ecx, ecx 
-            40ab4e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ab4e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40ab50      5 INSTR BELONGTO 40a9e0 
             40ab50      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R13 R15 XMM2 ZZ mov     edx, offset aB  ; "</b>" 
             40ab55      3 INSTR BELONGTO 40a9e0 
@@ -8449,7 +8449,7 @@
             40ab58      5 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R15 XMM2 ZZ mov     edi, offset aB_0; "<b>" 
             40ab5d      2 INSTR BELONGTO 40a9e0 
             40ab5d      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R15 XMM2 ZZ xor     eax, eax 
-            40ab5d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ab5d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ab5f     -1 INSTR LOCAL NoMetaUpdate call    _g_strconcat 
             40ab5f      5 INSTR BELONGTO 40a9e0 
             40ab5f      5 INSTR DEADREGS  EFLAGS R12 R13 R15 XMM2 ZZ call    _g_strconcat 
@@ -8475,7 +8475,7 @@
             40ab82     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40ab82      5 INSTR BELONGTO 40a9e0 
             40ab82      5 INSTR DEADREGS  EFLAGS R15 XMM2 ZZ call    _g_type_check_instance_cast 
-            40ab87     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40ab87     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40ab87      5 INSTR BELONGTO 40a9e0 
             40ab87      5 INSTR DEADREGS  EFLAGS RSI RDI R15 XMM2 ZZ mov     esi, 1 
             40ab8c      3 INSTR BELONGTO 40a9e0 
@@ -8517,10 +8517,10 @@
             40abc7      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 XMM0 XMM1 XMM2 ZZ xor     r8d, r8d 
             40abca      2 INSTR BELONGTO 40a9e0 
             40abca      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 XMM0 XMM1 XMM2 ZZ xor     ecx, ecx 
-            40abca     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40abca     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40abcc      2 INSTR BELONGTO 40a9e0 
             40abcc      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 XMM0 XMM1 XMM2 ZZ xor     edx, edx 
-            40abcc     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40abcc     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40abce      3 INSTR BELONGTO 40a9e0 
             40abce      3 INSTR DEADREGS  EFLAGS RSI RDI R15 XMM0 XMM1 XMM2 ZZ mov     rsi, r12 
             40abd1      3 INSTR BELONGTO 40a9e0 
@@ -8540,8 +8540,8 @@
             40abe4      5 INSTR DEADREGS  EFLAGS R12 R13 R15 XMM0 XMM1 XMM2 ZZ call    _g_free 
             40abe9      2 INSTR BELONGTO 40a9e0 
             40abe9      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 XMM0 XMM1 XMM2 ZZ xor     edi, edi 
-            40abe9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40abeb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            40abe9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40abeb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             40abeb      5 INSTR BELONGTO 40a9e0 
             40abeb      5 INSTR DEADREGS  EFLAGS RSI R12 R13 R15 XMM0 XMM1 XMM2 ZZ mov     esi, 0Ch 
             40abf0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
@@ -8561,10 +8561,10 @@
             40ac03      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R15 XMM0 XMM1 XMM2 ZZ xor     r8d, r8d 
             40ac06      2 INSTR BELONGTO 40a9e0 
             40ac06      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 XMM0 XMM1 XMM2 ZZ xor     ecx, ecx 
-            40ac06     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ac06     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40ac08      2 INSTR BELONGTO 40a9e0 
             40ac08      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 XMM0 XMM1 XMM2 ZZ xor     edx, edx 
-            40ac08     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ac08     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ac0a      3 INSTR BELONGTO 40a9e0 
             40ac0a      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM0 XMM1 XMM2 ZZ mov     rsi, r12 
             40ac0d      3 INSTR BELONGTO 40a9e0 
@@ -8588,12 +8588,12 @@
             40ac29     -1 INSTR LOCAL NoMetaUpdate call    _gtk_alignment_new 
             40ac29      5 INSTR BELONGTO 40a9e0 
             40ac29      5 INSTR DEADREGS  EFLAGS R13 R15 XMM3 ZZ call    _gtk_alignment_new 
-            40ac2e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            40ac2e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             40ac2e      5 INSTR BELONGTO 40a9e0 
             40ac2e      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 XMM3 ZZ mov     edx, 0FFFFFFFFh 
             40ac33      3 INSTR BELONGTO 40a9e0 
             40ac33      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM3 ZZ mov     rdi, rax 
-            40ac36     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 30h 
+            40ac36     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 30h 
             40ac36      5 INSTR BELONGTO 40a9e0 
             40ac36      5 INSTR DEADREGS  EFLAGS RSI R13 R15 XMM3 ZZ mov     esi, 30h 
             40ac3b      3 INSTR BELONGTO 40a9e0 
@@ -8613,10 +8613,10 @@
             40ac4e      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R15 XMM3 ZZ xor     r8d, r8d 
             40ac51      2 INSTR BELONGTO 40a9e0 
             40ac51      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 XMM3 ZZ xor     ecx, ecx 
-            40ac51     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ac51     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40ac53      2 INSTR BELONGTO 40a9e0 
             40ac53      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 XMM3 ZZ xor     edx, edx 
-            40ac53     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ac53     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ac55      3 INSTR BELONGTO 40a9e0 
             40ac55      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM3 ZZ mov     rsi, rbp 
             40ac58      3 INSTR BELONGTO 40a9e0 
@@ -8629,7 +8629,7 @@
             40ac63     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40ac63      5 INSTR BELONGTO 40a9e0 
             40ac63      5 INSTR DEADREGS  EFLAGS R13 R15 XMM3 ZZ call    _gtk_widget_show 
-            40ac68     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            40ac68     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             40ac68      5 INSTR BELONGTO 40a9e0 
             40ac68      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM3 ZZ mov     esi, 6 
             40ac6d      5 INSTR BELONGTO 40a9e0 
@@ -8659,10 +8659,10 @@
             40ac95     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40ac95      5 INSTR BELONGTO 40a9e0 
             40ac95      5 INSTR DEADREGS  EFLAGS R13 R15 XMM3 ZZ call    _gtk_widget_show 
-            40ac9a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            40ac9a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             40ac9a      5 INSTR BELONGTO 40a9e0 
             40ac9a      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM3 ZZ mov     esi, 6 
-            40ac9f     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40ac9f     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40ac9f      5 INSTR BELONGTO 40a9e0 
             40ac9f      5 INSTR DEADREGS  EFLAGS RDI R13 R15 XMM3 ZZ mov     edi, 1 
             40aca4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
@@ -8682,10 +8682,10 @@
             40acb7      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 R15 XMM3 ZZ xor     r8d, r8d 
             40acba      2 INSTR BELONGTO 40a9e0 
             40acba      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R15 XMM3 ZZ xor     ecx, ecx 
-            40acba     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40acba     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40acbc      2 INSTR BELONGTO 40a9e0 
             40acbc      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R15 XMM3 ZZ xor     edx, edx 
-            40acbc     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40acbc     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40acbe      3 INSTR BELONGTO 40a9e0 
             40acbe      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 XMM3 ZZ mov     rdi, rax 
             40acc1      3 INSTR BELONGTO 40a9e0 
@@ -8700,8 +8700,8 @@
             40accc      5 INSTR DEADREGS  EFLAGS R12 R13 R15 XMM3 ZZ call    _gtk_widget_show 
             40acd1      2 INSTR BELONGTO 40a9e0 
             40acd1      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R15 XMM3 ZZ xor     edi, edi        ; domainname 
-            40acd1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            40acd3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40acd1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40acd3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40acd3      5 INSTR BELONGTO 40a9e0 
             40acd3      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R15 XMM3 ZZ mov     edx, 5          ; category 
             40acd8      5 INSTR BELONGTO 40a9e0 
@@ -8747,7 +8747,7 @@
             40ad18      5 INSTR DEADREGS  EFLAGS R13 R15 XMM3 ZZ call    _g_type_check_instance_cast 
             40ad1d      2 INSTR BELONGTO 40a9e0 
             40ad1d      2 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM3 ZZ xor     esi, esi 
-            40ad1d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40ad1d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40ad1f      3 INSTR BELONGTO 40a9e0 
             40ad1f      3 INSTR DEADREGS  EFLAGS RDI R13 R15 XMM3 ZZ mov     rdi, rax 
             40ad22     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_set_active 
@@ -8761,8 +8761,8 @@
             40ad2a      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R15 XMM3 ZZ xor     r8d, r8d 
             40ad2d      2 INSTR BELONGTO 40a9e0 
             40ad2d      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 XMM3 ZZ xor     ecx, ecx 
-            40ad2d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40ad2f     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40A7C0 
+            40ad2d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ad2f     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40A7C0 
             40ad2f      5 INSTR BELONGTO 40a9e0 
             40ad2f      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 XMM3 ZZ mov     edx, offset loc_40A7C0 
             40ad34      3 INSTR BELONGTO 40a9e0 
@@ -8781,13 +8781,13 @@
             40ad47      5 INSTR DEADREGS  EFLAGS R13 R15 XMM3 ZZ call    _g_type_check_instance_cast 
             40ad4c      2 INSTR BELONGTO 40a9e0 
             40ad4c      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R15 XMM3 ZZ xor     ecx, ecx 
-            40ad4c     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ad4c     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40ad4e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40ad4e      3 INSTR BELONGTO 40a9e0 
             40ad4e      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R13 R15 XMM3 ZZ xor     r8d, r8d 
             40ad51      2 INSTR BELONGTO 40a9e0 
             40ad51      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 XMM3 ZZ xor     edx, edx 
-            40ad51     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ad51     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ad53      3 INSTR BELONGTO 40a9e0 
             40ad53      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM3 ZZ mov     rsi, r12 
             40ad56      3 INSTR BELONGTO 40a9e0 
@@ -8821,8 +8821,8 @@
             40ad7f      5 INSTR DEADREGS  EFLAGS R12 XMM3 ZZ call    _gtk_widget_show 
             40ad84      2 INSTR BELONGTO 40a9e0 
             40ad84      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 XMM3 ZZ xor     edi, edi        ; domainname 
-            40ad84     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            40ad86     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40ad84     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40ad86     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40ad86      5 INSTR BELONGTO 40a9e0 
             40ad86      5 INSTR DEADREGS  EFLAGS RDX RSI R12 XMM3 ZZ mov     edx, 5          ; category 
             40ad8b      5 INSTR BELONGTO 40a9e0 
@@ -8853,10 +8853,10 @@
             40adb8     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40adb8      3 INSTR BELONGTO 40a9e0 
             40adb8      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 XMM3 ZZ xor     r8d, r8d 
-            40adbb     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40adbb     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40adbb      5 INSTR BELONGTO 40a9e0 
             40adbb      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 XMM3 ZZ mov     ecx, 1 
-            40adc0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40A7C0 
+            40adc0     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40A7C0 
             40adc0      5 INSTR BELONGTO 40a9e0 
             40adc0      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 XMM3 ZZ mov     edx, offset loc_40A7C0 
             40adc5      3 INSTR BELONGTO 40a9e0 
@@ -8878,10 +8878,10 @@
             40addd      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 XMM3 ZZ xor     r8d, r8d 
             40ade0      2 INSTR BELONGTO 40a9e0 
             40ade0      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 XMM3 ZZ xor     ecx, ecx 
-            40ade0     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ade0     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40ade2      2 INSTR BELONGTO 40a9e0 
             40ade2      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 XMM3 ZZ xor     edx, edx 
-            40ade2     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ade2     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ade4      3 INSTR BELONGTO 40a9e0 
             40ade4      3 INSTR DEADREGS  EFLAGS RSI RDI R15 XMM3 ZZ mov     rsi, r12 
             40ade7      3 INSTR BELONGTO 40a9e0 
@@ -8908,12 +8908,12 @@
             40ae08     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40ae08      5 INSTR BELONGTO 40a9e0 
             40ae08      5 INSTR DEADREGS  EFLAGS R12 R15 XMM3 ZZ call    _gtk_widget_show 
-            40ae0d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40ae0d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40ae0d      5 INSTR BELONGTO 40a9e0 
             40ae0d      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R15 XMM3 ZZ mov     edx, 5          ; category 
             40ae12      2 INSTR BELONGTO 40a9e0 
             40ae12      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R15 XMM3 ZZ xor     edi, edi        ; domainname 
-            40ae12     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40ae12     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40ae14      5 INSTR BELONGTO 40a9e0 
             40ae14      5 INSTR DEADREGS  EFLAGS RSI R12 R15 XMM3 ZZ mov     esi, offset aSelect_areaToG; "Select _area to grab" 
             40ae19     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -8942,10 +8942,10 @@
             40ae41     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40ae41      3 INSTR BELONGTO 40a9e0 
             40ae41      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R15 XMM3 ZZ xor     r8d, r8d 
-            40ae44     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            40ae44     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             40ae44      5 INSTR BELONGTO 40a9e0 
             40ae44      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 XMM3 ZZ mov     ecx, 2 
-            40ae49     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40A7C0 
+            40ae49     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40A7C0 
             40ae49      5 INSTR BELONGTO 40a9e0 
             40ae49      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 XMM3 ZZ mov     edx, offset loc_40A7C0 
             40ae4e      3 INSTR BELONGTO 40a9e0 
@@ -8967,10 +8967,10 @@
             40ae66      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R15 XMM3 ZZ xor     r8d, r8d 
             40ae69      2 INSTR BELONGTO 40a9e0 
             40ae69      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 XMM3 ZZ xor     ecx, ecx 
-            40ae69     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ae69     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40ae6b      2 INSTR BELONGTO 40a9e0 
             40ae6b      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 XMM3 ZZ xor     edx, edx 
-            40ae6b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ae6b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ae6d      3 INSTR BELONGTO 40a9e0 
             40ae6d      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM3 ZZ mov     rsi, r12 
             40ae70      3 INSTR BELONGTO 40a9e0 
@@ -8985,8 +8985,8 @@
             40ae7b      5 INSTR DEADREGS  EFLAGS R12 R13 R15 XMM3 ZZ call    _gtk_widget_show 
             40ae80      2 INSTR BELONGTO 40a9e0 
             40ae80      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 XMM3 ZZ xor     edi, edi 
-            40ae80     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40ae82     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            40ae80     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40ae82     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             40ae82      5 INSTR BELONGTO 40a9e0 
             40ae82      5 INSTR DEADREGS  EFLAGS RSI R12 R13 R15 XMM3 ZZ mov     esi, 6 
             40ae87     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
@@ -9010,10 +9010,10 @@
             40aea4      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 XMM3 ZZ mov     rdi, rax 
             40aea7      2 INSTR BELONGTO 40a9e0 
             40aea7      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 R15 XMM3 ZZ xor     ecx, ecx 
-            40aea7     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40aea7     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40aea9      2 INSTR BELONGTO 40a9e0 
             40aea9      2 INSTR DEADREGS  EFLAGS RDX RSI R13 R15 XMM3 ZZ xor     edx, edx 
-            40aea9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40aea9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40aeab      3 INSTR BELONGTO 40a9e0 
             40aeab      3 INSTR DEADREGS  EFLAGS RSI R13 R15 XMM3 ZZ mov     rsi, r12 
             40aeae     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
@@ -9036,18 +9036,18 @@
             40aecd      7 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 XMM3 ZZ mov     rdi, cs:qword_60FAA0 
             40aed4      2 INSTR BELONGTO 40a9e0 
             40aed4      2 INSTR DEADREGS  EFLAGS RSI R12 R13 R15 XMM3 ZZ xor     esi, esi 
-            40aed4     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40aed4     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40aed6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
             40aed6      5 INSTR BELONGTO 40a9e0 
             40aed6      5 INSTR DEADREGS  EFLAGS R12 R13 R15 XMM3 ZZ call    _gtk_widget_set_sensitive 
-            40aedb     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40aedb     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40aedb      5 INSTR BELONGTO 40a9e0 
             40aedb      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R15 XMM3 ZZ mov     edx, 5          ; category 
             40aee0      5 INSTR BELONGTO 40a9e0 
             40aee0      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 XMM3 ZZ mov     esi, offset aGrab_afterADel; "Grab _after a delay of" 
             40aee5      2 INSTR BELONGTO 40a9e0 
             40aee5      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R15 XMM3 ZZ xor     edi, edi        ; domainname 
-            40aee5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40aee5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40aee7     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40aee7      5 INSTR BELONGTO 40a9e0 
             40aee7      5 INSTR DEADREGS  EFLAGS R12 R13 R15 XMM3 ZZ call    _dcgettext 
@@ -9087,10 +9087,10 @@
             40af26      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 R15 XMM1 XMM3 ZZ xor     r8d, r8d 
             40af29      2 INSTR BELONGTO 40a9e0 
             40af29      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R15 XMM1 XMM3 ZZ xor     ecx, ecx 
-            40af29     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40af29     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40af2b      2 INSTR BELONGTO 40a9e0 
             40af2b      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R15 XMM1 XMM3 ZZ xor     edx, edx 
-            40af2b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40af2b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40af2d      3 INSTR BELONGTO 40a9e0 
             40af2d      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 XMM1 XMM3 ZZ mov     rsi, rbp 
             40af30      3 INSTR BELONGTO 40a9e0 
@@ -9138,7 +9138,7 @@
             40af83      8 INSTR BELONGTO 40a9e0 
             40af8b      2 INSTR BELONGTO 40a9e0 
             40af8b      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 XMM2 XMM4 XMM5 ZZ xor     esi, esi 
-            40af8b     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40af8b     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40af8d      3 INSTR BELONGTO 40a9e0 
             40af8d      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R15 XMM2 XMM4 XMM5 ZZ mov     rdi, rax 
             40af90     -1 INSTR LOCAL NoMetaUpdate call    _gtk_spin_button_new 
@@ -9152,8 +9152,8 @@
             40af98      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 R15 XMM2 XMM4 XMM5 ZZ xor     r8d, r8d 
             40af9b      2 INSTR BELONGTO 40a9e0 
             40af9b      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R15 XMM2 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40af9b     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40af9d     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40A7A0 
+            40af9b     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40af9d     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40A7A0 
             40af9d      5 INSTR BELONGTO 40a9e0 
             40af9d      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R15 XMM2 XMM4 XMM5 ZZ mov     edx, offset sub_40A7A0 
             40afa2      5 INSTR BELONGTO 40a9e0 
@@ -9177,10 +9177,10 @@
             40afc1      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R15 XMM2 XMM4 XMM5 ZZ xor     r8d, r8d 
             40afc4      2 INSTR BELONGTO 40a9e0 
             40afc4      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 XMM2 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40afc4     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40afc4     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40afc6      2 INSTR BELONGTO 40a9e0 
             40afc6      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 XMM2 XMM4 XMM5 ZZ xor     edx, edx 
-            40afc6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40afc6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40afc8      3 INSTR BELONGTO 40a9e0 
             40afc8      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM2 XMM4 XMM5 ZZ mov     rsi, r12 
             40afcb      3 INSTR BELONGTO 40a9e0 
@@ -9208,14 +9208,14 @@
             40afee     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40afee      5 INSTR BELONGTO 40a9e0 
             40afee      5 INSTR DEADREGS  EFLAGS R12 R13 R15 XMM2 XMM4 XMM5 ZZ call    _gtk_widget_show 
-            40aff3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40aff3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40aff3      5 INSTR BELONGTO 40a9e0 
             40aff3      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R15 XMM2 XMM4 XMM5 ZZ mov     edx, 5          ; category 
             40aff8      5 INSTR BELONGTO 40a9e0 
             40aff8      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 XMM2 XMM4 XMM5 ZZ mov     esi, offset aSeconds; "seconds" 
             40affd      2 INSTR BELONGTO 40a9e0 
             40affd      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R15 XMM2 XMM4 XMM5 ZZ xor     edi, edi        ; domainname 
-            40affd     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40affd     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40afff     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40afff      5 INSTR BELONGTO 40a9e0 
             40afff      5 INSTR DEADREGS  EFLAGS R12 R13 R15 XMM2 XMM4 XMM5 ZZ call    _dcgettext 
@@ -9255,10 +9255,10 @@
             40b03e      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 R15 XMM2 XMM4 XMM5 ZZ xor     r8d, r8d 
             40b041      2 INSTR BELONGTO 40a9e0 
             40b041      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R15 XMM2 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b041     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b041     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b043      2 INSTR BELONGTO 40a9e0 
             40b043      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R15 XMM2 XMM4 XMM5 ZZ xor     edx, edx 
-            40b043     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b043     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b045      3 INSTR BELONGTO 40a9e0 
             40b045      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 XMM2 XMM4 XMM5 ZZ mov     rsi, rbp 
             40b048      3 INSTR BELONGTO 40a9e0 
@@ -9271,18 +9271,18 @@
             40b053     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40b053      5 INSTR BELONGTO 40a9e0 
             40b053      5 INSTR DEADREGS  EFLAGS R12 R13 R15 XMM2 XMM4 XMM5 ZZ call    _gtk_widget_show 
-            40b058     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40b058     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40b058      5 INSTR BELONGTO 40a9e0 
             40b058      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R15 XMM2 XMM4 XMM5 ZZ mov     edx, 5          ; category 
             40b05d      2 INSTR BELONGTO 40a9e0 
             40b05d      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 XMM2 XMM4 XMM5 ZZ xor     edi, edi        ; domainname 
-            40b05d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40b05d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40b05f      5 INSTR BELONGTO 40a9e0 
             40b05f      5 INSTR DEADREGS  EFLAGS RSI R12 R13 R15 XMM2 XMM4 XMM5 ZZ mov     esi, offset aEffects; "Effects" 
             40b064     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40b064      5 INSTR BELONGTO 40a9e0 
             40b064      5 INSTR DEADREGS  EFLAGS R12 R13 R15 XMM2 XMM4 XMM5 ZZ call    _dcgettext 
-            40b069     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            40b069     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             40b069      5 INSTR BELONGTO 40a9e0 
             40b069      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 XMM2 XMM4 XMM5 ZZ mov     esi, 6 
             40b06e     -1 INSTR LOCAL MetadataRedundant mov     edi, 1 
@@ -9306,10 +9306,10 @@
             40b089      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R14 R15 XMM2 XMM4 XMM5 ZZ xor     r8d, r8d 
             40b08c      2 INSTR BELONGTO 40a9e0 
             40b08c      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 XMM2 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b08c     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b08c     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b08e      2 INSTR BELONGTO 40a9e0 
             40b08e      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 XMM2 XMM4 XMM5 ZZ xor     edx, edx 
-            40b08e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b08e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b090      3 INSTR BELONGTO 40a9e0 
             40b090      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 XMM2 XMM4 XMM5 ZZ mov     rsi, rbp 
             40b093      3 INSTR BELONGTO 40a9e0 
@@ -9324,7 +9324,7 @@
             40b09e      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM2 XMM4 XMM5 ZZ call    _gtk_widget_show 
             40b0a3      2 INSTR BELONGTO 40a9e0 
             40b0a3      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R13 R14 R15 XMM2 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b0a3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b0a3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b0a5      5 INSTR BELONGTO 40a9e0 
             40b0a5      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R13 R14 R15 XMM2 XMM4 XMM5 ZZ mov     edx, offset aB  ; "</b>" 
             40b0aa      3 INSTR BELONGTO 40a9e0 
@@ -9333,7 +9333,7 @@
             40b0ad      5 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 XMM2 XMM4 XMM5 ZZ mov     edi, offset aB_0; "<b>" 
             40b0b2      2 INSTR BELONGTO 40a9e0 
             40b0b2      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 XMM2 XMM4 XMM5 ZZ xor     eax, eax 
-            40b0b2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b0b2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b0b4      7 INSTR BELONGTO 40a9e0 
             40b0b4      7 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM2 XMM4 XMM5 ZZ mov     cs:qword_60FAC0, rbp 
             40b0bb     -1 INSTR LOCAL NoMetaUpdate call    _g_strconcat 
@@ -9356,7 +9356,7 @@
             40b0d6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40b0d6      5 INSTR BELONGTO 40a9e0 
             40b0d6      5 INSTR DEADREGS  EFLAGS R14 R15 XMM2 XMM4 XMM5 ZZ call    _g_type_check_instance_cast 
-            40b0db     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40b0db     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40b0db      5 INSTR BELONGTO 40a9e0 
             40b0db      5 INSTR DEADREGS  EFLAGS RSI RDI R14 R15 XMM2 XMM4 XMM5 ZZ mov     esi, 1 
             40b0e0      3 INSTR BELONGTO 40a9e0 
@@ -9390,10 +9390,10 @@
             40b10e      5 INSTR DEADREGS  EFLAGS R14 R15 XMM0 XMM1 XMM2 XMM4 XMM5 ZZ call    _g_type_check_instance_cast 
             40b113      2 INSTR BELONGTO 40a9e0 
             40b113      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R14 R15 XMM0 XMM1 XMM2 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b113     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b113     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b115      2 INSTR BELONGTO 40a9e0 
             40b115      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R14 R15 XMM0 XMM1 XMM2 XMM4 XMM5 ZZ xor     edx, edx 
-            40b115     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b115     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b117     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40b117      3 INSTR BELONGTO 40a9e0 
             40b117      3 INSTR DEADREGS  EFLAGS RSI RDI R8 R14 R15 XMM0 XMM1 XMM2 XMM4 XMM5 ZZ xor     r8d, r8d 
@@ -9416,8 +9416,8 @@
             40b130      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM4 XMM5 ZZ call    _g_free 
             40b135      2 INSTR BELONGTO 40a9e0 
             40b135      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM4 XMM5 ZZ xor     edi, edi 
-            40b135     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40b137     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            40b135     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40b137     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             40b137      5 INSTR BELONGTO 40a9e0 
             40b137      5 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM4 XMM5 ZZ mov     esi, 0Ch 
             40b13c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
@@ -9439,10 +9439,10 @@
             40b152      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 XMM0 XMM1 XMM2 XMM4 XMM5 ZZ mov     rsi, r12 
             40b155      2 INSTR BELONGTO 40a9e0 
             40b155      2 INSTR DEADREGS  EFLAGS RCX RDX RDI R13 R14 R15 XMM0 XMM1 XMM2 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b155     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b155     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b157      2 INSTR BELONGTO 40a9e0 
             40b157      2 INSTR DEADREGS  EFLAGS RDX RDI R13 R14 R15 XMM0 XMM1 XMM2 XMM4 XMM5 ZZ xor     edx, edx 
-            40b157     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b157     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b159      3 INSTR BELONGTO 40a9e0 
             40b159      3 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 XMM0 XMM1 XMM2 XMM4 XMM5 ZZ mov     rdi, rax 
             40b15c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
@@ -9481,13 +9481,13 @@
             40b18d      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     r8d, r8d 
             40b190      2 INSTR BELONGTO 40a9e0 
             40b190      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     edx, edx 
-            40b190     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40b192     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Ch 
+            40b190     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40b192     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Ch 
             40b192      5 INSTR BELONGTO 40a9e0 
             40b192      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ mov     ecx, 0Ch 
             40b197      2 INSTR BELONGTO 40a9e0 
             40b197      2 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     esi, esi 
-            40b197     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40b197     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40b199      3 INSTR BELONGTO 40a9e0 
             40b199      3 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ mov     rdi, rax 
             40b19c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_alignment_set_padding 
@@ -9505,10 +9505,10 @@
             40b1ac      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     r8d, r8d 
             40b1af      2 INSTR BELONGTO 40a9e0 
             40b1af      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b1af     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b1af     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b1b1      2 INSTR BELONGTO 40a9e0 
             40b1b1      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     edx, edx 
-            40b1b1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b1b1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b1b3      3 INSTR BELONGTO 40a9e0 
             40b1b3      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ mov     rsi, rbp 
             40b1b6      3 INSTR BELONGTO 40a9e0 
@@ -9521,10 +9521,10 @@
             40b1c1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40b1c1      5 INSTR BELONGTO 40a9e0 
             40b1c1      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ call    _gtk_widget_show 
-            40b1c6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            40b1c6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             40b1c6      5 INSTR BELONGTO 40a9e0 
             40b1c6      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ mov     esi, 6 
-            40b1cb     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40b1cb     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40b1cb      5 INSTR BELONGTO 40a9e0 
             40b1cb      5 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ mov     edi, 1 
             40b1d0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
@@ -9552,14 +9552,14 @@
             40b1f3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40b1f3      5 INSTR BELONGTO 40a9e0 
             40b1f3      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ call    _gtk_widget_show 
-            40b1f8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40b1f8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40b1f8      5 INSTR BELONGTO 40a9e0 
             40b1f8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, 5          ; category 
             40b1fd      5 INSTR BELONGTO 40a9e0 
             40b1fd      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ mov     esi, offset aInclude_pointe; "Include _pointer" 
             40b202      2 INSTR BELONGTO 40a9e0 
             40b202      2 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     edi, edi        ; domainname 
-            40b202     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40b202     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40b204     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40b204      5 INSTR BELONGTO 40a9e0 
             40b204      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ call    _dcgettext 
@@ -9597,8 +9597,8 @@
             40b23a      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     r8d, r8d 
             40b23d      2 INSTR BELONGTO 40a9e0 
             40b23d      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b23d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40b23f     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40A890 
+            40b23d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b23f     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40A890 
             40b23f      5 INSTR BELONGTO 40a9e0 
             40b23f      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, offset sub_40A890 
             40b244      3 INSTR BELONGTO 40a9e0 
@@ -9622,12 +9622,12 @@
             40b25f      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ mov     rsi, rbp 
             40b262      2 INSTR BELONGTO 40a9e0 
             40b262      2 INSTR DEADREGS  EFLAGS RCX RDX RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b262     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b262     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b264      3 INSTR BELONGTO 40a9e0 
             40b264      3 INSTR DEADREGS  EFLAGS RDX RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ mov     rdi, rax 
             40b267      2 INSTR BELONGTO 40a9e0 
             40b267      2 INSTR DEADREGS  EFLAGS RDX R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     edx, edx 
-            40b267     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b267     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b269     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40b269      5 INSTR BELONGTO 40a9e0 
             40b269      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ call    _gtk_box_pack_start 
@@ -9636,14 +9636,14 @@
             40b271     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40b271      5 INSTR BELONGTO 40a9e0 
             40b271      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ call    _gtk_widget_show 
-            40b276     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40b276     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40b276      5 INSTR BELONGTO 40a9e0 
             40b276      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, 5          ; category 
             40b27b      5 INSTR BELONGTO 40a9e0 
             40b27b      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ mov     esi, offset aIncludeTheWi_0; "Include the window _border" 
             40b280      2 INSTR BELONGTO 40a9e0 
             40b280      2 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     edi, edi        ; domainname 
-            40b280     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40b280     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40b282     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40b282      5 INSTR BELONGTO 40a9e0 
             40b282      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ call    _dcgettext 
@@ -9690,8 +9690,8 @@
             40b2ca      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     r8d, r8d 
             40b2cd      2 INSTR BELONGTO 40a9e0 
             40b2cd      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b2cd     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40b2cf     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40A870 
+            40b2cd     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b2cf     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40A870 
             40b2cf      5 INSTR BELONGTO 40a9e0 
             40b2cf      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, offset sub_40A870 
             40b2d4      3 INSTR BELONGTO 40a9e0 
@@ -9713,10 +9713,10 @@
             40b2ec      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     r8d, r8d 
             40b2ef      2 INSTR BELONGTO 40a9e0 
             40b2ef      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b2ef     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b2ef     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b2f1      2 INSTR BELONGTO 40a9e0 
             40b2f1      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     edx, edx 
-            40b2f1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b2f1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b2f3      3 INSTR BELONGTO 40a9e0 
             40b2f3      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ mov     rsi, rbp 
             40b2f6      3 INSTR BELONGTO 40a9e0 
@@ -9731,8 +9731,8 @@
             40b301      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ call    _gtk_widget_show 
             40b306      2 INSTR BELONGTO 40a9e0 
             40b306      2 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ xor     edi, edi 
-            40b306     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40b308     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            40b306     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40b308     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             40b308      5 INSTR BELONGTO 40a9e0 
             40b308      5 INSTR DEADREGS  EFLAGS RSI R13 R14 R15 XMM2 XMM3 XMM4 XMM5 ZZ mov     esi, 0Ch 
             40b30d      7 INSTR BELONGTO 40a9e0 
@@ -9754,10 +9754,10 @@
             40b327      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 R14 XMM2 XMM3 XMM4 XMM5 ZZ xor     r8d, r8d 
             40b32a      2 INSTR BELONGTO 40a9e0 
             40b32a      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 XMM2 XMM3 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b32a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b32a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b32c      2 INSTR BELONGTO 40a9e0 
             40b32c      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 XMM2 XMM3 XMM4 XMM5 ZZ xor     edx, edx 
-            40b32c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b32c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b32e      3 INSTR BELONGTO 40a9e0 
             40b32e      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 XMM2 XMM3 XMM4 XMM5 ZZ mov     rdi, rax 
             40b331      3 INSTR BELONGTO 40a9e0 
@@ -9772,14 +9772,14 @@
             40b341     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40b341      5 INSTR BELONGTO 40a9e0 
             40b341      5 INSTR DEADREGS  EFLAGS R12 R13 R14 XMM2 XMM3 XMM4 XMM5 ZZ call    _gtk_widget_show 
-            40b346     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40b346     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40b346      5 INSTR BELONGTO 40a9e0 
             40b346      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, 5          ; category 
             40b34b      5 INSTR BELONGTO 40a9e0 
             40b34b      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 XMM2 XMM3 XMM4 XMM5 ZZ mov     esi, offset aApply_effect; "Apply _effect:" 
             40b350      2 INSTR BELONGTO 40a9e0 
             40b350      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 XMM2 XMM3 XMM4 XMM5 ZZ xor     edi, edi        ; domainname 
-            40b350     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40b350     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40b352     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40b352      5 INSTR BELONGTO 40a9e0 
             40b352      5 INSTR DEADREGS  EFLAGS R12 R13 R14 XMM2 XMM3 XMM4 XMM5 ZZ call    _dcgettext 
@@ -9833,10 +9833,10 @@
             40b3a5      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     rdi, rax 
             40b3a8      2 INSTR BELONGTO 40a9e0 
             40b3a8      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b3a8     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b3a8     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b3aa      2 INSTR BELONGTO 40a9e0 
             40b3aa      2 INSTR DEADREGS  EFLAGS RDX RSI R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     edx, edx 
-            40b3aa     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b3aa     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b3ac      3 INSTR BELONGTO 40a9e0 
             40b3ac      3 INSTR DEADREGS  EFLAGS RSI R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     rsi, r14 
             40b3af     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
@@ -9847,21 +9847,21 @@
             40b3b7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40b3b7      5 INSTR BELONGTO 40a9e0 
             40b3b7      5 INSTR DEADREGS  EFLAGS R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ call    _gtk_widget_show 
-            40b3bc     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1Ch 
+            40b3bc     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1Ch 
             40b3bc      5 INSTR BELONGTO 40a9e0 
             40b3bc      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     ecx, 1Ch 
-            40b3c1     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40h 
+            40b3c1     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40h 
             40b3c1      5 INSTR BELONGTO 40a9e0 
             40b3c1      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, 40h 
-            40b3c6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
+            40b3c6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
             40b3c6      5 INSTR BELONGTO 40a9e0 
             40b3c6      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     esi, 40h 
-            40b3cb     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
+            40b3cb     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
             40b3cb      5 INSTR BELONGTO 40a9e0 
             40b3cb      5 INSTR DEADREGS  EFLAGS RAX RDI R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     edi, 3 
             40b3d0      2 INSTR BELONGTO 40a9e0 
             40b3d0      2 INSTR DEADREGS  EFLAGS RAX R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     eax, eax 
-            40b3d0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b3d0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b3d2      7 INSTR BELONGTO 40a9e0 
             40b3d2      7 INSTR DEADREGS  EFLAGS R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     cs:qword_60FAB8, r14 
             40b3d9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_new 
@@ -9872,7 +9872,7 @@
             40b3e1      5 INSTR BELONGTO 40a9e0 
             40b3e1      5 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ lea     rsi, [rsp+0B8h+var_58] 
             40b3e1      5 PTRIMMEDESP STACK 96 displ lea     rsi, [rsp+0B8h+var_58]
-            40b3e6     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, r12d 
+            40b3e6     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, r12d 
             40b3e6      3 INSTR BELONGTO 40a9e0 
             40b3e6      3 INSTR DEADREGS  EFLAGS RDX RDI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, r12d 
             40b3e9      3 INSTR BELONGTO 40a9e0 
@@ -9888,8 +9888,8 @@
             40b3f9      4 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     rsi, [rbp+8]    ; msgid 
             40b3fd      2 INSTR BELONGTO 40a9e0 
             40b3fd      2 INSTR DEADREGS  EFLAGS RDX RDI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     edi, edi        ; domainname 
-            40b3fd     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            40b3ff     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40b3fd     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40b3ff     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40b3ff      5 INSTR BELONGTO 40a9e0 
             40b3ff      5 INSTR DEADREGS  EFLAGS RDX XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, 5          ; category 
             40b404     -1 INSTR LOCAL MetadataUnused mov     [rsp+0B8h+var_90], rcx 
@@ -9914,8 +9914,8 @@
             40b42a      6 INSTR DEADREGS  EFLAGS RAX RDX RDI R8 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     r8d, 1 
             40b430      2 INSTR BELONGTO 40a9e0 
             40b430      2 INSTR DEADREGS  EFLAGS RAX RDX RDI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     eax, eax 
-            40b430     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            40b432     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40b430     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            40b432     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40b432      5 INSTR BELONGTO 40a9e0 
             40b432      5 INSTR DEADREGS  EFLAGS RDX RDI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, 2 
             40b437      3 INSTR BELONGTO 40a9e0 
@@ -9980,7 +9980,7 @@
             40b496      7 INSTR BELONGTO 40a9e0 
             40b49d     -1 INSTR LOCAL MetadataUnused mov     rax, [rax+28h] 
             40b49d      4 INSTR BELONGTO 40a9e0 
-            40b4a1     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rax] 
+            40b4a1     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rax] 
             40b4a1      3 INSTR BELONGTO 40a9e0 
             40b4a1      3 INSTR DEADREGS  EFLAGS R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ movzx   eax, byte ptr [rax] 
             40b4a4     -1 INSTR LOCAL NoMetaUpdate cmp     al, 6Eh 
@@ -10013,7 +10013,7 @@
             40b4d6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40b4d6      5 INSTR BELONGTO 40a9e0 
             40b4d6      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ call    _g_type_check_instance_cast 
-            40b4db     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b4db     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40b4db      5 INSTR BELONGTO 40a9e0 
             40b4db      5 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, 1 
             40b4e0      3 INSTR BELONGTO 40a9e0 
@@ -10037,12 +10037,12 @@
             40b4f9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     rsi, r12 
             40b4fc      3 INSTR BELONGTO 40a9e0 
             40b4fc      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     rdi, rax 
-            40b4ff     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40b4ff     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40b4ff      5 INSTR BELONGTO 40a9e0 
             40b4ff      5 INSTR DEADREGS  EFLAGS RAX RCX RDX R12 R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     ecx, 1 
             40b504      2 INSTR BELONGTO 40a9e0 
             40b504      2 INSTR DEADREGS  EFLAGS RAX RDX R12 R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     eax, eax 
-            40b504     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b504     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b506      5 INSTR BELONGTO 40a9e0 
             40b506      5 INSTR DEADREGS  EFLAGS RDX R12 R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, offset aText; "text" 
             40b50b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_layout_set_attributes 
@@ -10055,8 +10055,8 @@
             40b513      3 INSTR BELONGTO 40a9e0 
             40b516      2 INSTR BELONGTO 40a9e0 
             40b516      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b516     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40b518     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40A8B0 
+            40b516     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b518     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40A8B0 
             40b518      5 INSTR BELONGTO 40a9e0 
             40b518      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, offset sub_40A8B0 
             40b51d      3 INSTR BELONGTO 40a9e0 
@@ -10087,10 +10087,10 @@
             40b547      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 R13 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     r8d, r8d 
             40b54a      2 INSTR BELONGTO 40a9e0 
             40b54a      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R13 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b54a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b54a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b54c      2 INSTR BELONGTO 40a9e0 
             40b54c      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     edx, edx 
-            40b54c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b54c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b54e      3 INSTR BELONGTO 40a9e0 
             40b54e      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     rsi, rbp 
             40b551      3 INSTR BELONGTO 40a9e0 
@@ -10118,12 +10118,12 @@
             40b574     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40b574      5 INSTR BELONGTO 40a9e0 
             40b574      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ call    _gtk_widget_show 
-            40b579     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40b579     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40b579      5 INSTR BELONGTO 40a9e0 
             40b579      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, 5          ; category 
             40b57e      2 INSTR BELONGTO 40a9e0 
             40b57e      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     edi, edi        ; domainname 
-            40b57e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40b57e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40b580      5 INSTR BELONGTO 40a9e0 
             40b580      5 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     esi, offset aTake_screensho; "Take _Screenshot" 
             40b585      7 INSTR BELONGTO 40a9e0 
@@ -10149,7 +10149,7 @@
             40b5a6      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     r8d, 0FFFFFFFAh 
             40b5ac      5 INSTR BELONGTO 40a9e0 
             40b5ac      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     ecx, offset aGtkCancel; "gtk-cancel" 
-            40b5b1     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF5h 
+            40b5b1     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF5h 
             40b5b1      5 INSTR BELONGTO 40a9e0 
             40b5b1      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, 0FFFFFFF5h 
             40b5b6      3 INSTR BELONGTO 40a9e0 
@@ -10158,7 +10158,7 @@
             40b5b9      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     esi, offset aGtkHelp; "gtk-help" 
             40b5be      2 INSTR BELONGTO 40a9e0 
             40b5be      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     eax, eax 
-            40b5be     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b5be     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b5c0     -1 INSTR LOCAL MetadataUnused mov     [rsp+0B8h+var_B0], 0 
             40b5c0      9 INSTR BELONGTO 40a9e0 
             40b5c9      7 INSTR BELONGTO 40a9e0 
@@ -10176,7 +10176,7 @@
             40b5df     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40b5df      5 INSTR BELONGTO 40a9e0 
             40b5df      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ call    _g_type_check_instance_cast 
-            40b5e4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFBh 
+            40b5e4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFBh 
             40b5e4      5 INSTR BELONGTO 40a9e0 
             40b5e4      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     esi, 0FFFFFFFBh 
             40b5e9      3 INSTR BELONGTO 40a9e0 
@@ -10192,11 +10192,11 @@
             40b5f6      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R8 R9 R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     r9d, r9d 
             40b5f9      2 INSTR BELONGTO 40a9e0 
             40b5f9      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R8 R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b5f9     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b5f9     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b5fb     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40b5fb      3 INSTR BELONGTO 40a9e0 
             40b5fb      3 INSTR DEADREGS  EFLAGS RDX RBX RSI R8 R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     r8d, r8d 
-            40b5fe     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40A990 
+            40b5fe     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40A990 
             40b5fe      5 INSTR BELONGTO 40a9e0 
             40b5fe      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, offset loc_40A990 
             40b603      5 INSTR BELONGTO 40a9e0 
@@ -10209,7 +10209,7 @@
             40b60d      5 PTRIMMEDESP STACK 48 displ mov     rdi, [rsp+0B8h+var_88]
             40b612     -1 INSTR LOCAL MetadataRedundant xor     r9d, r9d 
             40b612      3 INSTR BELONGTO 40a9e0 
-            40b615     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40A940 
+            40b615     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40A940 
             40b615      5 INSTR BELONGTO 40a9e0 
             40b615      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R8 R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     edx, offset loc_40A940 
             40b61a     -1 INSTR LOCAL MetadataRedundant xor     r8d, r8d 
@@ -10218,7 +10218,7 @@
             40b61d      5 INSTR DEADREGS  EFLAGS RCX RBX RSI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     esi, offset aKeyPressEvent; "key-press-event" 
             40b622      2 INSTR BELONGTO 40a9e0 
             40b622      2 INSTR DEADREGS  EFLAGS RCX RBX R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     ecx, ecx 
-            40b622     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b622     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b624     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             40b624      5 INSTR BELONGTO 40a9e0 
             40b624      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ call    _g_signal_connect_data 
@@ -10257,7 +10257,7 @@
             40b656     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40b656      5 INSTR BELONGTO 40a9e0 
             40b656      5 INSTR DEADREGS  EFLAGS R12 R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ call    _g_type_check_instance_cast 
-            40b65b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40b65b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40b65b      5 INSTR BELONGTO 40a9e0 
             40b65b      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     esi, 2 
             40b660      3 INSTR BELONGTO 40a9e0 
@@ -10275,7 +10275,7 @@
             40b678     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40b678      5 INSTR BELONGTO 40a9e0 
             40b678      5 INSTR DEADREGS  EFLAGS R13 R15 XMM3 ZZ call    _g_type_check_instance_cast 
-            40b67d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40b67d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40b67d      5 INSTR BELONGTO 40a9e0 
             40b67d      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM3 ZZ mov     esi, 1 
             40b682      3 INSTR BELONGTO 40a9e0 
@@ -10293,7 +10293,7 @@
             40b698     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40b698      5 INSTR BELONGTO 40a9e0 
             40b698      5 INSTR DEADREGS  EFLAGS R15 XMM3 ZZ call    _g_type_check_instance_cast 
-            40b69d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40b69d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40b69d      5 INSTR BELONGTO 40a9e0 
             40b69d      5 INSTR DEADREGS  EFLAGS RSI RDI R15 XMM3 ZZ mov     esi, 1 
             40b6a2      3 INSTR BELONGTO 40a9e0 
@@ -10310,7 +10310,7 @@
             40b6b6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40b6b6      5 INSTR BELONGTO 40a9e0 
             40b6b6      5 INSTR DEADREGS  EFLAGS R12 R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ call    _g_type_check_instance_cast 
-            40b6bb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40b6bb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40b6bb      5 INSTR BELONGTO 40a9e0 
             40b6bb      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     esi, 1 
             40b6c0      3 INSTR BELONGTO 40a9e0 
@@ -10329,7 +10329,7 @@
             40b6d6      5 INSTR DEADREGS  EFLAGS R12 R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ call    _g_type_check_instance_cast 
             40b6db      2 INSTR BELONGTO 40a9e0 
             40b6db      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ xor     esi, esi 
-            40b6db     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40b6db     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40b6dd      3 INSTR BELONGTO 40a9e0 
             40b6dd      3 INSTR DEADREGS  EFLAGS RDI R12 R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 ZZ mov     rdi, rax 
             40b6e0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_set_active 
@@ -10396,14 +10396,14 @@
             40b72e      4 INSTR BELONGTO 40b6f0 
             40b72e      4 INSTR DEADREGS  EFLAGS RDX RDI R15 ZZ mov     [rsp+0D8h+var_B4], eax 
             40b72e      4 PTRIMMEDESP STACK 36 displ mov     [rsp+0D8h+var_B4], eax
-            40b732     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rsp+0D8h+var_94] 
+            40b732     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rsp+0D8h+var_94] 
             40b732      4 INSTR BELONGTO 40b6f0 
             40b732      4 INSTR DEADREGS  EFLAGS RAX RDX RDI R15 ZZ mov     eax, [rsp+0D8h+var_94] 
             40b732      4 PTRIMMEDESP STACK 68 displ mov     eax, [rsp+0D8h+var_94]
             40b736      3 INSTR BELONGTO 40b6f0 
             40b736      3 INSTR DEADREGS  EFLAGS RDX RDI R15 ZZ mov     rdi, r13 
             40b739      2 INSTR BELONGTO 40b6f0 
-            40b739     -2 INSTR LOCAL n EAX ZZ  NumericDEFs add     eax, eax 
+            40b739     -2 INSTR LOCAL n RAX ZZ  NumericDEFs add     eax, eax 
             40b73b      3 INSTR BELONGTO 40b6f0 
             40b73b      3 INSTR DEADREGS  EFLAGS RDX R15 ZZ lea     edx, [rax+rbx] 
             40b73e      4 INSTR BELONGTO 40b6f0 
@@ -10437,7 +10437,7 @@
             40b765      4 PTRIMMEDESP STACK 72 displ mov     ecx, [rsp+0D8h+var_90]
             40b769      3 INSTR BELONGTO 40b6f0 
             40b769      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, r15d 
-            40b76c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40b76c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40b76c      5 INSTR BELONGTO 40b6f0 
             40b76c      5 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     esi, 1 
             40b771      2 INSTR BELONGTO 40b6f0 
@@ -10618,7 +10618,7 @@
             40b8cf      4 INSTR BELONGTO 40b6f0 
             40b8d3      2 INSTR BELONGTO 40b6f0 
             40b8d3      2 INSTR DEADREGS  EFLAGS RAX RCX RSI R8 R9 R10 R11 R13 R14 ZZ mov     eax, edi 
-            40b8d3     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edi 
+            40b8d3     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edi 
             40b8d5      5 INSTR BELONGTO 40b6f0 
             40b8d5      5 INSTR DEADREGS  EFLAGS RCX RSI R8 R9 R10 R11 R13 R14 ZZ mov     r10d, [rsp+0D8h+var_78] 
             40b8d5      5 PTRIMMEDESP STACK 96 displ mov     r10d, [rsp+0D8h+var_78]
@@ -10667,7 +10667,7 @@
             40b921     -1 INSTR LOCAL MetadataUnused add     r11, rax 
             40b921      3 INSTR BELONGTO 40b6f0 
             40b924      4 INSTR BELONGTO 40b6f0 
-            40b928     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, r10d 
+            40b928     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, r10d 
             40b928      3 INSTR BELONGTO 40b6f0 
             40b928      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R9 ZZ mov     eax, r10d 
             40b92b     -1 INSTR LOCAL MetadataUnused mov     edx, [rsp+0D8h+var_B8] 
@@ -10679,7 +10679,7 @@
             40b935     -1 INSTR LOCAL NoMetaUpdate cmp     [rsp+0D8h+var_B4], r10d 
             40b935      5 INSTR BELONGTO 40b6f0 
             40b935      5 PTRIMMEDESP STACK 36 displ cmp     [rsp+0D8h+var_B4], r10d
-            40b93a     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setle   sil 
+            40b93a     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setle   sil 
             40b93a      4 INSTR BELONGTO 40b6f0 
             40b93a      4 INSTR DEADREGS  RSI R9 ZZ setle   sil 
             40b93e     -1 INSTR LOCAL MetadataRedundant or      esi, eax 
@@ -10754,7 +10754,7 @@
             40b9ba      5 INSTR BELONGTO 40b6f0 
             40b9bf     -1 INSTR LOCAL NoMetaUpdate mulsd   xmm1, xmm0 
             40b9bf      4 INSTR BELONGTO 40b6f0 
-            40b9c3     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
+            40b9c3     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
             40b9c3      5 INSTR BELONGTO 40b6f0 
             40b9c3      5 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 R13 R14 ZZ mov     eax, 0FFFFFFFFh 
             40b9c8     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm1, xmm3 
@@ -10763,7 +10763,7 @@
             40b9cc      2 INSTR BELONGTO 40b6f0 
             40b9ce      2 INSTR BELONGTO 40b6f0 
             40b9ce      2 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 R13 R14 ZZ xor     eax, eax 
-            40b9ce     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b9ce     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b9d0     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm4, xmm1 
             40b9d0      4 INSTR BELONGTO 40b6f0 
             40b9d4     -1 INSTR LOCAL NoMetaUpdate ja      short loc_40B9DA 
@@ -10872,10 +10872,10 @@
             40ba72      8 INSTR BELONGTO 40ba50 
             40ba7a      3 INSTR BELONGTO 40ba50 
             40ba7a      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R13 R14 XMM1 XMM2 ZZ mov     rsi, rbp 
-            40ba7d     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 4 
+            40ba7d     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 4 
             40ba7d      5 INSTR BELONGTO 40ba50 
             40ba7d      5 INSTR DEADREGS  EFLAGS RCX RDX R12 R13 R14 XMM1 XMM2 ZZ mov     ecx, 4 
-            40ba82     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40ba82     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             40ba82      5 INSTR BELONGTO 40ba50 
             40ba82      5 INSTR DEADREGS  EFLAGS RDX R12 R13 R14 XMM1 XMM2 ZZ mov     edx, 5 
             40ba87     -1 INSTR LOCAL NoMetaUpdate call    sub_40B6F0 
@@ -10913,10 +10913,10 @@
             40bac1      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R9 R13 R14 XMM0 XMM1 XMM2 ZZ mov     r9d, r12d 
             40bac4     -1 INSTR LOCAL MetadataUnused movapd  xmm2, xmm3 
             40bac4      4 INSTR BELONGTO 40ba50 
-            40bac8     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 5 
+            40bac8     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 5 
             40bac8      5 INSTR BELONGTO 40ba50 
             40bac8      5 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R13 R14 XMM0 XMM1 XMM2 XMM3 ZZ mov     ecx, 5 
-            40bacd     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40bacd     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             40bacd      5 INSTR BELONGTO 40ba50 
             40bacd      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 XMM0 XMM1 XMM2 XMM3 ZZ mov     edx, 5 
             40bad2      3 INSTR BELONGTO 40ba50 
@@ -10951,7 +10951,7 @@
             40bafe      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 XMM0 XMM1 XMM2 XMM3 ZZ pop     r14 
             40bb00      1 INSTR BELONGTO 40ba50 
             40bb00      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 XMM0 XMM1 XMM2 XMM3 ZZ retn 
-            40bb01     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
+            40bb01     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
             40bb01      5 INSTR BELONGTO 40ba50 
             40bb01      5 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 ZZ mov     edi, 10h 
             40bb06     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc0 
@@ -10987,7 +10987,7 @@
             40bb40     -2 INSTR LOCAL n R13 ZZ  NumericDEFs mov     r13d, r14d 
             40bb40      3 INSTR BELONGTO 40ba50 
             40bb40      3 INSTR DEADREGS  EFLAGS RCX RDX R13 ZZ mov     r13d, r14d 
-            40bb43     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, r14d 
+            40bb43     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, r14d 
             40bb43      3 INSTR BELONGTO 40ba50 
             40bb43      3 INSTR DEADREGS  EFLAGS RCX RDX ZZ mov     edx, r14d 
             40bb46      4 INSTR BELONGTO 40ba50 
@@ -10996,7 +10996,7 @@
             40bb4a      4 INSTR BELONGTO 40ba50 
             40bb4e      2 INSTR BELONGTO 40ba50 
             40bb4e      2 INSTR DEADREGS  EFLAGS ZZ sar     eax, 1 
-            40bb4e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM sar     eax, 1 
+            40bb4e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM sar     eax, 1 
             40bb50      6 INSTR BELONGTO 40ba50 
             40bb50      6 INSTR DEADREGS  EFLAGS ZZ movsd   [rsp+48h+var_38], xmm1 
             40bb50      6 PTRIMMEDESP STACK 16 displ movsd   [rsp+48h+var_38], xmm1
@@ -11072,7 +11072,7 @@
             40bbd6     10 INSTR BELONGTO 40ba50 
             40bbe0      2 INSTR BELONGTO 40ba50 
             40bbe0      2 INSTR DEADREGS  EFLAGS RDX R12 R13 R14 XMM2 ZZ xor     edx, edx 
-            40bbe0     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40bbe0     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40bbe2      6 INSTR BELONGTO 40ba50 
             40bbe8     -1 INSTR LOCAL SafeIfNoIndexing movsd   xmm0, qword ptr [rcx+rdx*8] 
             40bbe8      5 INSTR BELONGTO 40ba50 
@@ -11128,8 +11128,8 @@
             40bc49      8 INSTR BELONGTO 40bc20 
             40bc51      2 INSTR BELONGTO 40bc20 
             40bc51      2 INSTR DEADREGS  EFLAGS RCX RDX R12 XMM0 ZZ xor     ecx, ecx 
-            40bc51     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40bc53     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40bc51     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40bc53     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40bc53      5 INSTR BELONGTO 40bc20 
             40bc53      5 INSTR DEADREGS  EFLAGS RDX R12 XMM0 ZZ mov     edx, 1 
             40bc58     -1 INSTR LOCAL NoMetaUpdate call    sub_40B6F0 
@@ -11161,12 +11161,12 @@
             40bc83      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R9 XMM0 XMM1 XMM2 ZZ mov     r8d, eax 
             40bc86      3 INSTR BELONGTO 40bc20 
             40bc86      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R9 XMM0 XMM1 XMM2 ZZ mov     r9d, r12d 
-            40bc89     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40bc89     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40bc89      5 INSTR BELONGTO 40bc20 
             40bc89      5 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 XMM0 XMM1 XMM2 ZZ mov     ecx, 1 
             40bc8e     -1 INSTR LOCAL MetadataUnused movapd  xmm2, xmm3 
             40bc8e      4 INSTR BELONGTO 40bc20 
-            40bc92     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40bc92     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40bc92      5 INSTR BELONGTO 40bc20 
             40bc92      5 INSTR DEADREGS  EFLAGS RDX RSI R12 XMM0 XMM1 XMM2 ZZ mov     edx, 1 
             40bc97     -1 INSTR LOCAL MetadataUnused movapd  xmm1, xmm3 
@@ -11203,7 +11203,7 @@
             40bcd4      1 INSTR BELONGTO 40bc20 
             40bcd4      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 XMM0 XMM3 ZZ retn 
             40bcd4     56 DEALLOC STACK esp - 56 retn
-            40bcd8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
+            40bcd8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
             40bcd8      5 INSTR BELONGTO 40bc20 
             40bcd8      5 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     edi, 10h 
             40bcdd     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc0 
@@ -11511,10 +11511,10 @@
             40bef1      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R12 ZZ xor     r8d, r8d 
             40bef4      2 INSTR BELONGTO 40be70 
             40bef4      2 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 ZZ xor     ecx, ecx 
-            40bef4     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40bef4     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40bef6      2 INSTR BELONGTO 40be70 
             40bef6      2 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ xor     esi, esi 
-            40bef6     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40bef6     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40bef8      3 INSTR BELONGTO 40be70 
             40bef8      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rbx 
             40befb     -1 INSTR LOCAL NoMetaUpdate call    _ca_context_play_full 
@@ -11603,7 +11603,7 @@
             40bf76      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _gdk_window_get_toplevel 
             40bf80      2 INSTR BELONGTO 40bf30 
             40bf80      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     ebx, ebx 
-            40bf80     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40bf80     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40bf82      3 INSTR BELONGTO 40bf30 
             40bf82      3 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     rax, rbx 
             40bf85      1 INSTR BELONGTO 40bf30 
@@ -11612,10 +11612,10 @@
             40bf86      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             40bf90      2 INSTR BELONGTO 40bf30 
             40bf90      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edx, edx 
-            40bf90     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40bf90     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40bf92      2 INSTR BELONGTO 40bf30 
             40bf92      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            40bf92     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40bf92     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40bf94      3 INSTR BELONGTO 40bf30 
             40bf94      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
             40bf97     -1 INSTR LOCAL NoMetaUpdate call    _gdk_device_get_window_at_position 
@@ -11750,18 +11750,18 @@
             40c07b      2 INSTR BELONGTO 40bfb0 
             40c07d      5 INSTR BELONGTO 40bfb0 
             40c07d      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     edx, offset aCouldnTFindWin; "Couldn't find window manager window" 
-            40c082     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40c082     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40c082      5 INSTR BELONGTO 40bfb0 
             40c082      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, 10h 
             40c087      2 INSTR BELONGTO 40bfb0 
             40c087      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            40c087     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40c087     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40c089     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40c089      5 INSTR BELONGTO 40bfb0 
             40c089      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_log 
             40c08e      2 INSTR BELONGTO 40bfb0 
             40c08e      2 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 R14 R15 ZZ xor     ebp, ebp 
-            40c08e     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40c08e     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40c090      8 INSTR BELONGTO 40bfb0 
             40c090      8 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 R14 R15 ZZ lea     rsi, [rsp+198h+var_A8] 
             40c090      8 PTRIMMEDESP STACK 240 displ lea     rsi, [rsp+198h+var_A8]
@@ -11939,7 +11939,7 @@
             40c1eb      8 PTRIMMEDESP STACK 240 displ lea     rsi, [rsp+198h+var_A8]
             40c1f3      2 INSTR BELONGTO 40bfb0 
             40c1f3      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     ecx, ecx 
-            40c1f3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40c1f3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40c1f5      3 INSTR BELONGTO 40bfb0 
             40c1f5      3 INSTR DEADREGS  EFLAGS RDX RBX RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rdi, rax 
             40c1f8      8 INSTR BELONGTO 40bfb0 
@@ -11952,11 +11952,11 @@
             40c203      8 PTRIMMEDESP STACK 136 displ mov     [rsp+198h+var_110], rsi
             40c20b      2 INSTR BELONGTO 40bfb0 
             40c20b      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     esi, esi 
-            40c20b     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40c20b     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40c20d     -1 INSTR LOCAL NoMetaUpdate call    sub_40BD40 
             40c20d      5 INSTR BELONGTO 40bfb0 
             40c20d      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ call    sub_40BD40 
-            40c212     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rsp+198h+var_C8] 
+            40c212     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rsp+198h+var_C8] 
             40c212      7 INSTR BELONGTO 40bfb0 
             40c212      7 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 R14 R15 ZZ mov     eax, [rsp+198h+var_C8] 
             40c212      7 PTRIMMEDESP STACK 208 displ mov     eax, [rsp+198h+var_C8]
@@ -12038,7 +12038,7 @@
             40c2ce     -1 INSTR LOCAL NoMetaUpdate call    _gdk_display_get_default 
             40c2ce      5 INSTR BELONGTO 40bfb0 
             40c2ce      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _gdk_display_get_default 
-            40c2d3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 44h 
+            40c2d3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 44h 
             40c2d3      5 INSTR BELONGTO 40bfb0 
             40c2d3      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     esi, 44h 
             40c2d8      3 INSTR BELONGTO 40bfb0 
@@ -12110,7 +12110,7 @@
             40c356      5 INSTR DEADREGS  EFLAGS RAX RSI R13 R14 R15 ZZ mov     esi, (offset aUnknownTypeD+0Dh); "%d" 
             40c35b      2 INSTR BELONGTO 40bfb0 
             40c35b      2 INSTR DEADREGS  EFLAGS RAX R13 R14 R15 ZZ xor     eax, eax 
-            40c35b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c35b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c35d     -1 INSTR LOCAL NoMetaUpdate call    ___isoc99_sscanf 
             40c35d      5 INSTR BELONGTO 40bfb0 
             40c35d      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    ___isoc99_sscanf 
@@ -12130,7 +12130,7 @@
             40c37c      3 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 ZZ mov     rdi, rax 
             40c37f      2 INSTR BELONGTO 40bfb0 
             40c37f      2 INSTR DEADREGS  EFLAGS RAX R13 R14 R15 ZZ xor     eax, eax 
-            40c37f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c37f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c381     -1 INSTR LOCAL NoMetaUpdate call    ___isoc99_sscanf 
             40c381      5 INSTR BELONGTO 40bfb0 
             40c381      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    ___isoc99_sscanf 
@@ -12199,7 +12199,7 @@
             40c411      8 PTRIMMEDESP STACK 136 displ mov     rcx, [rsp+198h+var_110]
             40c419      2 INSTR BELONGTO 40bfb0 
             40c419      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ xor     edx, edx 
-            40c419     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c419     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c41b      5 INSTR BELONGTO 40bfb0 
             40c41b      5 INSTR DEADREGS  EFLAGS RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 XMM3 ZZ mov     rdi, [rsp+198h+var_120] 
             40c41b      5 PTRIMMEDESP STACK 120 displ mov     rdi, [rsp+198h+var_120]
@@ -12232,7 +12232,7 @@
             40c44d      8 PTRIMMEDESP STACK 336 displ lea     rcx, [rsp+198h+var_48]
             40c455      2 INSTR BELONGTO 40bfb0 
             40c455      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ xor     edx, edx 
-            40c455     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c455     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c457      3 INSTR BELONGTO 40bfb0 
             40c457      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     rsi, rbp 
             40c45a      3 INSTR BELONGTO 40bfb0 
@@ -12265,13 +12265,13 @@
             40c492      7 INSTR BELONGTO 40bfb0 
             40c492      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 R15 ZZ mov     ecx, [rsp+198h+var_B0] 
             40c492      7 PTRIMMEDESP STACK 232 displ mov     ecx, [rsp+198h+var_B0]
-            40c499     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 8 
+            40c499     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 8 
             40c499      5 INSTR BELONGTO 40bfb0 
             40c499      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 8 
             40c49e      2 INSTR BELONGTO 40bfb0 
             40c49e      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            40c49e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40c4a0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40c49e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40c4a0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40c4a0      5 INSTR BELONGTO 40bfb0 
             40c4a0      5 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 R15 ZZ mov     esi, 1 
             40c4a5     -1 INSTR LOCAL MetadataUnused mov     ebp, eax 
@@ -12301,13 +12301,13 @@
             40c4d0      5 INSTR BELONGTO 40bfb0 
             40c4d5     -1 INSTR LOCAL MetadataUnused add     eax, edx 
             40c4d5      2 INSTR BELONGTO 40bfb0 
-            40c4d7     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movsx   edx, [rsp+198h+var_E8] 
+            40c4d7     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movsx   edx, [rsp+198h+var_E8] 
             40c4d7      8 INSTR BELONGTO 40bfb0 
             40c4d7      8 INSTR DEADREGS  EFLAGS RDX R13 R14 R15 ZZ movsx   edx, [rsp+198h+var_E8] 
             40c4d7      8 PTRIMMEDESP STACK 176 displ movsx   edx, [rsp+198h+var_E8]
             40c4df     -1 INSTR LOCAL MetadataUnused mov     [rsp+198h+var_D8], eax 
             40c4df      7 INSTR BELONGTO 40bfb0 
-            40c4e6     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movsx   eax, word ptr [rsp+198h+var_158] 
+            40c4e6     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movsx   eax, word ptr [rsp+198h+var_158] 
             40c4e6      5 INSTR BELONGTO 40bfb0 
             40c4e6      5 INSTR DEADREGS  EFLAGS RAX R13 R14 R15 ZZ movsx   eax, word ptr [rsp+198h+var_158] 
             40c4e6      5 PTRIMMEDESP STACK 64 displ movsx   eax, word ptr [rsp+198h+var_158]
@@ -12338,10 +12338,10 @@
             40c524      5 INSTR BELONGTO 40bfb0 
             40c529     -1 INSTR LOCAL MetadataUnused movzx   r13d, word ptr [rcx+4] 
             40c529      5 INSTR BELONGTO 40bfb0 
-            40c52e     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, word ptr [rcx+6] 
+            40c52e     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, word ptr [rcx+6] 
             40c52e      4 INSTR BELONGTO 40bfb0 
             40c52e      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R14 R15 ZZ movzx   eax, word ptr [rcx+6] 
-            40c532     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movsx   edx, word ptr [rcx] 
+            40c532     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movsx   edx, word ptr [rcx] 
             40c532      3 INSTR BELONGTO 40bfb0 
             40c532      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 R15 ZZ movsx   edx, word ptr [rcx] 
             40c535     -2 INSTR LOCAL n R14 ZZ  NumericDEFs movsx   r14d, word ptr [rcx+2] 
@@ -12409,7 +12409,7 @@
             40c5b3      4 INSTR BELONGTO 40bfb0 
             40c5b7     -1 INSTR LOCAL NoMetaUpdate jge     loc_40C696 
             40c5b7      6 INSTR BELONGTO 40bfb0 
-            40c5bd     -2 INSTR LOCAL n EAX ZZ  NumericDEFs lea     eax, ds:0[rdx*4] 
+            40c5bd     -2 INSTR LOCAL n RAX ZZ  NumericDEFs lea     eax, ds:0[rdx*4] 
             40c5bd      7 INSTR BELONGTO 40bfb0 
             40c5bd      7 INSTR DEADREGS  EFLAGS RAX RDI R15 ZZ lea     eax, ds:0[rdx*4] 
             40c5c4     -1 INSTR LOCAL NoMetaUpdate cmp     ebp, 1 
@@ -12463,14 +12463,14 @@
             40c60c      3 INSTR BELONGTO 40bfb0 
             40c60f     -1 INSTR LOCAL NoMetaUpdate jle     short loc_40C687 
             40c60f      2 INSTR BELONGTO 40bfb0 
-            40c611     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, [rsp+198h+var_158] 
+            40c611     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, [rsp+198h+var_158] 
             40c611      4 INSTR BELONGTO 40bfb0 
             40c611      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     edx, [rsp+198h+var_158] 
             40c611      4 PTRIMMEDESP STACK 64 displ mov     edx, [rsp+198h+var_158]
             40c615      2 INSTR BELONGTO 40bfb0 
             40c615      2 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ xor     ecx, ecx 
-            40c615     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40c617     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM imul    eax, r14d 
+            40c615     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40c617     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM imul    eax, r14d 
             40c617      4 INSTR BELONGTO 40bfb0 
             40c617      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ imul    eax, r14d 
             40c61b     -1 INSTR LOCAL MetadataRedundant imul    edx, r14d 
@@ -12490,7 +12490,7 @@
             40c633      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ lea     rax, [r15+rax+4] 
             40c638     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40C658 
             40c638      2 INSTR BELONGTO 40bfb0 
-            40c640     -2 INSTR LOCAL n ESI ZZ  NumericDEFs movzx   esi, byte ptr [rdx+3] 
+            40c640     -2 INSTR LOCAL n RSI ZZ  NumericDEFs movzx   esi, byte ptr [rdx+3] 
             40c640      4 INSTR BELONGTO 40bfb0 
             40c640      4 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ movzx   esi, byte ptr [rdx+3] 
             40c644     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     ecx, 1 
@@ -12505,7 +12505,7 @@
             40c653      3 INSTR BELONGTO 40bfb0 
             40c656     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40C687 
             40c656      2 INSTR BELONGTO 40bfb0 
-            40c658     -2 INSTR LOCAL n ESI ZZ  NumericDEFs movzx   esi, byte ptr [rdx] 
+            40c658     -2 INSTR LOCAL n RSI ZZ  NumericDEFs movzx   esi, byte ptr [rdx] 
             40c658      3 INSTR BELONGTO 40bfb0 
             40c658      3 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ movzx   esi, byte ptr [rdx] 
             40c65b     -1 INSTR LOCAL NoMetaUpdate test    ebp, ebp 
@@ -12609,7 +12609,7 @@
             40c714      3 INSTR BELONGTO 40bfb0 
             40c714      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rbx, rax 
             40c717      9 INSTR BELONGTO 40bfb0 
-            40c720     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, r12d 
+            40c720     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, r12d 
             40c720      3 INSTR BELONGTO 40bfb0 
             40c720      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     esi, r12d 
             40c723      3 INSTR BELONGTO 40bfb0 
@@ -12841,7 +12841,7 @@
             40c8db      2 INSTR BELONGTO 40bfb0 
             40c8dd      2 INSTR BELONGTO 40bfb0 
             40c8dd      2 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, eax 
-            40c8dd     -2 INSTR LOCAL n EDI ZZ  NumericDEFs mov     edi, eax 
+            40c8dd     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     edi, eax 
             40c8df     -1 INSTR LOCAL MetadataRedundant imul    edi, r8d 
             40c8df      4 INSTR BELONGTO 40bfb0 
             40c8e3     -1 INSTR LOCAL MetadataRedundant movsxd  rdi, edi 
@@ -12911,7 +12911,7 @@
             40c95d      5 INSTR BELONGTO 40bfb0 
             40c962      3 INSTR BELONGTO 40bfb0 
             40c962      3 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ add     r14d, ecx 
-            40c965     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
+            40c965     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
             40c965      5 INSTR BELONGTO 40bfb0 
             40c965      5 INSTR DEADREGS  RSI RDI R15 ZZ mov     esi, 0 
             40c96a      4 INSTR BELONGTO 40bfb0 
@@ -12922,7 +12922,7 @@
             40c970      5 INSTR BELONGTO 40bfb0 
             40c975      2 INSTR BELONGTO 40bfb0 
             40c975      2 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ add     edx, ecx 
-            40c977     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
+            40c977     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
             40c977      5 INSTR BELONGTO 40bfb0 
             40c977      5 INSTR DEADREGS  RSI RDI R15 ZZ mov     esi, 0 
             40c97c      3 INSTR BELONGTO 40bfb0 
@@ -12935,18 +12935,18 @@
             40c987      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R14 R15 ZZ mov     r8d, offset aGdk_pixbuf_get; "gdk_pixbuf_get_colorspace (pixbuf) == G"... 
             40c98d      5 INSTR BELONGTO 40bfb0 
             40c98d      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 ZZ mov     ecx, offset aBlank_rectangl; "blank_rectangle_in_pixbuf" 
-            40c992     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 81h 
+            40c992     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 81h 
             40c992      5 INSTR BELONGTO 40bfb0 
             40c992      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 ZZ mov     edx, 81h 
             40c997      5 INSTR BELONGTO 40bfb0 
             40c997      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ mov     esi, offset aScreenshotUtil; "screenshot-utils.c" 
             40c99c      2 INSTR BELONGTO 40bfb0 
             40c99c      2 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 ZZ xor     edi, edi 
-            40c99c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40c99c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40c99e     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40c99e      5 INSTR BELONGTO 40bfb0 
             40c99e      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_assertion_message_expr 
-            40c9a3     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movsx   eax, [rsp+198h+var_F8] 
+            40c9a3     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movsx   eax, [rsp+198h+var_F8] 
             40c9a3      8 INSTR BELONGTO 40bfb0 
             40c9a3      8 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R13 R14 R15 XMM2 ZZ movsx   eax, [rsp+198h+var_F8] 
             40c9a3      8 PTRIMMEDESP STACK 160 displ movsx   eax, [rsp+198h+var_F8]
@@ -13036,18 +13036,18 @@
             40ca61      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_get_user_cache_dir 
             40ca66      2 INSTR BELONGTO 40ca30 
             40ca66      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ xor     edx, edx 
-            40ca66     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ca66     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ca68      3 INSTR BELONGTO 40ca30 
             40ca68      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     rdi, rax 
             40ca6b      5 INSTR BELONGTO 40ca30 
             40ca6b      5 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 R14 R15 ZZ mov     esi, offset domainname; "gnome-screenshot" 
             40ca70      2 INSTR BELONGTO 40ca30 
             40ca70      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 ZZ xor     eax, eax 
-            40ca70     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ca70     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ca72     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40ca72      5 INSTR BELONGTO 40ca30 
             40ca72      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_build_filename 
-            40ca77     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1C0h 
+            40ca77     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1C0h 
             40ca77      5 INSTR BELONGTO 40ca30 
             40ca77      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     esi, 1C0h 
             40ca7c      3 INSTR BELONGTO 40ca30 
@@ -13066,13 +13066,13 @@
             40ca91      2 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 R15 ZZ mov     esi, eax 
             40ca93      2 INSTR BELONGTO 40ca30 
             40ca93      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 ZZ xor     eax, eax 
-            40ca93     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ca93     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ca95     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40ca95      5 INSTR BELONGTO 40ca30 
             40ca95      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_strdup_printf 
             40ca9a      2 INSTR BELONGTO 40ca30 
             40ca9a      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ xor     edx, edx 
-            40ca9a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ca9a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ca9c      3 INSTR BELONGTO 40ca30 
             40ca9c      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     rsi, rax 
             40ca9f      3 INSTR BELONGTO 40ca30 
@@ -13081,7 +13081,7 @@
             40caa2      3 INSTR DEADREGS  EFLAGS RAX RDI R12 R14 R15 ZZ mov     rdi, rbp 
             40caa5      2 INSTR BELONGTO 40ca30 
             40caa5      2 INSTR DEADREGS  EFLAGS RAX R12 R14 R15 ZZ xor     eax, eax 
-            40caa5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40caa5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40caa7     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40caa7      5 INSTR BELONGTO 40ca30 
             40caa7      5 INSTR DEADREGS  EFLAGS R12 R14 R15 ZZ call    _g_build_filename 
@@ -13114,7 +13114,7 @@
             40cade      5 INSTR DEADREGS  EFLAGS RAX RDI R14 R15 ZZ mov     edi, offset aIiiibs; "(iiiibs)" 
             40cae3      2 INSTR BELONGTO 40ca30 
             40cae3      2 INSTR DEADREGS  EFLAGS RAX R14 R15 ZZ xor     eax, eax 
-            40cae3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cae3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cae5      4 INSTR BELONGTO 40ca30 
             40cae5      4 INSTR DEADREGS  EFLAGS R14 R15 ZZ mov     [rsp+88h+var_88], r12 
             40cae5      4 PTRIMMEDESP STACK 0 displ mov     [rsp+88h+var_88], r12
@@ -13187,15 +13187,15 @@
             40cb6f      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 R15 ZZ mov     rcx, [rax+8] 
             40cb73      2 INSTR BELONGTO 40ca30 
             40cb73      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R14 R15 ZZ xor     edi, edi 
-            40cb73     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40cb73     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40cb75      5 INSTR BELONGTO 40ca30 
             40cb75      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R14 R15 ZZ mov     edx, offset aUnableToUseGno; "Unable to use GNOME Shell's builtin scr"... 
-            40cb7a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40cb7a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40cb7a      5 INSTR BELONGTO 40ca30 
             40cb7a      5 INSTR DEADREGS  EFLAGS RAX RSI R14 R15 ZZ mov     esi, 10h 
             40cb7f      2 INSTR BELONGTO 40ca30 
             40cb7f      2 INSTR DEADREGS  EFLAGS RAX R14 R15 ZZ xor     eax, eax 
-            40cb7f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cb7f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cb81     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40cb81      5 INSTR BELONGTO 40ca30 
             40cb81      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _g_log 
@@ -13253,14 +13253,14 @@
             40cbe3      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R14 R15 ZZ mov     esi, [rax+24h] 
             40cbe6      3 INSTR BELONGTO 40ca30 
             40cbe6      3 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R14 R15 ZZ mov     r8, r12 
-            40cbe9     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40cbe9     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40cbe9      5 INSTR BELONGTO 40ca30 
             40cbe9      5 INSTR DEADREGS  EFLAGS RAX RCX RDI R14 R15 ZZ mov     ecx, 1 
             40cbee      5 INSTR BELONGTO 40ca30 
             40cbee      5 INSTR DEADREGS  EFLAGS RAX RDI R14 R15 ZZ mov     edi, offset aBbbs; "(bbbs)" 
             40cbf3      2 INSTR BELONGTO 40ca30 
             40cbf3      2 INSTR DEADREGS  EFLAGS RAX R14 R15 ZZ xor     eax, eax 
-            40cbf3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cbf3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cbf5      6 INSTR BELONGTO 40ca30 
             40cbf5      6 INSTR DEADREGS  EFLAGS R14 R15 ZZ mov     r15d, offset aScreenshotwind; "ScreenshotWindow" 
             40cbfb     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_new 
@@ -13274,14 +13274,14 @@
             40cc10      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 R15 ZZ mov     esi, [rax+1Ch] 
             40cc13      3 INSTR BELONGTO 40ca30 
             40cc13      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R14 R15 ZZ mov     rcx, r12 
-            40cc16     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40cc16     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40cc16      5 INSTR BELONGTO 40ca30 
             40cc16      5 INSTR DEADREGS  EFLAGS RAX RDX RDI R14 R15 ZZ mov     edx, 1 
             40cc1b      5 INSTR BELONGTO 40ca30 
             40cc1b      5 INSTR DEADREGS  EFLAGS RAX RDI R14 R15 ZZ mov     edi, offset aBbs; "(bbs)" 
             40cc20      2 INSTR BELONGTO 40ca30 
             40cc20      2 INSTR DEADREGS  EFLAGS RAX R14 R15 ZZ xor     eax, eax 
-            40cc20     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cc20     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cc22      6 INSTR BELONGTO 40ca30 
             40cc22      6 INSTR DEADREGS  EFLAGS R14 R15 ZZ mov     r15d, offset aScreenshot; "Screenshot" 
             40cc28     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_new 
@@ -13379,8 +13379,8 @@
             40ccc7      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 ZZ mov     esi, offset aScreenshot_sho; "screenshot_show_dialog" 
             40cccc      2 INSTR BELONGTO 40cc70 
             40cccc      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 ZZ xor     edi, edi 
-            40cccc     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40ccce     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 0FFFFFFFFh 
+            40cccc     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40ccce     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 0FFFFFFFFh 
             40ccce      5 INSTR BELONGTO 40cc70 
             40ccce      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ mov     ebx, 0FFFFFFFFh 
             40ccd3     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
@@ -13388,7 +13388,7 @@
             40ccd3      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _g_return_if_fail_warning 
             40ccd8      2 INSTR BELONGTO 40cc70 
             40ccd8      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 R13 R14 ZZ mov     eax, ebx 
-            40ccd8     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            40ccd8     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             40ccda      5 INSTR BELONGTO 40cc70 
             40ccda      5 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 ZZ mov     rbp, [rsp+28h+var_20] 
             40ccda      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+28h+var_20]
@@ -13410,24 +13410,24 @@
             40cd00      3 INSTR BELONGTO 40cc70 
             40cd03     -1 INSTR LOCAL NoMetaUpdate jz      loc_40CDC8 
             40cd03      6 INSTR BELONGTO 40cc70 
-            40cd09     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, r12d 
+            40cd09     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, r12d 
             40cd09      3 INSTR BELONGTO 40cc70 
             40cd09      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 ZZ mov     ecx, r12d 
-            40cd0c     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, r13d 
+            40cd0c     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, r13d 
             40cd0c      3 INSTR BELONGTO 40cc70 
             40cd0c      3 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R8 R9 R12 ZZ mov     edx, r13d 
             40cd0f      3 INSTR BELONGTO 40cc70 
             40cd0f      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R12 R13 ZZ mov     r9, r14 
             40cd12      6 INSTR BELONGTO 40cc70 
             40cd12      6 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R12 R13 R14 ZZ mov     r8d, (offset aUnableToParseA+1Bh); "%s" 
-            40cd18     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40cd18     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40cd18      5 INSTR BELONGTO 40cc70 
             40cd18      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 R14 ZZ mov     esi, 2 
             40cd1d      3 INSTR BELONGTO 40cc70 
             40cd1d      3 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 ZZ mov     rdi, rbx 
             40cd20      2 INSTR BELONGTO 40cc70 
             40cd20      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 ZZ xor     eax, eax 
-            40cd20     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cd20     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cd22     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             40cd22      5 INSTR BELONGTO 40cc70 
             40cd22      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _gtk_message_dialog_new 
@@ -13474,7 +13474,7 @@
             40cd65      5 INSTR DEADREGS  EFLAGS RAX RSI R14 ZZ mov     esi, (offset aUnableToParseA+1Bh); "%s" 
             40cd6a      2 INSTR BELONGTO 40cc70 
             40cd6a      2 INSTR DEADREGS  EFLAGS RAX R14 ZZ xor     eax, eax 
-            40cd6a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cd6a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cd6c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_format_secondary_text 
             40cd6c      5 INSTR BELONGTO 40cc70 
             40cd6c      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _gtk_message_dialog_format_secondary_text 
@@ -13537,11 +13537,11 @@
             40cdcd      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 ZZ mov     esi, offset aScreenshot_sho; "screenshot_show_dialog" 
             40cdd2      2 INSTR BELONGTO 40cc70 
             40cdd2      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 ZZ xor     edi, edi 
-            40cdd2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40cdd2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40cdd4     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40cdd4      5 INSTR BELONGTO 40cc70 
             40cdd4      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ call    _g_return_if_fail_warning 
-            40cdd9     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 0FFFFFFFFh 
+            40cdd9     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 0FFFFFFFFh 
             40cdd9      5 INSTR BELONGTO 40cc70 
             40cdd9      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 ZZ mov     ebx, 0FFFFFFFFh 
             40cdde     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40CCD8 
@@ -13597,14 +13597,14 @@
             40ce2d      2 INSTR BELONGTO 40cdf0 
             40ce2f      4 INSTR BELONGTO 40cdf0 
             40ce2f      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rbp, [rax+8] 
-            40ce33     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40ce33     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40ce33      5 INSTR BELONGTO 40cdf0 
             40ce33      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             40ce38      5 INSTR BELONGTO 40cdf0 
             40ce38      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aErrorLoadingTh; "Error loading the help page" 
             40ce3d      2 INSTR BELONGTO 40cdf0 
             40ce3d      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            40ce3d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40ce3d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40ce3f     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40ce3f      5 INSTR BELONGTO 40cdf0 
             40ce3f      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -13614,10 +13614,10 @@
             40ce47      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     r8, rbp 
             40ce4a      3 INSTR BELONGTO 40cdf0 
             40ce4a      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R9 R10 R11 ZZ mov     rcx, rax 
-            40ce4d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40ce4d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40ce4d      5 INSTR BELONGTO 40cdf0 
             40ce4d      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R9 R10 R11 ZZ mov     edx, 1 
-            40ce52     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            40ce52     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             40ce52      5 INSTR BELONGTO 40cdf0 
             40ce52      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R9 R10 R11 ZZ mov     esi, 3 
             40ce57     -1 INSTR LOCAL NoMetaUpdate call    sub_40CC70 
@@ -13687,7 +13687,7 @@
             40ceb8      2 INSTR BELONGTO 40ce70 
             40ceba      2 INSTR BELONGTO 40ce70 
             40ceba      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            40ceba     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40ceba     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40cebc      4 INSTR BELONGTO 40ce70 
             40cec0      3 INSTR BELONGTO 40ce70 
             40cec0      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 904b0a7a..b2a12039 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 @@
-5875cfe31109689894d687552176d4292327e878
\ No newline at end of file
+d1504ab93a421ff3f923a37bf24692a3f9ceb4c1
\ 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 47b99d19..40e1161b 100644
--- a/tests/commit/trimmed-sorted-save-gnome-session-properties.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-session-properties.psexe.annot
@@ -1991,8 +1991,8 @@
             405486      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 ZZ xor     r8d, r8d 
             405489      2 INSTR BELONGTO 405410 
             405489      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ xor     ecx, ecx 
-            405489     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40548b     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_4055F0 
+            405489     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40548b     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_4055F0 
             40548b      5 INSTR BELONGTO 405410 
             40548b      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, offset sub_4055F0 
             405490      5 INSTR BELONGTO 405410 
@@ -2014,7 +2014,7 @@
             4054a8      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _gtk_main 
             4054ad      2 INSTR BELONGTO 405410 
             4054ad      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            4054ad     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4054ad     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4054af     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 20h 
             4054af      4 INSTR BELONGTO 405410 
             4054b3      1 INSTR BELONGTO 405410 
@@ -2032,30 +2032,30 @@
             4054c3      3 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     rsi, [rax] 
             4054c6      2 INSTR BELONGTO 405410 
             4054c6      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            4054c6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4054c6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4054c8     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             4054c8      5 INSTR BELONGTO 405410 
             4054c8      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_print 
             4054cd      2 INSTR BELONGTO 405410 
             4054cd      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            4054cd     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4054cd     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4054cf     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4054AF 
             4054cf      2 INSTR BELONGTO 405410 
             4054d1     -1 INSTR LOCAL MetadataUnused mov     rax, [rsp+28h+var_10] 
             4054d1      5 INSTR BELONGTO 405410 
             4054d6      5 INSTR BELONGTO 405410 
             4054d6      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     edx, offset aUnableToStartS; "Unable to start: %s" 
-            4054db     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4054db     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             4054db      5 INSTR BELONGTO 405410 
             4054db      5 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI ZZ mov     esi, 10h 
             4054e0      2 INSTR BELONGTO 405410 
             4054e0      2 INSTR DEADREGS  EFLAGS RCX RBX RDI ZZ xor     edi, edi 
-            4054e0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4054e0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4054e2      4 INSTR BELONGTO 405410 
             4054e2      4 INSTR DEADREGS  EFLAGS RCX RBX ZZ mov     rcx, [rax+8] 
             4054e6      2 INSTR BELONGTO 405410 
             4054e6      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            4054e6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4054e6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4054e8     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4054e8      5 INSTR BELONGTO 405410 
             4054e8      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -2064,7 +2064,7 @@
             4054f2     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
             4054f2      5 INSTR BELONGTO 405410 
             4054f2      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_error_free 
-            4054f7     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4054f7     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4054f7      5 INSTR BELONGTO 405410 
             4054f7      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
             4054fc     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4054AF 
@@ -2195,7 +2195,7 @@
             4055c9      3 INSTR BELONGTO 4055c0 
             4055cc     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4055E0 
             4055cc      2 INSTR BELONGTO 4055c0 
-            4055ce     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            4055ce     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             4055ce      5 INSTR BELONGTO 4055c0 
             4055d3     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             4055d3      3 INSTR BELONGTO 4055c0 
@@ -2293,14 +2293,14 @@
             405665      6 PTRIMMEDESP STACK 8 displ cmp     [rsp+28h+var_20], 0
             40566b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40561B 
             40566b      2 INSTR BELONGTO 4055f0 
-            40566d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40566d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40566d      5 INSTR BELONGTO 4055f0 
             40566d      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             405672      5 INSTR BELONGTO 4055f0 
             405672      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset msgid; "Could not display help document" 
             405677      2 INSTR BELONGTO 4055f0 
             405677      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            405677     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            405677     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             405679     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             405679      5 INSTR BELONGTO 4055f0 
             405679      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -2320,20 +2320,20 @@
             405691      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 ZZ mov     r9, rbp 
             405694      6 INSTR BELONGTO 4055f0 
             405694      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 ZZ mov     r8d, (offset aBSBS+0Ah); "%s" 
-            40569a     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            40569a     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             40569a      5 INSTR BELONGTO 4055f0 
             40569a      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     ecx, 2 
             40569f      3 INSTR BELONGTO 4055f0 
             40569f      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rdi, rax 
-            4056a2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            4056a2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             4056a2      5 INSTR BELONGTO 4055f0 
             4056a2      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     edx, 3 
-            4056a7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            4056a7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             4056a7      5 INSTR BELONGTO 4055f0 
             4056a7      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 3 
             4056ac      2 INSTR BELONGTO 4055f0 
             4056ac      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            4056ac     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4056ac     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4056ae     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             4056ae      5 INSTR BELONGTO 4055f0 
             4056ae      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _gtk_message_dialog_new 
@@ -2363,7 +2363,7 @@
             4056d7      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             4056da      2 INSTR BELONGTO 4055f0 
             4056da      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4056da     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4056da     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4056dc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_format_secondary_text 
             4056dc      5 INSTR BELONGTO 4055f0 
             4056dc      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_message_dialog_format_secondary_text 
@@ -2417,7 +2417,7 @@
             405724      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
             405729      3 INSTR BELONGTO 405720 
             405729      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            40572c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40572c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40572c      5 INSTR BELONGTO 405720 
             40572c      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             405731      7 INSTR BELONGTO 405720 
@@ -2590,7 +2590,7 @@
             405870      2 INSTR BELONGTO 405770 
             405872     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             405872      2 INSTR BELONGTO 405770 
-            405874     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM setnz   cl 
+            405874     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM setnz   cl 
             405874      3 INSTR BELONGTO 405770 
             405874      3 INSTR DEADREGS  RAX RCX RDX RSI RDI R8 R9 R12 R13 ZZ setnz   cl 
             405877     -1 INSTR LOCAL MetadataUnused mov     rax, [rsp+0B8h+var_58] 
@@ -2609,7 +2609,7 @@
             405889      6 INSTR DEADREGS  EFLAGS RDX R8 R12 R13 R14 ZZ mov     r8d, 1 
             40588f      2 INSTR BELONGTO 405770 
             40588f      2 INSTR DEADREGS  EFLAGS RDX R12 R13 R14 ZZ xor     edx, edx 
-            40588f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40588f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405891     -1 INSTR LOCAL MetadataUnused mov     [rsp+0B8h+var_90], rbp 
             405891      5 INSTR BELONGTO 405770 
             405896     -1 INSTR LOCAL MetadataUnused mov     [rsp+0B8h+var_A0], r15 
@@ -2618,7 +2618,7 @@
             40589b      5 INSTR BELONGTO 405770 
             4058a0      2 INSTR BELONGTO 405770 
             4058a0      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 ZZ xor     eax, eax 
-            4058a0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4058a0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4058a2     -1 INSTR LOCAL MetadataUnused mov     [rsp+0B8h+var_B0], rbx 
             4058a2      5 INSTR BELONGTO 405770 
             4058a7     -1 INSTR LOCAL MetadataUnused mov     [rsp+0B8h+var_78], 0FFFFFFFFh 
@@ -2669,7 +2669,7 @@
             405926      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_file_icon_get_file 
             40592b      2 INSTR BELONGTO 405770 
             40592b      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ xor     esi, esi 
-            40592b     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40592b     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40592d      3 INSTR BELONGTO 405770 
             40592d      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rax 
             405930     -1 INSTR LOCAL NoMetaUpdate call    _g_file_query_exists 
@@ -2701,7 +2701,7 @@
             40595e      2 INSTR BELONGTO 405770 
             405960      2 INSTR BELONGTO 405770 
             405960      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R12 R13 ZZ xor     ecx, ecx 
-            405960     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            405960     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             405962     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405877 
             405962      5 INSTR BELONGTO 405770 
             405970     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_theme_get_default 
@@ -2788,7 +2788,7 @@
             4059eb     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             4059eb      3 INSTR BELONGTO 4059b0 
             4059eb      3 INSTR DEADREGS  EFLAGS RDX RBX RSI R8 ZZ xor     r8d, r8d 
-            4059ee     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_405AB0 
+            4059ee     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_405AB0 
             4059ee      5 INSTR BELONGTO 4059b0 
             4059ee      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, offset sub_405AB0 
             4059f3      5 INSTR BELONGTO 4059b0 
@@ -2842,7 +2842,7 @@
             405a3a      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_tree_model_get_iter_first 
             405a3f      2 INSTR BELONGTO 405a20 
             405a3f      2 INSTR DEADREGS  EFLAGS RDX R8 ZZ xor     edx, edx 
-            405a3f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405a3f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405a41     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             405a41      2 INSTR BELONGTO 405a20 
             405a43     -1 INSTR LOCAL NoMetaUpdate jz      short loc_405A7D 
@@ -2853,11 +2853,11 @@
             405a48      5 PTRIMMEDESP STACK 8 displ lea     rcx, [rsp+28h+var_20]
             405a4d      2 INSTR BELONGTO 405a20 
             405a4d      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R8 ZZ xor     eax, eax 
-            405a4d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405a4d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405a4f     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
             405a4f      6 INSTR BELONGTO 405a20 
             405a4f      6 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 ZZ mov     r8d, 0FFFFFFFFh 
-            405a55     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
+            405a55     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
             405a55      5 INSTR BELONGTO 405a20 
             405a55      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 4 
             405a5a      3 INSTR BELONGTO 405a20 
@@ -2885,12 +2885,12 @@
             405a79      2 INSTR BELONGTO 405a20 
             405a7b      2 INSTR BELONGTO 405a20 
             405a7b      2 INSTR DEADREGS  EFLAGS RAX RDX RBX R8 R9 R10 R11 R12 ZZ xor     edx, edx 
-            405a7b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405a7b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405a7d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
             405a7d      4 INSTR BELONGTO 405a20 
             405a81      2 INSTR BELONGTO 405a20 
             405a81      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ mov     eax, edx 
-            405a81     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edx 
+            405a81     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edx 
             405a83      1 INSTR BELONGTO 405a20 
             405a83      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
             405a84      1 INSTR BELONGTO 405a20 
@@ -2907,7 +2907,7 @@
             405a98     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
             405a98      4 INSTR BELONGTO 405a20 
             405a9c     16 DEALLOC STACK esp - 16 mov     edx, 1
-            405a9c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            405a9c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             405a9c      5 INSTR BELONGTO 405a20 
             405a9c      5 INSTR DEADREGS  EFLAGS RAX RDX RBX R8 R9 R10 R11 R12 ZZ mov     edx, 1 
             405aa1      1 INSTR BELONGTO 405a20 
@@ -2916,7 +2916,7 @@
             405aa2      1 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ pop     rbp 
             405aa3      2 INSTR BELONGTO 405a20 
             405aa3      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ mov     eax, edx 
-            405aa3     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edx 
+            405aa3     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edx 
             405aa5      2 INSTR BELONGTO 405a20 
             405aa5      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ pop     r12 
             405aa7      1 INSTR BELONGTO 405a20 
@@ -3031,7 +3031,7 @@
             405b31      2 INSTR BELONGTO 405b00 
             405b33     -1 INSTR LOCAL NoMetaUpdate jz      short loc_405B65 
             405b33      2 INSTR BELONGTO 405b00 
-            405b35     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+            405b35     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
             405b35      5 INSTR BELONGTO 405b00 
             405b35      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 ZZ mov     esi, 18h 
             405b3a      3 INSTR BELONGTO 405b00 
@@ -3044,10 +3044,10 @@
             405b43      3 INSTR DEADREGS  EFLAGS RCX RDX R8 ZZ xor     r8d, r8d 
             405b46      2 INSTR BELONGTO 405b00 
             405b46      2 INSTR DEADREGS  EFLAGS RCX RDX ZZ xor     ecx, ecx 
-            405b46     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            405b46     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             405b48      2 INSTR BELONGTO 405b00 
             405b48      2 INSTR DEADREGS  EFLAGS RDX ZZ xor     edx, edx 
-            405b48     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405b48     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405b4a      4 INSTR BELONGTO 405b00 
             405b4a      4 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+48h+var_48], rbx 
             405b4a      4 PTRIMMEDESP STACK 0 displ mov     [rsp+48h+var_48], rbx
@@ -3073,15 +3073,15 @@
             405b6a      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
             405b6b      1 INSTR BELONGTO 405b00 
             405b6b      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-            405b75     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-            405b7a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            405b7c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405b75     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            405b7a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            405b7c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405b7e     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
             405b90      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
             405b95      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
             405b9d      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
             405bae     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_selection 
-            405bb3     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            405bb3     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             405bb5      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp
             405bbb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_selection_get_selected 
             405bc0     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
@@ -3095,8 +3095,8 @@
             405bf9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             405bfe      5 PTRIMMEDESP STACK 32 displ lea     rcx, [rsp+20h]
             405c06     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            405c0c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            405c0e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
+            405c0c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            405c0e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
             405c13      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
             405c16     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             405c1b      5 PTRIMMEDESP STACK 32 displ mov     rdi, [rsp+20h]
@@ -3138,7 +3138,7 @@
             405ced      5 PTRIMMEDESP STACK 56 displ mov     rdi, [rsp+38h]
             405cf2     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             405cf7     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_405CAC 
-            405d03     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405d03     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405d05     -1 INSTR LOCAL NoMetaUpdate jmp     loc_405B90 
             405d10      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 1 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             405d10      0 FUNC MMSAFENESS SAFE
@@ -3162,7 +3162,7 @@
             405d20      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_tree_view_get_selection 
             405d25      2 INSTR BELONGTO 405d10 
             405d25      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     esi, esi 
-            405d25     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            405d25     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             405d27      3 INSTR BELONGTO 405d10 
             405d27      3 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     rdx, rsp 
             405d27      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp
@@ -3206,8 +3206,8 @@
             405d66      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 ZZ mov     r8d, 0FFFFFFFFh 
             405d6c      2 INSTR BELONGTO 405d10 
             405d6c      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ xor     eax, eax 
-            405d6c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            405d6e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
+            405d6c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            405d6e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
             405d6e      5 INSTR BELONGTO 405d10 
             405d6e      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, 4 
             405d73      3 INSTR BELONGTO 405d10 
@@ -3241,12 +3241,12 @@
             405d98     48 DEALLOC STACK esp - 48 pop     rbx
             405d99      1 INSTR BELONGTO 405d10 
             405d99      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-            405da0     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            405da2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405da0     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            405da2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405da4      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
             405da9      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
             405dae      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
-            405dba     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            405dba     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             405dbc     -1 INSTR LOCAL NoMetaUpdate call    sub_407B00 
             405dc4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             405dd2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -3301,7 +3301,7 @@
             405ed0     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_405EB0 
             405ed5     -1 INSTR LOCAL NoMetaUpdate call    _g_strfreev 
             405edd      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-            405ee3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405ee3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405ee5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_drag_finish 
             405eea     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             405f00     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_stop_emission_by_name 
@@ -3313,7 +3313,7 @@
             405f10     -3 INSTR LOCAL NoWarn push    rbp 
             405f11      3 INSTR BELONGTO 405f10 
             405f11      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rsi 
-            405f14     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            405f14     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             405f14      5 INSTR BELONGTO 405f10 
             405f14      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             405f19      1 INSTR BELONGTO 405f10 
@@ -3348,10 +3348,10 @@
             405f3b      5 INSTR DEADREGS  EFLAGS ZZ call    sub_408AD0 
             405f40      2 INSTR BELONGTO 405f10 
             405f40      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            405f40     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405f40     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405f42      2 INSTR BELONGTO 405f10 
             405f42      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            405f42     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            405f42     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             405f44     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, rax 
             405f44      3 INSTR BELONGTO 405f10 
             405f44      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
@@ -3396,7 +3396,7 @@
             405fa6      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             405fac     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             405fb1      5 PTRIMMEDESP STACK 32 displ lea     rsi, [rsp+20h]
-            405fb6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405fb6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405fbb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_cursor 
             405fc0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get_type 
             405fcd      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
@@ -3410,15 +3410,15 @@
             406002     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             406007      5 PTRIMMEDESP STACK 40 displ lea     rcx, [rsp+28h]
             40600f     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            406015     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            406017     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
+            406015     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            406017     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
             40601c      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
             40601f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             406024      5 PTRIMMEDESP STACK 40 displ mov     rdi, [rsp+28h]
             406029     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             40602c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_406062 
             40602e     -1 INSTR LOCAL NoMetaUpdate call    _g_object_ref 
-            406033     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            406033     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40603e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40604b      3 PTRIMMEDEBP STACK 0 displ mov     rdx, rbp
             406053     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set_data_full 
@@ -3450,25 +3450,25 @@
             4060fd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             406102      5 PTRIMMEDESP STACK 40 displ lea     rcx, [rsp+28h]
             40610a     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            406110     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            406112     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
+            406110     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            406112     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
             406117      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
             40611a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             406122     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_toggle_get_active 
             406127      5 PTRIMMEDESP STACK 40 displ mov     rdi, [rsp+28h]
             40612c     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             40612f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4060CC 
-            406131     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            406131     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             406133     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
-            406135     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setz    sil 
+            406135     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setz    sil 
             406139     -1 INSTR LOCAL NoMetaUpdate call    sub_408C10 
             40613e      5 PTRIMMEDESP STACK 40 displ mov     rdi, [rsp+28h]
             406143     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             406148     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4060CC 
             406150      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbx
             406155      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], rbp
-            406161     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            406163     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            406161     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            406163     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             406165     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_selection_get_selected 
             406170      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
             406176     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
@@ -3535,10 +3535,10 @@
             4061f4     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 48h 
             4061f4      6 INSTR BELONGTO 4061a0 
             4061f4      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 48h 
-            4061fa     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_405720 
+            4061fa     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_405720 
             4061fa      5 INSTR BELONGTO 4061a0 
             4061fa      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset sub_405720 
-            4061ff     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 460h 
+            4061ff     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 460h 
             4061ff      5 INSTR BELONGTO 4061a0 
             4061ff      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 460h 
             406204      7 INSTR BELONGTO 4061a0 
@@ -3567,18 +3567,18 @@
             406241     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_is_a 
             406246     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             406248     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_406260 
-            406255     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            406255     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             406257     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
             406260     -1 INSTR LOCAL NoMetaUpdate call    sub_4061A0 
             40626b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             406270     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+40h], 0 
             406275     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4062B0 
-            40627e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40627e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             406283     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             406290     -1 INSTR LOCAL NoMetaUpdate jmp     rax 
-            4062a3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4062a3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4062a5     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
-            4062bb     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4062bb     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4062bd     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
             4062d0      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 16 3 -16 0 4 0 8 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             4062d0      0 FUNC MMSAFENESS SPECSAFE
@@ -3681,7 +3681,7 @@
             406361      8 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     qword ptr [rax+38h], 0 
             406369      7 INSTR BELONGTO 4062d0 
             406369      7 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, cs:qword_60F7E8 
-            406370     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            406370     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             406370      5 INSTR BELONGTO 4062d0 
             406370      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             406375     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
@@ -3725,35 +3725,35 @@
             4063cc     -3 INSTR LOCAL NoWarn push    rbp 
             4063d0     -3 INSTR LOCAL NoWarn push    rbx 
             4063d5     -1 INSTR LOCAL NoMetaUpdate call    sub_4061A0 
-            4063e4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4063e4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4063e9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             4063f4      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4063f7     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [rax+10h] 
             406400     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             406408     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_type 
             406413     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            406418     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40641d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF9h 
-            406427     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406418     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40641d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF9h 
+            406427     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406429     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_buttons 
             406432     -1 INSTR LOCAL NoMetaUpdate call    _g_icon_get_type 
             406437     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 50h 
             406440     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 40h 
-            406446     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 14h 
-            40644b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 14h 
-            406450     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6 
-            406455     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406446     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 14h 
+            40644b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 14h 
+            406450     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6 
+            406455     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406457      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], 40h
             40645f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_new 
             406464      4 PTRIMMEDEBP STACK 8 displ mov     [rbp+8], rax
             406468     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get_type 
             406478     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40647d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40647d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             406482     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_filter_new 
             406492     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             40649f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_filter_get_type 
             4064aa     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4064af     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4064af     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4064b4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_filter_set_visible_column 
             4064b9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_type 
             4064cd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
@@ -3762,7 +3762,7 @@
             4064e7      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4064ee     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_set_model 
             4064f6     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
-            4064fb     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4064fb     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4064fd      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             406500     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_set_headers_visible 
             406505     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
@@ -3771,18 +3771,18 @@
             40651b     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             406520      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             406523     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_selection 
-            406528     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            406528     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             406533     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_selection_set_mode 
             406538     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40653b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40654e     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             406553     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_toggle_new 
-            406558     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40655d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            406558     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40655d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             406567     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40656c     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40656f     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40657f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40656f     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40657f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406581     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new_with_attributes 
             406586      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40658c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
@@ -3790,47 +3790,47 @@
             406594     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             4065a7     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             4065ac     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_pixbuf_new 
-            4065b1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            4065b6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4065b1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            4065b6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             4065c0     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4065c5     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 1 
-            4065d7     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
-            4065e1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4065d7     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            4065e1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4065e3      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], 0
             4065eb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new_with_attributes 
-            4065f0     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4065f2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
-            4065fd     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4065f0     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4065f2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            4065fd     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406604     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             40660c      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40660f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
             406614     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_text_new 
-            406619     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40661e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            406619     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40661e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             406628     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40662d     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 1 
-            40663f     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
-            406649     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40663f     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
+            406649     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40664b      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], 0
             406653     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new_with_attributes 
-            406658     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40665a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
-            406665     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406658     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40665a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            406665     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40666c     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             406674      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             406677     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
-            40667c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            40667c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             406684     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_set_sort_column_id 
-            406689     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+            406689     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
             40668e      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             406691     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_set_search_column 
-            406696     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            406696     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40669b      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40669e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_set_rules_hint 
-            4066a3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4066a5     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4066a3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4066a5     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4066a7     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 2 
-            4066ad     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 300h 
+            4066ad     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 300h 
             4066b2      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4066b5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_enable_model_drag_source 
             4066ba     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
@@ -3839,10 +3839,10 @@
             4066d0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_drag_source_add_uri_targets 
             4066d8      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4066db     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4066e0     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4066e2     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4066e0     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4066e2     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4066e4     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 2 
-            4066ed     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
+            4066ed     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
             4066f2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_drag_dest_set 
             4066fa      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4066fd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -3857,7 +3857,7 @@
             40672f      4 PTRIMMEDESP STACK 28 displ mov     esi, [rsp+1Ch]
             406736     -1 INSTR LOCAL NoMetaUpdate test    esi, esi 
             406738     -1 INSTR LOCAL NoMetaUpdate jle     short loc_406762 
-            40673d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40673d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40673f     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rdx, 1 
             406743     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM shl     rdx, 4 
             406759     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rax, 10h 
@@ -3884,8 +3884,8 @@
             4067e3     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             4067e8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_sortable_get_type 
             4067f8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4067fd     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            406802     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            4067fd     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            406802     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             406807     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_sortable_set_sort_column_id 
             406818     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
             406823     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -3933,7 +3933,7 @@
             4069e0     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_free 
             4069eb     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4069f3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-            4069fb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4069fb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             406a00     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             406a05     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 20h 
             406a20     -3 INSTR LOCAL NoWarn push    r13 
@@ -3955,9 +3955,9 @@
             406a93      5 PTRIMMEDESP STACK 8 displ mov     rax, [rsp+8]
             406a98     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             406a9b     -1 INSTR LOCAL NoMetaUpdate jz      loc_406BF0 
-            406aa5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            406aac     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            406ab1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406aa5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            406aac     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            406ab1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406ab3     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             406ab8      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
             406abd     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
@@ -3971,37 +3971,37 @@
             406b09      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             406b12     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             406b17     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            406b1a     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            406b1f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            406b1a     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            406b1f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             406b2a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             406b2f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             406b3d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            406b42     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1C2h 
-            406b4a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 258h 
+            406b42     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1C2h 
+            406b4a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 258h 
             406b4f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_default_size 
             406b5a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            406b5f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            406b5f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             406b67     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_resizable 
             406b6c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_get_type 
             406b77     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            406b7c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            406b7c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             406b84     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_set_border_width 
             406b8c      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             406b8f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            406b94     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            406b94     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             406b9c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_set_spacing 
             406ba7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             406bb4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_icon_name 
-            406bb9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            406bc3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            406bb9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            406bc3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             406bc5     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             406bd3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             406bd8      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             406bde     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_title 
             406be3     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
-            406bf5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            406bfa     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            406bfc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406bf5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            406bfa     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            406bfc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406bfe     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             406c03     -1 INSTR LOCAL NoMetaUpdate jmp     loc_406AC2 
             406c10      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -4016,12 +4016,12 @@
             406c11      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ call    sub_4061A0 
             406c16      2 INSTR BELONGTO 406c10 
             406c16      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            406c16     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            406c16     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             406c18      3 INSTR BELONGTO 406c10 
             406c18      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
             406c1b      2 INSTR BELONGTO 406c10 
             406c1b      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            406c1b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406c1b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406c1d     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             406c1d      5 INSTR BELONGTO 406c10 
             406c1d      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_object_new 
@@ -4060,7 +4060,7 @@
             406c49      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_class_peek_parent 
             406c4e      3 INSTR BELONGTO 406c40 
             406c4e      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
-            406c51     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            406c51     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             406c51      5 INSTR BELONGTO 406c40 
             406c51      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             406c56      7 INSTR BELONGTO 406c40 
@@ -4077,7 +4077,7 @@
             406c6a      6 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 ZZ mov     r8d, 7 
             406c70      2 INSTR BELONGTO 406c40 
             406c70      2 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ xor     ecx, ecx 
-            406c70     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            406c70     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             406c72      3 INSTR BELONGTO 406c40 
             406c72      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rdx 
             406c75      3 INSTR BELONGTO 406c40 
@@ -4099,7 +4099,7 @@
             406ca5      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
             406ca8      3 INSTR BELONGTO 406c40 
             406ca8      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-            406cab     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            406cab     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             406cab      5 INSTR BELONGTO 406c40 
             406cab      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
             406cb0     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -4112,7 +4112,7 @@
             406cba      6 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 ZZ mov     r8d, 7 
             406cc0      2 INSTR BELONGTO 406c40 
             406cc0      2 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ xor     ecx, ecx 
-            406cc0     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            406cc0     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             406cc2      3 INSTR BELONGTO 406c40 
             406cc2      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rdx 
             406cc5      3 INSTR BELONGTO 406c40 
@@ -4124,7 +4124,7 @@
             406ccd      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
             406cd0      3 INSTR BELONGTO 406c40 
             406cd0      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-            406cd3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            406cd3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             406cd3      5 INSTR BELONGTO 406c40 
             406cd3      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 2 
             406cd8     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -4137,7 +4137,7 @@
             406ce2      6 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 ZZ mov     r8d, 7 
             406ce8      2 INSTR BELONGTO 406c40 
             406ce8      2 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ xor     ecx, ecx 
-            406ce8     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            406ce8     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             406cea      3 INSTR BELONGTO 406c40 
             406cea      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rdx 
             406ced      3 INSTR BELONGTO 406c40 
@@ -4147,7 +4147,7 @@
             406cf0      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_string 
             406cf5      3 INSTR BELONGTO 406c40 
             406cf5      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
-            406cf8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            406cf8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             406cf8      5 INSTR BELONGTO 406c40 
             406cf8      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     esi, 3 
             406cfd      3 INSTR BELONGTO 406c40 
@@ -4244,14 +4244,14 @@
             406d7e      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 ZZ mov     ecx, offset aGtkCancel; "gtk-cancel" 
             406d83      2 INSTR BELONGTO 406d50 
             406d83      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ xor     edx, edx 
-            406d83     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            406d83     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             406d85      3 INSTR BELONGTO 406d50 
             406d85      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 ZZ mov     rsi, rax 
             406d88      5 INSTR BELONGTO 406d50 
             406d88      5 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 ZZ mov     edi, 40B936h 
             406d8d      2 INSTR BELONGTO 406d50 
             406d8d      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 ZZ xor     eax, eax 
-            406d8d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406d8d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406d8f     -1 INSTR LOCAL MetadataUnused mov     [rsp+38h+var_30], 0 
             406d8f      9 INSTR BELONGTO 406d50 
             406d98      7 INSTR BELONGTO 406d50 
@@ -4292,7 +4292,7 @@
             406dd1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             406dd1      5 INSTR BELONGTO 406d50 
             406dd1      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _g_type_check_instance_cast 
-            406dd6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            406dd6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             406dd6      5 INSTR BELONGTO 406d50 
             406dd6      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 ZZ mov     esi, 1 
             406ddb      3 INSTR BELONGTO 406d50 
@@ -4300,12 +4300,12 @@
             406dde     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_destroy_with_parent 
             406dde      5 INSTR BELONGTO 406d50 
             406dde      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _gtk_window_set_destroy_with_parent 
-            406de3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406de3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406de3      5 INSTR BELONGTO 406d50 
             406de3      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 ZZ mov     edx, 5          ; category 
             406de8      2 INSTR BELONGTO 406d50 
             406de8      2 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 ZZ xor     edi, edi        ; domainname 
-            406de8     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406de8     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406dea      5 INSTR BELONGTO 406d50 
             406dea      5 INSTR DEADREGS  EFLAGS RSI R13 R14 ZZ mov     esi, offset aSelectCommand; "Select Command" 
             406def     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -4392,7 +4392,7 @@
             406e6e      6 INSTR BELONGTO 406d50 
             406e74      3 INSTR BELONGTO 406d50 
             406e74      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 ZZ mov     rdi, rax        ; s 
-            406e77     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h        ; c 
+            406e77     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h        ; c 
             406e77      5 INSTR BELONGTO 406d50 
             406e77      5 INSTR DEADREGS  EFLAGS RBX RSI R13 ZZ mov     esi, 20h        ; c 
             406e7c     -1 INSTR LOCAL NoMetaUpdate call    _strchr 
@@ -4409,7 +4409,7 @@
             406e8d      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _strlen 
             406e92      2 INSTR BELONGTO 406d50 
             406e92      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 ZZ xor     edi, edi 
-            406e92     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            406e92     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             406e94     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     rsi, rax 
             406e94      3 INSTR BELONGTO 406d50 
             406e94      3 INSTR DEADREGS  EFLAGS RBX RSI R13 ZZ mov     rsi, rax 
@@ -4436,7 +4436,7 @@
             406ebc      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     rdx, [rbx] 
             406ebf      5 INSTR BELONGTO 406d50 
             406ebf      5 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     byte ptr [rdx+rax+1], 0 
-            406ec4     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [r14] 
+            406ec4     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [r14] 
             406ec4      4 INSTR BELONGTO 406d50 
             406ec4      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ movzx   edx, byte ptr [r14] 
             406ec8     -1 INSTR LOCAL NoMetaUpdate test    dl, dl 
@@ -4459,7 +4459,7 @@
             406ee5      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     byte ptr [rdx+rax+1], 0 
             406eea     -1 INSTR LOCAL MetadataUnused add     r13, 1 
             406eea      4 INSTR BELONGTO 406d50 
-            406eee     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [r13+0] 
+            406eee     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [r13+0] 
             406eee      5 INSTR BELONGTO 406d50 
             406eee      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ movzx   edx, byte ptr [r13+0] 
             406ef3     -1 INSTR LOCAL NoMetaUpdate test    dl, dl 
@@ -4478,7 +4478,7 @@
             406f08      4 INSTR BELONGTO 406d50 
             406f0c     -1 INSTR LOCAL NoMetaUpdate jb      short loc_406ED8 
             406f0c      2 INSTR BELONGTO 406d50 
-            406f0e     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movsx   edx, dl 
+            406f0e     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movsx   edx, dl 
             406f0e      3 INSTR BELONGTO 406d50 
             406f0e      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ movsx   edx, dl 
             406f11     -1 INSTR LOCAL MetadataUnused add     r13, 1 
@@ -4491,7 +4491,7 @@
             406f1f     -1 INSTR LOCAL NoMetaUpdate call    _g_string_insert_c 
             406f1f      5 INSTR BELONGTO 406d50 
             406f1f      5 INSTR DEADREGS  EFLAGS ZZ call    _g_string_insert_c 
-            406f24     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [r13+0] 
+            406f24     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [r13+0] 
             406f24      5 INSTR BELONGTO 406d50 
             406f24      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ movzx   edx, byte ptr [r13+0] 
             406f29     -1 INSTR LOCAL NoMetaUpdate test    dl, dl 
@@ -4520,7 +4520,7 @@
             406f52      3 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     rdi, rbx 
             406f55      2 INSTR BELONGTO 406d50 
             406f55      2 INSTR DEADREGS  EFLAGS RBX RSI R13 ZZ xor     esi, esi 
-            406f55     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            406f55     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             406f57     -1 INSTR LOCAL NoMetaUpdate call    _g_string_free 
             406f57      5 INSTR BELONGTO 406d50 
             406f57      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _g_string_free 
@@ -4568,7 +4568,7 @@
             406fa5      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rbx, rax 
             406fa8     -1 INSTR LOCAL NoMetaUpdate jmp     loc_406EEA 
             406fa8      5 INSTR BELONGTO 406d50 
-            406fb0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 22h 
+            406fb0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 22h 
             406fb0      5 INSTR BELONGTO 406d50 
             406fb0      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     edx, 22h 
             406fb5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -4581,7 +4581,7 @@
             406fbf      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_string_insert_c 
             406fc4     -1 INSTR LOCAL NoMetaUpdate jmp     loc_406EC4 
             406fc4      5 INSTR BELONGTO 406d50 
-            406fd0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 22h 
+            406fd0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 22h 
             406fd0      5 INSTR BELONGTO 406d50 
             406fd0      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     edx, 22h 
             406fd5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -4668,10 +4668,10 @@
             407064     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 48h 
             407064      6 INSTR BELONGTO 407010 
             407064      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 48h 
-            40706a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_406C40 
+            40706a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_406C40 
             40706a      5 INSTR BELONGTO 407010 
             40706a      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset sub_406C40 
-            40706f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 460h 
+            40706f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 460h 
             40706f      5 INSTR BELONGTO 407010 
             40706f      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 460h 
             407074      7 INSTR BELONGTO 407010 
@@ -4700,18 +4700,18 @@
             4070b1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_is_a 
             4070b6     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             4070b8     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4070D0 
-            4070c5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4070c5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4070c7     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
             4070d0     -1 INSTR LOCAL NoMetaUpdate call    sub_407010 
             4070db     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4070e0     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+40h], 0 
             4070e5     -1 INSTR LOCAL NoMetaUpdate jz      short loc_407120 
-            4070ee     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4070ee     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4070f3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             407100     -1 INSTR LOCAL NoMetaUpdate jmp     rax 
-            407113     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407113     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407115     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
-            40712b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40712b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40712d     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
             407140      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -16 0 4 0 0 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             407140      0 FUNC MMSAFENESS UNSAFE
@@ -4753,7 +4753,7 @@
             407178      4 INSTR BELONGTO 407140 
             40717c      5 INSTR BELONGTO 407140 
             407181      2 INSTR BELONGTO 407140 
-            407181     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407181     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407183      1 INSTR BELONGTO 407140 
             407184      1 INSTR BELONGTO 407140 
             407185     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -4781,7 +4781,7 @@
             4071d5      5 INSTR BELONGTO 407140 
             4071da      4 INSTR BELONGTO 407140 
             4071de      7 INSTR BELONGTO 407140 
-            4071e5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4071e5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4071e5      5 INSTR BELONGTO 407140 
             4071ea      8 INSTR BELONGTO 407140 
             4071f2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
@@ -4805,7 +4805,7 @@
             40722e     -3 INSTR LOCAL NoWarn push    rbp 
             407232     -3 INSTR LOCAL NoWarn push    rbx 
             407237     -1 INSTR LOCAL NoMetaUpdate call    sub_407010 
-            407246     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            407246     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40724b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             407253      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             407259     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [rax+10h] 
@@ -4821,9 +4821,9 @@
             40729e      5 PTRIMMEDESP STACK 24 displ mov     rax, [rsp+18h]
             4072a3     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             4072a6     -1 INSTR LOCAL NoMetaUpdate jz      loc_407618 
-            4072b0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            4072b7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            4072bc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4072b0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            4072b7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4072bc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4072be     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4072c3      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+18h]
             4072c8     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
@@ -4840,28 +4840,28 @@
             407320     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40732b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
             407336     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40733b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            40733b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             407343     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_set_border_width 
             407348     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             407356     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407363     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_icon_name 
             407368     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40736b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40736e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            407375     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40736e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            407375     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40737f     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             40738a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40738f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFAh 
+            40738f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFAh 
             40739c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_button 
             4073a5     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+20h], 0 
             4073aa     -1 INSTR LOCAL NoMetaUpdate jz      loc_4075B0 
-            4073b0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            4073ba     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4073b0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4073ba     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4073bc     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4073ca     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4073d5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_title 
             4073e0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4073e5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFBh 
+            4073e5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFBh 
             4073f2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_button 
             407400      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             407403     -1 INSTR LOCAL NoMetaUpdate call    _gtk_builder_get_object 
@@ -4908,25 +4908,25 @@
             407579     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             407584     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40758c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show_all 
-            407594     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            407594     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             407599     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40759e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
             4075b0     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+28h], 0 
             4075b5     -1 INSTR LOCAL NoMetaUpdate jnz     loc_4073B0 
             4075bb     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+30h], 0 
             4075c0     -1 INSTR LOCAL NoMetaUpdate jnz     loc_4073B0 
-            4075c6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            4075cb     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4075c6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4075cb     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4075d2     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4075e0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4075eb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_title 
             4075f6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4075fb     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFBh 
+            4075fb     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFBh 
             407608     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_button 
             40760d     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4073F7 
-            40761d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            407622     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            407624     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40761d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            407622     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            407624     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407626     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40762b     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4072CD 
             407630      5 PTRIMMEDESP STACK -40 displ mov     [rsp-28h], rbx
@@ -4947,11 +4947,11 @@
             407689     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             407697     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             40769c      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-            4076b8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            4076bd     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4076b8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4076bd     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4076bf      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
             4076c4      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-            4076c8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4076c8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4076ca     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4076cf      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
             4076d4      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -4996,7 +4996,7 @@
             4077c0     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4077F0 
             4077cc      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
             4077d1      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
-            4077d6     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4077d6     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4077d8      5 PTRIMMEDESP STACK 48 displ mov     r12, [rsp+30h]
             4077dd      5 PTRIMMEDESP STACK 56 displ mov     r13, [rsp+38h]
             4077e2      5 PTRIMMEDESP STACK 64 displ mov     r14, [rsp+40h]
@@ -5004,7 +5004,7 @@
             4077eb     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
             4077f8     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             407804     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
-            407809     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            407809     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             407811      4 PTRIMMEDEBP STACK 40 displ mov     [rbp+28h], rax
             407815     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40781f      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
@@ -5016,13 +5016,13 @@
             40783f     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_notify 
             407850     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40785c     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
-            407861     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            407861     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             407869      4 PTRIMMEDEBP STACK 48 displ mov     [rbp+30h], rax
             40786d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407877     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40781F 
             407888     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             407894     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
-            407899     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            407899     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4078a1      4 PTRIMMEDEBP STACK 32 displ mov     [rbp+20h], rax
             4078a5     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4078af     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40781F 
@@ -5043,11 +5043,11 @@
             407911     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             407920     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             407925      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-            407941     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            407946     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407941     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            407946     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407948      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
             40794d      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-            407951     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407951     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407953     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             407958      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
             40795d      5 PTRIMMEDESP STACK 48 displ mov     rbp, [rsp+30h]
@@ -5130,13 +5130,13 @@
             407a0f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsm_app_dial_0; "gsm_app_dialog_get_name" 
             407a14      2 INSTR BELONGTO 4079e0 
             407a14      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            407a14     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407a14     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407a16     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             407a16      5 INSTR BELONGTO 4079e0 
             407a16      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             407a1b      2 INSTR BELONGTO 4079e0 
             407a1b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            407a1b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407a1b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407a1d      1 INSTR BELONGTO 4079e0 
             407a1d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             407a1e      1 INSTR BELONGTO 4079e0 
@@ -5203,13 +5203,13 @@
             407a6f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsm_app_dial_1; "gsm_app_dialog_get_command" 
             407a74      2 INSTR BELONGTO 407a40 
             407a74      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            407a74     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407a74     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407a76     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             407a76      5 INSTR BELONGTO 407a40 
             407a76      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             407a7b      2 INSTR BELONGTO 407a40 
             407a7b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            407a7b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407a7b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407a7d      1 INSTR BELONGTO 407a40 
             407a7d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             407a7e      1 INSTR BELONGTO 407a40 
@@ -5276,13 +5276,13 @@
             407acf      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsm_app_dial_2; "gsm_app_dialog_get_comment" 
             407ad4      2 INSTR BELONGTO 407aa0 
             407ad4      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            407ad4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407ad4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407ad6     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             407ad6      5 INSTR BELONGTO 407aa0 
             407ad6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             407adb      2 INSTR BELONGTO 407aa0 
             407adb      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            407adb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407adb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407add      1 INSTR BELONGTO 407aa0 
             407add      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             407ade      1 INSTR BELONGTO 407aa0 
@@ -5343,7 +5343,7 @@
             407b35      5 INSTR DEADREGS  EFLAGS RAX RCX RBX ZZ mov     ecx, offset aCommand; "command" 
             407b3a      2 INSTR BELONGTO 407b00 
             407b3a      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            407b3a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407b3a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407b3c      4 INSTR BELONGTO 407b00 
             407b3c      4 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+28h+var_28], r12 
             407b3c      4 PTRIMMEDESP STACK 0 displ mov     [rsp+28h+var_28], r12
@@ -5417,14 +5417,14 @@
             407ba3      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 ZZ mov     rbp, rax 
             407ba6     -1 INSTR LOCAL NoMetaUpdate jmp     loc_407C33 
             407ba6      5 INSTR BELONGTO 407b80 
-            407bb0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407bb0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407bb0      5 INSTR BELONGTO 407b80 
             407bb0      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             407bb5      5 INSTR BELONGTO 407b80 
             407bb5      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aTheStartupComm; "The startup command cannot be empty" 
             407bba      2 INSTR BELONGTO 407b80 
             407bba      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            407bba     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407bba     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407bbc     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             407bbc      5 INSTR BELONGTO 407b80 
             407bbc      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -5456,14 +5456,14 @@
             407bea      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R12 R13 R14 ZZ mov     r8d, (offset aBSBS+0Ah); "%s" 
             407bf0      2 INSTR BELONGTO 407b80 
             407bf0      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R12 R13 R14 ZZ xor     eax, eax 
-            407bf0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            407bf2     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            407bf0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            407bf2     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             407bf2      5 INSTR BELONGTO 407b80 
             407bf2      5 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R13 R14 ZZ mov     ecx, 2 
-            407bf7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            407bf7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             407bf7      5 INSTR BELONGTO 407b80 
             407bf7      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 ZZ mov     edx, 3 
-            407bfc     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            407bfc     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             407bfc      5 INSTR BELONGTO 407b80 
             407bfc      5 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 ZZ mov     esi, 1 
             407c01     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
@@ -5648,7 +5648,7 @@
             407d1a     -1 INSTR LOCAL NoMetaUpdate cmp     [rsp+78h+var_60], 0 
             407d1a      6 INSTR BELONGTO 407b80 
             407d1a      6 PTRIMMEDESP STACK 24 displ cmp     [rsp+78h+var_60], 0
-            407d20     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            407d20     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
             407d20      5 INSTR BELONGTO 407b80 
             407d20      5 INSTR DEADREGS  R12 R13 R15 ZZ mov     ebp, 1 
             407d25     -1 INSTR LOCAL NoMetaUpdate jz      short loc_407D37 
@@ -5683,7 +5683,7 @@
             407d4f      4 INSTR BELONGTO 407b80 
             407d53      2 INSTR BELONGTO 407b80 
             407d53      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     eax, ebp 
-            407d53     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebp 
+            407d53     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebp 
             407d53     72 DEALLOC STACK esp - 72 mov     eax, ebp
             407d55      1 INSTR BELONGTO 407b80 
             407d55      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     rbx 
@@ -5720,17 +5720,17 @@
             407d80      5 INSTR BELONGTO 407b80 
             407d88      2 INSTR BELONGTO 407b80 
             407d88      2 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ xor     ebp, ebp 
-            407d88     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            407d88     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             407d8a     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_407D37 
             407d8a      2 INSTR BELONGTO 407b80 
-            407d90     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407d90     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407d90      5 INSTR BELONGTO 407b80 
             407d90      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             407d95      5 INSTR BELONGTO 407b80 
             407d95      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aTheStartupCo_0; "The startup command is not valid" 
             407d9a      2 INSTR BELONGTO 407b80 
             407d9a      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            407d9a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407d9a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407d9c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             407d9c      5 INSTR BELONGTO 407b80 
             407d9c      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -5907,7 +5907,7 @@
             407ec4      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _g_get_user_config_dir 
             407ec9      2 INSTR BELONGTO 407e90 
             407ec9      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 ZZ xor     ecx, ecx 
-            407ec9     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            407ec9     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             407ecb      3 INSTR BELONGTO 407e90 
             407ecb      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ mov     rdi, rax 
             407ece      3 INSTR BELONGTO 407e90 
@@ -5916,7 +5916,7 @@
             407ed1      5 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 R14 ZZ mov     esi, offset aAutostart; "autostart" 
             407ed6      2 INSTR BELONGTO 407e90 
             407ed6      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 ZZ xor     eax, eax 
-            407ed6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407ed6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407ed8     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             407ed8      5 INSTR BELONGTO 407e90 
             407ed8      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _g_build_filename 
@@ -5933,7 +5933,7 @@
             407eeb      5 INSTR DEADREGS  EFLAGS RAX RBX RDI R13 R14 ZZ mov     edi, offset aS_desktop; "%s.desktop" 
             407ef0      2 INSTR BELONGTO 407e90 
             407ef0      2 INSTR DEADREGS  EFLAGS RAX RBX R13 R14 ZZ xor     eax, eax 
-            407ef0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407ef0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407ef2     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             407ef2      5 INSTR BELONGTO 407e90 
             407ef2      5 INSTR DEADREGS  EFLAGS RBX R13 R14 ZZ call    _g_strdup_printf 
@@ -5941,7 +5941,7 @@
             407ef7      3 INSTR DEADREGS  EFLAGS RBX RDI R13 R14 ZZ mov     rdi, rax 
             407efa      3 INSTR BELONGTO 407e90 
             407efa      3 INSTR DEADREGS  EFLAGS RBX R13 R14 ZZ mov     r13, rax 
-            407efd     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            407efd     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             407efd      5 INSTR BELONGTO 407e90 
             407efd      5 INSTR DEADREGS  EFLAGS RBX R14 ZZ mov     ebx, 1 
             407f02     -1 INSTR LOCAL NoMetaUpdate call    _g_path_get_basename 
@@ -5956,7 +5956,7 @@
             407f0f      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rbp, rax 
             407f12     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_407F67 
             407f12      2 INSTR BELONGTO 407e90 
-            407f18     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            407f18     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             407f18      5 INSTR BELONGTO 407e90 
             407f18      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 10h 
             407f1d      3 INSTR BELONGTO 407e90 
@@ -5984,14 +5984,14 @@
             407f40      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _g_free 
             407f45      2 INSTR BELONGTO 407e90 
             407f45      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R13 R14 ZZ mov     edx, ebx 
-            407f45     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, ebx 
+            407f45     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, ebx 
             407f47      3 INSTR BELONGTO 407e90 
             407f47      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R13 R14 ZZ mov     rsi, r12 
             407f4a      5 INSTR BELONGTO 407e90 
             407f4a      5 INSTR DEADREGS  EFLAGS RAX RDI R13 R14 ZZ mov     edi, offset byte_40BFD5 
             407f4f      2 INSTR BELONGTO 407e90 
             407f4f      2 INSTR DEADREGS  EFLAGS RAX R13 R14 ZZ xor     eax, eax 
-            407f4f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407f4f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407f51     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     ebx, 1 
             407f51      3 INSTR BELONGTO 407e90 
             407f54     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
@@ -6055,7 +6055,7 @@
             407fa8      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _g_get_user_config_dir 
             407fad      2 INSTR BELONGTO 407e90 
             407fad      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 ZZ xor     ecx, ecx 
-            407fad     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            407fad     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             407faf      3 INSTR BELONGTO 407e90 
             407faf      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ mov     rdi, rax 
             407fb2      3 INSTR BELONGTO 407e90 
@@ -6064,7 +6064,7 @@
             407fb5      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 R14 ZZ mov     esi, offset aAutostart; "autostart" 
             407fba      2 INSTR BELONGTO 407e90 
             407fba      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 R14 ZZ xor     eax, eax 
-            407fba     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407fba     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407fbc     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             407fbc      5 INSTR BELONGTO 407e90 
             407fbc      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ call    _g_build_filename 
@@ -6109,18 +6109,18 @@
             407ff1      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_get_user_config_dir 
             407ff6      2 INSTR BELONGTO 407ff0 
             407ff6      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edx, edx 
-            407ff6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407ff6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407ff8      3 INSTR BELONGTO 407ff0 
             407ff8      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rax 
             407ffb      5 INSTR BELONGTO 407ff0 
             407ffb      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, offset aAutostart; "autostart" 
             408000      2 INSTR BELONGTO 407ff0 
             408000      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            408000     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408000     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408002     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             408002      5 INSTR BELONGTO 407ff0 
             408002      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_build_filename 
-            408007     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1C0h 
+            408007     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1C0h 
             408007      5 INSTR BELONGTO 407ff0 
             408007      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 1C0h 
             40800c     -1 INSTR LOCAL MetadataUnused mov     rbx, rax 
@@ -6181,7 +6181,7 @@
             408059      5 INSTR DEADREGS  EFLAGS ZZ call    _g_get_user_config_dir 
             40805e      2 INSTR BELONGTO 408020 
             40805e      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            40805e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40805e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408060      3 INSTR BELONGTO 408020 
             408060      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rax 
             408063      5 INSTR BELONGTO 408020 
@@ -6190,7 +6190,7 @@
             408068      3 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     rdx, r12 
             40806b      2 INSTR BELONGTO 408020 
             40806b      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            40806b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40806b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40806d     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40806d      5 INSTR BELONGTO 408020 
             40806d      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_build_filename 
@@ -6200,10 +6200,10 @@
             408076      4 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     rbx, [rbp+18h] 
             40807a      3 INSTR BELONGTO 408020 
             40807a      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     rdx, rbp 
-            40807d     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_408390 
+            40807d     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_408390 
             40807d      5 INSTR BELONGTO 408020 
             40807d      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset sub_408390 
-            408082     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            408082     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             408082      5 INSTR BELONGTO 408020 
             408082      5 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     edi, 2 
             408087     -1 INSTR LOCAL NoMetaUpdate call    _g_timeout_add_seconds 
@@ -6299,7 +6299,7 @@
             408127      5 INSTR DEADREGS  EFLAGS RAX RDI R12 ZZ mov     edi, offset aBSBS; "<b>%s</b>\n%s" 
             40812c      2 INSTR BELONGTO 4080d0 
             40812c      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            40812c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40812c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40812e     -1 INSTR LOCAL NoMetaUpdate call    _g_markup_printf_escaped 
             40812e      5 INSTR BELONGTO 4080d0 
             40812e      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_markup_printf_escaped 
@@ -6318,14 +6318,14 @@
             408149      1 INSTR BELONGTO 4080d0 
             408149      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ retn 
             408149     24 DEALLOC STACK esp - 24 retn
-            408150     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            408150     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             408150      5 INSTR BELONGTO 4080d0 
             408150      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 5          ; category 
             408155      5 INSTR BELONGTO 4080d0 
             408155      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aNoDescription; "No description" 
             40815a      2 INSTR BELONGTO 4080d0 
             40815a      2 INSTR DEADREGS  EFLAGS RDI R12 ZZ xor     edi, edi        ; domainname 
-            40815a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40815a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40815c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40815c      5 INSTR BELONGTO 4080d0 
             40815c      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _dcgettext 
@@ -6350,14 +6350,14 @@
             408181      4 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rbp, [rax+28h] 
             408185     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4080FF 
             408185      5 INSTR BELONGTO 4080d0 
-            408190     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            408190     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             408190      5 INSTR BELONGTO 4080d0 
             408190      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 5          ; category 
             408195      5 INSTR BELONGTO 4080d0 
             408195      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aNo ; "No " 
             40819a      2 INSTR BELONGTO 4080d0 
             40819a      2 INSTR DEADREGS  EFLAGS RDI R12 ZZ xor     edi, edi        ; domainname 
-            40819a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40819a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40819c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40819c      5 INSTR BELONGTO 4080d0 
             40819c      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _dcgettext 
@@ -6376,7 +6376,7 @@
             4081b0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4081b1     -1 INSTR LOCAL MetadataUnused mov     ebx, cs:dword_60F810 
             4081b1      6 INSTR BELONGTO 4081b0 
-            4081b7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4081b7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4081b7      5 INSTR BELONGTO 4081b0 
             4081b7      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             4081bc     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -6388,12 +6388,12 @@
             4081c3      3 INSTR BELONGTO 4081b0 
             4081c6      2 INSTR BELONGTO 4081b0 
             4081c6      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 ZZ xor     edx, edx 
-            4081c6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4081c6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4081c8      1 INSTR BELONGTO 4081b0 
             4081c8      1 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx 
             4081c9      2 INSTR BELONGTO 4081b0 
             4081c9      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            4081c9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4081c9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4081cb     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
             4081cb      5 INSTR BELONGTO 4081b0 
             4081cb      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_signal_emit 
@@ -6419,7 +6419,7 @@
             4081d9      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_class_peek_parent 
             4081de      3 INSTR BELONGTO 4081d0 
             4081de      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
-            4081e1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4081e1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4081e1      5 INSTR BELONGTO 4081d0 
             4081e1      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             4081e6      7 INSTR BELONGTO 4081d0 
@@ -6450,17 +6450,17 @@
             408224     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             408224      3 INSTR BELONGTO 4081d0 
             408224      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 ZZ xor     r8d, r8d 
-            408227     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
+            408227     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
             408227      5 INSTR BELONGTO 4081d0 
             408227      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI ZZ mov     ecx, 88h 
-            40822c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40822c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40822c      5 INSTR BELONGTO 4081d0 
             40822c      5 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ mov     edx, 2 
             408231      5 INSTR BELONGTO 4081d0 
             408231      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aChanged; "changed" 
             408236      2 INSTR BELONGTO 4081d0 
             408236      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            408236     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408236     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408238     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             408238      5 INSTR BELONGTO 4081d0 
             408238      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_new 
@@ -6480,15 +6480,15 @@
             408261      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     cs:dword_60F810, eax 
             408267     -1 INSTR LOCAL MetadataRedundant xor     r8d, r8d 
             408267      3 INSTR BELONGTO 4081d0 
-            40826a     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 90h 
+            40826a     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 90h 
             40826a      5 INSTR BELONGTO 4081d0 
             40826a      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX ZZ mov     ecx, 90h 
-            40826f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40826f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40826f      5 INSTR BELONGTO 4081d0 
             40826f      5 INSTR DEADREGS  EFLAGS RAX RDX RBX ZZ mov     edx, 2 
             408274      2 INSTR BELONGTO 4081d0 
             408274      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            408274     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408274     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408276     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             408276      5 INSTR BELONGTO 4081d0 
             408276      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_signal_new 
@@ -6530,7 +6530,7 @@
             4082b4      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strcmp0 
             4082b9     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             4082b9      2 INSTR BELONGTO 4082a0 
-            4082bb     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4082bb     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4082bb      5 INSTR BELONGTO 4082a0 
             4082bb      5 INSTR DEADREGS  RAX RDX R8 R9 R10 R11 ZZ mov     edx, 1 
             4082c0     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4082DA 
@@ -6552,12 +6552,12 @@
             4082d2      2 INSTR BELONGTO 4082a0 
             4082d4     -1 INSTR LOCAL NoMetaUpdate cmp     byte ptr [rbx], 0 
             4082d4      3 INSTR BELONGTO 4082a0 
-            4082d7     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setz    dl 
+            4082d7     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setz    dl 
             4082d7      3 INSTR BELONGTO 4082a0 
             4082d7      3 INSTR DEADREGS  RAX RDX RBX R8 R9 R10 R11 ZZ setz    dl 
             4082da      2 INSTR BELONGTO 4082a0 
             4082da      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, edx 
-            4082da     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edx 
+            4082da     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edx 
             4082dc      5 INSTR BELONGTO 4082a0 
             4082dc      5 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ mov     rbx, [rsp+18h+var_10] 
             4082dc      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+18h+var_10]
@@ -6583,7 +6583,7 @@
             4082fe      2 INSTR BELONGTO 4082a0 
             408300      2 INSTR BELONGTO 4082a0 
             408300      2 INSTR DEADREGS  EFLAGS RAX RDX RBX R8 R9 R10 R11 ZZ xor     edx, edx 
-            408300     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            408300     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408302     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4082DA 
             408302      2 INSTR BELONGTO 4082a0 
             408310      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -6629,15 +6629,15 @@
             40834e     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h 
             40834e      6 INSTR BELONGTO 408310 
             40834e      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 20h 
-            408354     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_4081D0 
+            408354     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_4081D0 
             408354      5 INSTR BELONGTO 408310 
             408354      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset sub_4081D0 
-            408359     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 98h 
+            408359     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 98h 
             408359      5 INSTR BELONGTO 408310 
             408359      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 98h 
             40835e      3 INSTR BELONGTO 408310 
             40835e      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-            408361     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+            408361     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
             408361      5 INSTR BELONGTO 408310 
             408361      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
             408366      7 INSTR BELONGTO 408310 
@@ -6719,7 +6719,7 @@
             4083d7      4 INSTR BELONGTO 408390 
             4083db      2 INSTR BELONGTO 408390 
             4083db      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ xor     edx, edx 
-            4083db     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4083db     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4083dd     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, r12 
             4083dd      3 INSTR BELONGTO 408390 
             4083dd      3 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     rdi, r12 
@@ -6727,7 +6727,7 @@
             4083e0      3 INSTR DEADREGS  EFLAGS RSI R12 R13 ZZ mov     rsi, [rax] 
             4083e3      2 INSTR BELONGTO 408390 
             4083e3      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            4083e3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4083e3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4083e5     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             4083e5      5 INSTR BELONGTO 408390 
             4083e5      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_build_filename 
@@ -6738,10 +6738,10 @@
             4083ed      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_key_file_new 
             4083f2      2 INSTR BELONGTO 408390 
             4083f2      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ xor     ecx, ecx 
-            4083f2     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4083f2     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4083f4      2 INSTR BELONGTO 408390 
             4083f4      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ xor     edx, edx 
-            4083f4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4083f4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4083f6      3 INSTR BELONGTO 408390 
             4083f6      3 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     rsi, r12 
             4083f9      3 INSTR BELONGTO 408390 
@@ -6757,7 +6757,7 @@
             408406      2 INSTR BELONGTO 408390 
             408408      2 INSTR BELONGTO 408390 
             408408      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ xor     edx, edx 
-            408408     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            408408     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40840a      5 INSTR BELONGTO 408390 
             40840a      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R13 ZZ mov     esi, offset aHidden; "Hidden" 
             40840f      3 INSTR BELONGTO 408390 
@@ -6797,7 +6797,7 @@
             40844a      5 PTRIMMEDESP STACK 8 displ lea     rcx, [rsp+38h+var_30]
             40844f      3 INSTR BELONGTO 408390 
             40844f      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     rdi, rax 
-            408452     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            408452     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             408452      5 INSTR BELONGTO 408390 
             408452      5 INSTR DEADREGS  EFLAGS RDX RSI R13 ZZ mov     edx, 3 
             408457      3 INSTR BELONGTO 408390 
@@ -6864,7 +6864,7 @@
             4084c5      4 INSTR BELONGTO 408390 
             4084c9      2 INSTR BELONGTO 408390 
             4084c9      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 ZZ xor     edx, edx 
-            4084c9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4084c9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4084cb      3 INSTR BELONGTO 408390 
             4084cb      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 R10 R11 R12 R13 ZZ mov     rdi, rbp 
             4084ce      4 INSTR BELONGTO 408390 
@@ -6882,15 +6882,15 @@
             4084df      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 ZZ mov     rcx, [rax+8] 
             4084e3      5 INSTR BELONGTO 408390 
             4084e3      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ mov     edx, offset aCouldNotSaveSF; "Could not save %s file" 
-            4084e8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4084e8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             4084e8      5 INSTR BELONGTO 408390 
             4084e8      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ mov     esi, 10h 
             4084ed      2 INSTR BELONGTO 408390 
             4084ed      2 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 ZZ xor     edi, edi 
-            4084ed     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4084ed     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4084ef      2 INSTR BELONGTO 408390 
             4084ef      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            4084ef     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4084ef     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4084f1     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4084f1      5 INSTR BELONGTO 408390 
             4084f1      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_log 
@@ -6907,7 +6907,7 @@
             408509      4 INSTR BELONGTO 408390 
             40850d      2 INSTR BELONGTO 408390 
             40850d      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ xor     eax, eax 
-            40850d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40850d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40850f      1 INSTR BELONGTO 408390 
             40850f      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 ZZ pop     rbx 
             408510      1 INSTR BELONGTO 408390 
@@ -7045,7 +7045,7 @@
             408639      3 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ mov     eax, [rdx+5Ch] 
             40863c     -1 INSTR LOCAL NoMetaUpdate jmp     loc_408491 
             40863c      5 INSTR BELONGTO 408390 
-            408648     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            408648     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             408648      5 INSTR BELONGTO 408390 
             408648      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ mov     edx, 1 
             40864d      5 INSTR BELONGTO 408390 
@@ -7079,7 +7079,7 @@
             40867e      6 INSTR BELONGTO 408390 
             408684      2 INSTR BELONGTO 408390 
             408684      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ xor     edx, edx 
-            408684     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            408684     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408686      5 INSTR BELONGTO 408390 
             408686      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R13 ZZ mov     esi, offset aNodisplay; "NoDisplay" 
             40868b      3 INSTR BELONGTO 408390 
@@ -7098,7 +7098,7 @@
             4086a0      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 ZZ xor     r8d, r8d 
             4086a3      2 INSTR BELONGTO 408390 
             4086a3      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ xor     ecx, ecx 
-            4086a3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4086a3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4086a5      5 INSTR BELONGTO 408390 
             4086a5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     edx, offset aName; "Name" 
             4086aa      5 INSTR BELONGTO 408390 
@@ -7133,7 +7133,7 @@
             4086da      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 ZZ xor     r8d, r8d 
             4086dd      2 INSTR BELONGTO 408390 
             4086dd      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ xor     ecx, ecx 
-            4086dd     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4086dd     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4086df      5 INSTR BELONGTO 408390 
             4086df      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     edx, offset aComment; "Comment" 
             4086e4      5 INSTR BELONGTO 408390 
@@ -7165,7 +7165,7 @@
             40870f      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_free 
             408714      2 INSTR BELONGTO 408390 
             408714      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ xor     ecx, ecx 
-            408714     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408714     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408716      5 INSTR BELONGTO 408390 
             408716      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     edx, offset aExec; "Exec" 
             40871b      5 INSTR BELONGTO 408390 
@@ -7200,7 +7200,7 @@
             40874b      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 ZZ xor     r8d, r8d 
             40874e      2 INSTR BELONGTO 408390 
             40874e      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ xor     ecx, ecx 
-            40874e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40874e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408750      5 INSTR BELONGTO 408390 
             408750      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     edx, offset aIcon; "Icon" 
             408755      5 INSTR BELONGTO 408390 
@@ -7237,7 +7237,7 @@
             408788      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_key_file_free 
             40878d      4 INSTR BELONGTO 408390 
             40878d      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R13 ZZ mov     rax, [rbx+18h] 
-            408791     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            408791     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             408791      5 INSTR BELONGTO 408390 
             408791      5 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     esi, 10h 
             408796      4 INSTR BELONGTO 408390 
@@ -7291,7 +7291,7 @@
             4087f4     24 DEALLOC STACK esp - 24 xor     eax, eax
             4087f4      2 INSTR BELONGTO 408390 
             4087f4      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ xor     eax, eax 
-            4087f4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4087f4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4087f6      1 INSTR BELONGTO 408390 
             4087f6      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 ZZ pop     rbx 
             4087f7      1 INSTR BELONGTO 408390 
@@ -7367,7 +7367,7 @@
             408878      4 INSTR BELONGTO 408840 
             40887c      5 INSTR BELONGTO 408840 
             408881      2 INSTR BELONGTO 408840 
-            408881     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408881     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408883      1 INSTR BELONGTO 408840 
             408884      1 INSTR BELONGTO 408840 
             408885     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -7393,7 +7393,7 @@
             4088c2     -1 INSTR LOCAL NoMetaUpdate call    sub_407DB0 
             4088c2      5 INSTR BELONGTO 408840 
             4088c7      7 INSTR BELONGTO 408840 
-            4088ce     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4088ce     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4088ce      5 INSTR BELONGTO 408840 
             4088d3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             4088d3      5 INSTR BELONGTO 408840 
@@ -7449,7 +7449,7 @@
             408938      4 INSTR BELONGTO 408900 
             40893c      5 INSTR BELONGTO 408900 
             408941      2 INSTR BELONGTO 408900 
-            408941     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408941     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408943      1 INSTR BELONGTO 408900 
             408944      1 INSTR BELONGTO 408900 
             408945     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -7475,7 +7475,7 @@
             408981     -1 INSTR LOCAL NoMetaUpdate call    sub_408390 
             408981      5 INSTR BELONGTO 408900 
             408986      7 INSTR BELONGTO 408900 
-            40898d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40898d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40898d      5 INSTR BELONGTO 408900 
             408992     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             408992      5 INSTR BELONGTO 408900 
@@ -7516,7 +7516,7 @@
             4089d6      4 INSTR DEADREGS  RCX RDX RDI R8 R9 R10 R11 ZZ mov     [rbx+18h], rax 
             4089da      3 INSTR BELONGTO 4089c0 
             4089da      3 INSTR DEADREGS  RCX RDX RDI R8 R9 R10 R11 ZZ mov     rdi, rax 
-            4089dd     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 70h 
+            4089dd     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 70h 
             4089dd      5 INSTR BELONGTO 4089c0 
             4089dd      5 INSTR DEADREGS  RCX RDX R8 R9 R10 R11 ZZ mov     edx, 70h 
             4089e2     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_408A38 
@@ -7531,10 +7531,10 @@
             4089ee      2 INSTR BELONGTO 4089c0 
             4089f0      2 INSTR BELONGTO 4089c0 
             4089f0      2 INSTR DEADREGS  EFLAGS RAX RCX R8 R9 R10 R11 ZZ mov     ecx, edx 
-            4089f0     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, edx 
+            4089f0     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, edx 
             4089f2      2 INSTR BELONGTO 4089c0 
             4089f2      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ xor     eax, eax 
-            4089f2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4089f2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4089f4     -1 INSTR LOCAL MetadataRedundant shr     ecx, 3 
             4089f4      3 INSTR BELONGTO 4089c0 
             4089f7     -1 INSTR LOCAL NoMetaUpdate test    dl, 4 
@@ -7555,7 +7555,7 @@
             408a0e      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     word ptr [rdi], 0 
             408a13     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rdi, 2 
             408a13      4 INSTR BELONGTO 4089c0 
-            408a17     -2 INSTR LOCAL n EDX ZZ  NumericDEFs and     edx, 1 
+            408a17     -2 INSTR LOCAL n RDX ZZ  NumericDEFs and     edx, 1 
             408a17      3 INSTR BELONGTO 4089c0 
             408a17      3 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ and     edx, 1 
             408a1a     -1 INSTR LOCAL NoMetaUpdate jz      short loc_408A1F 
@@ -7578,7 +7578,7 @@
             408a3c      3 INSTR DEADREGS  EFLAGS RCX RDX R8 R9 R10 R11 ZZ mov     byte ptr [rax], 0 
             408a3f      2 INSTR BELONGTO 4089c0 
             408a3f      2 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 ZZ mov     dl, 6Fh 
-            408a3f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     dl, 6Fh 
+            408a3f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     dl, 6Fh 
             408a41     -1 INSTR LOCAL NoMetaUpdate test    dil, 2 
             408a41      4 INSTR BELONGTO 4089c0 
             408a45     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4089EA 
@@ -7646,13 +7646,13 @@
             408aaf      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsp_app_get_ba; "gsp_app_get_basename" 
             408ab4      2 INSTR BELONGTO 408a80 
             408ab4      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            408ab4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408ab4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408ab6     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             408ab6      5 INSTR BELONGTO 408a80 
             408ab6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             408abb      2 INSTR BELONGTO 408a80 
             408abb      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            408abb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408abb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408abd      1 INSTR BELONGTO 408a80 
             408abd      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             408abe      1 INSTR BELONGTO 408a80 
@@ -7708,13 +7708,13 @@
             408aff      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsp_app_get_pa; "gsp_app_get_path" 
             408b04      2 INSTR BELONGTO 408ad0 
             408b04      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            408b04     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408b04     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408b06     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             408b06      5 INSTR BELONGTO 408ad0 
             408b06      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             408b0b      2 INSTR BELONGTO 408ad0 
             408b0b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            408b0b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408b0b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408b0d      1 INSTR BELONGTO 408ad0 
             408b0d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             408b0e      1 INSTR BELONGTO 408ad0 
@@ -7770,13 +7770,13 @@
             408b4f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsp_app_get_hi; "gsp_app_get_hidden" 
             408b54      2 INSTR BELONGTO 408b20 
             408b54      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            408b54     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408b54     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408b56     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             408b56      5 INSTR BELONGTO 408b20 
             408b56      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             408b5b      2 INSTR BELONGTO 408b20 
             408b5b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            408b5b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408b5b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408b5d      1 INSTR BELONGTO 408b20 
             408b5d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             408b5e      1 INSTR BELONGTO 408b20 
@@ -7832,13 +7832,13 @@
             408b9f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsp_app_get_di; "gsp_app_get_display" 
             408ba4      2 INSTR BELONGTO 408b70 
             408ba4      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            408ba4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408ba4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408ba6     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             408ba6      5 INSTR BELONGTO 408b70 
             408ba6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             408bab      2 INSTR BELONGTO 408b70 
             408bab      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            408bab     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408bab     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408bad      1 INSTR BELONGTO 408b70 
             408bad      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             408bae      1 INSTR BELONGTO 408b70 
@@ -7853,7 +7853,7 @@
             408bb8      2 INSTR BELONGTO 408b70 
             408bba     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
             408bba      2 INSTR BELONGTO 408b70 
-            408bbc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setz    al 
+            408bbc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setz    al 
             408bbc      3 INSTR BELONGTO 408b70 
             408bbc      3 INSTR DEADREGS  RAX R8 R9 R10 R11 ZZ setz    al 
             408bbf      1 INSTR BELONGTO 408b70 
@@ -7901,13 +7901,13 @@
             408bef      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsp_app_get_en; "gsp_app_get_enabled" 
             408bf4      2 INSTR BELONGTO 408bc0 
             408bf4      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            408bf4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408bf4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408bf6     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             408bf6      5 INSTR BELONGTO 408bc0 
             408bf6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             408bfb      2 INSTR BELONGTO 408bc0 
             408bfb      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            408bfb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408bfb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408bfd      1 INSTR BELONGTO 408bc0 
             408bfd      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             408bfe      1 INSTR BELONGTO 408bc0 
@@ -8059,13 +8059,13 @@
             408cbf      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsp_app_get_sh; "gsp_app_get_shown" 
             408cc4      2 INSTR BELONGTO 408c90 
             408cc4      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            408cc4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408cc4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408cc6     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             408cc6      5 INSTR BELONGTO 408c90 
             408cc6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             408ccb      2 INSTR BELONGTO 408c90 
             408ccb      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            408ccb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408ccb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408ccd      1 INSTR BELONGTO 408c90 
             408ccd      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             408cce      1 INSTR BELONGTO 408c90 
@@ -8121,13 +8121,13 @@
             408d0f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsp_app_get_na; "gsp_app_get_name" 
             408d14      2 INSTR BELONGTO 408ce0 
             408d14      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            408d14     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408d14     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408d16     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             408d16      5 INSTR BELONGTO 408ce0 
             408d16      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             408d1b      2 INSTR BELONGTO 408ce0 
             408d1b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            408d1b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408d1b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408d1d      1 INSTR BELONGTO 408ce0 
             408d1d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             408d1e      1 INSTR BELONGTO 408ce0 
@@ -8183,13 +8183,13 @@
             408d5f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsp_app_get_ex; "gsp_app_get_exec" 
             408d64      2 INSTR BELONGTO 408d30 
             408d64      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            408d64     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408d64     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408d66     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             408d66      5 INSTR BELONGTO 408d30 
             408d66      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             408d6b      2 INSTR BELONGTO 408d30 
             408d6b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            408d6b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408d6b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408d6d      1 INSTR BELONGTO 408d30 
             408d6d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             408d6e      1 INSTR BELONGTO 408d30 
@@ -8245,13 +8245,13 @@
             408daf      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsp_app_get_co; "gsp_app_get_comment" 
             408db4      2 INSTR BELONGTO 408d80 
             408db4      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            408db4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408db4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408db6     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             408db6      5 INSTR BELONGTO 408d80 
             408db6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             408dbb      2 INSTR BELONGTO 408d80 
             408dbb      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            408dbb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408dbb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408dbd      1 INSTR BELONGTO 408d80 
             408dbd      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             408dbe      1 INSTR BELONGTO 408d80 
@@ -8307,13 +8307,13 @@
             408dff      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsp_app_get_ic; "gsp_app_get_icon" 
             408e04      2 INSTR BELONGTO 408dd0 
             408e04      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            408e04     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408e04     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408e06     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             408e06      5 INSTR BELONGTO 408dd0 
             408e06      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             408e0b      2 INSTR BELONGTO 408dd0 
             408e0b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            408e0b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408e0b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408e0d      1 INSTR BELONGTO 408dd0 
             408e0d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             408e0e      1 INSTR BELONGTO 408dd0 
@@ -8374,11 +8374,11 @@
             408e5f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsp_app_get_xd; "gsp_app_get_xdg_position" 
             408e64      2 INSTR BELONGTO 408e30 
             408e64      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            408e64     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408e64     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408e66     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             408e66      5 INSTR BELONGTO 408e30 
             408e66      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
-            408e6b     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
+            408e6b     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
             408e6b      5 INSTR BELONGTO 408e30 
             408e6b      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 0FFFFFFFFh 
             408e70      1 INSTR BELONGTO 408e30 
@@ -8436,11 +8436,11 @@
             408ebf      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsp_app_get__0; "gsp_app_get_xdg_system_position" 
             408ec4      2 INSTR BELONGTO 408e90 
             408ec4      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            408ec4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408ec4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408ec6     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             408ec6      5 INSTR BELONGTO 408e90 
             408ec6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
-            408ecb     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
+            408ecb     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
             408ecb      5 INSTR BELONGTO 408e90 
             408ecb      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 0FFFFFFFFh 
             408ed0      1 INSTR BELONGTO 408e90 
@@ -8472,7 +8472,7 @@
             408efd      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             408f01      2 INSTR BELONGTO 408ef0 
             408f01      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ mov     ebp, esi 
-            408f01     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, esi 
+            408f01     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     ebp, esi 
             408f03     -1 INSTR LOCAL NoMetaUpdate call    sub_408310 
             408f03      5 INSTR BELONGTO 408ef0 
             408f03      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_408310 
@@ -8574,13 +8574,13 @@
             408f9f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsp_app_get_de; "gsp_app_get_description" 
             408fa4      2 INSTR BELONGTO 408f70 
             408fa4      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            408fa4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408fa4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408fa6     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             408fa6      5 INSTR BELONGTO 408f70 
             408fa6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             408fab      2 INSTR BELONGTO 408f70 
             408fab      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            408fab     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408fab     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408fad      1 INSTR BELONGTO 408f70 
             408fad      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             408fae      1 INSTR BELONGTO 408f70 
@@ -8924,7 +8924,7 @@
             4091fd      2 INSTR BELONGTO 409170 
             4091ff      4 INSTR BELONGTO 409170 
             4091ff      4 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, [rax+8] 
-            409203     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            409203     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             409203      5 INSTR BELONGTO 409170 
             409203      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 10h 
             409208     -1 INSTR LOCAL NoMetaUpdate call    _g_file_test 
@@ -8947,7 +8947,7 @@
             409222      6 INSTR BELONGTO 409170 
             409228      3 INSTR BELONGTO 409170 
             409228      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbp 
-            40922b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40922b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40922b      5 INSTR BELONGTO 409170 
             40922b      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             409230      4 INSTR BELONGTO 409170 
@@ -8970,10 +8970,10 @@
             40924a      1 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbp 
             40924b      2 INSTR BELONGTO 409170 
             40924b      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 ZZ xor     edx, edx 
-            40924b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40924b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40924d      2 INSTR BELONGTO 409170 
             40924d      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            40924d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40924d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40924f     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
             40924f      5 INSTR BELONGTO 409170 
             40924f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_signal_emit 
@@ -9069,10 +9069,10 @@
             4092d5      5 INSTR DEADREGS  EFLAGS ZZ call    _g_key_file_new 
             4092da      2 INSTR BELONGTO 409270 
             4092da      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            4092da     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4092da     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4092dc      2 INSTR BELONGTO 409270 
             4092dc      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            4092dc     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4092dc     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4092de      3 INSTR BELONGTO 409270 
             4092de      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r12 
             4092e1      3 INSTR BELONGTO 409270 
@@ -9124,7 +9124,7 @@
             40932f      4 INSTR DEADREGS  EFLAGS RCX R14 ZZ mov     [rdx+8], rax 
             409333      2 INSTR BELONGTO 409270 
             409333      2 INSTR DEADREGS  EFLAGS RCX RDX R14 ZZ xor     edx, edx 
-            409333     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409333     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409335     -1 INSTR LOCAL NoMetaUpdate call    sub_40A8C0 
             409335      5 INSTR BELONGTO 409270 
             409335      5 INSTR DEADREGS  EFLAGS RCX R14 ZZ call    sub_40A8C0 
@@ -9134,7 +9134,7 @@
             40933f      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 ZZ mov     r12, [rbx+18h] 
             409343      2 INSTR BELONGTO 409270 
             409343      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 ZZ xor     edx, edx 
-            409343     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409343     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409345      5 INSTR BELONGTO 409270 
             409345      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R14 ZZ mov     esi, offset aNodisplay; "NoDisplay" 
             40934a      3 INSTR BELONGTO 409270 
@@ -9146,7 +9146,7 @@
             409352      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 ZZ mov     [r12+14h], eax 
             409357      4 INSTR BELONGTO 409270 
             409357      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 ZZ mov     r12, [rbx+18h] 
-            40935b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40935b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40935b      5 INSTR BELONGTO 409270 
             40935b      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 ZZ mov     edx, 1 
             409360      5 INSTR BELONGTO 409270 
@@ -9179,7 +9179,7 @@
             40938f      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R14 ZZ xor     r8d, r8d 
             409392      2 INSTR BELONGTO 409270 
             409392      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 ZZ xor     ecx, ecx 
-            409392     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            409392     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             409394      5 INSTR BELONGTO 409270 
             409394      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 ZZ mov     edx, offset aName; "Name" 
             409399      5 INSTR BELONGTO 409270 
@@ -9195,7 +9195,7 @@
             4093ab      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R14 ZZ mov     r12, [rbx+18h] 
             4093af      2 INSTR BELONGTO 409270 
             4093af      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 ZZ xor     ecx, ecx 
-            4093af     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4093af     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4093b1      5 INSTR BELONGTO 409270 
             4093b1      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 ZZ mov     edx, offset aExec; "Exec" 
             4093b6      5 INSTR BELONGTO 409270 
@@ -9214,7 +9214,7 @@
             4093cc      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R14 ZZ xor     r8d, r8d 
             4093cf      2 INSTR BELONGTO 409270 
             4093cf      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 ZZ xor     ecx, ecx 
-            4093cf     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4093cf     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4093d1      5 INSTR BELONGTO 409270 
             4093d1      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 ZZ mov     edx, offset aComment; "Comment" 
             4093d6      5 INSTR BELONGTO 409270 
@@ -9244,7 +9244,7 @@
             409401      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R14 ZZ xor     r8d, r8d 
             409404      2 INSTR BELONGTO 409270 
             409404      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 ZZ xor     ecx, ecx 
-            409404     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            409404     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             409406      3 INSTR BELONGTO 409270 
             409406      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 ZZ mov     rdi, rbp 
             409409      5 INSTR BELONGTO 409270 
@@ -9356,12 +9356,12 @@
             4094c0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ call    sub_408310 
             4094c5      2 INSTR BELONGTO 409270 
             4094c5      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            4094c5     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4094c5     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4094c7      3 INSTR BELONGTO 409270 
             4094c7      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
             4094ca      2 INSTR BELONGTO 409270 
             4094ca      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            4094ca     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4094ca     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4094cc     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             4094cc      5 INSTR BELONGTO 409270 
             4094cc      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_object_new 
@@ -9423,14 +9423,14 @@
             409558      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 R14 R15 ZZ mov     r8d, offset aNewAppPrivSave; "!new || app->priv->save_timeout == 0" 
             40955e      5 INSTR BELONGTO 409270 
             40955e      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R14 R15 ZZ mov     ecx, offset aGsp_app_new; "gsp_app_new" 
-            409563     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 372h 
+            409563     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 372h 
             409563      5 INSTR BELONGTO 409270 
             409563      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R14 R15 ZZ mov     edx, 372h 
             409568      5 INSTR BELONGTO 409270 
             409568      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R14 R15 ZZ mov     esi, offset aGspApp_c; "gsp-app.c" 
             40956d      2 INSTR BELONGTO 409270 
             40956d      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R14 R15 ZZ xor     edi, edi 
-            40956d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40956d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40956f     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40956f      5 INSTR BELONGTO 409270 
             40956f      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ call    _g_assertion_message_expr 
@@ -9439,14 +9439,14 @@
             409578      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 R14 R15 ZZ mov     r8d, offset aXdg_positionAp; "xdg_position <= app->priv->xdg_system_p"... 
             40957e      5 INSTR BELONGTO 409270 
             40957e      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R14 R15 ZZ mov     ecx, offset aGsp_app_new; "gsp_app_new" 
-            409583     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 36Ch 
+            409583     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 36Ch 
             409583      5 INSTR BELONGTO 409270 
             409583      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R14 R15 ZZ mov     edx, 36Ch 
             409588      5 INSTR BELONGTO 409270 
             409588      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R14 R15 ZZ mov     esi, offset aGspApp_c; "gsp-app.c" 
             40958d      2 INSTR BELONGTO 409270 
             40958d      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R14 R15 ZZ xor     edi, edi 
-            40958d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40958d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40958f     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40958f      5 INSTR BELONGTO 409270 
             40958f      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ call    _g_assertion_message_expr 
@@ -9459,7 +9459,7 @@
             40959e      4 INSTR DEADREGS  RBX R8 R9 R10 R11 R12 R14 R15 ZZ cmova   r13d, edx 
             4095a2      2 INSTR BELONGTO 409270 
             4095a2      2 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R14 R15 ZZ xor     ebx, ebx 
-            4095a2     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            4095a2     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             4095a4      4 INSTR BELONGTO 409270 
             4095a4      4 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R14 R15 ZZ mov     [rax+54h], r13d 
             4095a8     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4094AD 
@@ -9474,14 +9474,14 @@
             4095bd      7 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     dword ptr [rax+68h], 0 
             4095c4      2 INSTR BELONGTO 409270 
             4095c4      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     ebx, ebx 
-            4095c4     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            4095c4     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             4095c6     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4094AD 
             4095c6      5 INSTR BELONGTO 409270 
             4095d0      3 INSTR BELONGTO 409270 
             4095d0      3 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R15 ZZ mov     rdi, rbp 
             4095d3      2 INSTR BELONGTO 409270 
             4095d3      2 INSTR DEADREGS  EFLAGS RBX R12 R13 R15 ZZ xor     ebx, ebx 
-            4095d3     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            4095d3     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             4095d5     -1 INSTR LOCAL NoMetaUpdate call    _g_key_file_free 
             4095d5      5 INSTR BELONGTO 409270 
             4095d5      5 INSTR DEADREGS  EFLAGS R12 R13 R15 ZZ call    _g_key_file_free 
@@ -9617,7 +9617,7 @@
             4096b7      5 PTRIMMEDESP STACK 12 displ lea     rsi, [rsp+48h+var_3C]
             4096bc      2 INSTR BELONGTO 409680 
             4096bc      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI R14 R15 ZZ xor     ecx, ecx 
-            4096bc     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4096bc     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4096be      3 INSTR BELONGTO 409680 
             4096be      3 INSTR DEADREGS  EFLAGS RDX RBX RDI R14 R15 ZZ mov     rdx, rsp 
             4096be      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp
@@ -9655,7 +9655,7 @@
             4096f5      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aGsp_app_create; "gsp_app_create" 
             4096fa      2 INSTR BELONGTO 409680 
             4096fa      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            4096fa     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4096fa     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4096fc     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             4096fc      5 INSTR BELONGTO 409680 
             4096fc      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_return_if_fail_warning 
@@ -9686,12 +9686,12 @@
             409725      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R14 ZZ call    sub_408310 
             40972a      2 INSTR BELONGTO 409680 
             40972a      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R14 ZZ xor     esi, esi 
-            40972a     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40972a     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40972c      3 INSTR BELONGTO 409680 
             40972c      3 INSTR DEADREGS  EFLAGS RBX RDI R14 ZZ mov     rdi, rax 
             40972f      2 INSTR BELONGTO 409680 
             40972f      2 INSTR DEADREGS  EFLAGS RAX RBX R14 ZZ xor     eax, eax 
-            40972f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40972f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409731     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             409731      5 INSTR BELONGTO 409680 
             409731      5 INSTR DEADREGS  EFLAGS RBX R14 ZZ call    _g_object_new 
@@ -9706,7 +9706,7 @@
             409740      5 INSTR DEADREGS  EFLAGS ZZ call    _g_get_user_config_dir 
             409745      2 INSTR BELONGTO 409680 
             409745      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            409745     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            409745     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             409747      3 INSTR BELONGTO 409680 
             409747      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rax 
             40974a      3 INSTR BELONGTO 409680 
@@ -9715,7 +9715,7 @@
             40974d      5 INSTR DEADREGS  EFLAGS RAX RSI R15 ZZ mov     esi, offset aAutostart; "autostart" 
             409752      2 INSTR BELONGTO 409680 
             409752      2 INSTR DEADREGS  EFLAGS RAX R15 ZZ xor     eax, eax 
-            409752     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409752     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409754     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             409754      5 INSTR BELONGTO 409680 
             409754      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _g_build_filename 
@@ -9891,7 +9891,7 @@
             4098a9      5 INSTR DEADREGS  EFLAGS ZZ call    _g_get_user_config_dir 
             4098ae      2 INSTR BELONGTO 409860 
             4098ae      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            4098ae     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4098ae     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4098b0      3 INSTR BELONGTO 409860 
             4098b0      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r12 
             4098b3      5 INSTR BELONGTO 409860 
@@ -9900,7 +9900,7 @@
             4098b8      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             4098bb      2 INSTR BELONGTO 409860 
             4098bb      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4098bb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4098bb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4098bd     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             4098bd      5 INSTR BELONGTO 409860 
             4098bd      5 INSTR DEADREGS  EFLAGS ZZ call    _g_build_filename 
@@ -9929,10 +9929,10 @@
             4098e0      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             4098e3      2 INSTR BELONGTO 409860 
             4098e3      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            4098e3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4098e3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4098e5      2 INSTR BELONGTO 409860 
             4098e5      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            4098e5     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4098e5     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4098e7      3 INSTR BELONGTO 409860 
             4098e7      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
             4098ea      3 INSTR BELONGTO 409860 
@@ -9959,7 +9959,7 @@
             40990d      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_object_unref 
             409912      2 INSTR BELONGTO 409860 
             409912      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ xor     esi, esi 
-            409912     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409912     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409914      3 INSTR BELONGTO 409860 
             409914      3 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     rdi, rbp 
             409917     -1 INSTR LOCAL NoMetaUpdate call    sub_409270 
@@ -10041,7 +10041,7 @@
             40999f     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             40999f      5 INSTR BELONGTO 409860 
             40999f      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_object_unref 
-            4099a4     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4099a4     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4099a4      5 INSTR BELONGTO 409860 
             4099a4      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ mov     eax, 1 
             4099a9     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
@@ -10071,7 +10071,7 @@
             4099cd      4 INSTR BELONGTO 409860 
             4099d1      2 INSTR BELONGTO 409860 
             4099d1      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            4099d1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4099d1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4099d3      1 INSTR BELONGTO 409860 
             4099d3      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
             4099d4      1 INSTR BELONGTO 409860 
@@ -10095,7 +10095,7 @@
             4099f8      4 INSTR BELONGTO 409860 
             4099fc      2 INSTR BELONGTO 409860 
             4099fc      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            4099fc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4099fc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4099fe      1 INSTR BELONGTO 409860 
             4099fe      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
             4099ff      1 INSTR BELONGTO 409860 
@@ -10110,7 +10110,7 @@
             409a0d      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset aGsp_app_copy_d; "gsp_app_copy_desktop_file" 
             409a12      2 INSTR BELONGTO 409860 
             409a12      2 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ xor     edi, edi 
-            409a12     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409a12     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409a14     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             409a14      5 INSTR BELONGTO 409860 
             409a14      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
@@ -10119,7 +10119,7 @@
             409a1d     16 DEALLOC STACK esp - 16 xor     eax, eax
             409a1d      2 INSTR BELONGTO 409860 
             409a1d      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            409a1d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409a1d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409a1f      1 INSTR BELONGTO 409860 
             409a1f      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
             409a20      1 INSTR BELONGTO 409860 
@@ -10138,7 +10138,7 @@
             409a30      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_free 
             409a35      2 INSTR BELONGTO 409860 
             409a35      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            409a35     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409a35     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409a37     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4099A9 
             409a37      5 INSTR BELONGTO 409860 
             409a40      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -10155,10 +10155,10 @@
             409a47      3 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ xor     r8d, r8d 
             409a4a      2 INSTR BELONGTO 409a40 
             409a4a      2 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ xor     ecx, ecx 
-            409a4a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            409a4a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             409a4c      2 INSTR BELONGTO 409a40 
             409a4c      2 INSTR DEADREGS  EFLAGS RDX RBX ZZ xor     edx, edx 
-            409a4c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409a4c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409a4e     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
             409a4e      3 INSTR BELONGTO 409a40 
             409a51     16 DATAREF STACK 582 esp + 0 PARENT LocalFrame LOCALFRAME
@@ -10170,7 +10170,7 @@
             409a55      4 INSTR BELONGTO 409a40 
             409a55      4 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+18h+var_18], rsi 
             409a55      4 PTRIMMEDESP STACK 0 displ mov     [rsp+18h+var_18], rsi
-            409a59     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+            409a59     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
             409a59      5 INSTR BELONGTO 409a40 
             409a59      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 18h 
             409a5e     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_handlers_disconnect_matched 
@@ -10204,7 +10204,7 @@
             409a82      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             409a86      7 INSTR BELONGTO 409a70 
             409a86      7 INSTR DEADREGS  EFLAGS RSI R12 ZZ mov     r12d, cs:dword_60F82C 
-            409a8d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            409a8d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             409a8d      5 INSTR BELONGTO 409a70 
             409a8d      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             409a92     -1 INSTR LOCAL MetadataUnused mov     rbp, rdi 
@@ -10221,10 +10221,10 @@
             409aa0      3 INSTR DEADREGS  EFLAGS RDX RDI R12 ZZ mov     rdi, rax 
             409aa3      2 INSTR BELONGTO 409a70 
             409aa3      2 INSTR DEADREGS  EFLAGS RAX RDX R12 ZZ xor     edx, edx 
-            409aa3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409aa3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409aa5      2 INSTR BELONGTO 409a70 
             409aa5      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            409aa5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409aa5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409aa7     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
             409aa7      5 INSTR BELONGTO 409a70 
             409aa7      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_signal_emit 
@@ -10278,7 +10278,7 @@
             409ae9      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_class_peek_parent 
             409aee      3 INSTR BELONGTO 409ae0 
             409aee      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
-            409af1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            409af1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             409af1      5 INSTR BELONGTO 409ae0 
             409af1      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             409af6      7 INSTR BELONGTO 409ae0 
@@ -10311,17 +10311,17 @@
             409b3a      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             409b3d      3 INSTR BELONGTO 409ae0 
             409b3d      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rsi, [rax] 
-            409b40     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
+            409b40     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
             409b40      5 INSTR BELONGTO 409ae0 
             409b40      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI ZZ mov     ecx, 88h 
-            409b45     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            409b45     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             409b45      5 INSTR BELONGTO 409ae0 
             409b45      5 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ mov     edx, 2 
             409b4a      5 INSTR BELONGTO 409ae0 
             409b4a      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aAdded; "added" 
             409b4f      2 INSTR BELONGTO 409ae0 
             409b4f      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            409b4f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409b4f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409b51     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             409b51      5 INSTR BELONGTO 409ae0 
             409b51      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_new 
@@ -10343,15 +10343,15 @@
             409b83      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     cs:dword_60F828, eax 
             409b89     -1 INSTR LOCAL MetadataRedundant xor     r8d, r8d 
             409b89      3 INSTR BELONGTO 409ae0 
-            409b8c     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 90h 
+            409b8c     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 90h 
             409b8c      5 INSTR BELONGTO 409ae0 
             409b8c      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX ZZ mov     ecx, 90h 
-            409b91     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            409b91     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             409b91      5 INSTR BELONGTO 409ae0 
             409b91      5 INSTR DEADREGS  EFLAGS RAX RDX RBX ZZ mov     edx, 2 
             409b96      2 INSTR BELONGTO 409ae0 
             409b96      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            409b96     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409b96     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409b98     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             409b98      5 INSTR BELONGTO 409ae0 
             409b98      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_signal_new 
@@ -10459,15 +10459,15 @@
             409c4e     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h 
             409c4e      6 INSTR BELONGTO 409c10 
             409c4e      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 20h 
-            409c54     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_409AE0 
+            409c54     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_409AE0 
             409c54      5 INSTR BELONGTO 409c10 
             409c54      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset sub_409AE0 
-            409c59     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 98h 
+            409c59     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 98h 
             409c59      5 INSTR BELONGTO 409c10 
             409c59      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 98h 
             409c5e      3 INSTR BELONGTO 409c10 
             409c5e      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-            409c61     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+            409c61     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
             409c61      5 INSTR BELONGTO 409c10 
             409c61      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
             409c66      7 INSTR BELONGTO 409c10 
@@ -10536,11 +10536,11 @@
             409cc5      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset aGsp_app_mana_4; "gsp_app_manager_get_dir_index" 
             409cca      2 INSTR BELONGTO 409c90 
             409cca      2 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ xor     edi, edi 
-            409cca     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409cca     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409ccc     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             409ccc      5 INSTR BELONGTO 409c90 
             409ccc      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
-            409cd1     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
+            409cd1     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
             409cd1      5 INSTR BELONGTO 409c90 
             409cd1      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ mov     eax, 0FFFFFFFFh 
             409cd6      1 INSTR BELONGTO 409c90 
@@ -10559,7 +10559,7 @@
             409ce5      4 INSTR BELONGTO 409c90 
             409ce9     -1 INSTR LOCAL MetadataUnused mov     rbx, [rax+8] 
             409ce9      4 INSTR BELONGTO 409c90 
-            409ced     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
+            409ced     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
             409ced      5 INSTR BELONGTO 409c90 
             409ced      5 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, 0FFFFFFFFh 
             409cf2     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -10601,7 +10601,7 @@
             409d28      1 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
             409d29      1 INSTR BELONGTO 409c90 
             409d29      1 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ pop     rbp 
-            409d2a     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
+            409d2a     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
             409d2a      5 INSTR BELONGTO 409c90 
             409d2a      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ mov     eax, 0FFFFFFFFh 
             409d2f      2 INSTR BELONGTO 409c90 
@@ -10614,7 +10614,7 @@
             409d37      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset aGsp_app_mana_4; "gsp_app_manager_get_dir_index" 
             409d3c      2 INSTR BELONGTO 409c90 
             409d3c      2 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ xor     edi, edi 
-            409d3c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409d3c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409d3e     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             409d3e      5 INSTR BELONGTO 409c90 
             409d3e      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
@@ -10622,7 +10622,7 @@
             409d43      1 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
             409d44      1 INSTR BELONGTO 409c90 
             409d44      1 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ pop     rbp 
-            409d45     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
+            409d45     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
             409d45      5 INSTR BELONGTO 409c90 
             409d45      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ mov     eax, 0FFFFFFFFh 
             409d4a      2 INSTR BELONGTO 409c90 
@@ -10669,7 +10669,7 @@
             409d88      4 INSTR BELONGTO 409d50 
             409d8c      5 INSTR BELONGTO 409d50 
             409d91      2 INSTR BELONGTO 409d50 
-            409d91     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409d91     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409d93      1 INSTR BELONGTO 409d50 
             409d94      1 INSTR BELONGTO 409d50 
             409d95     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -10683,7 +10683,7 @@
             409db0      3 INSTR BELONGTO 409d50 
             409db3      4 INSTR BELONGTO 409d50 
             409db7      2 INSTR BELONGTO 409d50 
-            409db7     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409db7     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409db9      5 INSTR BELONGTO 409d50 
             409dbe      4 INSTR BELONGTO 409d50 
             409dc2     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_foreach 
@@ -10694,7 +10694,7 @@
             409dcf      5 INSTR BELONGTO 409d50 
             409dd4      4 INSTR BELONGTO 409d50 
             409dd8      7 INSTR BELONGTO 409d50 
-            409ddf     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            409ddf     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             409ddf      5 INSTR BELONGTO 409d50 
             409de4      8 INSTR BELONGTO 409d50 
             409dec     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
@@ -10751,7 +10751,7 @@
             409e48      4 INSTR BELONGTO 409e10 
             409e4c      5 INSTR BELONGTO 409e10 
             409e51      2 INSTR BELONGTO 409e10 
-            409e51     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409e51     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409e53      1 INSTR BELONGTO 409e10 
             409e54      1 INSTR BELONGTO 409e10 
             409e55     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -10775,7 +10775,7 @@
             409e8e      5 INSTR BELONGTO 409e10 
             409e93      4 INSTR BELONGTO 409e10 
             409e97      7 INSTR BELONGTO 409e10 
-            409e9e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            409e9e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             409e9e      5 INSTR BELONGTO 409e10 
             409ea3      7 INSTR BELONGTO 409e10 
             409eaa     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
@@ -10873,13 +10873,13 @@
             409f37      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsp_app_mana_1; "gsp_app_manager_get_dir" 
             409f3c      2 INSTR BELONGTO 409f00 
             409f3c      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            409f3c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409f3c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409f3e     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             409f3e      5 INSTR BELONGTO 409f00 
             409f3e      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             409f43      2 INSTR BELONGTO 409f00 
             409f43      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            409f43     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409f43     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409f45     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             409f45      4 INSTR BELONGTO 409f00 
             409f49      1 INSTR BELONGTO 409f00 
@@ -10894,7 +10894,7 @@
             409f54      4 INSTR DEADREGS  EFLAGS RDX R8 R9 R10 R11 ZZ mov     rdx, [rax+8] 
             409f58      2 INSTR BELONGTO 409f00 
             409f58      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ xor     eax, eax 
-            409f58     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409f58     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409f5a     -1 INSTR LOCAL NoMetaUpdate test    rdx, rdx 
             409f5a      3 INSTR BELONGTO 409f00 
             409f5d     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_409F71 
@@ -10927,7 +10927,7 @@
             409f88      4 INSTR BELONGTO 409f00 
             409f8c      2 INSTR BELONGTO 409f00 
             409f8c      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            409f8c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409f8c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409f8c      8 DEALLOC STACK esp - 8 xor     eax, eax
             409f8e      1 INSTR BELONGTO 409f00 
             409f8e      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
@@ -11045,7 +11045,7 @@
             40a053      5 INSTR DEADREGS  EFLAGS ZZ call    _g_slist_prepend 
             40a058      3 INSTR BELONGTO 409fa0 
             40a058      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 ZZ mov     rcx, rbx 
-            40a05b     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_409A70 
+            40a05b     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_409A70 
             40a05b      5 INSTR BELONGTO 409fa0 
             40a05b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R9 ZZ mov     edx, offset sub_409A70 
             40a060      3 INSTR BELONGTO 409fa0 
@@ -11067,7 +11067,7 @@
             40a07a      7 INSTR BELONGTO 409fa0 
             40a081      3 INSTR BELONGTO 409fa0 
             40a081      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            40a084     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40a084     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40a084      5 INSTR BELONGTO 409fa0 
             40a084      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             40a089     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -11087,10 +11087,10 @@
             40a0a2      3 INSTR BELONGTO 409fa0 
             40a0a5      2 INSTR BELONGTO 409fa0 
             40a0a5      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     edx, edx 
-            40a0a5     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a0a5     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a0a7      2 INSTR BELONGTO 409fa0 
             40a0a7      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            40a0a7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a0a7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a0a9     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             40a0a9      4 INSTR BELONGTO 409fa0 
             40a0ad     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
@@ -11167,14 +11167,14 @@
             40a134      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 R15 ZZ mov     r8d, offset aG_str_has_pref; "g_str_has_prefix (autostart_dirs[0], g_"... 
             40a13a      5 INSTR BELONGTO 40a0c0 
             40a13a      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R15 ZZ mov     ecx, offset aGsp_app_mana_5; "gsp_app_manager_fill" 
-            40a13f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1EFh 
+            40a13f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1EFh 
             40a13f      5 INSTR BELONGTO 40a0c0 
             40a13f      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R15 ZZ mov     edx, 1EFh 
             40a144      5 INSTR BELONGTO 40a0c0 
             40a144      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 ZZ mov     esi, offset aGspAppManager_; "gsp-app-manager.c" 
             40a149      2 INSTR BELONGTO 40a0c0 
             40a149      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R15 ZZ xor     edi, edi 
-            40a149     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a149     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a14b     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40a14b      5 INSTR BELONGTO 40a0c0 
             40a14b      5 INSTR DEADREGS  EFLAGS R12 R13 R15 ZZ call    _g_assertion_message_expr 
@@ -11216,7 +11216,7 @@
             40a192      2 INSTR BELONGTO 40a0c0 
             40a194      4 INSTR BELONGTO 40a0c0 
             40a194      4 INSTR DEADREGS  EFLAGS RDI R15 ZZ mov     r15, [r12] 
-            40a198     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
+            40a198     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
             40a198      5 INSTR BELONGTO 40a0c0 
             40a198      5 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     edi, 18h 
             40a19d     -1 INSTR LOCAL NoMetaUpdate call    _g_slice_alloc 
@@ -11253,13 +11253,13 @@
             40a1d7      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _g_file_new_for_path 
             40a1dc      2 INSTR BELONGTO 40a0c0 
             40a1dc      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ xor     ecx, ecx 
-            40a1dc     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a1dc     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40a1de      2 INSTR BELONGTO 40a0c0 
             40a1de      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ xor     edx, edx 
-            40a1de     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a1de     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a1e0      2 INSTR BELONGTO 40a0c0 
             40a1e0      2 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ xor     esi, esi 
-            40a1e0     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a1e0     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a1e2      3 INSTR BELONGTO 40a0c0 
             40a1e2      3 INSTR DEADREGS  EFLAGS RDI R15 ZZ mov     r15, rax 
             40a1e5      3 INSTR BELONGTO 40a0c0 
@@ -11288,7 +11288,7 @@
             40a207      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R15 ZZ xor     r8d, r8d 
             40a20a      3 INSTR BELONGTO 40a0c0 
             40a20a      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R15 ZZ mov     rcx, rbx 
-            40a20d     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40A3B0 
+            40a20d     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40A3B0 
             40a20d      5 INSTR BELONGTO 40a0c0 
             40a20d      5 INSTR DEADREGS  EFLAGS RDX RSI R15 ZZ mov     edx, offset sub_40A3B0 
             40a212      5 INSTR BELONGTO 40a0c0 
@@ -11300,10 +11300,10 @@
             40a21c      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     rdi, [r12] 
             40a220      2 INSTR BELONGTO 40a0c0 
             40a220      2 INSTR DEADREGS  EFLAGS RDX RSI R15 ZZ xor     edx, edx 
-            40a220     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a220     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a222      2 INSTR BELONGTO 40a0c0 
             40a222      2 INSTR DEADREGS  EFLAGS RSI R15 ZZ xor     esi, esi 
-            40a222     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a222     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a224     -1 INSTR LOCAL NoMetaUpdate call    _g_dir_open 
             40a224      5 INSTR BELONGTO 40a0c0 
             40a224      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _g_dir_open 
@@ -11342,12 +11342,12 @@
             40a263      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rdi, [r12] 
             40a267      2 INSTR BELONGTO 40a0c0 
             40a267      2 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ xor     edx, edx 
-            40a267     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a267     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a269      3 INSTR BELONGTO 40a0c0 
             40a269      3 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     rsi, r15 
             40a26c      2 INSTR BELONGTO 40a0c0 
             40a26c      2 INSTR DEADREGS  EFLAGS RAX R15 ZZ xor     eax, eax 
-            40a26c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a26c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a26e     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40a26e      5 INSTR BELONGTO 40a0c0 
             40a26e      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _g_build_filename 
@@ -11468,10 +11468,10 @@
             40a325      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset aGsp_app_mana_3; "gsp_app_manager_find_app_with_basename" 
             40a32a      2 INSTR BELONGTO 40a2f0 
             40a32a      2 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ xor     edi, edi 
-            40a32a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a32a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a32c      2 INSTR BELONGTO 40a2f0 
             40a32c      2 INSTR DEADREGS  EFLAGS RBX R12 ZZ xor     ebp, ebp 
-            40a32c     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40a32c     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40a32e     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40a32e      5 INSTR BELONGTO 40a2f0 
             40a32e      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
@@ -11493,7 +11493,7 @@
             40a345      4 INSTR BELONGTO 40a2f0 
             40a349      2 INSTR BELONGTO 40a2f0 
             40a349      2 INSTR DEADREGS  EFLAGS RBX ZZ xor     ebp, ebp 
-            40a349     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40a349     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40a34b     -1 INSTR LOCAL MetadataUnused mov     rbx, [rax] 
             40a34b      3 INSTR BELONGTO 40a2f0 
             40a34e     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -11537,7 +11537,7 @@
             40a389      2 INSTR BELONGTO 40a2f0 
             40a38b      2 INSTR BELONGTO 40a2f0 
             40a38b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     ebp, ebp 
-            40a38b     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40a38b     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40a38d      1 INSTR BELONGTO 40a2f0 
             40a38d      1 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
             40a38e     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, rbp 
@@ -11555,13 +11555,13 @@
             40a39a      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset aGsp_app_mana_3; "gsp_app_manager_find_app_with_basename" 
             40a39f      2 INSTR BELONGTO 40a2f0 
             40a39f      2 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ xor     edi, edi 
-            40a39f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a39f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a3a1     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40a3a1      5 INSTR BELONGTO 40a2f0 
             40a3a1      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
             40a3a6      2 INSTR BELONGTO 40a2f0 
             40a3a6      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     ebp, ebp 
-            40a3a6     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40a3a6     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40a3a8      1 INSTR BELONGTO 40a2f0 
             40a3a8      1 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
             40a3a9     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, rbp 
@@ -11695,7 +11695,7 @@
             40a469      3 INSTR BELONGTO 40a3b0 
             40a46c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40A482 
             40a46c      2 INSTR BELONGTO 40a3b0 
-            40a46e     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, r12d 
+            40a46e     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, r12d 
             40a46e      3 INSTR BELONGTO 40a3b0 
             40a46e      3 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     esi, r12d 
             40a471      3 INSTR BELONGTO 40a3b0 
@@ -11722,7 +11722,7 @@
             40a495     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40a495      5 INSTR BELONGTO 40a3b0 
             40a495      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_free 
-            40a49a     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40a49a     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40a49a      5 INSTR BELONGTO 40a3b0 
             40a49a      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     eax, 1 
             40a49f      5 INSTR BELONGTO 40a3b0 
@@ -11795,7 +11795,7 @@
             40a521      5 INSTR BELONGTO 40a3b0 
             40a521      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     rdi, [rsp+58h+var_48] 
             40a521      5 PTRIMMEDESP STACK 16 displ mov     rdi, [rsp+58h+var_48]
-            40a526     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, r15d 
+            40a526     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, r15d 
             40a526      3 INSTR BELONGTO 40a3b0 
             40a526      3 INSTR DEADREGS  EFLAGS RSI R12 ZZ mov     esi, r15d 
             40a529     -1 INSTR LOCAL NoMetaUpdate call    sub_409F00 
@@ -11807,7 +11807,7 @@
             40a531      6 INSTR BELONGTO 40a3b0 
             40a537      2 INSTR BELONGTO 40a3b0 
             40a537      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ xor     edx, edx 
-            40a537     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a537     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a539      3 INSTR BELONGTO 40a3b0 
             40a539      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     rsi, rbx 
             40a53c     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, rax 
@@ -11815,7 +11815,7 @@
             40a53c      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             40a53f      2 INSTR BELONGTO 40a3b0 
             40a53f      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            40a53f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a53f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a541     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40a541      5 INSTR BELONGTO 40a3b0 
             40a541      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_build_filename 
@@ -11823,7 +11823,7 @@
             40a546      3 INSTR BELONGTO 40a3b0 
             40a549      3 INSTR BELONGTO 40a3b0 
             40a549      3 INSTR DEADREGS  EFLAGS RDX RSI R12 R14 ZZ mov     r12, rax 
-            40a54c     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, r15d 
+            40a54c     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, r15d 
             40a54c      3 INSTR BELONGTO 40a3b0 
             40a54c      3 INSTR DEADREGS  EFLAGS RDX RSI R14 ZZ mov     edx, r15d 
             40a54f      3 INSTR BELONGTO 40a3b0 
@@ -11871,14 +11871,14 @@
             40a5a1      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aIndex0; "index == 0" 
             40a5a7      5 INSTR BELONGTO 40a3b0 
             40a5a7      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset a_gsp_app_manag; "_gsp_app_manager_handle_delete" 
-            40a5ac     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 131h 
+            40a5ac     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 131h 
             40a5ac      5 INSTR BELONGTO 40a3b0 
             40a5ac      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 131h 
             40a5b1      5 INSTR BELONGTO 40a3b0 
             40a5b1      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGspAppManager_; "gsp-app-manager.c" 
             40a5b6      2 INSTR BELONGTO 40a3b0 
             40a5b6      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40a5b6     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a5b6     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a5b8     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40a5b8      5 INSTR BELONGTO 40a3b0 
             40a5b8      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -11952,18 +11952,18 @@
             40a62e      4 PTRIMMEDESP STACK 0 displ mov     r8, [rsp+58h+var_58]
             40a632      2 INSTR BELONGTO 40a3b0 
             40a632      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     edx, edx 
-            40a632     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a632     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a634      3 INSTR BELONGTO 40a3b0 
             40a634      3 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rsi, rbx 
             40a637      2 INSTR BELONGTO 40a3b0 
             40a637      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ xor     eax, eax 
-            40a637     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a637     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a639      3 INSTR BELONGTO 40a3b0 
             40a639      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, [r8] 
             40a63c     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40a63c      5 INSTR BELONGTO 40a3b0 
             40a63c      5 INSTR DEADREGS  EFLAGS ZZ call    _g_build_filename 
-            40a641     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40a641     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40a641      5 INSTR BELONGTO 40a3b0 
             40a641      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 10h 
             40a646      3 INSTR BELONGTO 40a3b0 
@@ -11985,10 +11985,10 @@
             40a65c      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+58h+var_40]
             40a661      2 INSTR BELONGTO 40a3b0 
             40a661      2 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ xor     ecx, ecx 
-            40a661     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a661     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40a663      2 INSTR BELONGTO 40a3b0 
             40a663      2 INSTR DEADREGS  EFLAGS RDX RSI ZZ xor     edx, edx 
-            40a663     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a663     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a665      3 INSTR BELONGTO 40a3b0 
             40a665      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, r9 
             40a668     -1 INSTR LOCAL NoMetaUpdate call    _g_key_file_load_from_file 
@@ -12039,7 +12039,7 @@
             40a6ae     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40a6ae      5 INSTR BELONGTO 40a3b0 
             40a6ae      5 INSTR DEADREGS  EFLAGS R12 R15 ZZ call    _g_free 
-            40a6b3     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, dword ptr [rsp+58h+var_48] 
+            40a6b3     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, dword ptr [rsp+58h+var_48] 
             40a6b3      4 INSTR BELONGTO 40a3b0 
             40a6b3      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R15 ZZ mov     eax, dword ptr [rsp+58h+var_48] 
             40a6b3      4 PTRIMMEDESP STACK 16 displ mov     eax, dword ptr [rsp+58h+var_48]
@@ -12047,7 +12047,7 @@
             40a6b7      2 INSTR BELONGTO 40a3b0 
             40a6b9     -1 INSTR LOCAL NoMetaUpdate js      short loc_40A6DD 
             40a6b9      2 INSTR BELONGTO 40a3b0 
-            40a6bb     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, dword ptr [rsp+58h+var_48] 
+            40a6bb     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, dword ptr [rsp+58h+var_48] 
             40a6bb      4 INSTR BELONGTO 40a3b0 
             40a6bb      4 INSTR DEADREGS  EFLAGS RSI RDI R12 R15 ZZ mov     esi, dword ptr [rsp+58h+var_48] 
             40a6bb      4 PTRIMMEDESP STACK 16 displ mov     esi, dword ptr [rsp+58h+var_48]
@@ -12067,11 +12067,11 @@
             40a6d1      5 INSTR DEADREGS  EFLAGS R12 R15 ZZ call    _g_key_file_free 
             40a6d6      2 INSTR BELONGTO 40a3b0 
             40a6d6      2 INSTR DEADREGS  EFLAGS RDI R12 R15 ZZ xor     edi, edi 
-            40a6d6     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a6d6     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a6d8     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40a6d8      5 INSTR BELONGTO 40a3b0 
             40a6d8      5 INSTR DEADREGS  EFLAGS R12 R15 ZZ call    _g_free 
-            40a6dd     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
+            40a6dd     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
             40a6dd      5 INSTR BELONGTO 40a3b0 
             40a6dd      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R15 ZZ mov     esi, 0FFFFFFFFh 
             40a6e2     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, r14 
@@ -12093,14 +12093,14 @@
             40a6fd      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 R13 R14 R15 ZZ xor     r8d, r8d 
             40a700      5 INSTR BELONGTO 40a3b0 
             40a700      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     ecx, offset a_gsp_app_manag; "_gsp_app_manager_handle_delete" 
-            40a705     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 163h 
+            40a705     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 163h 
             40a705      5 INSTR BELONGTO 40a3b0 
             40a705      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 163h 
             40a70a      5 INSTR BELONGTO 40a3b0 
             40a70a      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aGspAppManager_; "gsp-app-manager.c" 
             40a70f      2 INSTR BELONGTO 40a3b0 
             40a70f      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            40a70f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a70f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a711     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message 
             40a711      5 INSTR BELONGTO 40a3b0 
             40a711      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_assertion_message 
@@ -12128,12 +12128,12 @@
             40a740      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_409C10 
             40a745      2 INSTR BELONGTO 40a720 
             40a745      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            40a745     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a745     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a747      3 INSTR BELONGTO 40a720 
             40a747      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             40a74a      2 INSTR BELONGTO 40a720 
             40a74a      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40a74a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a74a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a74c     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             40a74c      5 INSTR BELONGTO 40a720 
             40a74c      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_new 
@@ -12187,13 +12187,13 @@
             40a78f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGsp_app_mana_6; "gsp_app_manager_get_apps" 
             40a794      2 INSTR BELONGTO 40a760 
             40a794      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            40a794     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a794     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a796     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40a796      5 INSTR BELONGTO 40a760 
             40a796      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             40a79b      2 INSTR BELONGTO 40a760 
             40a79b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40a79b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a79b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a79d      1 INSTR BELONGTO 40a760 
             40a79d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40a79e      1 INSTR BELONGTO 40a760 
@@ -12296,7 +12296,7 @@
             40a833      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_propagate_error 
             40a838      2 INSTR BELONGTO 40a7e0 
             40a838      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            40a838     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a838     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a83a      5 INSTR BELONGTO 40a7e0 
             40a83a      5 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+38h+var_18] 
             40a83a      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+38h+var_18]
@@ -12350,13 +12350,13 @@
             40a88d      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset aGsp_key_file_t; "gsp_key_file_to_file" 
             40a892      2 INSTR BELONGTO 40a7e0 
             40a892      2 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ xor     edi, edi 
-            40a892     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a892     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a894     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40a894      5 INSTR BELONGTO 40a7e0 
             40a894      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
             40a899      2 INSTR BELONGTO 40a7e0 
             40a899      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            40a899     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a899     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a89b     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40A83A 
             40a89b      2 INSTR BELONGTO 40a7e0 
             40a8a0      5 INSTR BELONGTO 40a7e0 
@@ -12365,13 +12365,13 @@
             40a8a5      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset aGsp_key_file_t; "gsp_key_file_to_file" 
             40a8aa      2 INSTR BELONGTO 40a7e0 
             40a8aa      2 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ xor     edi, edi 
-            40a8aa     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a8aa     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a8ac     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40a8ac      5 INSTR BELONGTO 40a7e0 
             40a8ac      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
             40a8b1      2 INSTR BELONGTO 40a7e0 
             40a8b1      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            40a8b1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a8b1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a8b3     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40A83A 
             40a8b3      2 INSTR BELONGTO 40a7e0 
             40a8c0      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 1 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -12382,7 +12382,7 @@
             40a8c0     57 FUNC GLOBAL sub_40A8C0 FUNC_UNSAFE NOFP RET             40a8f8 
             40a8c1      2 INSTR BELONGTO 40a8c0 
             40a8c1      2 INSTR DEADREGS  EFLAGS RCX RBX ZZ mov     ebx, edx 
-            40a8c1     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, edx 
+            40a8c1     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     ebx, edx 
             40a8c3      3 INSTR BELONGTO 40a8c0 
             40a8c3      3 INSTR DEADREGS  EFLAGS RCX RDX ZZ mov     rdx, rsi 
             40a8c6      5 INSTR BELONGTO 40a8c0 
@@ -12414,7 +12414,7 @@
             40a8ec      5 INSTR DEADREGS  EFLAGS ZZ call    _g_error_free 
             40a8f1      2 INSTR BELONGTO 40a8c0 
             40a8f1      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, ebx 
-            40a8f1     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            40a8f1     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             40a8f3     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
             40a8f3      4 INSTR BELONGTO 40a8c0 
             40a8f7     16 DEALLOC STACK esp - 16 pop     rbx
@@ -12428,7 +12428,7 @@
             40a900      2 INSTR BELONGTO 40a900 
             40a900      2 INSTR DEADREGS  EFLAGS RAX R8 ZZ push    r13 
             40a900     -3 INSTR LOCAL NoWarn push    r13 
-            40a902     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40a902     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40a902      5 INSTR BELONGTO 40a900 
             40a902      5 INSTR DEADREGS  EFLAGS RAX R8 R13 ZZ mov     eax, 1 
             40a907      2 INSTR BELONGTO 40a900 
@@ -12458,7 +12458,7 @@
             40a91e      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R12 R13 ZZ xor     r8d, r8d 
             40a921      2 INSTR BELONGTO 40a900 
             40a921      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R13 ZZ xor     ecx, ecx 
-            40a921     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a921     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40a923      5 INSTR BELONGTO 40a900 
             40a923      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 ZZ mov     edx, offset aOnlyshowin; "OnlyShowIn" 
             40a928      5 INSTR BELONGTO 40a900 
@@ -12509,7 +12509,7 @@
             40a975      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 ZZ xor     r8d, r8d 
             40a978      2 INSTR BELONGTO 40a900 
             40a978      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 ZZ xor     ecx, ecx 
-            40a978     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a978     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40a97a      5 INSTR BELONGTO 40a900 
             40a97a      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     edx, offset aNotshowin; "NotShowIn" 
             40a97f      5 INSTR BELONGTO 40a900 
@@ -12521,7 +12521,7 @@
             40a987      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_key_file_get_string_list 
             40a98c      3 INSTR BELONGTO 40a900 
             40a98c      3 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     r12, rax 
-            40a98f     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40a98f     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40a98f      5 INSTR BELONGTO 40a900 
             40a98f      5 INSTR DEADREGS  EFLAGS RAX R13 ZZ mov     eax, 1 
             40a994     -1 INSTR LOCAL NoMetaUpdate test    r12, r12 
@@ -12562,7 +12562,7 @@
             40a9cc      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_strfreev 
             40a9d1      2 INSTR BELONGTO 40a900 
             40a9d1      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ xor     eax, eax 
-            40a9d1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a9d1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a9d3     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             40a9d3      4 INSTR BELONGTO 40a900 
             40a9d7      1 INSTR BELONGTO 40a900 
@@ -12584,7 +12584,7 @@
             40a9e8      4 INSTR BELONGTO 40a900 
             40a9ec      2 INSTR BELONGTO 40a900 
             40a9ec      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ xor     eax, eax 
-            40a9ec     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a9ec     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a9ee      1 INSTR BELONGTO 40a900 
             40a9ee      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 ZZ pop     rbx 
             40a9ef      1 INSTR BELONGTO 40a900 
@@ -12602,7 +12602,7 @@
             40a9fb      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_strfreev 
             40aa00     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             40aa00      4 INSTR BELONGTO 40a900 
-            40aa04     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40aa04     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40aa04      5 INSTR BELONGTO 40a900 
             40aa04      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ mov     eax, 1 
             40aa04      8 DEALLOC STACK esp - 8 mov     eax, 1
@@ -12667,7 +12667,7 @@
             40aa48      3 INSTR BELONGTO 40aa10 
             40aa4b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40AA88 
             40aa4b      2 INSTR BELONGTO 40aa10 
-            40aa4d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2Eh        ; c 
+            40aa4d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2Eh        ; c 
             40aa4d      5 INSTR BELONGTO 40aa10 
             40aa4d      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 2Eh        ; c 
             40aa52      3 INSTR BELONGTO 40aa10 
@@ -12736,7 +12736,7 @@
             40aab5      5 INSTR BELONGTO 40aab0 
             40aaba      2 INSTR BELONGTO 40aab0 
             40aaba      2 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ xor     ecx, ecx 
-            40aaba     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40aaba     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40aabc     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_10], r12 
             40aabc      5 INSTR BELONGTO 40aab0 
             40aac1     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
@@ -12771,7 +12771,7 @@
             40aaea      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 ZZ xor     r8d, r8d 
             40aaed      2 INSTR BELONGTO 40aab0 
             40aaed      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ xor     ecx, ecx 
-            40aaed     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40aaed     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40aaef      3 INSTR BELONGTO 40aab0 
             40aaef      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     rdx, r12 
             40aaf2      5 INSTR BELONGTO 40aab0 
@@ -12828,7 +12828,7 @@
             40ab55      5 INSTR BELONGTO 40ab50 
             40ab55      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     [rsp+var_8], rbp 
             40ab55      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
-            40ab5a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            40ab5a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             40ab5a      5 INSTR BELONGTO 40ab50 
             40ab5a      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 4 
             40ab5f     24 DATAREF STACK 600 esp + 0 PARENT LocalFrame LOCALFRAME
@@ -12837,7 +12837,7 @@
             40ab5f      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             40ab63      3 INSTR BELONGTO 40ab50 
             40ab63      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-            40ab66     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            40ab66     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
             40ab66      5 INSTR BELONGTO 40ab50 
             40ab66      5 INSTR DEADREGS  EFLAGS ZZ mov     ebp, 1 
             40ab6b     -1 INSTR LOCAL NoMetaUpdate call    _g_file_test 
@@ -12849,7 +12849,7 @@
             40ab72      2 INSTR BELONGTO 40ab50 
             40ab74      2 INSTR BELONGTO 40ab50 
             40ab74      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, ebp 
-            40ab74     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebp 
+            40ab74     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebp 
             40ab76      5 INSTR BELONGTO 40ab50 
             40ab76      5 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ mov     rbx, [rsp+18h+var_10] 
             40ab76      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+18h+var_10]
@@ -12860,7 +12860,7 @@
             40ab80      4 INSTR BELONGTO 40ab50 
             40ab84      1 INSTR BELONGTO 40ab50 
             40ab84      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-            40ab88     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1EDh 
+            40ab88     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1EDh 
             40ab88      5 INSTR BELONGTO 40ab50 
             40ab88      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 1EDh 
             40ab8d      3 INSTR BELONGTO 40ab50 
@@ -12890,21 +12890,21 @@
             40abb1      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 ZZ mov     r8, rax 
             40abb4      3 INSTR BELONGTO 40ab50 
             40abb4      3 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ mov     rcx, rbx 
-            40abb7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40abb7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40abb7      5 INSTR BELONGTO 40ab50 
             40abb7      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     esi, 10h 
             40abbc      2 INSTR BELONGTO 40ab50 
             40abbc      2 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ xor     edi, edi 
-            40abbc     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40abbc     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40abbe      2 INSTR BELONGTO 40ab50 
             40abbe      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40abbe     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40abbe     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40abc0     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40abc0      5 INSTR BELONGTO 40ab50 
             40abc0      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
             40abc5      2 INSTR BELONGTO 40ab50 
             40abc5      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     ebp, ebp 
-            40abc5     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40abc5     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40abc7     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40AB74 
             40abc7      2 INSTR BELONGTO 40ab50 
             40abd0     -1 INSTR LOCAL MetadataUnused mov     rdi, rbx 
@@ -12924,20 +12924,20 @@
             40abf0     -3 INSTR LOCAL NoWarn push    rbp 
             40abf1     -3 INSTR LOCAL NoWarn push    rbx 
             40abf6     -1 INSTR LOCAL NoMetaUpdate call    _g_get_user_config_dir 
-            40ac09     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40ac0e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ac09     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ac0e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ac10     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40ac1b     -1 INSTR LOCAL NoMetaUpdate call    sub_40AB50 
             40ac20     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40ac22     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40AC50 
-            40ac2e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            40ac33     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40ac2e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40ac33     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40ac35     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
-            40ac3d     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40ac3d     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40ac3f     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40ac44     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
-            40ac50     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40ac52     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40ac50     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40ac52     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40ac57     -1 INSTR LOCAL NoMetaUpdate call    _g_dir_open 
             40ac5c     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40ac62     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40AC44 
@@ -12945,8 +12945,8 @@
             40ac67     -1 INSTR LOCAL NoMetaUpdate call    _g_dir_read_name 
             40ac6c     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40ac6f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40AC9C 
-            40ac78     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40ac80     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ac78     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40ac80     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ac82     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40ac8a     -1 INSTR LOCAL NoMetaUpdate call    _g_unlink 
             40ac8f      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -12984,12 +12984,12 @@
             40acd4      7 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ lea     rsi, aGnomeSession; "gnome-session" 
             40acdb      2 INSTR BELONGTO 40acb0 
             40acdb      2 INSTR DEADREGS  EFLAGS RCX RDI ZZ xor     ecx, ecx 
-            40acdb     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40acdb     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40acdd      3 INSTR BELONGTO 40acb0 
             40acdd      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             40ace0      2 INSTR BELONGTO 40acb0 
             40ace0      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40ace0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ace0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ace2     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40ace2      5 INSTR BELONGTO 40acb0 
             40ace2      5 INSTR DEADREGS  EFLAGS ZZ call    _g_build_filename 
@@ -13022,15 +13022,15 @@
             40ad21      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rcx, cs:qword_60F838 
             40ad28      7 INSTR BELONGTO 40acb0 
             40ad28      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ lea     rdx, aGsmsessionsa_0; "GsmSessionSave: could not create direct"... 
-            40ad2f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40ad2f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40ad2f      5 INSTR BELONGTO 40acb0 
             40ad2f      5 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     esi, 10h 
             40ad34      2 INSTR BELONGTO 40acb0 
             40ad34      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ xor     edi, edi 
-            40ad34     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40ad34     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40ad36      2 INSTR BELONGTO 40acb0 
             40ad36      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40ad36     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ad36     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ad38     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40ad38      5 INSTR BELONGTO 40acb0 
             40ad38      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -13064,12 +13064,12 @@
             40ad63      7 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ lea     rsi, aAutostart ; "autostart" 
             40ad6a      2 INSTR BELONGTO 40ad50 
             40ad6a      2 INSTR DEADREGS  EFLAGS RDX RBX RDI ZZ xor     edx, edx 
-            40ad6a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ad6a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ad6c      3 INSTR BELONGTO 40ad50 
             40ad6c      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
             40ad6f      2 INSTR BELONGTO 40ad50 
             40ad6f      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40ad6f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ad6f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ad71     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40ad71      5 INSTR BELONGTO 40ad50 
             40ad71      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_build_filename 
@@ -13098,10 +13098,10 @@
             40ad9f      7 INSTR DEADREGS  EFLAGS RAX RCX RSI ZZ lea     rsi, aGnome_0   ; "gnome" 
             40ada6      2 INSTR BELONGTO 40ad50 
             40ada6      2 INSTR DEADREGS  EFLAGS RAX RCX ZZ xor     ecx, ecx 
-            40ada6     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ada6     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40ada8      2 INSTR BELONGTO 40ad50 
             40ada8      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40ada8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ada8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40adaa     -1 INSTR LOCAL MetadataUnused add     rbx, 8 
             40adaa      4 INSTR BELONGTO 40ad50 
             40adae     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
@@ -13136,10 +13136,10 @@
             40ade0      7 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ lea     rsi, aAutostart ; "autostart" 
             40ade7      2 INSTR BELONGTO 40ad50 
             40ade7      2 INSTR DEADREGS  EFLAGS RAX RDX ZZ xor     edx, edx 
-            40ade7     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ade7     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ade9      2 INSTR BELONGTO 40ad50 
             40ade9      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40ade9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ade9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40adeb     -1 INSTR LOCAL MetadataUnused add     rbx, 8 
             40adeb      4 INSTR BELONGTO 40ad50 
             40adef     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
@@ -13162,7 +13162,7 @@
             40ae07      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
             40ae0a      2 INSTR BELONGTO 40ad50 
             40ae0a      2 INSTR DEADREGS  EFLAGS RBX RSI ZZ xor     esi, esi 
-            40ae0a     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40ae0a     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40ae0c     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_add 
             40ae0c      5 INSTR BELONGTO 40ad50 
             40ae0c      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_ptr_array_add 
@@ -13206,12 +13206,12 @@
             40ae43      7 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ lea     rsi, aApplications; "applications" 
             40ae4a      2 INSTR BELONGTO 40ae30 
             40ae4a      2 INSTR DEADREGS  EFLAGS RDX RBX RDI ZZ xor     edx, edx 
-            40ae4a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ae4a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ae4c      3 INSTR BELONGTO 40ae30 
             40ae4c      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
             40ae4f      2 INSTR BELONGTO 40ae30 
             40ae4f      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40ae4f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ae4f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ae51     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40ae51      5 INSTR BELONGTO 40ae30 
             40ae51      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_build_filename 
@@ -13238,10 +13238,10 @@
             40ae78      7 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ lea     rsi, aApplications; "applications" 
             40ae7f      2 INSTR BELONGTO 40ae30 
             40ae7f      2 INSTR DEADREGS  EFLAGS RAX RDX ZZ xor     edx, edx 
-            40ae7f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ae7f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ae81      2 INSTR BELONGTO 40ae30 
             40ae81      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40ae81     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ae81     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ae83     -1 INSTR LOCAL MetadataUnused add     rbx, 8 
             40ae83      4 INSTR BELONGTO 40ae30 
             40ae87     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
@@ -13264,7 +13264,7 @@
             40ae9f      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
             40aea2      2 INSTR BELONGTO 40ae30 
             40aea2      2 INSTR DEADREGS  EFLAGS RBX RSI ZZ xor     esi, esi 
-            40aea2     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40aea2     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40aea4     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_add 
             40aea4      5 INSTR BELONGTO 40ae30 
             40aea4      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_ptr_array_add 
@@ -13324,7 +13324,7 @@
             40aee1      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R14 R15 ZZ mov     rbx, rax 
             40aee4      2 INSTR BELONGTO 40aec0 
             40aee4      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R14 R15 ZZ xor     eax, eax 
-            40aee4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40aee4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40aee6     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rbp+0], 0 
             40aee6      5 INSTR BELONGTO 40aec0 
             40aeeb     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40AEFD 
@@ -13354,7 +13354,7 @@
             40af17      4 INSTR BELONGTO 40aec0 
             40af1b     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40AF10 
             40af1b      2 INSTR BELONGTO 40aec0 
-            40af1d     -2 INSTR LOCAL n EDI ZZ  NumericDEFs lea     edi, [rax+1] 
+            40af1d     -2 INSTR LOCAL n RDI ZZ  NumericDEFs lea     edi, [rax+1] 
             40af1d      3 INSTR BELONGTO 40aec0 
             40af1d      3 INSTR DEADREGS  EFLAGS RSI RDI R14 R15 ZZ lea     edi, [rax+1] 
             40af20     -1 INSTR LOCAL NoMetaUpdate test    r12d, r12d 
@@ -13368,7 +13368,7 @@
             40af2b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM movsxd  rdi, eax 
             40af2b      3 INSTR BELONGTO 40aec0 
             40af2b      3 INSTR DEADREGS  EFLAGS RSI RDI R14 R15 ZZ movsxd  rdi, eax 
-            40af2e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            40af2e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             40af2e      5 INSTR BELONGTO 40aec0 
             40af2e      5 INSTR DEADREGS  EFLAGS RSI R14 R15 ZZ mov     esi, 8 
             40af33     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc_n 
@@ -13385,7 +13385,7 @@
             40af44      3 INSTR DEADREGS  EFLAGS RCX R13 R15 ZZ xor     r15d, r15d 
             40af47      2 INSTR BELONGTO 40aec0 
             40af47      2 INSTR DEADREGS  EFLAGS RCX R13 ZZ xor     ecx, ecx 
-            40af47     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40af47     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40af49     -1 INSTR LOCAL NoMetaUpdate test    r12d, r12d 
             40af49      3 INSTR BELONGTO 40aec0 
             40af4c     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40B080 
@@ -13401,7 +13401,7 @@
             40af5a      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 R15 ZZ movsxd  rsi, ecx 
             40af5d      2 INSTR BELONGTO 40aec0 
             40af5d      2 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R15 ZZ xor     eax, eax 
-            40af5d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40af5d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40af5f      4 INSTR BELONGTO 40aec0 
             40af5f      4 INSTR DEADREGS  EFLAGS RDI R12 R13 R15 ZZ lea     rsi, [r14+rsi*8] 
             40af63      5 INSTR BELONGTO 40aec0 
@@ -13433,7 +13433,7 @@
             40af8c      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 R15 ZZ movsxd  r15, ecx 
             40af8f      2 INSTR BELONGTO 40aec0 
             40af8f      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ xor     eax, eax 
-            40af8f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40af8f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40af91      4 INSTR BELONGTO 40aec0 
             40af91      4 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ lea     rsi, [r14+r15*8] 
             40af95      3 INSTR BELONGTO 40aec0 
@@ -13490,7 +13490,7 @@
             40afe8      4 INSTR DEADREGS  EFLAGS RAX RDX R15 ZZ mov     rdx, [rbp+0] 
             40afec      2 INSTR BELONGTO 40aec0 
             40afec      2 INSTR DEADREGS  EFLAGS RAX R15 ZZ xor     eax, eax 
-            40afec     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40afec     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40afee     -2 INSTR LOCAL n R15 ZZ  AlwaysNUM xor     r15d, r15d 
             40afee      3 INSTR BELONGTO 40aec0 
             40afee      3 INSTR DEADREGS  EFLAGS R15 ZZ xor     r15d, r15d 
@@ -13527,7 +13527,7 @@
             40b025      3 INSTR DEADREGS  EFLAGS RAX RCX R15 ZZ movsxd  r15, r13d 
             40b028      2 INSTR BELONGTO 40aec0 
             40b028      2 INSTR DEADREGS  EFLAGS RAX RCX ZZ xor     eax, eax 
-            40b028     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b028     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b02a      4 INSTR BELONGTO 40aec0 
             40b02a      4 INSTR DEADREGS  EFLAGS RCX ZZ lea     rcx, [r14+r15*8] 
             40b02e     -1 INSTR LOCAL NoMetaUpdate xchg    ax, ax 
@@ -13589,7 +13589,7 @@
             40b090      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 R13 ZZ mov     [r14], rax 
             40b093      3 INSTR BELONGTO 40aec0 
             40b093      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 R13 ZZ mov     rdx, [rbx] 
-            40b096     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40b096     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40b096      5 INSTR BELONGTO 40aec0 
             40b096      5 INSTR DEADREGS  EFLAGS RCX RDI R12 R13 ZZ mov     ecx, 1 
             40b09b     -1 INSTR LOCAL NoMetaUpdate test    rdx, rdx 
@@ -13606,18 +13606,18 @@
             40b0c3      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], 0
             40b0cc     -1 INSTR LOCAL NoMetaUpdate call    sub_40AEC0 
             40b0d4     -1 INSTR LOCAL NoMetaUpdate call    _g_key_file_new 
-            40b0e6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b0e6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b0e8     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
-            40b0f7     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40b0fc     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-            40b101     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b0f7     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40b0fc     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40b101     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b103     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40b10b     -1 INSTR LOCAL NoMetaUpdate test    rcx, rcx 
             40b10e     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40B139 
-            40b11f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40b121     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b11f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40b121     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b123     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     r14, 8 
-            40b127     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40b127     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             40b12c     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40b134     -1 INSTR LOCAL NoMetaUpdate test    rcx, rcx 
             40b137     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40B118 
@@ -13629,9 +13629,9 @@
             40b152      5 PTRIMMEDESP STACK 8 displ mov     rcx, [rsp+8]
             40b157     -1 INSTR LOCAL NoMetaUpdate test    rcx, rcx 
             40b15a     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40B1A8 
-            40b163     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40b165     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            40b167     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40b163     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40b165     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            40b167     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             40b16c     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40b171     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rsp+8], 0 
             40b171      6 PTRIMMEDESP STACK 8 displ cmp     qword ptr [rsp+8], 0
@@ -13644,7 +13644,7 @@
             40b196     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
             40b1a8      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40b1ab     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
-            40b1ba     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b1ba     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b1bc     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40b1c1      5 PTRIMMEDESP STACK 8 displ lea     rcx, [rsp+8]
             40b1c6     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
@@ -13653,9 +13653,9 @@
             40b1dd      5 PTRIMMEDESP STACK 8 displ mov     rcx, [rsp+8]
             40b1e2     -1 INSTR LOCAL NoMetaUpdate test    rcx, rcx 
             40b1e5     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40B179 
-            40b1ee     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-            40b1f3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40b1f5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b1ee     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40b1f3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40b1f5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b1f7     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40b1fc     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40B179 
             40b210      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -13678,7 +13678,7 @@
             40b227      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strcmp0 
             40b22c      2 INSTR BELONGTO 40b210 
             40b22c      2 INSTR DEADREGS  EFLAGS RDX R8 R9 R10 R11 ZZ xor     edx, edx 
-            40b22c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b22c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b22e     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40b22e      2 INSTR BELONGTO 40b210 
             40b230      8 INSTR BELONGTO 40b210 
@@ -13731,7 +13731,7 @@
             40b290      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbp 
             40b290     -3 INSTR LOCAL NoWarn push    rbp 
             40b290     92 FUNC GLOBAL sub_40B290 FUNC_UNSAFE NOFP RET             40b2eb 
-            40b291     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40b291     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40b291      5 INSTR BELONGTO 40b290 
             40b291      5 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, 1 
             40b296      1 INSTR BELONGTO 40b290 
@@ -13777,7 +13777,7 @@
             40b2cd      2 INSTR BELONGTO 40b290 
             40b2cf      2 INSTR BELONGTO 40b290 
             40b2cf      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40b2cf     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b2cf     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b2d1     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             40b2d1      4 INSTR BELONGTO 40b290 
             40b2d5      1 INSTR BELONGTO 40b290 
@@ -13788,7 +13788,7 @@
             40b2d7      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             40b2e0     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             40b2e0      4 INSTR BELONGTO 40b290 
-            40b2e4     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40b2e4     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40b2e4      5 INSTR BELONGTO 40b290 
             40b2e4      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
             40b2e4      8 DEALLOC STACK esp - 8 mov     eax, 1
@@ -13829,25 +13829,25 @@
             40b38d     -1 INSTR LOCAL NoMetaUpdate jz      loc_40B4C8 
             40b393     -1 INSTR LOCAL NoMetaUpdate test    ebp, ebp 
             40b39f     -1 INSTR LOCAL NoMetaUpdate jz      loc_40B458 
-            40b3a5     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40b3a7     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40b3a9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40b3ab     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
-            40b3b0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b3a5     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b3a7     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40b3a9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40b3ab     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            40b3b0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b3b2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
-            40b3c1     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40b3c6     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b3c1     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40b3c6     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b3c8     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40b3d0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_type 
             40b3d5      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40b3de     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40b3e3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF9h 
+            40b3e3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF9h 
             40b3ee     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_button 
             40b3f6     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40b3fb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             40b400      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40b406     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40b40b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40b40b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40b413     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_position 
             40b41b      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40b41e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -13859,17 +13859,17 @@
             40b43a     -1 INSTR LOCAL NoMetaUpdate jz      loc_40B511 
             40b440     -1 INSTR LOCAL NoMetaUpdate call    _gtk_main_quit 
             40b445     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 0D8h 
-            40b458     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
-            40b45d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
-            40b462     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40b464     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40b466     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b458     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            40b45d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            40b462     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40b464     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40b466     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b468     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             40b473     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40b478     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             40b47d      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40b483     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40b488     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40b488     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40b490     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_position 
             40b495     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_type 
             40b49a      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -13878,21 +13878,21 @@
             40b4ad      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40b4b0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_destroy 
             40b4b5     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 0D8h 
-            40b4c8     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40b4ca     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b4c8     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40b4ca     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b4cc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_init_check 
             40b4d1     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40b4d3     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40B393 
-            40b4e0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40b4e5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b4e0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40b4e5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b4e7     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            40b4ef     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b4ef     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b4f1     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
-            40b500     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b500     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b502     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
-            40b507     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40b507     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40b50c     -1 INSTR LOCAL NoMetaUpdate call    _exit 
-            40b511     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40b511     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40b516     -1 INSTR LOCAL NoMetaUpdate call    _exit 
             40b520      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], rbx
             40b525      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbp
@@ -13902,10 +13902,10 @@
             40b540     -1 INSTR LOCAL NoMetaUpdate jz      loc_40B5D8 
             40b559     -2 INSTR LOCAL n R13 ZZ  NUMVia2ndSrcIMMEDNUM mov     r13d, 68DB8BADh 
             40b55f      5 PTRIMMEDESP STACK 16 displ lea     rdi, [rsp+10h]
-            40b564     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40b564     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40b566     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     ecx, 1 
-            40b56b     -2 INSTR LOCAL n EAX EDX ZZ  AlwaysNUM imul    r13d 
-            40b570     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM sar     eax, 1Fh 
+            40b56b     -2 INSTR LOCAL n RAX RDX ZZ  AlwaysNUM imul    r13d 
+            40b570     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM sar     eax, 1Fh 
             40b576     -2 INSTR LOCAL n R13 ZZ  AlwaysNUM sar     r13d, 0Ch 
             40b57d     -2 INSTR LOCAL n R13 ZZ  AlwaysNUM imul    r13d, 2710h 
             40b590     -1 INSTR LOCAL NoMetaUpdate call    _gettimeofday 
@@ -13913,7 +13913,7 @@
             40b59a      5 PTRIMMEDESP STACK 16 displ mov     rcx, [rsp+10h]
             40b5a6     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM movsxd  r9, r12d 
             40b5a9      2 PTRIMMEDEBP STACK 0 displ mov     edx, ebp
-            40b5ad     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b5ad     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b5af      4 PTRIMMEDESP STACK 0 displ mov     [rsp], r13d
             40b5b3     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40b5b8      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
@@ -13927,13 +13927,13 @@
             40b604     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40B553 
             40b610      5 PTRIMMEDESP STACK -40 displ mov     [rsp-28h], rbx
             40b615      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], rbp
-            40b61a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b61a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40b61f      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], r12
             40b624      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r13
             40b62c      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r14
             40b638     -1 INSTR LOCAL NoMetaUpdate call    _g_setenv 
             40b63d      5 PTRIMMEDESP STACK 24 displ lea     rsi, [rsp+18h]
-            40b642     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b642     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b644      9 PTRIMMEDESP STACK 24 displ mov     qword ptr [rsp+18h], 0
             40b64d     -1 INSTR LOCAL NoMetaUpdate call    _dbus_g_bus_get 
             40b652     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
@@ -13946,12 +13946,12 @@
             40b696     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_new 
             40b6a1      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40b6a7     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_insert 
-            40b6b3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40h 
-            40b6b8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
+            40b6b3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40h 
+            40b6b8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
             40b6bd     -1 INSTR LOCAL NoMetaUpdate call    _dbus_g_type_get_map 
             40b6c2      5 PTRIMMEDESP STACK 24 displ lea     rdx, [rsp+18h]
             40b6ce     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
-            40b6da     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b6da     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b6dc      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], 0
             40b6e4     -1 INSTR LOCAL NoMetaUpdate call    _dbus_g_proxy_call 
             40b6ec     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
@@ -13969,18 +13969,18 @@
             40b71d      5 PTRIMMEDESP STACK 64 displ mov     r14, [rsp+40h]
             40b722     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
             40b730      5 PTRIMMEDESP STACK 24 displ mov     rax, [rsp+18h]
-            40b73c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b73c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b741      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-            40b744     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            40b74d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b744     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40b74d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b74f     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40b754      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+18h]
             40b759     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
             40b75e     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40B709 
             40b76a     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40b76c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40B78A 
-            40b775     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 80h 
-            40b77a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40b775     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 80h 
+            40b77a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             40b77f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_size_register 
             40b78a     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             40b790      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -14031,7 +14031,7 @@
             40b7d8      2 INSTR BELONGTO 40b790 
             40b7da      2 INSTR BELONGTO 40b790 
             40b7da      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            40b7da     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40b7da     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40b7dc      4 INSTR BELONGTO 40b790 
             40b7e0      3 INSTR BELONGTO 40b790 
             40b7e0      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 328e8566..051696ee 100644
--- a/tests/commit/trimmed-sorted-save-gnome-session-quit.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-session-quit.psexe.annot
@@ -233,7 +233,7 @@
             40096f      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R8 ZZ xor     r8d, r8d 
             400972      2 INSTR BELONGTO 400930 
             400972      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI ZZ xor     edx, edx 
-            400972     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            400972     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             400974      5 INSTR BELONGTO 400930 
             400974      5 INSTR DEADREGS  EFLAGS RCX RBX RSI ZZ mov     ecx, offset off_6020A0 
             400979      3 INSTR BELONGTO 400930 
@@ -263,8 +263,8 @@
             4009a8      2 INSTR BELONGTO 400930 
             4009aa      2 INSTR BELONGTO 400930 
             4009aa      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edi, edi        ; domainname 
-            4009aa     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            4009ac     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4009aa     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4009ac     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4009ac      5 INSTR BELONGTO 400930 
             4009ac      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, 5          ; category 
             4009b1      5 INSTR BELONGTO 400930 
@@ -278,7 +278,7 @@
             4009c0      3 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     rsi, rax 
             4009c3      2 INSTR BELONGTO 400930 
             4009c3      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            4009c3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4009c3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4009c5     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             4009c5      5 INSTR BELONGTO 400930 
             4009c5      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_printerr 
@@ -303,14 +303,14 @@
             4009e5      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 ZZ xor     r8d, r8d 
             4009e8      2 INSTR BELONGTO 400930 
             4009e8      2 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ xor     ecx, ecx 
-            4009e8     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4009e8     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4009ea      3 INSTR BELONGTO 400930 
             4009ea      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rax 
             4009ed      5 INSTR BELONGTO 400930 
             4009ed      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, offset aShutdown; "Shutdown" 
             4009f2      2 INSTR BELONGTO 400930 
             4009f2      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4009f2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4009f2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4009f4      9 INSTR BELONGTO 400930 
             4009f4      9 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+28h+var_10], 0 
             4009f4      9 PTRIMMEDESP STACK 24 displ mov     [rsp+28h+var_10], 0
@@ -331,15 +331,15 @@
             400a10      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, [rax+8] 
             400a14      2 INSTR BELONGTO 400930 
             400a14      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     edi, edi 
-            400a14     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            400a14     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             400a16      5 INSTR BELONGTO 400930 
             400a16      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aFailedToCallSh; "Failed to call shutdown: %s" 
-            400a1b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            400a1b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             400a1b      5 INSTR BELONGTO 400930 
             400a1b      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 10h 
             400a20      2 INSTR BELONGTO 400930 
             400a20      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            400a20     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            400a20     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             400a22     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             400a22      5 INSTR BELONGTO 400930 
             400a22      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -367,7 +367,7 @@
             400a51      2 INSTR BELONGTO 400930 
             400a53      2 INSTR BELONGTO 400930 
             400a53      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            400a53     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            400a53     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             400a55     -1 INSTR LOCAL NoMetaUpdate call    sub_400C70 
             400a55      5 INSTR BELONGTO 400930 
             400a55      5 INSTR DEADREGS  EFLAGS RBX ZZ call    sub_400C70 
@@ -375,13 +375,13 @@
             400a5a      4 INSTR BELONGTO 400930 
             400a5e      2 INSTR BELONGTO 400930 
             400a5e      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            400a5e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            400a5e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             400a5e     32 DEALLOC STACK esp - 32 xor     eax, eax
             400a60      1 INSTR BELONGTO 400930 
             400a60      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             400a61      1 INSTR BELONGTO 400930 
             400a61      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-            400a62     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            400a62     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             400a62      5 INSTR BELONGTO 400930 
             400a62      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 1 
             400a67     -1 INSTR LOCAL NoMetaUpdate call    sub_400C70 
@@ -389,7 +389,7 @@
             400a67      5 INSTR DEADREGS  EFLAGS RBX ZZ call    sub_400C70 
             400a6c     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_400A5A 
             400a6c      2 INSTR BELONGTO 400930 
-            400a6e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            400a6e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             400a6e      5 INSTR BELONGTO 400930 
             400a6e      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 2 
             400a73     -1 INSTR LOCAL NoMetaUpdate call    sub_400C70 
@@ -399,15 +399,15 @@
             400a78      2 INSTR BELONGTO 400930 
             400a7a      5 INSTR BELONGTO 400930 
             400a7a      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edx, offset aFailedToCall_0; "Failed to call shutdown" 
-            400a7f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            400a7f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             400a7f      5 INSTR BELONGTO 400930 
             400a7f      5 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     esi, 10h 
             400a84      2 INSTR BELONGTO 400930 
             400a84      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ xor     edi, edi 
-            400a84     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            400a84     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             400a86      2 INSTR BELONGTO 400930 
             400a86      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            400a86     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            400a86     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             400a88     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             400a88      5 INSTR BELONGTO 400930 
             400a88      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -417,17 +417,17 @@
             400a8f      5 INSTR BELONGTO 400930 
             400a94      5 INSTR BELONGTO 400930 
             400a94      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     edx, offset aUnableToStartS; "Unable to start: %s" 
-            400a99     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            400a99     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             400a99      5 INSTR BELONGTO 400930 
             400a99      5 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI ZZ mov     esi, 10h 
             400a9e      2 INSTR BELONGTO 400930 
             400a9e      2 INSTR DEADREGS  EFLAGS RCX RBX RDI ZZ xor     edi, edi 
-            400a9e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            400a9e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             400aa0      4 INSTR BELONGTO 400930 
             400aa0      4 INSTR DEADREGS  EFLAGS RCX RBX ZZ mov     rcx, [rax+8] 
             400aa4      2 INSTR BELONGTO 400930 
             400aa4      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            400aa4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            400aa4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             400aa6     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             400aa6      5 INSTR BELONGTO 400930 
             400aa6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -567,7 +567,7 @@
             400b89      3 INSTR BELONGTO 400b80 
             400b8c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_400BA0 
             400b8c      2 INSTR BELONGTO 400b80 
-            400b8e     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            400b8e     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             400b8e      5 INSTR BELONGTO 400b80 
             400b93     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             400b93      3 INSTR BELONGTO 400b80 
@@ -587,7 +587,7 @@
             400bb0     -3 INSTR LOCAL NoWarn push    rbx 
             400bb1      2 INSTR BELONGTO 400bb0 
             400bb1      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     edi, edi 
-            400bb1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            400bb1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             400bb3     16 DATAREF STACK 89 esp + 0 PARENT LocalFrame LOCALFRAME
             400bb3      4 INSTR BELONGTO 400bb0 
             400bb3      4 INSTR DEADREGS  EFLAGS RBX RSI ZZ sub     rsp, 10h 
@@ -636,20 +636,20 @@
             400bf5      5 INSTR BELONGTO 400bb0 
             400bfa      5 INSTR BELONGTO 400bb0 
             400bfa      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     edx, offset aCouldnTConnect; "Couldn't connect to session bus: %s" 
-            400bff     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            400bff     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             400bff      5 INSTR BELONGTO 400bb0 
             400bff      5 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI ZZ mov     esi, 10h 
             400c04      2 INSTR BELONGTO 400bb0 
             400c04      2 INSTR DEADREGS  EFLAGS RCX RBX RDI ZZ xor     edi, edi 
-            400c04     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            400c04     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             400c06      2 INSTR BELONGTO 400bb0 
             400c06      2 INSTR DEADREGS  EFLAGS RCX RBX ZZ xor     ebx, ebx 
-            400c06     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            400c06     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             400c08      4 INSTR BELONGTO 400bb0 
             400c08      4 INSTR DEADREGS  EFLAGS RCX ZZ mov     rcx, [rax+8] 
             400c0c      2 INSTR BELONGTO 400bb0 
             400c0c      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            400c0c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            400c0c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             400c0e     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             400c0e      5 INSTR BELONGTO 400bb0 
             400c0e      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -658,7 +658,7 @@
             400c18     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
             400c18      5 INSTR BELONGTO 400bb0 
             400c18      5 INSTR DEADREGS  EFLAGS ZZ call    _g_error_free 
-            400c1d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            400c1d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             400c1d      5 INSTR BELONGTO 400bb0 
             400c1d      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             400c22      5 INSTR BELONGTO 400bb0 
@@ -674,7 +674,7 @@
             400c33      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, rax 
             400c36      2 INSTR BELONGTO 400bb0 
             400c36      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            400c36     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            400c36     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             400c38     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             400c38      5 INSTR BELONGTO 400bb0 
             400c38      5 INSTR DEADREGS  EFLAGS ZZ call    _g_printerr 
@@ -682,8 +682,8 @@
             400c3d      2 INSTR BELONGTO 400bb0 
             400c3f      2 INSTR BELONGTO 400bb0 
             400c3f      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edi, edi        ; domainname 
-            400c3f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            400c41     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            400c3f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            400c41     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             400c41      5 INSTR BELONGTO 400bb0 
             400c41      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             400c46      5 INSTR BELONGTO 400bb0 
@@ -697,7 +697,7 @@
             400c55      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, rax 
             400c58      2 INSTR BELONGTO 400bb0 
             400c58      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            400c58     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            400c58     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             400c5a     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             400c5a      5 INSTR BELONGTO 400bb0 
             400c5a      5 INSTR DEADREGS  EFLAGS ZZ call    _g_printerr 
@@ -711,7 +711,7 @@
             400c70     -3 INSTR LOCAL NoWarn push    rbp 
             400c71      2 INSTR BELONGTO 400c70 
             400c71      2 INSTR DEADREGS  EFLAGS RSI ZZ mov     ebp, edi 
-            400c71     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, edi 
+            400c71     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     ebp, edi 
             400c73      1 INSTR BELONGTO 400c70 
             400c73      1 INSTR DEADREGS  EFLAGS RSI RDI ZZ push    rbx 
             400c73     -3 INSTR LOCAL NoWarn push    rbx 
@@ -743,8 +743,8 @@
             400c90      3 INSTR DEADREGS  EFLAGS RAX RCX RSI R8 ZZ mov     r8d, ebp 
             400c93      2 INSTR BELONGTO 400c70 
             400c93      2 INSTR DEADREGS  EFLAGS RAX RCX RSI ZZ xor     eax, eax 
-            400c93     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            400c95     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1Ch 
+            400c93     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            400c95     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1Ch 
             400c95      5 INSTR BELONGTO 400c70 
             400c95      5 INSTR DEADREGS  EFLAGS RCX RSI ZZ mov     ecx, 1Ch 
             400c9a      5 INSTR BELONGTO 400c70 
@@ -772,15 +772,15 @@
             400cc3      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, [rax+8] 
             400cc7      2 INSTR BELONGTO 400c70 
             400cc7      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     edi, edi 
-            400cc7     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            400cc7     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             400cc9      5 INSTR BELONGTO 400c70 
             400cc9      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aFailedToCallLo; "Failed to call logout: %s" 
-            400cce     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            400cce     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             400cce      5 INSTR BELONGTO 400c70 
             400cce      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 10h 
             400cd3      2 INSTR BELONGTO 400c70 
             400cd3      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            400cd3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            400cd3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             400cd5     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             400cd5      5 INSTR BELONGTO 400c70 
             400cd5      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -805,15 +805,15 @@
             400cf2      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             400cf3      5 INSTR BELONGTO 400c70 
             400cf3      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edx, offset aFailedToCall_1; "Failed to call logout" 
-            400cf8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            400cf8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             400cf8      5 INSTR BELONGTO 400c70 
             400cf8      5 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     esi, 10h 
             400cfd      2 INSTR BELONGTO 400c70 
             400cfd      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ xor     edi, edi 
-            400cfd     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            400cfd     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             400cff      2 INSTR BELONGTO 400c70 
             400cff      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            400cff     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            400cff     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             400d01     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             400d01      5 INSTR BELONGTO 400c70 
             400d01      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -867,7 +867,7 @@
             400d58      2 INSTR BELONGTO 400d10 
             400d5a      2 INSTR BELONGTO 400d10 
             400d5a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            400d5a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            400d5a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             400d5c      4 INSTR BELONGTO 400d10 
             400d60      3 INSTR BELONGTO 400d10 
             400d60      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 30191524..3252f8a0 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 @@
-14579558cadece27fa28e482acb0a51e9680887c
\ No newline at end of file
+8968a265e51e9777bd10d1a0b10e08bd7039ff3f
\ 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 d355135f..258cb349 100644
--- a/tests/commit/trimmed-sorted-save-gnome-settings-daemon.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-settings-daemon.psexe.annot
@@ -1142,7 +1142,7 @@
             403642      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _textdomain 
             403647      5 INSTR BELONGTO 403610 
             403647      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, (offset aIgnoringUnknow+1Ch); locale 
-            40364c     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
+            40364c     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
             40364c      5 INSTR BELONGTO 403610 
             40364c      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 6          ; category 
             403651     -1 INSTR LOCAL NoMetaUpdate call    _setlocale 
@@ -1155,7 +1155,7 @@
             403658      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_option_context_new 
             40365d      2 INSTR BELONGTO 403610 
             40365d      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edx, edx 
-            40365d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40365d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40365f      5 INSTR BELONGTO 403610 
             40365f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset off_6083E0 
             403664      3 INSTR BELONGTO 403610 
@@ -1167,7 +1167,7 @@
             40366a      5 INSTR DEADREGS  EFLAGS ZZ call    _g_option_context_add_main_entries 
             40366f      2 INSTR BELONGTO 403610 
             40366f      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40366f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40366f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403671     -1 INSTR LOCAL NoMetaUpdate call    _gtk_get_option_group 
             403671      5 INSTR BELONGTO 403610 
             403671      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_get_option_group 
@@ -1212,7 +1212,7 @@
             4036b9      2 INSTR BELONGTO 403610 
             4036bb      2 INSTR BELONGTO 403610 
             4036bb      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edx, edx 
-            4036bb     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4036bb     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4036bd      5 INSTR BELONGTO 403610 
             4036bd      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aAll; "all" 
             4036c2      5 INSTR BELONGTO 403610 
@@ -1225,10 +1225,10 @@
             4036cc      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_init 
             4036d1      2 INSTR BELONGTO 403610 
             4036d1      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            4036d1     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4036d1     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4036d3      2 INSTR BELONGTO 403610 
             4036d3      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            4036d3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4036d3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4036d5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_init_check 
             4036d5      5 INSTR BELONGTO 403610 
             4036d5      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _gtk_init_check 
@@ -1238,8 +1238,8 @@
             4036dc      6 INSTR BELONGTO 403610 
             4036e2      2 INSTR BELONGTO 403610 
             4036e2      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            4036e2     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            4036e4     -2 INSTR LOCAL n EDI ZZ  NumericDEFs mov     edi, offset loc_403CB0 
+            4036e2     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            4036e4     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     edi, offset loc_403CB0 
             4036e4      5 INSTR BELONGTO 403610 
             4036e4      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, offset loc_403CB0 
             4036e9     -1 INSTR LOCAL NoMetaUpdate call    _g_log_set_default_handler 
@@ -1252,11 +1252,11 @@
             4036f3      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _notify_init 
             4036f8      2 INSTR BELONGTO 403610 
             4036f8      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edx, edx 
-            4036f8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4036f8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4036fa      2 INSTR BELONGTO 403610 
             4036fa      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            4036fa     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            4036fc     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            4036fa     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            4036fc     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             4036fc      5 INSTR BELONGTO 403610 
             4036fc      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 2 
             403701     -1 INSTR LOCAL NoMetaUpdate call    _g_bus_get_sync 
@@ -1275,10 +1275,10 @@
             403718      5 PTRIMMEDESP STACK 40 displ lea     rax, [rsp+48h+var_20]
             40371d      2 INSTR BELONGTO 403610 
             40371d      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     edx, edx 
-            40371d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40371d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40371f      2 INSTR BELONGTO 403610 
             40371f      2 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 ZZ xor     esi, esi 
-            40371f     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40371f     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             403721      6 INSTR BELONGTO 403610 
             403721      6 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8d, offset aOrgGnomeSessio; "/org/gnome/SessionManager" 
             403727      3 INSTR BELONGTO 403610 
@@ -1307,7 +1307,7 @@
             403753      3 INSTR BELONGTO 403610 
             403756     -1 INSTR LOCAL NoMetaUpdate jz      loc_403882 
             403756      6 INSTR BELONGTO 403610 
-            40375c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40375c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40375c      5 INSTR BELONGTO 403610 
             40375c      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 50h 
             403761      3 INSTR BELONGTO 403610 
@@ -1317,8 +1317,8 @@
             403764      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_check_instance_cast 
             403769      2 INSTR BELONGTO 403610 
             403769      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 ZZ xor     ecx, ecx 
-            403769     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40376b     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_403E20 
+            403769     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40376b     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_403E20 
             40376b      5 INSTR BELONGTO 403610 
             40376b      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 ZZ mov     edx, offset sub_403E20 
             403770      5 INSTR BELONGTO 403610 
@@ -1336,24 +1336,24 @@
             40377e      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_signal_connect_data 
             403783      2 INSTR BELONGTO 403610 
             403783      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ xor     ecx, ecx 
-            403783     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403783     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403785      3 INSTR BELONGTO 403610 
             403785      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rdx, rbp 
-            403788     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_403CD0 
+            403788     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_403CD0 
             403788      5 INSTR BELONGTO 403610 
             403788      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset sub_403CD0 
             40378d      2 INSTR BELONGTO 403610 
             40378d      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            40378d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40378d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40378f     -1 INSTR LOCAL NoMetaUpdate call    _g_idle_add_full 
             40378f      5 INSTR BELONGTO 403610 
             40378f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_idle_add_full 
             403794      2 INSTR BELONGTO 403610 
             403794      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 ZZ xor     ecx, ecx 
-            403794     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403794     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403796      2 INSTR BELONGTO 403610 
             403796      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 ZZ xor     edx, edx 
-            403796     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            403796     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             403798     -2 INSTR LOCAL n R9 ZZ  NumericDEFs mov     r9d, offset sub_403C10 
             403798      6 INSTR BELONGTO 403610 
             403798      6 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 ZZ mov     r9d, offset sub_403C10 
@@ -1362,7 +1362,7 @@
             40379e      6 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 ZZ mov     r8d, offset sub_403E70 
             4037a4      5 INSTR BELONGTO 403610 
             4037a4      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aOrg_gnome_sett; "org.gnome.SettingsDaemon" 
-            4037a9     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            4037a9     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             4037a9      5 INSTR BELONGTO 403610 
             4037a9      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 2 
             4037ae     -1 INSTR LOCAL MetadataUnused mov     [rsp+48h+var_40], 0 
@@ -1404,15 +1404,15 @@
             4037fc      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _gtk_main 
             403801      5 INSTR BELONGTO 403610 
             403801      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     edx, offset aShuttingDown; "Shutting down" 
-            403806     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            403806     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             403806      5 INSTR BELONGTO 403610 
             403806      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     esi, 80h 
             40380b      2 INSTR BELONGTO 403610 
             40380b      2 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ xor     edi, edi 
-            40380b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40380b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40380d      2 INSTR BELONGTO 403610 
             40380d      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40380d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40380d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40380f     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40380f      5 INSTR BELONGTO 403610 
             40380f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -1433,15 +1433,15 @@
             40382a      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_object_unref 
             40382f      2 INSTR BELONGTO 403610 
             40382f      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ xor     eax, eax 
-            40382f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40382f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403831      5 INSTR BELONGTO 403610 
             403831      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, offset aSettingsdaemon; "SettingsDaemon finished" 
-            403836     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            403836     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             403836      5 INSTR BELONGTO 403610 
             403836      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 80h 
             40383b      2 INSTR BELONGTO 403610 
             40383b      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            40383b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40383b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40383d     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40383d      5 INSTR BELONGTO 403610 
             40383d      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -1449,7 +1449,7 @@
             403842      4 INSTR BELONGTO 403610 
             403846      2 INSTR BELONGTO 403610 
             403846      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            403846     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403846     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403846     56 DEALLOC STACK esp - 56 xor     eax, eax
             403848      1 INSTR BELONGTO 403610 
             403848      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
@@ -1466,11 +1466,11 @@
             40385a      2 INSTR BELONGTO 403610 
             40385c      2 INSTR BELONGTO 403610 
             40385c      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edx, edx 
-            40385c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40385e     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_403C60 
+            40385c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40385e     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_403C60 
             40385e      5 INSTR BELONGTO 403610 
             40385e      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset sub_403C60 
-            403863     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Eh 
+            403863     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Eh 
             403863      5 INSTR BELONGTO 403610 
             403863      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 1Eh 
             403868     -1 INSTR LOCAL NoMetaUpdate call    _g_timeout_add_seconds 
@@ -1480,12 +1480,12 @@
             40386d      2 INSTR BELONGTO 403610 
             40386f      5 INSTR BELONGTO 403610 
             40386f      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, offset aUnableToRegist; "Unable to register object" 
-            403874     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            403874     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             403874      5 INSTR BELONGTO 403610 
             403874      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 10h 
             403879      2 INSTR BELONGTO 403610 
             403879      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            403879     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403879     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40387b     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40387b      5 INSTR BELONGTO 403610 
             40387b      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -1495,17 +1495,17 @@
             403882      5 INSTR BELONGTO 403610 
             403887      2 INSTR BELONGTO 403610 
             403887      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ xor     edi, edi 
-            403887     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403887     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403889      5 INSTR BELONGTO 403610 
             403889      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI ZZ mov     edx, offset aCouldNotConnec; "Could not connect to the Session manage"... 
-            40388e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40388e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             40388e      5 INSTR BELONGTO 403610 
             40388e      5 INSTR DEADREGS  EFLAGS RCX RBX RSI ZZ mov     esi, 80h 
             403893      4 INSTR BELONGTO 403610 
             403893      4 INSTR DEADREGS  EFLAGS RCX RBX ZZ mov     rcx, [rax+8] 
             403897      2 INSTR BELONGTO 403610 
             403897      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            403897     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403897     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403899     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403899      5 INSTR BELONGTO 403610 
             403899      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -1535,17 +1535,17 @@
             4038cf      5 INSTR BELONGTO 403610 
             4038d4      2 INSTR BELONGTO 403610 
             4038d4      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ xor     edi, edi 
-            4038d4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4038d4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4038d6      5 INSTR BELONGTO 403610 
             4038d6      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI ZZ mov     edx, offset aUnableToStartS; "Unable to start: %s" 
-            4038db     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4038db     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             4038db      5 INSTR BELONGTO 403610 
             4038db      5 INSTR DEADREGS  EFLAGS RCX RBX RSI ZZ mov     esi, 10h 
             4038e0      4 INSTR BELONGTO 403610 
             4038e0      4 INSTR DEADREGS  EFLAGS RCX RBX ZZ mov     rcx, [rax+8] 
             4038e4      2 INSTR BELONGTO 403610 
             4038e4      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            4038e4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4038e4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4038e6     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4038e6      5 INSTR BELONGTO 403610 
             4038e6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -1558,16 +1558,16 @@
             4038f5      5 INSTR BELONGTO 403610 
             4038fa      5 INSTR BELONGTO 403610 
             4038fa      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, offset aUnableToInitia; "Unable to initialize GTK+" 
-            4038ff     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4038ff     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             4038ff      5 INSTR BELONGTO 403610 
             4038ff      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 10h 
             403904      2 INSTR BELONGTO 403610 
             403904      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            403904     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403904     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403906     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403906      5 INSTR BELONGTO 403610 
             403906      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
-            40390b     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
+            40390b     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
             40390b      5 INSTR BELONGTO 403610 
             40390b      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 1          ; status 
             403910     -1 INSTR LOCAL NoMetaUpdate call    _exit 
@@ -1583,15 +1583,15 @@
             40391f      4 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     rcx, [rax+8] 
             403923      2 INSTR BELONGTO 403610 
             403923      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ xor     edi, edi 
-            403923     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403923     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403925      5 INSTR BELONGTO 403610 
             403925      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     edx, (offset aWrongIageInFil+14h); "%s" 
-            40392a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40392a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40392a      5 INSTR BELONGTO 403610 
             40392a      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 10h 
             40392f      2 INSTR BELONGTO 403610 
             40392f      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40392f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40392f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403931     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403931      5 INSTR BELONGTO 403610 
             403931      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -1604,15 +1604,15 @@
             403940      2 INSTR BELONGTO 403610 
             403942      5 INSTR BELONGTO 403610 
             403942      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     edx, offset aUnableToInitia; "Unable to initialize GTK+" 
-            403947     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            403947     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             403947      5 INSTR BELONGTO 403610 
             403947      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     esi, 10h 
             40394c      2 INSTR BELONGTO 403610 
             40394c      2 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ xor     edi, edi 
-            40394c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40394c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40394e      2 INSTR BELONGTO 403610 
             40394e      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40394e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40394e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403950     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403950      5 INSTR BELONGTO 403610 
             403950      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -1744,7 +1744,7 @@
             403a19      3 INSTR BELONGTO 403a10 
             403a1c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_403A30 
             403a1c      2 INSTR BELONGTO 403a10 
-            403a1e     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            403a1e     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             403a1e      5 INSTR BELONGTO 403a10 
             403a23     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             403a23      3 INSTR BELONGTO 403a10 
@@ -1766,14 +1766,14 @@
             403a41      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     edx, (offset aIgnoringUnknow+1Ch); "" 
             403a46      3 INSTR BELONGTO 403a40 
             403a46      3 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     rbx, rdi 
-            403a49     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403a49     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403a49      5 INSTR BELONGTO 403a40 
             403a49      5 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     esi, 1 
             403a4e      5 INSTR BELONGTO 403a40 
             403a4e      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aBs ; "(bs)" 
             403a53      2 INSTR BELONGTO 403a40 
             403a53      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            403a53     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403a53     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403a55     16 DATAREF STACK 385 esp + 0 PARENT LocalFrame LOCALFRAME
             403a55     16 DATAREF STACK 386 esp + 0 CHILDOF 385 OFFSET 0 OutArgsRegion OUTARGS
             403a55      4 INSTR BELONGTO 403a40 
@@ -1793,7 +1793,7 @@
             403a64      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R8 ZZ mov     r8d, 0FFFFFFFFh 
             403a6a      2 INSTR BELONGTO 403a40 
             403a6a      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI ZZ xor     ecx, ecx 
-            403a6a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403a6a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403a6c      3 INSTR BELONGTO 403a40 
             403a6c      3 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     rdx, rax 
             403a6f      5 INSTR BELONGTO 403a40 
@@ -1871,15 +1871,15 @@
             403adb      4 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     rcx, [rax+8] 
             403adf      5 INSTR BELONGTO 403a90 
             403adf      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     edx, offset aUnableToRegi_0; "Unable to register client: %s" 
-            403ae4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            403ae4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             403ae4      5 INSTR BELONGTO 403a90 
             403ae4      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     esi, 10h 
             403ae9      2 INSTR BELONGTO 403a90 
             403ae9      2 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ xor     edi, edi 
-            403ae9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403ae9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403aeb      2 INSTR BELONGTO 403a90 
             403aeb      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            403aeb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403aeb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403aed     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403aed      5 INSTR BELONGTO 403a90 
             403aed      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -1905,7 +1905,7 @@
             403b10      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, offset aO  ; "(o)" 
             403b15      2 INSTR BELONGTO 403a90 
             403b15      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            403b15     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403b15     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403b17     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_get 
             403b17      5 INSTR BELONGTO 403a90 
             403b17      5 INSTR DEADREGS  EFLAGS ZZ call    _g_variant_get 
@@ -1915,15 +1915,15 @@
             403b1c      5 PTRIMMEDESP STACK 40 displ mov     rcx, [rsp+48h+var_20]
             403b21      5 INSTR BELONGTO 403a90 
             403b21      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edx, offset aRegisteredClie; "Registered client at path %s" 
-            403b26     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            403b26     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             403b26      5 INSTR BELONGTO 403a90 
             403b26      5 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     esi, 80h 
             403b2b      2 INSTR BELONGTO 403a90 
             403b2b      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ xor     edi, edi 
-            403b2b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403b2b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403b2d      2 INSTR BELONGTO 403a90 
             403b2d      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            403b2d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403b2d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403b2f     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403b2f      5 INSTR BELONGTO 403a90 
             403b2f      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -1938,7 +1938,7 @@
             403b46      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aOrg_gnome_sess; "org.gnome.SessionManager" 
             403b4b      2 INSTR BELONGTO 403a90 
             403b4b      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            403b4b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            403b4b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             403b4d     -1 INSTR LOCAL MetadataRedundant xor     esi, esi 
             403b4d      2 INSTR BELONGTO 403a90 
             403b4f     -1 INSTR LOCAL MetadataRedundant mov     edi, 2 
@@ -2000,17 +2000,17 @@
             403bb2      2 INSTR BELONGTO 403b90 
             403bb4      4 INSTR BELONGTO 403b90 
             403bb4      4 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ mov     rcx, [rdx+8] 
-            403bb8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            403bb8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             403bb8      5 INSTR BELONGTO 403b90 
             403bb8      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     esi, 80h 
             403bbd      5 INSTR BELONGTO 403b90 
             403bbd      5 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ mov     edx, offset aUnableToGetThe; "Unable to get the session client proxy:"... 
             403bc2      2 INSTR BELONGTO 403b90 
             403bc2      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ xor     edi, edi 
-            403bc2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403bc2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403bc4      2 INSTR BELONGTO 403b90 
             403bc4      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            403bc4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403bc4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403bc6     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403bc6      5 INSTR BELONGTO 403b90 
             403bc6      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -2031,7 +2031,7 @@
             403bea     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             403bea      3 INSTR BELONGTO 403b90 
             403bea      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 ZZ xor     r8d, r8d 
-            403bed     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_403D60 
+            403bed     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_403D60 
             403bed      5 INSTR BELONGTO 403b90 
             403bed      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset loc_403D60 
             403bf2      5 INSTR BELONGTO 403b90 
@@ -2055,15 +2055,15 @@
             403c10      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             403c14      5 INSTR BELONGTO 403c10 
             403c14      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edx, offset aNameTakenOrBus; "Name taken or bus went away - shutting "... 
-            403c19     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            403c19     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             403c19      5 INSTR BELONGTO 403c10 
             403c19      5 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     esi, 10h 
             403c1e      2 INSTR BELONGTO 403c10 
             403c1e      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ xor     edi, edi 
-            403c1e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403c1e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403c20      2 INSTR BELONGTO 403c10 
             403c20      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            403c20     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403c20     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403c22     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403c22      5 INSTR BELONGTO 403c10 
             403c22      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -2082,15 +2082,15 @@
             403c30      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             403c34      2 INSTR BELONGTO 403c30 
             403c34      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     eax, eax 
-            403c34     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403c34     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403c36      5 INSTR BELONGTO 403c30 
             403c36      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset aReceivedSigter; "Received SIGTERM - shutting down" 
-            403c3b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            403c3b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             403c3b      5 INSTR BELONGTO 403c30 
             403c3b      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 80h 
             403c40      2 INSTR BELONGTO 403c30 
             403c40      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            403c40     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403c40     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403c42     10 INSTR BELONGTO 403c30 
             403c42     10 INSTR DEADREGS  EFLAGS ZZ mov     cs:pipedes, 0FFFFFFFFh 
             403c4c     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
@@ -2101,7 +2101,7 @@
             403c51      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_main_quit 
             403c56      2 INSTR BELONGTO 403c30 
             403c56      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ xor     eax, eax 
-            403c56     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403c56     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403c58     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             403c58      4 INSTR BELONGTO 403c30 
             403c5c      1 INSTR BELONGTO 403c30 
@@ -2116,15 +2116,15 @@
             403c60      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             403c64      2 INSTR BELONGTO 403c60 
             403c64      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     eax, eax 
-            403c64     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403c64     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403c66      5 INSTR BELONGTO 403c60 
             403c66      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset aDoingTimedExit; "Doing timed exit" 
-            403c6b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            403c6b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             403c6b      5 INSTR BELONGTO 403c60 
             403c6b      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 80h 
             403c70      2 INSTR BELONGTO 403c60 
             403c70      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            403c70     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403c70     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403c72     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403c72      5 INSTR BELONGTO 403c60 
             403c72      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -2133,7 +2133,7 @@
             403c77      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_main_quit 
             403c7c      2 INSTR BELONGTO 403c60 
             403c7c      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ xor     eax, eax 
-            403c7c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403c7c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403c7e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             403c7e      4 INSTR BELONGTO 403c60 
             403c82      1 INSTR BELONGTO 403c60 
@@ -2189,7 +2189,7 @@
             403d00      5 INSTR BELONGTO 403cd0 
             403d05      3 INSTR BELONGTO 403cd0 
             403d08      2 INSTR BELONGTO 403cd0 
-            403d08     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403d08     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403d0a     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_new 
             403d0a      5 INSTR BELONGTO 403cd0 
             403d0f      3 INSTR BELONGTO 403cd0 
@@ -2199,7 +2199,7 @@
             403d18     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
             403d18      6 INSTR BELONGTO 403cd0 
             403d1e      2 INSTR BELONGTO 403cd0 
-            403d1e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            403d1e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             403d20      5 INSTR BELONGTO 403cd0 
             403d25      5 INSTR BELONGTO 403cd0 
             403d25      5 PTRIMMEDESP STACK 8 displ mov     [rsp+28h+var_20], rbp
@@ -2210,17 +2210,17 @@
             403d37     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             403d37      4 INSTR BELONGTO 403cd0 
             403d3b      2 INSTR BELONGTO 403cd0 
-            403d3b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403d3b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403d3d      1 INSTR BELONGTO 403cd0 
             403d3e      1 INSTR BELONGTO 403cd0 
             403d3f      1 INSTR BELONGTO 403cd0 
             403d40      6 INSTR BELONGTO 403cd0 
             403d46      5 INSTR BELONGTO 403cd0 
-            403d4b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 129h 
+            403d4b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 129h 
             403d4b      5 INSTR BELONGTO 403cd0 
             403d50      5 INSTR BELONGTO 403cd0 
             403d55      2 INSTR BELONGTO 403cd0 
-            403d55     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403d55     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403d57     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             403d57      5 INSTR BELONGTO 403cd0 
             403d5c      4 INSTR BELONGTO 403cd0 
@@ -2265,8 +2265,8 @@
             403dba      1 INSTR BELONGTO 403cd0 
             403dc0      5 INSTR BELONGTO 403cd0 
             403dc5      2 INSTR BELONGTO 403cd0 
-            403dc5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            403dc7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            403dc5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            403dc7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             403dc7      5 INSTR BELONGTO 403cd0 
             403dcc     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403dcc      5 INSTR BELONGTO 403cd0 
@@ -2280,10 +2280,10 @@
             403de2     -1 INSTR LOCAL NoMetaUpdate jmp     sub_403A40 
             403de2      5 INSTR BELONGTO 403cd0 
             403df0      5 INSTR BELONGTO 403cd0 
-            403df5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            403df5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             403df5      5 INSTR BELONGTO 403cd0 
             403dfa      2 INSTR BELONGTO 403cd0 
-            403dfa     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403dfa     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403dfc     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403dfc      5 INSTR BELONGTO 403cd0 
             403e01      7 INSTR BELONGTO 403cd0 
@@ -2322,12 +2322,12 @@
             403e39      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             403e40      5 INSTR BELONGTO 403e20 
             403e40      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, offset aGotASessionove; "Got a SessionOver signal - stopping" 
-            403e45     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            403e45     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             403e45      5 INSTR BELONGTO 403e20 
             403e45      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 80h 
             403e4a      2 INSTR BELONGTO 403e20 
             403e4a      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            403e4a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403e4a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403e4c     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403e4c      5 INSTR BELONGTO 403e20 
             403e4c      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -2375,11 +2375,11 @@
             403e91      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     edi, cs:pipedes ; fd 
             403e97      2 INSTR BELONGTO 403e70 
             403e97      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ xor     eax, eax 
-            403e97     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            403e99     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            403e97     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            403e99     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             403e99      5 INSTR BELONGTO 403e70 
             403e99      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, 1 
-            403e9e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2          ; cmd 
+            403e9e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2          ; cmd 
             403e9e      5 INSTR BELONGTO 403e70 
             403e9e      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 2          ; cmd 
             403ea3     -1 INSTR LOCAL NoMetaUpdate call    _fcntl 
@@ -2393,11 +2393,11 @@
             403ead      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     edi, cs:fd      ; fd 
             403eb3      2 INSTR BELONGTO 403e70 
             403eb3      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ xor     eax, eax 
-            403eb3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            403eb5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            403eb3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            403eb5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             403eb5      5 INSTR BELONGTO 403e70 
             403eb5      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, 1 
-            403eba     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2          ; cmd 
+            403eba     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2          ; cmd 
             403eba      5 INSTR BELONGTO 403e70 
             403eba      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 2          ; cmd 
             403ebf     -1 INSTR LOCAL NoMetaUpdate call    _fcntl 
@@ -2419,15 +2419,15 @@
             403ed5      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     edx, offset aCouldNotCreate; "Could not create pipe: %s" 
             403eda      3 INSTR BELONGTO 403e70 
             403eda      3 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI ZZ mov     rcx, rax 
-            403edd     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            403edd     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             403edd      5 INSTR BELONGTO 403e70 
             403edd      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     esi, 4 
             403ee2      2 INSTR BELONGTO 403e70 
             403ee2      2 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ xor     edi, edi 
-            403ee2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403ee2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403ee4      2 INSTR BELONGTO 403e70 
             403ee4      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            403ee4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403ee4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403ee6     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403ee6      5 INSTR BELONGTO 403e70 
             403ee6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -2437,14 +2437,14 @@
             403eed      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 ZZ mov     r8d, offset aBusNull; "bus != NULL" 
             403ef3      5 INSTR BELONGTO 403e70 
             403ef3      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     ecx, offset aSet_session_ov; "set_session_over_handler" 
-            403ef8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 10Dh 
+            403ef8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 10Dh 
             403ef8      5 INSTR BELONGTO 403e70 
             403ef8      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 10Dh 
             403efd      5 INSTR BELONGTO 403e70 
             403efd      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aMain_c; "main.c" 
             403f02      2 INSTR BELONGTO 403e70 
             403f02      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            403f02     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403f02     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403f04     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             403f04      5 INSTR BELONGTO 403e70 
             403f04      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_assertion_message_expr 
@@ -2455,12 +2455,12 @@
             403f0f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_io_channel_unix_new 
             403f14      2 INSTR BELONGTO 403e70 
             403f14      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edx, edx 
-            403f14     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            403f14     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             403f16      3 INSTR BELONGTO 403e70 
             403f16      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rbx, rax 
             403f19      2 INSTR BELONGTO 403e70 
             403f19      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            403f19     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            403f19     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             403f1b      3 INSTR BELONGTO 403e70 
             403f1b      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             403f1e     -1 INSTR LOCAL NoMetaUpdate call    _g_io_channel_set_encoding 
@@ -2479,7 +2479,7 @@
             403f30      5 INSTR BELONGTO 403e70 
             403f35      3 INSTR BELONGTO 403e70 
             403f35      3 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     rdi, rbx 
-            403f38     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_403C30 
+            403f38     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_403C30 
             403f38      5 INSTR BELONGTO 403e70 
             403f38      5 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, offset sub_403C30 
             403f3d     -1 INSTR LOCAL NoMetaUpdate call    _g_io_add_watch 
@@ -2570,17 +2570,17 @@
             403fc0      5 INSTR BELONGTO 403f60 
             403fc5      5 INSTR BELONGTO 403f60 
             403fc5      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     edx, offset aCouldNotGetSes; "Could not get session bus: %s" 
-            403fca     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            403fca     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             403fca      5 INSTR BELONGTO 403f60 
             403fca      5 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI ZZ mov     esi, 10h 
             403fcf      2 INSTR BELONGTO 403f60 
             403fcf      2 INSTR DEADREGS  EFLAGS RCX RBX RDI ZZ xor     edi, edi 
-            403fcf     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403fcf     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403fd1      4 INSTR BELONGTO 403f60 
             403fd1      4 INSTR DEADREGS  EFLAGS RCX RBX ZZ mov     rcx, [rax+8] 
             403fd5      2 INSTR BELONGTO 403f60 
             403fd5      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            403fd5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403fd5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403fd7     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             403fd7      5 INSTR BELONGTO 403f60 
             403fd7      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -2637,7 +2637,7 @@
             404043      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             40404b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             40404f     -1 INSTR LOCAL NoMetaUpdate jmp     _strcmp 
-            404058     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
+            404058     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
             40405d      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
             404062      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             404067     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
@@ -2663,7 +2663,7 @@
             4040b4      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
             4040b9      3 INSTR BELONGTO 4040b0 
             4040b9      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            4040bc     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4040bc     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4040bc      5 INSTR BELONGTO 4040b0 
             4040bc      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             4040c1      7 INSTR BELONGTO 4040b0 
@@ -2688,9 +2688,9 @@
             4040fc      9 PTRIMMEDESP STACK 24 displ mov     qword ptr [rsp+18h], 0
             404105     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+10h], 0 
             40410a     -1 INSTR LOCAL NoMetaUpdate jz      short loc_404147 
-            404111     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404111     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404113     -1 INSTR LOCAL NoMetaUpdate call    _g_variant_new 
-            40411f     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40411f     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             404135      5 PTRIMMEDESP STACK 24 displ lea     rax, [rsp+18h]
             40413a      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
             40413e     -1 INSTR LOCAL NoMetaUpdate call    _g_dbus_connection_emit_signal 
@@ -2698,9 +2698,9 @@
             404145     -1 INSTR LOCAL NoMetaUpdate jz      short loc_404150 
             404147     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 20h 
             404150      5 PTRIMMEDESP STACK 24 displ mov     rax, [rsp+18h]
-            40415a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-            40415f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            404165     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40415a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40415f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            404165     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404167     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40416c      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+18h]
             404171     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
@@ -2708,9 +2708,9 @@
             404180      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbx
             404185      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], rbp
             404191     -1 INSTR LOCAL NoMetaUpdate call    gnome_settings_plugin_info_get_location 
-            404196     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-            4041a1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            4041a8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404196     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            4041a1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            4041a8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4041aa     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4041b2      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4041b5      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
@@ -2720,9 +2720,9 @@
             4041d0      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbx
             4041d5      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], rbp
             4041e1     -1 INSTR LOCAL NoMetaUpdate call    gnome_settings_plugin_info_get_location 
-            4041e6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-            4041f1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            4041f8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4041e6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            4041f1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            4041f8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4041fa     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             404202      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             404205      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
@@ -2856,15 +2856,15 @@
             4042de     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h 
             4042de      6 INSTR BELONGTO 4042a0 
             4042de      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 20h 
-            4042e4     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_4040B0 
+            4042e4     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_4040B0 
             4042e4      5 INSTR BELONGTO 4042a0 
             4042e4      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset sub_4040B0 
-            4042e9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 98h 
+            4042e9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 98h 
             4042e9      5 INSTR BELONGTO 4042a0 
             4042e9      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 98h 
             4042ee      3 INSTR BELONGTO 4042a0 
             4042ee      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-            4042f1     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+            4042f1     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
             4042f1      5 INSTR BELONGTO 4042a0 
             4042f1      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
             4042f6      7 INSTR BELONGTO 4042a0 
@@ -2893,18 +2893,18 @@
             404341     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_is_a 
             404346     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             404348     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_404360 
-            404355     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            404355     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404357     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
             404360     -1 INSTR LOCAL NoMetaUpdate call    gnome_settings_manager_get_type 
             40436b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             404370     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+18h], 0 
             404375     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4043B0 
-            40437e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40437e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             404383     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             404390     -1 INSTR LOCAL NoMetaUpdate jmp     rax 
-            4043a3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4043a3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4043a5     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
-            4043bb     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4043bb     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4043bd     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
             4043d0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             4043d0      0 FUNC MMSAFENESS SAFE
@@ -2964,7 +2964,7 @@
             404420    747 FUNC GLOBAL gnome_settings_manager_start FUNC_UNSAFE NOFP RET             40470a 
             404422      2 INSTR BELONGTO 404420 
             404422      2 INSTR DEADREGS  EFLAGS RAX RDX R15 ZZ xor     eax, eax 
-            404422     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404422     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404424      5 INSTR BELONGTO 404420 
             404424      5 INSTR DEADREGS  EFLAGS RDX R15 ZZ mov     edx, offset aStartingSettin; "Starting settings manager" 
             404429      2 INSTR BELONGTO 404420 
@@ -2980,7 +2980,7 @@
             40442f      3 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ mov     r12, rdi 
             404432      2 INSTR BELONGTO 404420 
             404432      2 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 ZZ xor     edi, edi 
-            404432     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            404432     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404434      1 INSTR BELONGTO 404420 
             404434      1 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ push    rbp 
             404434     -3 INSTR LOCAL NoWarn push    rbp 
@@ -2989,7 +2989,7 @@
             404435     -3 INSTR LOCAL NoWarn push    rbx 
             404436      3 INSTR BELONGTO 404420 
             404436      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ mov     rbx, rsi 
-            404439     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            404439     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             404439      5 INSTR BELONGTO 404420 
             404439      5 INSTR DEADREGS  EFLAGS RSI R13 R14 R15 ZZ mov     esi, 80h 
             40443e     24 DATAREF STACK 401 esp + 0 PARENT LocalFrame LOCALFRAME
@@ -3009,15 +3009,15 @@
             40444e      6 INSTR BELONGTO 404420 
             404454      5 INSTR BELONGTO 404420 
             404454      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R13 R14 R15 ZZ mov     edx, offset aLoadingPnpids; "loading PNPIDs" 
-            404459     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            404459     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             404459      5 INSTR BELONGTO 404420 
             404459      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R13 R14 R15 ZZ mov     esi, 80h 
             40445e      2 INSTR BELONGTO 404420 
             40445e      2 INSTR DEADREGS  EFLAGS RAX RBX RDI R13 R14 R15 ZZ xor     edi, edi 
-            40445e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40445e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404460      2 INSTR BELONGTO 404420 
             404460      2 INSTR DEADREGS  EFLAGS RAX RBX R13 R14 R15 ZZ xor     eax, eax 
-            404460     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404460     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404462     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             404462      5 INSTR BELONGTO 404420 
             404462      5 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ call    _g_log 
@@ -3037,19 +3037,19 @@
             40447f      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_settings_new 
             404484      2 INSTR BELONGTO 404420 
             404484      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 ZZ xor     edi, edi 
-            404484     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            404484     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404486      5 INSTR BELONGTO 404420 
             404486      5 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 R14 R15 ZZ mov     ecx, offset aUsrLibGnomeSet; "/usr/lib/gnome-settings-daemon-3.0/" 
             40448b      5 INSTR BELONGTO 404420 
             40448b      5 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 R15 ZZ mov     edx, offset aLoadingSetting; "Loading settings plugins from dir: %s" 
             404490      4 INSTR BELONGTO 404420 
             404490      4 INSTR DEADREGS  EFLAGS RSI R13 R14 R15 ZZ mov     [rbx+18h], rax 
-            404494     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            404494     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             404494      5 INSTR BELONGTO 404420 
             404494      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R13 R14 R15 ZZ mov     esi, 80h 
             404499      2 INSTR BELONGTO 404420 
             404499      2 INSTR DEADREGS  EFLAGS RAX RBX R13 R14 R15 ZZ xor     eax, eax 
-            404499     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404499     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40449b     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40449b      5 INSTR BELONGTO 404420 
             40449b      5 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ call    _g_log 
@@ -3097,18 +3097,18 @@
             4044ef      2 INSTR BELONGTO 404420 
             4044f1      2 INSTR BELONGTO 404420 
             4044f1      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R13 R14 R15 ZZ xor     edx, edx 
-            4044f1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4044f1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4044f3      3 INSTR BELONGTO 404420 
             4044f3      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R13 R14 R15 ZZ mov     rsi, rbp 
             4044f6      5 INSTR BELONGTO 404420 
             4044f6      5 INSTR DEADREGS  EFLAGS RAX RDI R13 R14 R15 ZZ mov     edi, offset aUsrLibGnomeSet; "/usr/lib/gnome-settings-daemon-3.0/" 
             4044fb      2 INSTR BELONGTO 404420 
             4044fb      2 INSTR DEADREGS  EFLAGS RAX R13 R14 R15 ZZ xor     eax, eax 
-            4044fb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4044fb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4044fd     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             4044fd      5 INSTR BELONGTO 404420 
             4044fd      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_build_filename 
-            404502     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            404502     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             404502      5 INSTR BELONGTO 404420 
             404502      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ mov     esi, 1 
             404507      3 INSTR BELONGTO 404420 
@@ -3145,7 +3145,7 @@
             404531      5 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ call    _g_dir_close 
             404536      5 INSTR BELONGTO 404420 
             404536      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 R14 R15 ZZ mov     rbx, [r12+18h] 
-            40453b     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset loc_404070 
+            40453b     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset loc_404070 
             40453b      5 INSTR BELONGTO 404420 
             40453b      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ mov     esi, offset loc_404070 
             404540      4 INSTR BELONGTO 404420 
@@ -3159,7 +3159,7 @@
             40454d      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R13 R14 R15 ZZ mov     rax, [r12+18h] 
             404552      2 INSTR BELONGTO 404420 
             404552      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ xor     edx, edx 
-            404552     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            404552     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             404554     -1 INSTR LOCAL MetadataRedundant mov     esi, offset sub_404220 
             404554      5 INSTR BELONGTO 404420 
             404559      4 INSTR BELONGTO 404420 
@@ -3169,7 +3169,7 @@
             40455d      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_slist_foreach 
             404562     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             404562      4 INSTR BELONGTO 404420 
-            404566     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            404566     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             404566      5 INSTR BELONGTO 404420 
             404566      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     eax, 1 
             40456b      1 INSTR BELONGTO 404420 
@@ -3188,15 +3188,15 @@
             404575      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
             404580      2 INSTR BELONGTO 404420 
             404580      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R13 R14 R15 ZZ xor     edi, edi 
-            404580     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            404580     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404582      2 INSTR BELONGTO 404420 
             404582      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R13 R14 R15 ZZ xor     eax, eax 
-            404582     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404582     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404584      3 INSTR BELONGTO 404420 
             404584      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 R14 R15 ZZ mov     rcx, rbp 
             404587      5 INSTR BELONGTO 404420 
             404587      5 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 R15 ZZ mov     edx, offset aLoadingPluginS; "Loading plugin: %s" 
-            40458c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40458c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             40458c      5 INSTR BELONGTO 404420 
             40458c      5 INSTR DEADREGS  EFLAGS RSI R13 R14 R15 ZZ mov     esi, 80h 
             404591     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
@@ -3215,7 +3215,7 @@
             4045a4      6 INSTR BELONGTO 404420 
             4045aa      5 INSTR BELONGTO 404420 
             4045aa      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R14 R15 ZZ mov     rax, [r12+18h] 
-            4045af     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_404010 
+            4045af     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_404010 
             4045af      5 INSTR BELONGTO 404420 
             4045af      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 R15 ZZ mov     edx, offset loc_404010 
             4045b4      3 INSTR BELONGTO 404420 
@@ -3238,12 +3238,12 @@
             4045cd      5 INSTR BELONGTO 404420 
             4045d8      5 INSTR BELONGTO 404420 
             4045d8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, offset aGnomeSetting_0; "gnome-settings-daemon is not able to in"... 
-            4045dd     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4045dd     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             4045dd      5 INSTR BELONGTO 404420 
             4045dd      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     esi, 10h 
             4045e2      2 INSTR BELONGTO 404420 
             4045e2      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            4045e2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4045e2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4045e4     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4045e4      5 INSTR BELONGTO 404420 
             4045e4      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_log 
@@ -3258,10 +3258,10 @@
             4045f3      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R12 R13 R14 R15 ZZ mov     ecx, offset aPluginsNotSupp; "Plugins not supported" 
             4045f8      2 INSTR BELONGTO 404420 
             4045f8      2 INSTR DEADREGS  EFLAGS RAX RDX RBX R12 R13 R14 R15 ZZ xor     eax, eax 
-            4045f8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4045f8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4045fa      2 INSTR BELONGTO 404420 
             4045fa      2 INSTR DEADREGS  EFLAGS RDX RBX R12 R13 R14 R15 ZZ xor     edx, edx 
-            4045fa     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4045fa     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4045fc     -1 INSTR LOCAL NoMetaUpdate call    _g_set_error 
             4045fc      5 INSTR BELONGTO 404420 
             4045fc      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_set_error 
@@ -3270,7 +3270,7 @@
             404605     24 DEALLOC STACK esp - 24 xor     eax, eax
             404605      2 INSTR BELONGTO 404420 
             404605      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     eax, eax 
-            404605     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404605     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404607      1 INSTR BELONGTO 404420 
             404607      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ pop     rbx 
             404608      1 INSTR BELONGTO 404420 
@@ -3289,17 +3289,17 @@
             404612      5 INSTR BELONGTO 404420 
             404617      2 INSTR BELONGTO 404420 
             404617      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R13 R14 R15 ZZ xor     edi, edi 
-            404617     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            404617     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404619      5 INSTR BELONGTO 404420 
             404619      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R13 R14 R15 ZZ mov     edx, (offset aWrongIageInFil+14h); "%s" 
-            40461e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40461e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40461e      5 INSTR BELONGTO 404420 
             40461e      5 INSTR DEADREGS  EFLAGS RCX RBX RSI R13 R14 R15 ZZ mov     esi, 10h 
             404623      4 INSTR BELONGTO 404420 
             404623      4 INSTR DEADREGS  EFLAGS RCX RBX R13 R14 R15 ZZ mov     rcx, [rax+8] 
             404627      2 INSTR BELONGTO 404420 
             404627      2 INSTR DEADREGS  EFLAGS RAX RBX R13 R14 R15 ZZ xor     eax, eax 
-            404627     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404627     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404629     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             404629      5 INSTR BELONGTO 404420 
             404629      5 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ call    _g_log 
@@ -3357,15 +3357,15 @@
             404688      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R15 ZZ mov     rcx, r14 
             40468b      5 INSTR BELONGTO 404420 
             40468b      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R15 ZZ mov     edx, offset aIgnoringUnknow; "Ignoring unknown module '%s'" 
-            404690     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            404690     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             404690      5 INSTR BELONGTO 404420 
             404690      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R15 ZZ mov     esi, 10h 
             404695      2 INSTR BELONGTO 404420 
             404695      2 INSTR DEADREGS  EFLAGS RAX RDI R15 ZZ xor     edi, edi 
-            404695     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            404695     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404697      2 INSTR BELONGTO 404420 
             404697      2 INSTR DEADREGS  EFLAGS RAX R15 ZZ xor     eax, eax 
-            404697     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404697     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404699     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             404699      5 INSTR BELONGTO 404420 
             404699      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _g_log 
@@ -3402,7 +3402,7 @@
             4046cd      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, r13 
             4046d0      4 INSTR BELONGTO 404420 
             4046d0      4 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     [r15+28h], rax 
-            4046d4     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_4041D0 
+            4046d4     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_4041D0 
             4046d4      5 INSTR BELONGTO 404420 
             4046d4      5 INSTR DEADREGS  EFLAGS RDX RSI R15 ZZ mov     edx, offset loc_4041D0 
             4046d9      5 INSTR BELONGTO 404420 
@@ -3418,7 +3418,7 @@
             4046e9      3 INSTR BELONGTO 404420 
             4046ec      3 INSTR BELONGTO 404420 
             4046ec      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R15 ZZ mov     rcx, r12 
-            4046ef     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_404180 
+            4046ef     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_404180 
             4046ef      5 INSTR BELONGTO 404420 
             4046ef      5 INSTR DEADREGS  EFLAGS RDX RSI R15 ZZ mov     edx, offset loc_404180 
             4046f4      5 INSTR BELONGTO 404420 
@@ -3452,15 +3452,15 @@
             404721      3 INSTR BELONGTO 404710 
             404724      2 INSTR BELONGTO 404710 
             404724      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     edi, edi 
-            404724     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            404726     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            404724     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            404726     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             404726      5 INSTR BELONGTO 404710 
             404726      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     esi, 80h 
             40472b      5 INSTR BELONGTO 404710 
             40472b      5 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     edx, offset aAwakeCalled; "Awake called" 
             404730      2 INSTR BELONGTO 404710 
             404730      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            404730     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404730     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404732     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             404732      5 INSTR BELONGTO 404710 
             404732      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -3493,19 +3493,19 @@
             40475d      5 INSTR BELONGTO 404750 
             404762      2 INSTR BELONGTO 404750 
             404762      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R12 ZZ xor     edi, edi 
-            404762     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            404762     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404764     40 DATAREF STACK 403 esp + 0 PARENT LocalFrame LOCALFRAME
             404764      4 INSTR BELONGTO 404750 
             404764      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R12 ZZ sub     rsp, 28h 
             404764      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             404768      2 INSTR BELONGTO 404750 
             404768      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R12 ZZ xor     eax, eax 
-            404768     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404768     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40476a      3 INSTR BELONGTO 404750 
             40476a      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 ZZ mov     rcx, r8 
             40476d      5 INSTR BELONGTO 404750 
             40476d      5 INSTR DEADREGS  EFLAGS RDX RSI R12 ZZ mov     edx, offset aCallingMethodS; "Calling method '%s' for settings daemon" 
-            404772     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            404772     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             404772      5 INSTR BELONGTO 404750 
             404772      5 INSTR DEADREGS  EFLAGS RSI R12 ZZ mov     esi, 80h 
             404777      5 INSTR BELONGTO 404750 
@@ -3590,7 +3590,7 @@
             4047f8      2 INSTR BELONGTO 404750 
             4047fa      2 INSTR BELONGTO 404750 
             4047fa      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ xor     esi, esi 
-            4047fa     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4047fa     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4047fc      3 INSTR BELONGTO 404750 
             4047fc      3 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     rdi, rbp 
             4047ff     -1 INSTR LOCAL NoMetaUpdate call    _g_dbus_method_invocation_return_value 
@@ -3607,15 +3607,15 @@
             404810      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             404811      2 INSTR BELONGTO 404810 
             404811      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ xor     eax, eax 
-            404811     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404811     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404813     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
             404813      3 INSTR BELONGTO 404810 
             404816      5 INSTR BELONGTO 404810 
             404816      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset aStoppingSettin; "Stopping settings manager" 
             40481b      2 INSTR BELONGTO 404810 
             40481b      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi 
-            40481b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40481d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40481b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40481d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             40481d      5 INSTR BELONGTO 404810 
             40481d      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 80h 
             404822     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
@@ -3625,8 +3625,8 @@
             404827      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rax, [rbx+18h] 
             40482b      2 INSTR BELONGTO 404810 
             40482b      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            40482b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40482d     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_403FF0 
+            40482b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40482d     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_403FF0 
             40482d      5 INSTR BELONGTO 404810 
             40482d      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset sub_403FF0 
             404832      4 INSTR BELONGTO 404810 
@@ -3697,7 +3697,7 @@
             4048b7     -1 INSTR LOCAL NoMetaUpdate call    gnome_settings_manager_stop 
             4048b7      5 INSTR BELONGTO 4048a0 
             4048bc      7 INSTR BELONGTO 4048a0 
-            4048c3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4048c3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4048c3      5 INSTR BELONGTO 4048a0 
             4048c8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             4048c8      5 INSTR BELONGTO 4048a0 
@@ -3748,12 +3748,12 @@
             404928      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ call    gnome_settings_manager_get_type 
             40492d      2 INSTR BELONGTO 4048e0 
             40492d      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            40492d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40492d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40492f      3 INSTR BELONGTO 4048e0 
             40492f      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
             404932      2 INSTR BELONGTO 4048e0 
             404932      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            404932     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404932     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404934     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             404934      5 INSTR BELONGTO 4048e0 
             404934      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_object_new 
@@ -3770,7 +3770,7 @@
             40494d      7 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rbx, cs:qword_6084B8 
             404954      2 INSTR BELONGTO 4048e0 
             404954      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            404954     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            404954     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             404956      5 INSTR BELONGTO 4048e0 
             404956      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, offset aNodeNameOrgGno; "<node name='/org/gnome/SettingsDaemon'>"... 
             40495b      4 INSTR BELONGTO 4048e0 
@@ -3788,13 +3788,13 @@
             404971      2 INSTR BELONGTO 4048e0 
             404973      3 INSTR BELONGTO 4048e0 
             404973      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, rbx 
-            404976     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_403F60 
+            404976     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_403F60 
             404976      5 INSTR BELONGTO 4048e0 
             404976      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, offset sub_403F60 
             40497b      2 INSTR BELONGTO 4048e0 
             40497b      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            40497b     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40497d     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            40497b     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40497d     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             40497d      5 INSTR BELONGTO 4048e0 
             40497d      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 2 
             404982     -1 INSTR LOCAL NoMetaUpdate call    _g_bus_get 
@@ -3806,14 +3806,14 @@
             404990      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aManagerPrivInt; "manager->priv->introspection_data != NU"... 
             404996      5 INSTR BELONGTO 4048e0 
             404996      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aRegister_manag; "register_manager" 
-            40499b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 196h 
+            40499b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 196h 
             40499b      5 INSTR BELONGTO 4048e0 
             40499b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 196h 
             4049a0      5 INSTR BELONGTO 4048e0 
             4049a0      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGnomeSettingsM; "gnome-settings-manager.c" 
             4049a5      2 INSTR BELONGTO 4048e0 
             4049a5      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            4049a5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4049a5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4049a7     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             4049a7      5 INSTR BELONGTO 4048e0 
             4049a7      5 INSTR DEADREGS  EFLAGS ZZ call    _g_assertion_message_expr 
@@ -3895,15 +3895,15 @@
             404a3e     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 18h 
             404a3e      6 INSTR BELONGTO 404a00 
             404a3e      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 18h 
-            404a44     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_4049D0 
+            404a44     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_4049D0 
             404a44      5 INSTR BELONGTO 404a00 
             404a44      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset sub_4049D0 
-            404a49     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 98h 
+            404a49     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 98h 
             404a49      5 INSTR BELONGTO 404a00 
             404a49      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 98h 
             404a4e      3 INSTR BELONGTO 404a00 
             404a4e      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-            404a51     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+            404a51     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
             404a51      5 INSTR BELONGTO 404a00 
             404a51      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
             404a56      7 INSTR BELONGTO 404a00 
@@ -3962,7 +3962,7 @@
             404ac2      5 INSTR BELONGTO 404a80 
             404ac7      5 INSTR BELONGTO 404a80 
             404acc      2 INSTR BELONGTO 404a80 
-            404acc     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            404acc     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404ace     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             404ace      4 INSTR BELONGTO 404a80 
             404ad2     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -4019,7 +4019,7 @@
             404b42      5 INSTR BELONGTO 404b00 
             404b47      5 INSTR BELONGTO 404b00 
             404b4c      2 INSTR BELONGTO 404b00 
-            404b4c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            404b4c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404b4e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             404b4e      4 INSTR BELONGTO 404b00 
             404b52     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -4057,7 +4057,7 @@
             404b89      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_class_peek_parent 
             404b8e      3 INSTR BELONGTO 404b80 
             404b8e      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
-            404b91     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            404b91     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             404b91      5 INSTR BELONGTO 404b80 
             404b91      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             404b96      7 INSTR BELONGTO 404b80 
@@ -4086,17 +4086,17 @@
             404bcc     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             404bcc      3 INSTR BELONGTO 404b80 
             404bcc      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 ZZ xor     r8d, r8d 
-            404bcf     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
+            404bcf     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
             404bcf      5 INSTR BELONGTO 404b80 
             404bcf      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI ZZ mov     ecx, 88h 
-            404bd4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            404bd4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             404bd4      5 INSTR BELONGTO 404b80 
             404bd4      5 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ mov     edx, 2 
             404bd9      5 INSTR BELONGTO 404b80 
             404bd9      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aActivated; "activated" 
             404bde      2 INSTR BELONGTO 404b80 
             404bde      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            404bde     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404bde     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404be0     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             404be0      5 INSTR BELONGTO 404b80 
             404be0      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_new 
@@ -4116,15 +4116,15 @@
             404c09      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     cs:dword_6084E0, eax 
             404c0f     -1 INSTR LOCAL MetadataRedundant xor     r8d, r8d 
             404c0f      3 INSTR BELONGTO 404b80 
-            404c12     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 90h 
+            404c12     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 90h 
             404c12      5 INSTR BELONGTO 404b80 
             404c12      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX ZZ mov     ecx, 90h 
-            404c17     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            404c17     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             404c17      5 INSTR BELONGTO 404b80 
             404c17      5 INSTR DEADREGS  EFLAGS RAX RDX RBX ZZ mov     edx, 2 
             404c1c      2 INSTR BELONGTO 404b80 
             404c1c      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            404c1c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404c1c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404c1e     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             404c1e      5 INSTR BELONGTO 404b80 
             404c1e      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_signal_new 
@@ -4187,15 +4187,15 @@
             404c7e     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h 
             404c7e      6 INSTR BELONGTO 404c40 
             404c7e      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 20h 
-            404c84     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_404B80 
+            404c84     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_404B80 
             404c84      5 INSTR BELONGTO 404c40 
             404c84      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset sub_404B80 
-            404c89     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 98h 
+            404c89     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 98h 
             404c89      5 INSTR BELONGTO 404c40 
             404c89      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 98h 
             404c8e      3 INSTR BELONGTO 404c40 
             404c8e      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-            404c91     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+            404c91     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
             404c91      5 INSTR BELONGTO 404c40 
             404c91      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
             404c96      7 INSTR BELONGTO 404c40 
@@ -4254,7 +4254,7 @@
             404cfc      4 INSTR BELONGTO 404cc0 
             404d00      5 INSTR BELONGTO 404cc0 
             404d05      2 INSTR BELONGTO 404cc0 
-            404d05     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            404d05     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404d07      1 INSTR BELONGTO 404cc0 
             404d08      1 INSTR BELONGTO 404cc0 
             404d09     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -4275,12 +4275,12 @@
             404d30      2 INSTR BELONGTO 404cc0 
             404d32      4 INSTR BELONGTO 404cc0 
             404d36      5 INSTR BELONGTO 404cc0 
-            404d3b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            404d3b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             404d3b      5 INSTR BELONGTO 404cc0 
             404d40      2 INSTR BELONGTO 404cc0 
-            404d40     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            404d40     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404d42      2 INSTR BELONGTO 404cc0 
-            404d42     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404d42     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404d44     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             404d44      5 INSTR BELONGTO 404cc0 
             404d49      4 INSTR BELONGTO 404cc0 
@@ -4324,7 +4324,7 @@
             404dbd     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             404dbd      5 INSTR BELONGTO 404cc0 
             404dc2      7 INSTR BELONGTO 404cc0 
-            404dc9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            404dc9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             404dc9      5 INSTR BELONGTO 404cc0 
             404dce     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             404dce      5 INSTR BELONGTO 404cc0 
@@ -4392,12 +4392,12 @@
             404e4b      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ call    gnome_settings_plugin_info_get_type 
             404e50      2 INSTR BELONGTO 404e30 
             404e50      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ xor     esi, esi 
-            404e50     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            404e50     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             404e52      3 INSTR BELONGTO 404e30 
             404e52      3 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     rdi, rax 
             404e55      2 INSTR BELONGTO 404e30 
             404e55      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-            404e55     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404e55     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404e57     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             404e57      5 INSTR BELONGTO 404e30 
             404e57      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_object_new 
@@ -4417,10 +4417,10 @@
             404e6f      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_key_file_new 
             404e74      2 INSTR BELONGTO 404e30 
             404e74      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 ZZ xor     ecx, ecx 
-            404e74     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            404e74     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             404e76      2 INSTR BELONGTO 404e30 
             404e76      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ xor     edx, edx 
-            404e76     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            404e76     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             404e78      3 INSTR BELONGTO 404e30 
             404e78      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     rsi, rbp 
             404e7b      3 INSTR BELONGTO 404e30 
@@ -4436,7 +4436,7 @@
             404e88      6 INSTR BELONGTO 404e30 
             404e8e      2 INSTR BELONGTO 404e30 
             404e8e      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ xor     ecx, ecx 
-            404e8e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            404e8e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             404e90      5 INSTR BELONGTO 404e30 
             404e90      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, offset aIage; "IAge" 
             404e95      5 INSTR BELONGTO 404e30 
@@ -4452,7 +4452,7 @@
             404ea4      2 INSTR BELONGTO 404e30 
             404ea6      2 INSTR BELONGTO 404e30 
             404ea6      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ xor     ecx, ecx 
-            404ea6     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            404ea6     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             404ea8      5 INSTR BELONGTO 404e30 
             404ea8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, offset aIage; "IAge" 
             404ead      5 INSTR BELONGTO 404e30 
@@ -4468,7 +4468,7 @@
             404ebc      6 INSTR BELONGTO 404e30 
             404ec2      2 INSTR BELONGTO 404e30 
             404ec2      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ xor     ecx, ecx 
-            404ec2     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            404ec2     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             404ec4      5 INSTR BELONGTO 404e30 
             404ec4      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, offset aModule; "Module" 
             404ec9      5 INSTR BELONGTO 404e30 
@@ -4495,15 +4495,15 @@
             404eec      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R12 R13 ZZ mov     rcx, rbp 
             404eef      5 INSTR BELONGTO 404e30 
             404eef      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ mov     edx, offset aCouldNotFindMo; "Could not find 'Module' in %s" 
-            404ef4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            404ef4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             404ef4      5 INSTR BELONGTO 404e30 
             404ef4      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ mov     esi, 10h 
             404ef9      2 INSTR BELONGTO 404e30 
             404ef9      2 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 ZZ xor     edi, edi 
-            404ef9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            404ef9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404efb      2 INSTR BELONGTO 404e30 
             404efb      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            404efb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404efb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404efd     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             404efd      5 INSTR BELONGTO 404e30 
             404efd      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_log 
@@ -4513,12 +4513,12 @@
             404f08      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 ZZ mov     rcx, rbp 
             404f0b      5 INSTR BELONGTO 404e30 
             404f0b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     edx, offset aIageKeyDoesNot; "IAge key does not exist in file: %s" 
-            404f10     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            404f10     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             404f10      5 INSTR BELONGTO 404e30 
             404f10      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, 80h 
             404f15      2 INSTR BELONGTO 404e30 
             404f15      2 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ xor     edi, edi 
-            404f15     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            404f15     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404f17     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             404f17      5 INSTR BELONGTO 404e30 
             404f17      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_log 
@@ -4526,7 +4526,7 @@
             404f1c      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rbx 
             404f1f      2 INSTR BELONGTO 404e30 
             404f1f      2 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ xor     ebx, ebx 
-            404f1f     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            404f1f     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             404f21     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             404f21      5 INSTR BELONGTO 404e30 
             404f21      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_object_unref 
@@ -4551,12 +4551,12 @@
             404f48      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 ZZ mov     rcx, rbp 
             404f4b      5 INSTR BELONGTO 404e30 
             404f4b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     edx, offset aBadPluginFileS; "Bad plugin file: %s" 
-            404f50     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            404f50     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             404f50      5 INSTR BELONGTO 404e30 
             404f50      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, 10h 
             404f55      2 INSTR BELONGTO 404e30 
             404f55      2 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ xor     edi, edi 
-            404f55     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            404f55     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404f57     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             404f57      5 INSTR BELONGTO 404e30 
             404f57      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_log 
@@ -4569,7 +4569,7 @@
             404f64      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R12 ZZ xor     r8d, r8d 
             404f67      2 INSTR BELONGTO 404e30 
             404f67      2 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 ZZ xor     ecx, ecx 
-            404f67     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            404f67     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             404f69      5 INSTR BELONGTO 404e30 
             404f69      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aGnomeSettingsP; "GNOME Settings Plugin" 
             404f6e      3 INSTR BELONGTO 404e30 
@@ -4592,7 +4592,7 @@
             404f8c      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R12 ZZ xor     r8d, r8d 
             404f8f      2 INSTR BELONGTO 404e30 
             404f8f      2 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 ZZ xor     ecx, ecx 
-            404f8f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            404f8f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             404f91      5 INSTR BELONGTO 404e30 
             404f91      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aGnomeSettingsP; "GNOME Settings Plugin" 
             404f96      3 INSTR BELONGTO 404e30 
@@ -4617,7 +4617,7 @@
             404fb9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             404fbc      2 INSTR BELONGTO 404e30 
             404fbc      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            404fbc     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            404fbc     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             404fbe      5 INSTR BELONGTO 404e30 
             404fbe      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset aAuthors; "Authors" 
             404fc3      5 INSTR BELONGTO 404e30 
@@ -4637,7 +4637,7 @@
             404fde      6 INSTR BELONGTO 404e30 
             404fe4      2 INSTR BELONGTO 404e30 
             404fe4      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ xor     ecx, ecx 
-            404fe4     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            404fe4     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             404fe6      5 INSTR BELONGTO 404e30 
             404fe6      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, offset aCopyright; "Copyright" 
             404feb      5 INSTR BELONGTO 404e30 
@@ -4657,7 +4657,7 @@
             405005      4 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 ZZ mov     [rdx+38h], rax 
             405009      2 INSTR BELONGTO 404e30 
             405009      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ xor     ecx, ecx 
-            405009     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            405009     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40500b      5 INSTR BELONGTO 404e30 
             40500b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, offset aWebsite; "Website" 
             405010      5 INSTR BELONGTO 404e30 
@@ -4677,7 +4677,7 @@
             40502a      4 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 ZZ mov     [rdx+40h], rax 
             40502e      2 INSTR BELONGTO 404e30 
             40502e      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ xor     ecx, ecx 
-            40502e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40502e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             405030      5 INSTR BELONGTO 404e30 
             405030      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, offset aPriority; "Priority" 
             405035      5 INSTR BELONGTO 404e30 
@@ -4704,12 +4704,12 @@
             405055      4 INSTR BELONGTO 404e30 
             405059      5 INSTR BELONGTO 404e30 
             405059      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R12 R13 ZZ mov     edx, offset aGnomesetting_1; "GnomeSettingsPluginInfo: name='%s' file"... 
-            40505e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40505e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             40505e      5 INSTR BELONGTO 404e30 
             40505e      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 R12 R13 ZZ mov     esi, 80h 
             405063      2 INSTR BELONGTO 404e30 
             405063      2 INSTR DEADREGS  EFLAGS RCX RDI R8 R9 R12 R13 ZZ xor     edi, edi 
-            405063     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405063     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405065      4 INSTR BELONGTO 404e30 
             405065      4 INSTR DEADREGS  EFLAGS RCX R8 R9 R12 R13 ZZ mov     rcx, [rax+20h] 
             405069      4 INSTR BELONGTO 404e30 
@@ -4718,7 +4718,7 @@
             40506d      3 INSTR DEADREGS  EFLAGS R8 R12 R13 ZZ mov     r8, [rax] 
             405070      2 INSTR BELONGTO 404e30 
             405070      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            405070     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405070     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405072     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             405072      5 INSTR BELONGTO 404e30 
             405072      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_log 
@@ -4732,15 +4732,15 @@
             405088      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R12 R13 ZZ mov     rcx, rbp 
             40508b      5 INSTR BELONGTO 404e30 
             40508b      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ mov     edx, offset aWrongIageInFil; "Wrong IAge in file: %s" 
-            405090     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            405090     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             405090      5 INSTR BELONGTO 404e30 
             405090      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ mov     esi, 80h 
             405095      2 INSTR BELONGTO 404e30 
             405095      2 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 ZZ xor     edi, edi 
-            405095     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405095     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405097      2 INSTR BELONGTO 404e30 
             405097      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            405097     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405097     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405099     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             405099      5 INSTR BELONGTO 404e30 
             405099      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_log 
@@ -4756,15 +4756,15 @@
             4050b5      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R12 R13 ZZ mov     rcx, rbp 
             4050b8      5 INSTR BELONGTO 404e30 
             4050b8      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ mov     edx, offset aCouldNotFindNa; "Could not find 'Name' in %s" 
-            4050bd     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4050bd     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             4050bd      5 INSTR BELONGTO 404e30 
             4050bd      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ mov     esi, 10h 
             4050c2      2 INSTR BELONGTO 404e30 
             4050c2      2 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 ZZ xor     edi, edi 
-            4050c2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4050c2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4050c4      2 INSTR BELONGTO 404e30 
             4050c4      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            4050c4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4050c4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4050c6     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4050c6      5 INSTR BELONGTO 404e30 
             4050c6      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_log 
@@ -4774,15 +4774,15 @@
             4050d0      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R12 ZZ mov     rcx, rbp 
             4050d3      5 INSTR BELONGTO 404e30 
             4050d3      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 ZZ mov     edx, offset aCouldNotFindWe; "Could not find 'Website' in %s" 
-            4050d8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            4050d8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             4050d8      5 INSTR BELONGTO 404e30 
             4050d8      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 ZZ mov     esi, 80h 
             4050dd      2 INSTR BELONGTO 404e30 
             4050dd      2 INSTR DEADREGS  EFLAGS RAX RDI R12 ZZ xor     edi, edi 
-            4050dd     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4050dd     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4050df      2 INSTR BELONGTO 404e30 
             4050df      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            4050df     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4050df     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4050e1     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4050e1      5 INSTR BELONGTO 404e30 
             4050e1      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_log 
@@ -4792,15 +4792,15 @@
             4050eb      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R12 ZZ mov     rcx, rbp 
             4050ee      5 INSTR BELONGTO 404e30 
             4050ee      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 ZZ mov     edx, offset aCouldNotFindDe; "Could not find 'Description' in %s" 
-            4050f3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            4050f3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             4050f3      5 INSTR BELONGTO 404e30 
             4050f3      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 ZZ mov     esi, 80h 
             4050f8      2 INSTR BELONGTO 404e30 
             4050f8      2 INSTR DEADREGS  EFLAGS RAX RDI R12 ZZ xor     edi, edi 
-            4050f8     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4050f8     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4050fa      2 INSTR BELONGTO 404e30 
             4050fa      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            4050fa     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4050fa     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4050fc     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4050fc      5 INSTR BELONGTO 404e30 
             4050fc      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_log 
@@ -4812,15 +4812,15 @@
             40510a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R12 ZZ mov     rcx, rbp 
             40510d      5 INSTR BELONGTO 404e30 
             40510d      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 ZZ mov     edx, offset aCouldNotFindCo; "Could not find 'Copyright' in %s" 
-            405112     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            405112     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             405112      5 INSTR BELONGTO 404e30 
             405112      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 ZZ mov     esi, 80h 
             405117      2 INSTR BELONGTO 404e30 
             405117      2 INSTR DEADREGS  EFLAGS RAX RDI R12 ZZ xor     edi, edi 
-            405117     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405117     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405119      2 INSTR BELONGTO 404e30 
             405119      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            405119     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405119     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40511b     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40511b      5 INSTR BELONGTO 404e30 
             40511b      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_log 
@@ -4830,15 +4830,15 @@
             405125      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R12 ZZ mov     rcx, rbp 
             405128      5 INSTR BELONGTO 404e30 
             405128      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 ZZ mov     edx, offset aCouldNotFindAu; "Could not find 'Authors' in %s" 
-            40512d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40512d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             40512d      5 INSTR BELONGTO 404e30 
             40512d      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 ZZ mov     esi, 80h 
             405132      2 INSTR BELONGTO 404e30 
             405132      2 INSTR DEADREGS  EFLAGS RAX RDI R12 ZZ xor     edi, edi 
-            405132     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405132     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405134      2 INSTR BELONGTO 404e30 
             405134      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            405134     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405134     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405136     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             405136      5 INSTR BELONGTO 404e30 
             405136      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_log 
@@ -4878,7 +4878,7 @@
             405166     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_get_boolean 
             405166      5 INSTR BELONGTO 405140 
             405166      5 INSTR DEADREGS  EFLAGS ZZ call    _g_settings_get_boolean 
-            40516b     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [rbp+50h] 
+            40516b     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [rbp+50h] 
             40516b      4 INSTR BELONGTO 405140 
             40516b      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ movzx   edx, byte ptr [rbp+50h] 
             40516f      3 INSTR BELONGTO 405140 
@@ -4908,7 +4908,7 @@
             405194      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     [rdx+54h], eax 
             405197      4 INSTR BELONGTO 405140 
             405197      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, [rdx+8] 
-            40519b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40519b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40519b      5 INSTR BELONGTO 405140 
             40519b      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             4051a0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -4927,7 +4927,7 @@
             4051b0      1 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbp 
             4051b1     -1 INSTR LOCAL MetadataUnused xor     r8d, r8d 
             4051b1      3 INSTR BELONGTO 405140 
-            4051b4     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_405520 
+            4051b4     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_405520 
             4051b4      5 INSTR BELONGTO 405140 
             4051b4      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     edx, offset loc_405520 
             4051b9     -1 INSTR LOCAL MetadataUnused mov     esi, offset aChanged; "changed" 
@@ -4987,10 +4987,10 @@
             405204      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGnome_settin_3; "gnome_settings_plugin_info_deactivate" 
             405209      2 INSTR BELONGTO 4051d0 
             405209      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            405209     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405209     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40520b      2 INSTR BELONGTO 4051d0 
             40520b      2 INSTR DEADREGS  EFLAGS RBX ZZ xor     ebp, ebp 
-            40520b     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40520b     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40520d     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40520d      5 INSTR BELONGTO 4051d0 
             40520d      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
@@ -4998,7 +4998,7 @@
             405212      4 INSTR BELONGTO 4051d0 
             405216      2 INSTR BELONGTO 4051d0 
             405216      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, ebp 
-            405216     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebp 
+            405216     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebp 
             405218      1 INSTR BELONGTO 4051d0 
             405218      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             405219      1 INSTR BELONGTO 4051d0 
@@ -5007,10 +5007,10 @@
             40521a      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             405220      4 INSTR BELONGTO 4051d0 
             405220      4 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     rdx, [rbx+18h] 
-            405224     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            405224     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
             405224      5 INSTR BELONGTO 4051d0 
             405224      5 INSTR DEADREGS  EFLAGS RAX ZZ mov     ebp, 1 
-            405229     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rdx+50h] 
+            405229     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rdx+50h] 
             405229      4 INSTR BELONGTO 4051d0 
             405229      4 INSTR DEADREGS  EFLAGS RAX ZZ movzx   eax, byte ptr [rdx+50h] 
             40522d     -1 INSTR LOCAL MetadataRedundant and     eax, 6 
@@ -5030,10 +5030,10 @@
             405243      3 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ mov     rdi, rbx 
             405246      2 INSTR BELONGTO 4051d0 
             405246      2 INSTR DEADREGS  EFLAGS RAX RDX ZZ xor     eax, eax 
-            405246     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405246     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405248      2 INSTR BELONGTO 4051d0 
             405248      2 INSTR DEADREGS  EFLAGS RDX ZZ xor     edx, edx 
-            405248     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405248     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40524a     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
             40524a      5 INSTR BELONGTO 4051d0 
             40524a      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_emit 
@@ -5045,7 +5045,7 @@
             405257      4 INSTR BELONGTO 4051d0 
             40525b      2 INSTR BELONGTO 4051d0 
             40525b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, ebp 
-            40525b     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebp 
+            40525b     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebp 
             40525b      8 DEALLOC STACK esp - 8 mov     eax, ebp
             40525d      1 INSTR BELONGTO 4051d0 
             40525d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
@@ -5108,13 +5108,13 @@
             4052aa      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, offset aGnome_settin_4; "gnome_settings_plugin_info_activate" 
             4052af      2 INSTR BELONGTO 405260 
             4052af      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ xor     edi, edi 
-            4052af     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4052af     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4052b1     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             4052b1      5 INSTR BELONGTO 405260 
             4052b1      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_return_if_fail_warning 
             4052b6      2 INSTR BELONGTO 405260 
             4052b6      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ xor     eax, eax 
-            4052b6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4052b6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4052b8      5 INSTR BELONGTO 405260 
             4052b8      5 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 ZZ mov     rbx, [rsp+28h+var_20] 
             4052b8      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+28h+var_20]
@@ -5134,20 +5134,20 @@
             4052d8      4 INSTR BELONGTO 405260 
             4052dc      2 INSTR BELONGTO 405260 
             4052dc      2 INSTR DEADREGS  EFLAGS RAX RDX ZZ xor     eax, eax 
-            4052dc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            4052de     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [r13+50h] 
+            4052dc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            4052de     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [r13+50h] 
             4052de      5 INSTR BELONGTO 405260 
             4052de      5 INSTR DEADREGS  EFLAGS RDX ZZ movzx   edx, byte ptr [r13+50h] 
             4052e3     -1 INSTR LOCAL NoMetaUpdate test    dl, 4 
             4052e3      3 INSTR BELONGTO 405260 
             4052e6     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4052B8 
             4052e6      2 INSTR BELONGTO 405260 
-            4052e8     -2 INSTR LOCAL n EDX ZZ  NumericDEFs and     edx, 2 
+            4052e8     -2 INSTR LOCAL n RDX ZZ  NumericDEFs and     edx, 2 
             4052e8      3 INSTR BELONGTO 405260 
             4052e8      3 INSTR DEADREGS  EFLAGS RAX ZZ and     edx, 2 
             4052eb      2 INSTR BELONGTO 405260 
             4052eb      2 INSTR DEADREGS  RAX ZZ mov     al, 1 
-            4052eb     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     al, 1 
+            4052eb     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     al, 1 
             4052ed     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4052B8 
             4052ed      2 INSTR BELONGTO 405260 
             4052ef      4 INSTR BELONGTO 405260 
@@ -5163,10 +5163,10 @@
             4052fd      6 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ mov     esi, cs:dword_6084E0 
             405303      2 INSTR BELONGTO 405260 
             405303      2 INSTR DEADREGS  EFLAGS RAX RDX RDI R12 R13 ZZ xor     eax, eax 
-            405303     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405303     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405305      2 INSTR BELONGTO 405260 
             405305      2 INSTR DEADREGS  EFLAGS RDX RDI R12 R13 ZZ xor     edx, edx 
-            405305     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405305     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405307      3 INSTR BELONGTO 405260 
             405307      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rbx 
             40530a     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
@@ -5176,7 +5176,7 @@
             40530f      4 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 R13 ZZ mov     rax, [rbx+18h] 
             405313      4 INSTR BELONGTO 405260 
             405313      4 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 ZZ or      byte ptr [rax+50h], 2 
-            405317     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            405317     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             405317      5 INSTR BELONGTO 405260 
             405317      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ mov     eax, 1 
             40531c     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4052B8 
@@ -5206,7 +5206,7 @@
             40533f      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, offset aLoad_plugin_mo; "load_plugin_module" 
             405344      2 INSTR BELONGTO 405260 
             405344      2 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ xor     edi, edi 
-            405344     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405344     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405346     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             405346      5 INSTR BELONGTO 405260 
             405346      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_return_if_fail_warning 
@@ -5218,19 +5218,19 @@
             405353      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 ZZ mov     edx, offset aErrorActivatin; "Error activating plugin '%s'" 
             405358      2 INSTR BELONGTO 405260 
             405358      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 R13 ZZ xor     eax, eax 
-            405358     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            40535a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            405358     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            40535a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40535a      5 INSTR BELONGTO 405260 
             40535a      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, 10h 
             40535f      2 INSTR BELONGTO 405260 
             40535f      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ xor     edi, edi 
-            40535f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40535f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405361     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             405361      5 INSTR BELONGTO 405260 
             405361      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_log 
             405366      2 INSTR BELONGTO 405260 
             405366      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ xor     eax, eax 
-            405366     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405366     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405368     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4052B8 
             405368      5 INSTR BELONGTO 405260 
             40536d      4 INSTR BELONGTO 405260 
@@ -5333,12 +5333,12 @@
             405417      4 INSTR BELONGTO 405260 
             40541b      5 INSTR BELONGTO 405260 
             40541b      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 ZZ mov     edx, offset aCannotLoadPlug; "Cannot load plugin '%s' since file '%s'"... 
-            405420     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            405420     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             405420      5 INSTR BELONGTO 405260 
             405420      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 R13 ZZ mov     esi, 10h 
             405425      2 INSTR BELONGTO 405260 
             405425      2 INSTR DEADREGS  EFLAGS RCX RDI R12 R13 ZZ xor     edi, edi 
-            405425     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405425     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405427      4 INSTR BELONGTO 405260 
             405427      4 INSTR DEADREGS  EFLAGS RCX R12 R13 ZZ mov     rcx, [rax+20h] 
             40542b     -1 INSTR LOCAL MetadataRedundant xor     eax, eax 
@@ -5419,7 +5419,7 @@
             4054b4      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, offset aLoad_plugin_mo; "load_plugin_module" 
             4054b9      2 INSTR BELONGTO 405260 
             4054b9      2 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ xor     edi, edi 
-            4054b9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4054b9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4054bb     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             4054bb      5 INSTR BELONGTO 405260 
             4054bb      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_return_if_fail_warning 
@@ -5433,7 +5433,7 @@
             4054ce      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, offset aLoad_plugin_mo; "load_plugin_module" 
             4054d3      2 INSTR BELONGTO 405260 
             4054d3      2 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ xor     edi, edi 
-            4054d3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4054d3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4054d5     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             4054d5      5 INSTR BELONGTO 405260 
             4054d5      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_return_if_fail_warning 
@@ -5447,7 +5447,7 @@
             4054e8      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, offset aLoad_plugin_mo; "load_plugin_module" 
             4054ed      2 INSTR BELONGTO 405260 
             4054ed      2 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ xor     edi, edi 
-            4054ed     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4054ed     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4054ef     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             4054ef      5 INSTR BELONGTO 405260 
             4054ef      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_return_if_fail_warning 
@@ -5461,7 +5461,7 @@
             405502      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, offset aLoad_plugin_mo; "load_plugin_module" 
             405507      2 INSTR BELONGTO 405260 
             405507      2 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ xor     edi, edi 
-            405507     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405507     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405509     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             405509      5 INSTR BELONGTO 405260 
             405509      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_return_if_fail_warning 
@@ -5532,13 +5532,13 @@
             4055cf      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGnome_settin_5; "gnome_settings_plugin_info_is_active" 
             4055d4      2 INSTR BELONGTO 4055a0 
             4055d4      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            4055d4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4055d4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4055d6     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             4055d6      5 INSTR BELONGTO 4055a0 
             4055d6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             4055db      2 INSTR BELONGTO 4055a0 
             4055db      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            4055db     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4055db     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4055dd      1 INSTR BELONGTO 4055a0 
             4055dd      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             4055de      1 INSTR BELONGTO 4055a0 
@@ -5553,7 +5553,7 @@
             4055e9      3 INSTR BELONGTO 4055a0 
             4055ec     -1 INSTR LOCAL NoMetaUpdate cmp     al, 6 
             4055ec      2 INSTR BELONGTO 4055a0 
-            4055ee     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setz    al 
+            4055ee     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setz    al 
             4055ee      3 INSTR BELONGTO 4055a0 
             4055ee      3 INSTR DEADREGS  RAX R8 R9 R10 R11 ZZ setz    al 
             4055f1     -1 INSTR LOCAL MetadataRedundant movzx   eax, al 
@@ -5603,13 +5603,13 @@
             40562f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGnome_settin_6; "gnome_settings_plugin_info_get_enabled" 
             405634      2 INSTR BELONGTO 405600 
             405634      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            405634     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405634     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405636     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             405636      5 INSTR BELONGTO 405600 
             405636      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             40563b      2 INSTR BELONGTO 405600 
             40563b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40563b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40563b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40563d      1 INSTR BELONGTO 405600 
             40563d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40563e      1 INSTR BELONGTO 405600 
@@ -5618,7 +5618,7 @@
             405640      4 INSTR BELONGTO 405600 
             405644      1 INSTR BELONGTO 405600 
             405644      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
-            405645     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rax+50h] 
+            405645     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rax+50h] 
             405645      4 INSTR BELONGTO 405600 
             405645      4 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ movzx   eax, byte ptr [rax+50h] 
             405649     -1 INSTR LOCAL MetadataRedundant shl     eax, 1Fh 
@@ -5670,13 +5670,13 @@
             40567f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGnome_settin_7; "gnome_settings_plugin_info_is_available" 
             405684      2 INSTR BELONGTO 405650 
             405684      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            405684     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405684     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405686     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             405686      5 INSTR BELONGTO 405650 
             405686      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             40568b      2 INSTR BELONGTO 405650 
             40568b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40568b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40568b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40568d      1 INSTR BELONGTO 405650 
             40568d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40568e      1 INSTR BELONGTO 405650 
@@ -5687,7 +5687,7 @@
             405694      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             405695     -1 INSTR LOCAL NoMetaUpdate test    byte ptr [rax+50h], 4 
             405695      4 INSTR BELONGTO 405650 
-            405699     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setnz   al 
+            405699     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setnz   al 
             405699      3 INSTR BELONGTO 405650 
             405699      3 INSTR DEADREGS  RAX R8 R9 R10 R11 ZZ setnz   al 
             40569c     -1 INSTR LOCAL MetadataRedundant movzx   eax, al 
@@ -5737,13 +5737,13 @@
             4056cf      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGnome_settin_8; "gnome_settings_plugin_info_get_name" 
             4056d4      2 INSTR BELONGTO 4056a0 
             4056d4      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            4056d4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4056d4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4056d6     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             4056d6      5 INSTR BELONGTO 4056a0 
             4056d6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             4056db      2 INSTR BELONGTO 4056a0 
             4056db      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            4056db     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4056db     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4056dd      1 INSTR BELONGTO 4056a0 
             4056dd      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             4056de      1 INSTR BELONGTO 4056a0 
@@ -5799,13 +5799,13 @@
             40571f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGnome_settin_9; "gnome_settings_plugin_info_get_descript"... 
             405724      2 INSTR BELONGTO 4056f0 
             405724      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            405724     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405724     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405726     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             405726      5 INSTR BELONGTO 4056f0 
             405726      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             40572b      2 INSTR BELONGTO 4056f0 
             40572b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40572b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40572b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40572d      1 INSTR BELONGTO 4056f0 
             40572d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40572e      1 INSTR BELONGTO 4056f0 
@@ -5861,13 +5861,13 @@
             40576f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGnome_setti_10; "gnome_settings_plugin_info_get_authors" 
             405774      2 INSTR BELONGTO 405740 
             405774      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            405774     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405774     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405776     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             405776      5 INSTR BELONGTO 405740 
             405776      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             40577b      2 INSTR BELONGTO 405740 
             40577b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40577b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40577b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40577d      1 INSTR BELONGTO 405740 
             40577d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40577e      1 INSTR BELONGTO 405740 
@@ -5923,13 +5923,13 @@
             4057bf      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGnome_setti_11; "gnome_settings_plugin_info_get_website" 
             4057c4      2 INSTR BELONGTO 405790 
             4057c4      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            4057c4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4057c4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4057c6     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             4057c6      5 INSTR BELONGTO 405790 
             4057c6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             4057cb      2 INSTR BELONGTO 405790 
             4057cb      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            4057cb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4057cb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4057cd      1 INSTR BELONGTO 405790 
             4057cd      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             4057ce      1 INSTR BELONGTO 405790 
@@ -5985,13 +5985,13 @@
             40580f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGnome_setti_12; "gnome_settings_plugin_info_get_copyrigh"... 
             405814      2 INSTR BELONGTO 4057e0 
             405814      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            405814     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405814     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405816     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             405816      5 INSTR BELONGTO 4057e0 
             405816      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             40581b      2 INSTR BELONGTO 4057e0 
             40581b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40581b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40581b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40581d      1 INSTR BELONGTO 4057e0 
             40581d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40581e      1 INSTR BELONGTO 4057e0 
@@ -6047,13 +6047,13 @@
             40585f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGnome_setti_13; "gnome_settings_plugin_info_get_location" 
             405864      2 INSTR BELONGTO 405830 
             405864      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            405864     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405864     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405866     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             405866      5 INSTR BELONGTO 405830 
             405866      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             40586b      2 INSTR BELONGTO 405830 
             40586b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40586b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40586b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40586d      1 INSTR BELONGTO 405830 
             40586d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40586e      1 INSTR BELONGTO 405830 
@@ -6109,11 +6109,11 @@
             4058af      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGnome_setti_14; "gnome_settings_plugin_info_get_priority" 
             4058b4      2 INSTR BELONGTO 405880 
             4058b4      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            4058b4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4058b4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4058b6     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             4058b6      5 INSTR BELONGTO 405880 
             4058b6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
-            4058bb     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 64h 
+            4058bb     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 64h 
             4058bb      5 INSTR BELONGTO 405880 
             4058bb      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 64h 
             4058c0      1 INSTR BELONGTO 405880 
@@ -6203,14 +6203,14 @@
             405955      1 INSTR BELONGTO 4058e0 
             405955      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             405955     24 DEALLOC STACK esp - 24 retn
-            405968     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-            40596d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40596f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405968     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            40596d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40596f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405971     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
             405980      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbx
             405985      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], rbp
             405991     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
-            405999     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            405999     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4059a5     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             4059ad     -1 INSTR LOCAL NoMetaUpdate call    _g_type_module_get_type 
             4059b8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
@@ -6276,10 +6276,10 @@
             405a44     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 50h 
             405a44      6 INSTR BELONGTO 4059f0 
             405a44      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 50h 
-            405a4a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset loc_405980 
+            405a4a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset loc_405980 
             405a4a      5 INSTR BELONGTO 4059f0 
             405a4a      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset loc_405980 
-            405a4f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0B8h 
+            405a4f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0B8h 
             405a4f      5 INSTR BELONGTO 4059f0 
             405a4f      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 0B8h 
             405a54      7 INSTR BELONGTO 4059f0 
@@ -6322,15 +6322,15 @@
             405a88      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rbx, rax 
             405a8b      5 INSTR BELONGTO 405a70 
             405a8b      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edx, offset aUnloadingS; "Unloading %s" 
-            405a90     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            405a90     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             405a90      5 INSTR BELONGTO 405a70 
             405a90      5 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     esi, 80h 
             405a95      2 INSTR BELONGTO 405a70 
             405a95      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ xor     edi, edi 
-            405a95     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405a95     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405a97      2 INSTR BELONGTO 405a70 
             405a97      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            405a97     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405a97     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405a99     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             405a99      5 INSTR BELONGTO 405a70 
             405a99      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -6379,13 +6379,13 @@
             405add      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rbx, rax 
             405ae0      2 INSTR BELONGTO 405ac0 
             405ae0      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     edi, edi 
-            405ae0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405ae0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405ae2      2 INSTR BELONGTO 405ac0 
             405ae2      2 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ xor     eax, eax 
-            405ae2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405ae2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405ae4      5 INSTR BELONGTO 405ac0 
             405ae4      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, offset aLoadingS; "Loading %s" 
-            405ae9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            405ae9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             405ae9      5 INSTR BELONGTO 405ac0 
             405ae9      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 80h 
             405aee     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
@@ -6432,7 +6432,7 @@
             405b30      3 INSTR BELONGTO 405ac0 
             405b33      4 INSTR BELONGTO 405ac0 
             405b33      4 INSTR DEADREGS  RDX ZZ mov     [rbx+48h], rax 
-            405b37     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            405b37     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             405b37      5 INSTR BELONGTO 405ac0 
             405b37      5 INSTR DEADREGS  RDX ZZ mov     edx, 1 
             405b3c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_405B50 
@@ -6441,7 +6441,7 @@
             405b3e      4 INSTR BELONGTO 405ac0 
             405b42      2 INSTR BELONGTO 405ac0 
             405b42      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, edx 
-            405b42     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edx 
+            405b42     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edx 
             405b44      1 INSTR BELONGTO 405ac0 
             405b44      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             405b45      1 INSTR BELONGTO 405ac0 
@@ -6452,12 +6452,12 @@
             405b50      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, [rbx+40h] 
             405b54      5 INSTR BELONGTO 405ac0 
             405b54      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, offset aInvalidGnomeSe; "Invalid gnome settings plugin in module"... 
-            405b59     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            405b59     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             405b59      5 INSTR BELONGTO 405ac0 
             405b59      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 10h 
             405b5e      2 INSTR BELONGTO 405ac0 
             405b5e      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            405b5e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405b5e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405b60     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             405b60      5 INSTR BELONGTO 405ac0 
             405b60      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -6465,12 +6465,12 @@
             405b65      4 INSTR BELONGTO 405ac0 
             405b69      2 INSTR BELONGTO 405ac0 
             405b69      2 INSTR DEADREGS  EFLAGS RAX RDX RBX R8 R9 R10 R11 ZZ xor     edx, edx 
-            405b69     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405b69     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405b6b      1 INSTR BELONGTO 405ac0 
             405b6b      1 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ pop     rbx 
             405b6c      2 INSTR BELONGTO 405ac0 
             405b6c      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, edx 
-            405b6c     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edx 
+            405b6c     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edx 
             405b6e      1 INSTR BELONGTO 405ac0 
             405b6e      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
             405b6f      1 INSTR BELONGTO 405ac0 
@@ -6482,15 +6482,15 @@
             405b75      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     edx, 40691Fh 
             405b7a      3 INSTR BELONGTO 405ac0 
             405b7a      3 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ mov     rcx, rax 
-            405b7d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            405b7d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             405b7d      5 INSTR BELONGTO 405ac0 
             405b7d      5 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     esi, 10h 
             405b82      2 INSTR BELONGTO 405ac0 
             405b82      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ xor     edi, edi 
-            405b82     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405b82     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405b84      2 INSTR BELONGTO 405ac0 
             405b84      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            405b84     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405b84     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405b86     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             405b86      5 INSTR BELONGTO 405ac0 
             405b86      5 INSTR DEADREGS  EFLAGS ZZ call    _g_log 
@@ -6503,12 +6503,12 @@
             405b94      4 INSTR BELONGTO 405ac0 
             405b98      2 INSTR BELONGTO 405ac0 
             405b98      2 INSTR DEADREGS  EFLAGS RAX RDX RBX R8 R9 R10 R11 ZZ xor     edx, edx 
-            405b98     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405b98     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405b9a      1 INSTR BELONGTO 405ac0 
             405b9a      1 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ pop     rbx 
             405b9b      2 INSTR BELONGTO 405ac0 
             405b9b      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, edx 
-            405b9b     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edx 
+            405b9b     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edx 
             405b9d      1 INSTR BELONGTO 405ac0 
             405b9d      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
             405b9e      1 INSTR BELONGTO 405ac0 
@@ -6517,14 +6517,14 @@
             405ba0      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 ZZ mov     r8d, offset aRegister_func; "register_func" 
             405ba6      5 INSTR BELONGTO 405ac0 
             405ba6      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     ecx, offset aGnome_setti_18; "gnome_settings_module_load" 
-            405bab     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4Ch 
+            405bab     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4Ch 
             405bab      5 INSTR BELONGTO 405ac0 
             405bab      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 4Ch 
             405bb0      5 INSTR BELONGTO 405ac0 
             405bb0      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGnomeSetting_1; "gnome-settings-module.c" 
             405bb5      2 INSTR BELONGTO 405ac0 
             405bb5      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            405bb5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405bb5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405bb7     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             405bb7      5 INSTR BELONGTO 405ac0 
             405bb7      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_assertion_message_expr 
@@ -6536,15 +6536,15 @@
             405bc5      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     edx, 40691Fh 
             405bca      3 INSTR BELONGTO 405ac0 
             405bca      3 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI ZZ mov     rcx, rax 
-            405bcd     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            405bcd     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             405bcd      5 INSTR BELONGTO 405ac0 
             405bcd      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     esi, 10h 
             405bd2      2 INSTR BELONGTO 405ac0 
             405bd2      2 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ xor     eax, eax 
-            405bd2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405bd2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405bd4      2 INSTR BELONGTO 405ac0 
             405bd4      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            405bd4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405bd4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405bd6     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             405bd6      5 INSTR BELONGTO 405ac0 
             405bd6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -6553,12 +6553,12 @@
             405bdf     24 DEALLOC STACK esp - 24 xor     edx, edx
             405bdf      2 INSTR BELONGTO 405ac0 
             405bdf      2 INSTR DEADREGS  EFLAGS RAX RDX RBX R8 R9 R10 R11 ZZ xor     edx, edx 
-            405bdf     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            405bdf     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             405be1      1 INSTR BELONGTO 405ac0 
             405be1      1 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ pop     rbx 
             405be2      2 INSTR BELONGTO 405ac0 
             405be2      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, edx 
-            405be2     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edx 
+            405be2     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edx 
             405be4      1 INSTR BELONGTO 405ac0 
             405be4      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
             405be5      1 INSTR BELONGTO 405ac0 
@@ -6584,19 +6584,19 @@
             405c09      5 INSTR BELONGTO 405bf0 
             405c0e      3 INSTR BELONGTO 405bf0 
             405c11      3 INSTR BELONGTO 405bf0 
-            405c14     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            405c14     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             405c14      5 INSTR BELONGTO 405bf0 
             405c19      2 INSTR BELONGTO 405bf0 
-            405c19     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405c19     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405c1b      2 INSTR BELONGTO 405bf0 
-            405c1b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405c1b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405c1d     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             405c1d      5 INSTR BELONGTO 405bf0 
             405c22      4 INSTR BELONGTO 405bf0 
             405c26     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             405c26      5 INSTR BELONGTO 405bf0 
             405c2b      7 INSTR BELONGTO 405bf0 
-            405c32     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            405c32     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             405c32      5 INSTR BELONGTO 405bf0 
             405c37     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             405c37      5 INSTR BELONGTO 405bf0 
@@ -6652,13 +6652,13 @@
             405c7f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aGnome_setti_16; "gnome_settings_module_get_path" 
             405c84      2 INSTR BELONGTO 405c50 
             405c84      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            405c84     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405c84     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405c86     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             405c86      5 INSTR BELONGTO 405c50 
             405c86      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             405c8b      2 INSTR BELONGTO 405c50 
             405c8b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            405c8b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405c8b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405c8d      1 INSTR BELONGTO 405c50 
             405c8d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             405c8e      1 INSTR BELONGTO 405c50 
@@ -6685,15 +6685,15 @@
             405ca8      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_name 
             405cad      2 INSTR BELONGTO 405ca0 
             405cad      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     edi, edi 
-            405cad     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            405cad     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             405caf      3 INSTR BELONGTO 405ca0 
             405caf      3 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ mov     rcx, rax 
             405cb2      5 INSTR BELONGTO 405ca0 
             405cb2      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aCreatingObject; "Creating object of type %s" 
             405cb7      2 INSTR BELONGTO 405ca0 
             405cb7      2 INSTR DEADREGS  EFLAGS RAX RSI ZZ xor     eax, eax 
-            405cb7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            405cb9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+            405cb7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            405cb9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             405cb9      5 INSTR BELONGTO 405ca0 
             405cb9      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 80h 
             405cbe     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
@@ -6711,13 +6711,13 @@
             405ccd      2 INSTR BELONGTO 405ca0 
             405ccf      2 INSTR BELONGTO 405ca0 
             405ccf      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            405ccf     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405ccf     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405cd1     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
             405cd1      5 INSTR BELONGTO 405ca0 
             405cd1      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_object_new 
             405ce0      2 INSTR BELONGTO 405ca0 
             405ce0      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            405ce0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405ce0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405ce2      1 INSTR BELONGTO 405ca0 
             405ce2      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             405ce3      1 INSTR BELONGTO 405ca0 
@@ -6730,7 +6730,7 @@
             405cf0     90 FUNC GLOBAL gnome_settings_module_new FUNC_UNSAFE NOFP RET             405d49 
             405cf1      2 INSTR BELONGTO 405cf0 
             405cf1      2 INSTR DEADREGS  EFLAGS ZZ xor     ebp, ebp 
-            405cf1     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            405cf1     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             405cf3      1 INSTR BELONGTO 405cf0 
             405cf3      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             405cf3     -3 INSTR LOCAL NoWarn push    rbx 
@@ -6754,12 +6754,12 @@
             405d05      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    gnome_settings_module_get_type 
             405d0a      2 INSTR BELONGTO 405cf0 
             405d0a      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            405d0a     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            405d0a     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             405d0c      3 INSTR BELONGTO 405cf0 
             405d0c      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             405d0f      2 INSTR BELONGTO 405cf0 
             405d0f      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            405d0f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            405d0f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             405d11     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             405d11      5 INSTR BELONGTO 405cf0 
             405d11      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_new 
@@ -6848,7 +6848,7 @@
             405d98      2 INSTR BELONGTO 405d50 
             405d9a      2 INSTR BELONGTO 405d50 
             405d9a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            405d9a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            405d9a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             405d9c      4 INSTR BELONGTO 405d50 
             405da0      3 INSTR BELONGTO 405d50 
             405da0      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 2db5ac91..ff55b2d6 100644
--- a/tests/commit/trimmed-sorted-save-gnome-sound-applet.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-sound-applet.psexe.annot
@@ -1093,7 +1093,7 @@
              1002b      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
              1002e      3 INSTR BELONGTO ff10 
              1002e      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-             10031     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+             10031     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
              10031      5 INSTR BELONGTO ff10 
              10031      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 4 
              10036     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -1110,7 +1110,7 @@
              10050      6 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8d, 7 
              10056      2 INSTR BELONGTO ff10 
              10056      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-             10056     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             10056     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              10058     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_string 
              10058      5 INSTR BELONGTO ff10 
              10058      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_string 
@@ -1118,7 +1118,7 @@
              1005d      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
              10060      3 INSTR BELONGTO ff10 
              10060      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-             10063     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+             10063     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
              10063      5 INSTR BELONGTO ff10 
              10063      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 5 
              10068     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -1135,7 +1135,7 @@
              10082      6 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8d, 7 
              10088      2 INSTR BELONGTO ff10 
              10088      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-             10088     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             10088     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              1008a     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_string 
              1008a      5 INSTR BELONGTO ff10 
              1008a      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_string 
@@ -1143,7 +1143,7 @@
              1008f      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
              10092      3 INSTR BELONGTO ff10 
              10092      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-             10095     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+             10095     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
              10095      5 INSTR BELONGTO ff10 
              10095      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 6 
              1009a     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -1167,7 +1167,7 @@
              100c6      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
              100c9      3 INSTR BELONGTO ff10 
              100c9      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-             100cc     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
+             100cc     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
              100cc      5 INSTR BELONGTO ff10 
              100cc      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 7 
              100d1     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -1191,7 +1191,7 @@
              100fd      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
              10100      3 INSTR BELONGTO ff10 
              10100      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-             10103     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+             10103     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
              10103      5 INSTR BELONGTO ff10 
              10103      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 8 
              10108     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -1208,7 +1208,7 @@
              10122      6 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8d, 7 
              10128      2 INSTR BELONGTO ff10 
              10128      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-             10128     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             10128     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              1012a     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_boolean 
              1012a      5 INSTR BELONGTO ff10 
              1012a      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_boolean 
@@ -1216,7 +1216,7 @@
              1012f      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
              10132      3 INSTR BELONGTO ff10 
              10132      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-             10135     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 9 
+             10135     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 9 
              10135      5 INSTR BELONGTO ff10 
              10135      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 9 
              1013a     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -1233,13 +1233,13 @@
              10154      6 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8d, 7 
              1015a      2 INSTR BELONGTO ff10 
              1015a      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-             1015a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             1015a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              1015c     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_boolean 
              1015c      5 INSTR BELONGTO ff10 
              1015c      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_boolean 
              10161      3 INSTR BELONGTO ff10 
              10161      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
-             10164     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
+             10164     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
              10164      5 INSTR BELONGTO ff10 
              10164      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     esi, 0Ah 
              10169      3 INSTR BELONGTO ff10 
@@ -1322,7 +1322,7 @@
              101f0     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 38h 
              101f0      6 INSTR BELONGTO 10190 
              101f0      6 INSTR DEADREGS  EFLAGS RDX RBX R8 ZZ mov     r8d, 38h 
-             101f6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3F0h 
+             101f6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3F0h 
              101f6      5 INSTR BELONGTO 10190 
              101f6      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 3F0h 
              101fb      7 INSTR BELONGTO 10190 
@@ -1412,7 +1412,7 @@
              102c5     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
              102c5      5 INSTR BELONGTO 10220 
              102ca      7 INSTR BELONGTO 10220 
-             102d1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             102d1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              102d1      5 INSTR BELONGTO 10220 
              102d6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
              102d6      5 INSTR BELONGTO 10220 
@@ -1434,7 +1434,7 @@
              10310      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
              10315      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
              1031d      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
-             10332     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             10332     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              10337     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
              1033f      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
              10344     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [rax+10h] 
@@ -1451,7 +1451,7 @@
              10385     -3 INSTR LOCAL NoWarn push    rbx 
              1038d     -1 INSTR LOCAL NoMetaUpdate call    sub_10190 
              10398     -1 INSTR LOCAL NoMetaUpdate call    _g_type_instance_get_private 
-             1039d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             1039d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              103a6     -1 INSTR LOCAL NoMetaUpdate call    sub_F910 
              103ab     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cvttsd2si rax, xmm0 
              103b7      6 PTRIMMEDEBP STACK 164 displ mov     [rbp+0A4h], eax
@@ -1460,12 +1460,12 @@
              103d8     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
              103e1      7 PTRIMMEDEBP STACK 136 displ mov     [rbp+88h], rax
              103f0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_adjustment_get_type 
-             103f5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             103f5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              103fa     -1 INSTR LOCAL NoMetaUpdate call    sub_F910 
-             103ff     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             103ff     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              10401      6 PTRIMMEDESP STACK 32 displ movsd   qword ptr [rsp+20h], xmm0
              10407     -1 INSTR LOCAL NoMetaUpdate call    sub_F910 
-             1040c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             1040c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              1040e      6 PTRIMMEDESP STACK 48 displ movsd   qword ptr [rsp+30h], xmm0
              10414     -1 INSTR LOCAL NoMetaUpdate call    sub_F910 
              10419     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm7, cs:qword_17468 
@@ -1486,12 +1486,12 @@
              1045d      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
              10463     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              10475     -1 INSTR LOCAL NoMetaUpdate call    _g_object_ref_sink 
-             1047a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             1047a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              10480     -1 INSTR LOCAL NoMetaUpdate call    sub_F910 
-             10485     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             10485     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              10487      6 PTRIMMEDESP STACK 32 displ movsd   qword ptr [rsp+20h], xmm0
              1048d     -1 INSTR LOCAL NoMetaUpdate call    sub_F910 
-             10492     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             10492     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              10494      6 PTRIMMEDESP STACK 48 displ movsd   qword ptr [rsp+30h], xmm0
              1049a     -1 INSTR LOCAL NoMetaUpdate call    sub_F910 
              1049f     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm7, qword ptr [rsp+10h] 
@@ -1516,7 +1516,7 @@
              10505     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
              1050f     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
              10518     -1 INSTR LOCAL NoMetaUpdate call    _gtk_switch_new 
-             1051d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+             1051d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
              10522      4 PTRIMMEDEBP STACK 80 displ mov     [rbp+50h], rax
              1052e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_no_show_all 
              10548     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
@@ -1532,21 +1532,21 @@
              1058c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              10591      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
              10597     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
-             105a7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+             105a7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
              105ac     -1 INSTR LOCAL NoMetaUpdate call    _gtk_image_new_from_icon_name 
              105b1      4 PTRIMMEDEBP STACK 48 displ mov     [rbp+30h], rax
-             105b9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+             105b9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
              105c2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_no_show_all 
-             105d2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+             105d2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
              105d7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_image_new_from_icon_name 
              105dc      4 PTRIMMEDEBP STACK 64 displ mov     [rbp+40h], rax
-             105e4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+             105e4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
              105ed     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_no_show_all 
              105f6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_image_new 
-             105fb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+             105fb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
              10600      4 PTRIMMEDEBP STACK 32 displ mov     [rbp+20h], rax
              1060c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_no_show_all 
-             10615     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             10615     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              10617     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
              1061c      4 PTRIMMEDEBP STACK 40 displ mov     [rbp+28h], rax
              10620     -1 INSTR LOCAL NoMetaUpdate call    _gtk_misc_get_type 
@@ -1554,14 +1554,14 @@
              10635     -1 INSTR LOCAL NoMetaUpdate xorps   xmm0, xmm0 
              1063b     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm1, cs:dword_17480 
              10643     -1 INSTR LOCAL NoMetaUpdate call    _gtk_misc_set_alignment 
-             1064c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+             1064c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
              10655     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_no_show_all 
-             1065a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             1065a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              1065c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_frame_new 
              10664     -1 INSTR LOCAL NoMetaUpdate call    _gtk_frame_get_type 
              10669      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
              1066f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-             10674     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+             10674     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
              10679     -1 INSTR LOCAL NoMetaUpdate call    _gtk_frame_set_shadow_type 
              10684     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              10689      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
@@ -1638,7 +1638,7 @@
              108ad     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              108b8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_set_mnemonic_widget 
              108c5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-             108cd     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             108cd     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              108d2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              108d7      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
              108dc      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
@@ -1648,7 +1648,7 @@
              108f9     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_notify 
              10900     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_get_type 
              1090c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-             10911     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+             10911     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
              10916     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_set_text 
              10923     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_hide 
              10928     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_108CA 
@@ -1675,13 +1675,13 @@
              109b4     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
              109c2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_image_get_type 
              109d4     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-             109d9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6 
+             109d9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6 
              109e1      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
              109e4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_image_set_from_icon_name 
              109ed     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+78h], 0 
              109f6     -1 INSTR LOCAL NoMetaUpdate jz      short loc_10A30 
              109f8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-             10a00     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             10a00     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              10a05     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              10a0a      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
              10a0e      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
@@ -1724,9 +1724,9 @@
              10b08     -1 INSTR LOCAL NoMetaUpdate call    _gtk_image_get_type 
              10b1d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              10b22      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
-             10b28     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+             10b28     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
              10b2d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_image_set_from_icon_name 
-             10b35     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             10b35     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              10b3a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              10b3f      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
              10b43      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
@@ -1767,9 +1767,9 @@
              10c28     -1 INSTR LOCAL NoMetaUpdate call    _gtk_image_get_type 
              10c3d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              10c42      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
-             10c48     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+             10c48     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
              10c4d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_image_set_from_icon_name 
-             10c55     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             10c55     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              10c5a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              10c5f      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
              10c63      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
@@ -2144,7 +2144,7 @@
              10f08      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _gtk_widget_show_all 
              10f0d      3 INSTR BELONGTO 10c80 
              10f0d      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     rdi, rbx 
-             10f10     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             10f10     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              10f10      5 INSTR BELONGTO 10c80 
              10f10      5 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 R14 R15 ZZ mov     esi, 50h 
              10f15     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -2260,7 +2260,7 @@
              10fdf      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
              10fe4      2 INSTR BELONGTO 10fa0 
              10fe4      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-             10fe4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             10fe4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              10fe6      1 INSTR BELONGTO 10fa0 
              10fe6      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
              10fe7      1 INSTR BELONGTO 10fa0 
@@ -2281,7 +2281,7 @@
              11000     -3 INSTR LOCAL NoWarn push    rbp 
              11001      2 INSTR BELONGTO 11000 
              11001      2 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 ZZ mov     ebp, esi 
-             11001     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, esi 
+             11001     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     ebp, esi 
              11003      1 INSTR BELONGTO 11000 
              11003      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ push    rbx 
              11003     -3 INSTR LOCAL NoWarn push    rbx 
@@ -2350,7 +2350,7 @@
              11067      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_F960 
              1106c      3 INSTR BELONGTO 11000 
              1106c      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-             1106f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             1106f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              1106f      5 INSTR BELONGTO 11000 
              1106f      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
              11074     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -2510,7 +2510,7 @@
              1115e      5 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM0 XMM1 XMM2 ZZ call    _g_return_if_fail_warning 
              11163      2 INSTR BELONGTO 11110 
              11163      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 XMM0 XMM1 XMM2 ZZ xor     eax, eax 
-             11163     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             11163     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              11165     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
              11165      4 INSTR BELONGTO 11110 
              11169      1 INSTR BELONGTO 11110 
@@ -2596,7 +2596,7 @@
              111f4      4 INSTR BELONGTO 11110 
              111f8      2 INSTR BELONGTO 11110 
              111f8      2 INSTR DEADREGS  EFLAGS RDI R13 ZZ xor     edi, edi 
-             111f8     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             111f8     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              111fa      6 INSTR BELONGTO 11110 
              111fa      6 INSTR DEADREGS  EFLAGS R13 ZZ mov     eax, [rax+0A0h] 
              11200     -1 INSTR LOCAL MetadataUnused movsd   [rsp+68h+var_68], xmm0 
@@ -2616,7 +2616,7 @@
              1121e      5 INSTR BELONGTO 11110 
              11223      2 INSTR BELONGTO 11110 
              11223      2 INSTR DEADREGS  EFLAGS RDI R13 ZZ xor     edi, edi 
-             11223     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             11223     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              11225     -1 INSTR LOCAL NoMetaUpdate divsd   xmm0, xmm2 
              11225      4 INSTR BELONGTO 11110 
              11229     -1 INSTR LOCAL MetadataUnused movsd   [rsp+68h+var_38], xmm2 
@@ -2650,7 +2650,7 @@
              1126c      6 INSTR BELONGTO 11110 
              11272      2 INSTR BELONGTO 11110 
              11272      2 INSTR DEADREGS  EFLAGS RAX RDI R13 ZZ xor     edi, edi 
-             11272     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             11272     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              11274      4 INSTR BELONGTO 11110 
              11274      4 INSTR DEADREGS  EFLAGS RAX R13 ZZ mov     rax, [rbx+30h] 
              11278     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm2, xmm0 
@@ -2673,12 +2673,12 @@
              112a0      4 INSTR BELONGTO 11110 
              112a4     -1 INSTR LOCAL MetadataUnused xor     eax, eax 
              112a4      2 INSTR BELONGTO 11110 
-             112a6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
+             112a6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
              112a6      5 INSTR BELONGTO 11110 
              112a6      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R13 XMM2 ZZ mov     esi, 0 
              112ab     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm1, xmm0 
              112ab      4 INSTR BELONGTO 11110 
-             112af     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setnp   al 
+             112af     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setnp   al 
              112af      3 INSTR BELONGTO 11110 
              112af      3 INSTR DEADREGS  RAX RDI R13 XMM0 XMM2 ZZ setnp   al 
              112b2     -1 INSTR LOCAL MetadataRedundant cmovz   esi, eax 
@@ -2715,7 +2715,7 @@
              112e6      5 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM0 XMM1 XMM2 ZZ call    _gtk_adjustment_set_value 
              112eb     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
              112eb      4 INSTR BELONGTO 11110 
-             112ef     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             112ef     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              112ef      5 INSTR BELONGTO 11110 
              112ef      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 XMM0 XMM1 XMM2 ZZ mov     eax, 1 
              112f4      1 INSTR BELONGTO 11110 
@@ -2730,7 +2730,7 @@
              112fa      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 XMM0 XMM1 XMM2 ZZ retn 
              11300      2 INSTR BELONGTO 11110 
              11300      2 INSTR DEADREGS  EFLAGS RAX R12 XMM1 ZZ xor     eax, eax 
-             11300     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             11300     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              11302     -1 INSTR LOCAL NoMetaUpdate cmp     ebp, 1 
              11302      3 INSTR BELONGTO 11110 
              11305     -1 INSTR LOCAL NoMetaUpdate jbe     loc_111B6 
@@ -2755,7 +2755,7 @@
              11329      4 INSTR DEADREGS  EFLAGS RAX RDI R13 ZZ mov     rax, [rbx+30h] 
              1132d      2 INSTR BELONGTO 11110 
              1132d      2 INSTR DEADREGS  EFLAGS RDI R13 ZZ xor     edi, edi 
-             1132d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             1132d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              1132f     -1 INSTR LOCAL MetadataUnused mov     ebp, [rax+0A0h] 
              1132f      6 INSTR BELONGTO 11110 
              11335     -1 INSTR LOCAL MetadataUnused movsd   [rsp+68h+var_68], xmm0 
@@ -2797,7 +2797,7 @@
              1138a      4 INSTR DEADREGS  EFLAGS RAX RDI R11 R13 ZZ mov     rax, [rbx+30h] 
              1138e      2 INSTR BELONGTO 11110 
              1138e      2 INSTR DEADREGS  EFLAGS RDI R11 R13 ZZ xor     edi, edi 
-             1138e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             1138e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              11390      7 INSTR BELONGTO 11110 
              11390      7 INSTR DEADREGS  EFLAGS R11 R13 ZZ mov     r11d, [rax+0A0h] 
              11397     -1 INSTR LOCAL MetadataUnused movsd   [rsp+68h+var_68], xmm1 
@@ -2825,12 +2825,12 @@
              113c7      4 INSTR BELONGTO 11110 
              113cb     -1 INSTR LOCAL MetadataUnused xor     eax, eax 
              113cb      2 INSTR BELONGTO 11110 
-             113cd     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
+             113cd     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
              113cd      5 INSTR BELONGTO 11110 
              113cd      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R13 XMM0 ZZ mov     esi, 0 
              113d2     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm1, xmm2 
              113d2      4 INSTR BELONGTO 11110 
-             113d6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setnp   al 
+             113d6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setnp   al 
              113d6      3 INSTR BELONGTO 11110 
              113d6      3 INSTR DEADREGS  RAX RDI R13 XMM0 XMM2 ZZ setnp   al 
              113d9     -1 INSTR LOCAL MetadataRedundant cmovz   esi, eax 
@@ -2839,14 +2839,14 @@
              113dc      5 INSTR BELONGTO 11110 
              113e8     -1 INSTR LOCAL NoMetaUpdate test    ebp, ebp 
              113e8      2 INSTR BELONGTO 11110 
-             113ea     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             113ea     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              113ea      5 INSTR BELONGTO 11110 
              113ea      5 INSTR DEADREGS  RAX R12 R13 XMM0 XMM1 XMM2 ZZ mov     eax, 1 
              113ef     -1 INSTR LOCAL NoMetaUpdate jnz     loc_11165 
              113ef      6 INSTR BELONGTO 11110 
              113f5      2 INSTR BELONGTO 11110 
              113f5      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 XMM1 XMM2 ZZ xor     esi, esi 
-             113f5     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+             113f5     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
              113f7      3 INSTR BELONGTO 11110 
              113f7      3 INSTR DEADREGS  EFLAGS RDI R12 R13 XMM0 XMM1 XMM2 ZZ mov     rdi, rbx 
              113fa      4 INSTR BELONGTO 11110 
@@ -2855,7 +2855,7 @@
              113fe     -1 INSTR LOCAL NoMetaUpdate call    sub_11000 
              113fe      5 INSTR BELONGTO 11110 
              113fe      5 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM0 XMM1 XMM2 ZZ call    sub_11000 
-             11403     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rsp+68h+var_40] 
+             11403     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rsp+68h+var_40] 
              11403      4 INSTR BELONGTO 11110 
              11403      4 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 XMM0 XMM1 XMM2 ZZ mov     eax, [rsp+68h+var_40] 
              11403      4 PTRIMMEDESP STACK 40 displ mov     eax, [rsp+68h+var_40]
@@ -2885,7 +2885,7 @@
              1144a      4 INSTR BELONGTO 11110 
              1144e      2 INSTR BELONGTO 11110 
              1144e      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 XMM0 XMM1 XMM2 ZZ xor     eax, eax 
-             1144e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             1144e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              1144e     72 DEALLOC STACK esp - 72 xor     eax, eax
              11450      1 INSTR BELONGTO 11110 
              11450      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 XMM0 XMM1 XMM2 ZZ pop     rbx 
@@ -2968,7 +2968,7 @@
              11500      5 INSTR DEADREGS  EFLAGS R13 ZZ call    sub_F920 
              11505     -1 INSTR LOCAL NoMetaUpdate jmp     loc_11347 
              11505      5 INSTR BELONGTO 11110 
-             11510     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+             11510     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
              11510      5 INSTR BELONGTO 11110 
              11510      5 INSTR DEADREGS  EFLAGS RSI RDI R13 XMM0 XMM1 ZZ mov     esi, 1 
              11515     -1 INSTR LOCAL MetadataUnused movapd  xmm1, xmm2 
@@ -3044,14 +3044,14 @@
              115a7      4 INSTR BELONGTO 11560 
              115ab     -1 INSTR LOCAL MetadataUnused xor     eax, eax 
              115ab      2 INSTR BELONGTO 11560 
-             115ad     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
+             115ad     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0 
              115ad      5 INSTR BELONGTO 11560 
              115ad      5 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     esi, 0 
              115b2      3 INSTR BELONGTO 11560 
              115b2      3 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     rdi, rbx 
              115b5     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm0, xmm1 
              115b5      4 INSTR BELONGTO 11560 
-             115b9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setnp   al 
+             115b9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setnp   al 
              115b9      3 INSTR BELONGTO 11560 
              115b9      3 INSTR DEADREGS  RAX XMM0 XMM1 ZZ setnp   al 
              115bc     -1 INSTR LOCAL MetadataRedundant cmovz   esi, eax 
@@ -3081,7 +3081,7 @@
              115f0      3 INSTR DEADREGS  EFLAGS RBX RSI RDI XMM0 XMM1 ZZ mov     rdi, rax 
              115f3      2 INSTR BELONGTO 11560 
              115f3      2 INSTR DEADREGS  EFLAGS RAX RBX RSI XMM0 XMM1 ZZ xor     esi, esi 
-             115f3     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+             115f3     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
              115f5      5 INSTR BELONGTO 11560 
              115f5      5 INSTR DEADREGS  EFLAGS RAX RBX XMM0 XMM1 ZZ mov     [rsp+38h+var_30], rdx 
              115f5      5 PTRIMMEDESP STACK 8 displ mov     [rsp+38h+var_30], rdx
@@ -3089,7 +3089,7 @@
              115fa      7 INSTR DEADREGS  EFLAGS RAX RDX RBX XMM0 XMM1 ZZ lea     rdx, aApplication_id; "application.id" 
              11601      2 INSTR BELONGTO 11560 
              11601      2 INSTR DEADREGS  EFLAGS RAX RBX XMM0 XMM1 ZZ xor     eax, eax 
-             11601     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             11601     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              11603      9 INSTR BELONGTO 11560 
              11603      9 INSTR DEADREGS  EFLAGS RBX XMM0 XMM1 ZZ mov     [rsp+38h+var_28], 0 
              11603      9 PTRIMMEDESP STACK 16 displ mov     [rsp+38h+var_28], 0
@@ -3105,7 +3105,7 @@
              1161c      4 INSTR BELONGTO 11560 
              11620      2 INSTR BELONGTO 11560 
              11620      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 XMM0 XMM1 ZZ xor     eax, eax 
-             11620     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             11620     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              11620     40 DEALLOC STACK esp - 40 xor     eax, eax
              11622      1 INSTR BELONGTO 11560 
              11622      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 XMM0 XMM1 ZZ pop     rbx 
@@ -3186,7 +3186,7 @@
              1168f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
              11694      2 INSTR BELONGTO 11650 
              11694      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-             11694     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             11694     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              11696      1 INSTR BELONGTO 11650 
              11696      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
              11697      1 INSTR BELONGTO 11650 
@@ -3215,7 +3215,7 @@
              116fc     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
              1170c     -1 INSTR LOCAL NoMetaUpdate cmp     [rax+68h], ebp 
              1170f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_1173E 
-             11717     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             11717     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              1171c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              1172b     -1 INSTR LOCAL NoMetaUpdate call    _g_object_notify 
              11730     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
@@ -3232,7 +3232,7 @@
              11776     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
              11778     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_117A0 
              1178f     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-             11794     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             11794     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              117b0     -3 INSTR LOCAL NoWarn push    r12 
              117b5     -3 INSTR LOCAL NoWarn push    rbp 
              117b6     -3 INSTR LOCAL NoWarn push    rbx 
@@ -3248,12 +3248,12 @@
              117e2     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_11810 
              117e4     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 20h 
              11801     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
-             11814     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             11814     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              11816     -1 INSTR LOCAL NoMetaUpdate test    r12d, r12d 
              11820     -1 INSTR LOCAL NoMetaUpdate jnz     loc_119D0 
              11826     -1 INSTR LOCAL NoMetaUpdate call    sub_F910 
              11833     -1 INSTR LOCAL NoMetaUpdate call    _gtk_adjustment_set_upper 
-             1183c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             1183c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              11844     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
              11846     -1 INSTR LOCAL NoMetaUpdate jz      loc_11B20 
              1184c     -1 INSTR LOCAL NoMetaUpdate call    sub_F920 
@@ -3264,27 +3264,27 @@
              11879     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scale_clear_marks 
              1187e     -1 INSTR LOCAL NoMetaUpdate test    r12d, r12d 
              11881     -1 INSTR LOCAL NoMetaUpdate jz      loc_11A70 
-             1188b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             1188b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              11893     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm1, rax 
              11898      5 PTRIMMEDESP STACK 0 displ movsd   qword ptr [rsp], xmm1
              1189d     -1 INSTR LOCAL NoMetaUpdate call    sub_F910 
              118a2     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm1, qword ptr [rsp] 
              118a2      5 PTRIMMEDESP STACK 0 displ movsd   xmm1, qword ptr [rsp]
-             118a7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 7 
+             118a7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 7 
              118ac     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm1, xmm0 
              118b0     -1 INSTR LOCAL NoMetaUpdate jp      loc_119E0 
              118b6     -1 INSTR LOCAL NoMetaUpdate jnz     loc_119E0 
              118ca     -1 INSTR LOCAL NoMetaUpdate call    _g_dpgettext 
-             118d9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             118d9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              118db     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
-             118e0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             118e0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              118e5     -1 INSTR LOCAL NoMetaUpdate call    sub_F910 
              118ee      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
              118f5      5 PTRIMMEDESP STACK 0 displ movsd   qword ptr [rsp], xmm0
              118fa     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              118ff     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm0, qword ptr [rsp] 
              118ff      5 PTRIMMEDESP STACK 0 displ movsd   xmm0, qword ptr [rsp]
-             11907     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+             11907     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
              1190f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scale_add_mark 
              11917     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
              1191c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_alignment_get_type 
@@ -3314,7 +3314,7 @@
              119d0     -1 INSTR LOCAL NoMetaUpdate call    sub_F920 
              119d5     -1 INSTR LOCAL NoMetaUpdate jmp     loc_1182B 
              119ee     -1 INSTR LOCAL NoMetaUpdate call    _g_dpgettext 
-             119fd     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             119fd     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              119ff     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
              11a0b      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
              11a18     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm0, rdx 
@@ -3322,16 +3322,16 @@
              11a22     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              11a27     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm0, qword ptr [rsp] 
              11a27      5 PTRIMMEDESP STACK 0 displ movsd   xmm0, qword ptr [rsp]
-             11a32     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+             11a32     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
              11a37     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scale_add_mark 
-             11a40     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             11a40     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              11a48     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm0, rax 
              11a4d      6 PTRIMMEDESP STACK 24 displ movsd   qword ptr [rsp+18h], xmm0
              11a53     -1 INSTR LOCAL NoMetaUpdate call    sub_F910 
              11a58     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm0, qword ptr [rsp+18h] 
              11a58      6 PTRIMMEDESP STACK 24 displ ucomisd xmm0, qword ptr [rsp+18h]
              11a5e     -1 INSTR LOCAL NoMetaUpdate jbe     loc_11914 
-             11a64     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 7 
+             11a64     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 7 
              11a69     -1 INSTR LOCAL NoMetaUpdate jmp     loc_118BC 
              11a70     -1 INSTR LOCAL NoMetaUpdate call    _gtk_alignment_get_type 
              11a80     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -3407,7 +3407,7 @@
              11b6f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
              11b74      2 INSTR BELONGTO 11b30 
              11b74      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-             11b74     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             11b74     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              11b76      1 INSTR BELONGTO 11b30 
              11b76      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
              11b77      1 INSTR BELONGTO 11b30 
@@ -3452,10 +3452,10 @@
              11bf3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
              11c02     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
              11c07      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-             11c2f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             11c2f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
              11c34      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
              11c39      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-             11c3d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             11c3d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              11c3f     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
              11c44      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
              11c49      5 PTRIMMEDESP STACK 48 displ mov     rbp, [rsp+30h]
@@ -3515,12 +3515,12 @@
              11dcc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_get_type 
              11ddc     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              11de1     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
-             11de5     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+             11de5     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
              11dec     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_label_set_ellipsize 
              11df8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_get_type 
              11e08     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              11e0d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
-             11e11     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+             11e11     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
              11e1b     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_label_set_ellipsize 
              11e20      5 PTRIMMEDESP STACK -40 displ mov     [rsp-28h], rbx
              11e25      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], rbp
@@ -3536,10 +3536,10 @@
              11e67     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
              11e75     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
              11e7a      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-             11ea2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             11ea2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
              11ea7      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
              11eac      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-             11eb0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             11eb0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              11eb2     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
              11eb7      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
              11ebc      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -3655,7 +3655,7 @@
              12164      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
              1216a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              12175     -1 INSTR LOCAL NoMetaUpdate call    _gtk_range_set_adjustment 
-             1217d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             1217d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              12182     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              12187      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
              1218c      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -3682,7 +3682,7 @@
              12228     -1 INSTR LOCAL NoMetaUpdate test    ebp, ebp 
              1222a     -1 INSTR LOCAL NoMetaUpdate jz      short loc_12240 
              12236     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
-             12240     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+             12240     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
              12246     -1 INSTR LOCAL NoMetaUpdate call    sub_F910 
              1224b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cvttsd2si rax, xmm0 
              12256     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
@@ -3698,12 +3698,12 @@
              12261      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ call    sub_10190 
              12266      2 INSTR BELONGTO 12260 
              12266      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-             12266     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+             12266     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
              12268      3 INSTR BELONGTO 12260 
              12268      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
              1226b      2 INSTR BELONGTO 12260 
              1226b      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-             1226b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             1226b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              1226d     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
              1226d      5 INSTR BELONGTO 12260 
              1226d      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_object_new 
@@ -3721,7 +3721,7 @@
              12281     -1 INSTR LOCAL NoMetaUpdate jmp     _g_type_check_instance_cast 
              12281      5 INSTR BELONGTO 12260 
              12281      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_type_check_instance_cast 
-             12296     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             12296     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              12298     -1 INSTR LOCAL NoMetaUpdate cmp     edx, ecx 
              1229a     -1 INSTR LOCAL NoMetaUpdate jz      short locret_122A6 
              1229c     -1 INSTR LOCAL NoMetaUpdate cmp     ecx, edx 
@@ -3779,7 +3779,7 @@
              122e9      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_class_peek_parent 
              122ee      3 INSTR BELONGTO 122e0 
              122ee      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
-             122f1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             122f1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              122f1      5 INSTR BELONGTO 122e0 
              122f1      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
              122f6      7 INSTR BELONGTO 122e0 
@@ -3810,7 +3810,7 @@
              1232f      7 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8, 0FFFFFFFFFFFFFFFFh 
              12336      2 INSTR BELONGTO 122e0 
              12336      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-             12336     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             12336     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              12338      4 INSTR BELONGTO 122e0 
              12338      4 INSTR DEADREGS  EFLAGS ZZ mov     [rbx+30h], rax 
              1233c     -1 INSTR LOCAL MetadataRedundant lea     rax, loc_12F00 
@@ -3831,7 +3831,7 @@
              1235e      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
              12361      3 INSTR BELONGTO 122e0 
              12361      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-             12364     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+             12364     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
              12364      5 INSTR BELONGTO 122e0 
              12364      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 3 
              12369     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -3849,7 +3849,7 @@
              1237f      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, 0FFFFFFFFFFFFFFFFh 
              12386      2 INSTR BELONGTO 122e0 
              12386      2 INSTR DEADREGS  EFLAGS RCX RDI ZZ xor     ecx, ecx 
-             12386     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             12386     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              12388     -1 INSTR LOCAL MetadataRedundant mov     [rsp+28h+var_28], 0Bh 
              12388      7 INSTR BELONGTO 122e0 
              1238f      3 INSTR BELONGTO 122e0 
@@ -3861,7 +3861,7 @@
              12397      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
              1239a      3 INSTR BELONGTO 122e0 
              1239a      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-             1239d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+             1239d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
              1239d      5 INSTR BELONGTO 122e0 
              1239d      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
              123a2     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -3873,7 +3873,7 @@
              123ae      7 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ lea     rsi, aPulseaudioCont; "PulseAudio context" 
              123b5      7 INSTR BELONGTO 122e0 
              123b5      7 INSTR DEADREGS  EFLAGS RCX RDI ZZ lea     rdi, aPaContext ; "pa-context" 
-             123bc     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Bh 
+             123bc     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Bh 
              123bc      5 INSTR BELONGTO 122e0 
              123bc      5 INSTR DEADREGS  EFLAGS RCX ZZ mov     ecx, 0Bh 
              123c1     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_pointer 
@@ -3883,7 +3883,7 @@
              123c6      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
              123c9      3 INSTR BELONGTO 122e0 
              123c9      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-             123cc     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+             123cc     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
              123cc      5 INSTR BELONGTO 122e0 
              123cc      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 2 
              123d1     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -3900,7 +3900,7 @@
              123eb      6 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8d, 7 
              123f1      2 INSTR BELONGTO 122e0 
              123f1      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-             123f1     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             123f1     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              123f3     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_string 
              123f3      5 INSTR BELONGTO 122e0 
              123f3      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_string 
@@ -3908,7 +3908,7 @@
              123f8      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
              123fb      3 INSTR BELONGTO 122e0 
              123fb      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-             123fe     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+             123fe     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
              123fe      5 INSTR BELONGTO 122e0 
              123fe      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 4 
              12403     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -3925,7 +3925,7 @@
              1241d      6 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8d, 7 
              12423      2 INSTR BELONGTO 122e0 
              12423      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-             12423     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             12423     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              12425     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_string 
              12425      5 INSTR BELONGTO 122e0 
              12425      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_string 
@@ -3933,7 +3933,7 @@
              1242a      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
              1242d      3 INSTR BELONGTO 122e0 
              1242d      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-             12430     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+             12430     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
              12430      5 INSTR BELONGTO 122e0 
              12430      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 5 
              12435     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -3950,7 +3950,7 @@
              1244f      6 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8d, 3 
              12455      2 INSTR BELONGTO 122e0 
              12455      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-             12455     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             12455     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              12457     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_string 
              12457      5 INSTR BELONGTO 122e0 
              12457      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_string 
@@ -3958,7 +3958,7 @@
              1245c      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
              1245f      3 INSTR BELONGTO 122e0 
              1245f      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-             12462     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+             12462     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
              12462      5 INSTR BELONGTO 122e0 
              12462      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 6 
              12467     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -3975,13 +3975,13 @@
              12481      6 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8d, 1 
              12487      2 INSTR BELONGTO 122e0 
              12487      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-             12487     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             12487     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              12489     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_string 
              12489      5 INSTR BELONGTO 122e0 
              12489      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_string 
              1248e      3 INSTR BELONGTO 122e0 
              1248e      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
-             12491     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
+             12491     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
              12491      5 INSTR BELONGTO 122e0 
              12491      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     esi, 7 
              12496      3 INSTR BELONGTO 122e0 
@@ -4049,12 +4049,12 @@
              1250a     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h 
              1250a      6 INSTR BELONGTO 124c0 
              1250a      6 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 ZZ mov     r8d, 20h 
-             12510     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 88h 
+             12510     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 88h 
              12510      5 INSTR BELONGTO 124c0 
              12510      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 88h 
              12515      3 INSTR BELONGTO 124c0 
              12515      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-             12518     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+             12518     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
              12518      5 INSTR BELONGTO 124c0 
              12518      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
              1251d      7 INSTR BELONGTO 124c0 
@@ -4085,10 +4085,10 @@
              1257f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
              1258e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
              12593      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-             125bb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             125bb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
              125c0      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
              125c5      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-             125c9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             125c9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              125cb     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
              125d0      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
              125d5      5 PTRIMMEDESP STACK 48 displ mov     rbp, [rsp+30h]
@@ -4201,7 +4201,7 @@
              127a5      4 INSTR BELONGTO 126d0 
              127a9      7 INSTR BELONGTO 126d0 
              127b0      2 INSTR BELONGTO 126d0 
-             127b0     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+             127b0     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
              127b2      4 INSTR BELONGTO 126d0 
              127b6      8 INSTR BELONGTO 126d0 
              127be     -1 INSTR LOCAL NoMetaUpdate call    _g_list_foreach 
@@ -4212,7 +4212,7 @@
              127cb      5 INSTR BELONGTO 126d0 
              127d0      4 INSTR BELONGTO 126d0 
              127d4      7 INSTR BELONGTO 126d0 
-             127db     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             127db     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              127db      5 INSTR BELONGTO 126d0 
              127e0      8 INSTR BELONGTO 126d0 
              127e8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
@@ -4235,13 +4235,13 @@
              12820      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
              12825      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
              1282d      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
-             12842     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             12842     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              12847     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
              1284f      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
              12854     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [rax+10h] 
              1285a     -1 INSTR LOCAL NoMetaUpdate call    sub_124C0 
              12865     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-             12874     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+             12874     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
              12879      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
              1287e      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
              1288b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     esi, 1 
@@ -4284,7 +4284,7 @@
              128e6     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
              128e8     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_12910 
              128ff     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-             12904     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             12904     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              12920     -3 INSTR LOCAL NoWarn push    rbx 
              12924     -1 INSTR LOCAL NoMetaUpdate call    sub_124C0 
              12929     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -4297,7 +4297,7 @@
              12946     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
              12948     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_12970 
              1295f     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-             12964     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             12964     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              12980     -3 INSTR LOCAL NoWarn push    rbx 
              12984     -1 INSTR LOCAL NoMetaUpdate call    sub_124C0 
              12989     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -4310,7 +4310,7 @@
              129a6     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
              129a8     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_129D0 
              129bf     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-             129c4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             129c4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              129e0      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 4 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
              129e0      0 FUNC MMSAFENESS SAFE
              129e0      1 INSTR BELONGTO 129e0 
@@ -4359,7 +4359,7 @@
              12a1f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
              12a24      2 INSTR BELONGTO 129e0 
              12a24      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-             12a24     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             12a24     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              12a26      1 INSTR BELONGTO 129e0 
              12a26      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
              12a27      1 INSTR BELONGTO 129e0 
@@ -4430,7 +4430,7 @@
              12a94      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
              12a99      2 INSTR BELONGTO 12a40 
              12a99      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-             12a99     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             12a99     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              12a9b      4 INSTR BELONGTO 12a40 
              12a9b      4 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+18h+var_18] 
              12a9b      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp+18h+var_18]
@@ -4458,7 +4458,7 @@
              12ac4     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
              12ac4      5 INSTR BELONGTO 12a40 
              12ac4      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strdup 
-             12ac9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             12ac9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              12ac9      5 INSTR BELONGTO 12a40 
              12ac9      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 50h 
              12ace      3 INSTR BELONGTO 12a40 
@@ -4475,7 +4475,7 @@
              12ae5     -1 INSTR LOCAL NoMetaUpdate call    _g_object_notify 
              12ae5      5 INSTR BELONGTO 12a40 
              12ae5      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_object_notify 
-             12aea     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             12aea     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              12aea      5 INSTR BELONGTO 12a40 
              12aea      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ mov     eax, 1 
              12aef     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_12A9B 
@@ -4492,7 +4492,7 @@
              12b26     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
              12b28     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_12B50 
              12b3f     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-             12b44     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             12b44     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              12b60      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
              12b60      0 FUNC MMSAFENESS SAFE
              12b60    177 FUNC GLOBAL sub_12B60 FUNC_UNSAFE NOFP RET              12c10 
@@ -4551,7 +4551,7 @@
              12bb4      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
              12bb9      2 INSTR BELONGTO 12b60 
              12bb9      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-             12bb9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             12bb9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              12bbb      4 INSTR BELONGTO 12b60 
              12bbb      4 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+18h+var_18] 
              12bbb      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp+18h+var_18]
@@ -4579,7 +4579,7 @@
              12be4     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
              12be4      5 INSTR BELONGTO 12b60 
              12be4      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strdup 
-             12be9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             12be9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              12be9      5 INSTR BELONGTO 12b60 
              12be9      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 50h 
              12bee      3 INSTR BELONGTO 12b60 
@@ -4596,7 +4596,7 @@
              12c05     -1 INSTR LOCAL NoMetaUpdate call    _g_object_notify 
              12c05      5 INSTR BELONGTO 12b60 
              12c05      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_object_notify 
-             12c0a     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             12c0a     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              12c0a      5 INSTR BELONGTO 12b60 
              12c0a      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ mov     eax, 1 
              12c0f     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_12BBB 
@@ -4614,7 +4614,7 @@
              12c45     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_is_a 
              12c4a     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
              12c4c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_12C78 
-             12c63     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+             12c63     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
              12c65     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
              12c6b      3 PTRIMMEDEBP STACK 0 displ mov     rax, rbp
              12c81     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -4627,9 +4627,9 @@
              12cad     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
              12cb0     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_12C90 
              12cc7     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-             12cca     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A9h 
+             12cca     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A9h 
              12ccf     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message 
-             12ce9     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+             12ce9     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
              12ceb     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
              12cf1      3 PTRIMMEDEBP STACK 0 displ mov     rax, rbp
              12d00      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -24 0 4 0 8 5 -16 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 -8 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -4688,7 +4688,7 @@
              12d46      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
              12d4b      2 INSTR BELONGTO 12d00 
              12d4b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-             12d4b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             12d4b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              12d4d      1 INSTR BELONGTO 12d00 
              12d4d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
              12d4e      1 INSTR BELONGTO 12d00 
@@ -4768,7 +4768,7 @@
              12de0      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     [rbx+30h], rax 
              12de4      3 INSTR BELONGTO 12d00 
              12de4      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, r12 
-             12de7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             12de7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              12de7      5 INSTR BELONGTO 12d00 
              12de7      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 50h 
              12dec     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -4785,7 +4785,7 @@
              12e00      1 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
              12e01      1 INSTR BELONGTO 12d00 
              12e01      1 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ pop     rbp 
-             12e02     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             12e02     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              12e02      5 INSTR BELONGTO 12d00 
              12e02      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ mov     eax, 1 
              12e07      2 INSTR BELONGTO 12d00 
@@ -4803,7 +4803,7 @@
              12e1f      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
              12e24      2 INSTR BELONGTO 12d00 
              12e24      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-             12e24     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             12e24     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              12e26     -1 INSTR LOCAL NoMetaUpdate jmp     loc_12D4D 
              12e26      5 INSTR BELONGTO 12d00 
              12e30      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -4859,8 +4859,8 @@
              12eaf      7 INSTR BELONGTO 12e30 
              12eb6      3 INSTR BELONGTO 12e30 
              12eb9      2 INSTR BELONGTO 12e30 
-             12eb9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-             12ebb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+             12eb9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+             12ebb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
              12ebb      5 INSTR BELONGTO 12e30 
              12ec0     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
              12ec0      5 INSTR BELONGTO 12e30 
@@ -4870,7 +4870,7 @@
              12ed7      7 INSTR BELONGTO 12e30 
              12ede      7 INSTR BELONGTO 12e30 
              12ee5      7 INSTR BELONGTO 12e30 
-             12eec     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0D1h 
+             12eec     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0D1h 
              12eec      5 INSTR BELONGTO 12e30 
              12ef1     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
              12ef1      5 INSTR BELONGTO 12e30 
@@ -4918,14 +4918,14 @@
              12f71      7 INSTR BELONGTO 12e30 
              12f78      7 INSTR BELONGTO 12e30 
              12f7f      3 INSTR BELONGTO 12e30 
-             12f82     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             12f82     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
              12f82      5 INSTR BELONGTO 12e30 
              12f87      5 INSTR BELONGTO 12e30 
              12f87      5 PTRIMMEDESP STACK 16 displ mov     [rsp+60h+var_50], rbp
              12f8c      4 INSTR BELONGTO 12e30 
              12f8c      4 PTRIMMEDESP STACK 0 displ mov     [rsp+60h+var_60], rax
              12f90      2 INSTR BELONGTO 12e30 
-             12f90     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             12f90     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              12f92     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
              12f92      5 INSTR BELONGTO 12e30 
              12f97      5 INSTR BELONGTO 12e30 
@@ -5040,7 +5040,7 @@
              130e6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_is_a 
              130eb     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
              130ed     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_13120 
-             13104     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+             13104     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
              13106     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
              1310b      2 PTRIMMEDEBP STACK 0 displ mov     eax, ebp
              1310d      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
@@ -5049,7 +5049,7 @@
              1311b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
              13124     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+38h], 0 
              13129     -1 INSTR LOCAL NoMetaUpdate jz      loc_13230 
-             13136     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+             13136     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
              1313b     -1 INSTR LOCAL NoMetaUpdate call    _g_strcmp0 
              13140     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
              13142     -1 INSTR LOCAL NoMetaUpdate jz      short loc_1310B 
@@ -5074,25 +5074,25 @@
              131b8      4 PTRIMMEDEBP STACK 0 displ mov     rdi, [rbp+0]
              131bc     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_set_card_profile_by_index 
              131c1      4 PTRIMMEDEBP STACK 64 displ mov     [rbp+40h], rax
-             131c9     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+             131c9     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
              131ce     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+40h], 0 
              131d3     -1 INSTR LOCAL NoMetaUpdate jnz     loc_1310B 
-             131e7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-             131ec     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-             131ee     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     bpl, bpl 
+             131e7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             131ec     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+             131ee     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     bpl, bpl 
              131f1     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
              131f6     -1 INSTR LOCAL NoMetaUpdate jmp     loc_1310B 
              13200     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rbp+30h], 0 
              13200      5 PTRIMMEDEBP STACK 48 displ cmp     qword ptr [rbp+30h], 0
              13205     -1 INSTR LOCAL NoMetaUpdate jz      short loc_13258 
-             13223     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 103h 
+             13223     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 103h 
              13228     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
-             13245     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+             13245     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
              13247     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
              1324c     -1 INSTR LOCAL NoMetaUpdate jmp     loc_1310B 
              1325b     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
              13260      4 PTRIMMEDEBP STACK 32 displ mov     [rbp+20h], rax
-             13264     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+             13264     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
              13269     -1 INSTR LOCAL NoMetaUpdate jmp     loc_1310B 
              13270     -3 INSTR LOCAL NoWarn push    rbx 
              13274     -1 INSTR LOCAL NoMetaUpdate call    sub_124C0 
@@ -5106,7 +5106,7 @@
              13296     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
              13298     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_132C0 
              132af     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-             132b4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             132b4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              132d0      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -16 0 4 0 8 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
              132d0      0 FUNC MMSAFENESS SAFE
              132d0    175 FUNC GLOBAL sub_132D0 FUNC_UNSAFE NOFP RET              1337e 
@@ -5166,7 +5166,7 @@
              1331c      4 INSTR BELONGTO 132d0 
              13320      2 INSTR BELONGTO 132d0 
              13320      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-             13320     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             13320     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              13322      1 INSTR BELONGTO 132d0 
              13322      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
              13323      1 INSTR BELONGTO 132d0 
@@ -5192,7 +5192,7 @@
              1334d      4 INSTR BELONGTO 132d0 
              13351      2 INSTR BELONGTO 132d0 
              13351      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-             13351     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             13351     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              13353      1 INSTR BELONGTO 132d0 
              13353      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
              13354      1 INSTR BELONGTO 132d0 
@@ -5211,7 +5211,7 @@
              1336f      4 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ mov     [rbx+38h], rax 
              13373     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
              13373      4 INSTR BELONGTO 132d0 
-             13377     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             13377     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              13377      5 INSTR BELONGTO 132d0 
              13377      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
              13377      8 DEALLOC STACK esp - 8 mov     eax, 1
@@ -5254,7 +5254,7 @@
              133ae      3 INSTR DEADREGS  EFLAGS RAX RBX R9 ZZ xor     r9d, r9d 
              133b1      2 INSTR BELONGTO 13380 
              133b1      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-             133b1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             133b1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              133b3     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
              133b3      5 INSTR BELONGTO 13380 
              133b3      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_object_new 
@@ -5298,7 +5298,7 @@
              133e9      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
              133ee      3 INSTR BELONGTO 133e0 
              133ee      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-             133f1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             133f1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              133f1      5 INSTR BELONGTO 133e0 
              133f1      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
              133f6      7 INSTR BELONGTO 133e0 
@@ -5355,23 +5355,23 @@
              13479     -1 INSTR LOCAL NoMetaUpdate call    sub_9850 
              13483     -1 INSTR LOCAL NoMetaUpdate call    sub_97F0 
              13488     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-             1348b     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             1348b     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              13490      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
              13498     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_set_sink_mute_by_index 
              1349d     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
              134a0     -1 INSTR LOCAL NoMetaUpdate jz      short loc_134C8 
              134a5     -1 INSTR LOCAL NoMetaUpdate call    _pa_operation_unref 
-             134aa     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             134aa     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              134af      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
              134b3      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
              134b8      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
              134bd     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
              134cb     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_errno 
              134d2     -1 INSTR LOCAL NoMetaUpdate call    _pa_strerror 
-             134e8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-             134ed     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             134e8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             134ed     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              134ef     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
-             134f4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             134f4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              134f6     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_134AF 
              13500      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
              13505      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
@@ -5379,23 +5379,23 @@
              13519     -1 INSTR LOCAL NoMetaUpdate call    sub_9850 
              13523     -1 INSTR LOCAL NoMetaUpdate call    sub_97F0 
              13528     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-             1352b     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             1352b     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              13530      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
              13538     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_set_sink_port_by_index 
              1353d     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
              13540     -1 INSTR LOCAL NoMetaUpdate jz      short loc_13568 
              13545     -1 INSTR LOCAL NoMetaUpdate call    _pa_operation_unref 
-             1354a     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             1354a     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              1354f      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
              13553      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
              13558      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
              1355d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
              1356b     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_errno 
              13572     -1 INSTR LOCAL NoMetaUpdate call    _pa_strerror 
-             13588     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-             1358d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             13588     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             1358d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              1358f     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
-             13594     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             13594     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              13596     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_1354F 
              135a0      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], rbx
              135a5      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbp
@@ -5406,12 +5406,12 @@
              135d1     -1 INSTR LOCAL NoMetaUpdate call    sub_B8C0 
              135dc     -1 INSTR LOCAL NoMetaUpdate call    sub_97F0 
              135e1     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-             135e4     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             135e4     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              135f2     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_set_sink_volume_by_index 
              135f7     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
              135fa     -1 INSTR LOCAL NoMetaUpdate jz      short loc_13620 
              135fc      4 PTRIMMEDEBP STACK 0 displ mov     [rbp+0], rax
-             13600     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             13600     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              13605      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
              1360a      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
              1360f      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
@@ -5419,10 +5419,10 @@
              13619     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
              13623     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_errno 
              1362a     -1 INSTR LOCAL NoMetaUpdate call    _pa_strerror 
-             13640     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-             13645     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             13640     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             13645     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              13647     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
-             1364c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             1364c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              1364e     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_13605 
              13650      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
              13650      0 FUNC MMSAFENESS SAFE
@@ -5485,7 +5485,7 @@
              136b0     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 28h 
              136b0      6 INSTR BELONGTO 13650 
              136b0      6 INSTR DEADREGS  EFLAGS RDX RBX R8 ZZ mov     r8d, 28h 
-             136b6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
+             136b6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
              136b6      5 INSTR BELONGTO 13650 
              136b6      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 0A0h 
              136bb      7 INSTR BELONGTO 13650 
@@ -5519,7 +5519,7 @@
              13733     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              13738     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+20h], 0 
              1373d     -1 INSTR LOCAL NoMetaUpdate jz      short loc_13780 
-             13746     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             13746     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              1374b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
              13758     -1 INSTR LOCAL NoMetaUpdate jmp     rax 
              13776     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -5586,7 +5586,7 @@
              137fb      3 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     rdx, rbx 
              137fe      2 INSTR BELONGTO 137c0 
              137fe      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-             137fe     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             137fe     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              13800      4 INSTR BELONGTO 137c0 
              13800      4 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+28h+var_28], r12 
              13800      4 PTRIMMEDESP STACK 0 displ mov     [rsp+28h+var_28], r12
@@ -5638,7 +5638,7 @@
              13849      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
              1384e      3 INSTR BELONGTO 13840 
              1384e      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-             13851     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             13851     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              13851      5 INSTR BELONGTO 13840 
              13851      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
              13856      7 INSTR BELONGTO 13840 
@@ -5695,23 +5695,23 @@
              138d9     -1 INSTR LOCAL NoMetaUpdate call    sub_9850 
              138e3     -1 INSTR LOCAL NoMetaUpdate call    sub_97F0 
              138e8     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-             138eb     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             138eb     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              138f0      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
              138f8     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_set_source_port_by_index 
              138fd     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
              13900     -1 INSTR LOCAL NoMetaUpdate jz      short loc_13928 
              13905     -1 INSTR LOCAL NoMetaUpdate call    _pa_operation_unref 
-             1390a     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             1390a     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              1390f      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
              13913      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
              13918      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
              1391d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
              1392b     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_errno 
              13932     -1 INSTR LOCAL NoMetaUpdate call    _pa_strerror 
-             13948     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-             1394d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             13948     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             1394d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              1394f     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
-             13954     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             13954     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              13956     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_1390F 
              13960      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
              13965      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
@@ -5719,23 +5719,23 @@
              13979     -1 INSTR LOCAL NoMetaUpdate call    sub_9850 
              13983     -1 INSTR LOCAL NoMetaUpdate call    sub_97F0 
              13988     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-             1398b     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             1398b     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              13990      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
              13998     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_set_source_mute_by_index 
              1399d     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
              139a0     -1 INSTR LOCAL NoMetaUpdate jz      short loc_139C8 
              139a5     -1 INSTR LOCAL NoMetaUpdate call    _pa_operation_unref 
-             139aa     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             139aa     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              139af      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
              139b3      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
              139b8      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
              139bd     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
              139cb     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_errno 
              139d2     -1 INSTR LOCAL NoMetaUpdate call    _pa_strerror 
-             139e8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-             139ed     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             139e8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             139ed     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              139ef     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
-             139f4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             139f4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              139f6     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_139AF 
              13a00      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], rbx
              13a05      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbp
@@ -5746,12 +5746,12 @@
              13a31     -1 INSTR LOCAL NoMetaUpdate call    sub_B8C0 
              13a3c     -1 INSTR LOCAL NoMetaUpdate call    sub_97F0 
              13a41     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-             13a44     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             13a44     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              13a52     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_set_source_volume_by_index 
              13a57     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
              13a5a     -1 INSTR LOCAL NoMetaUpdate jz      short loc_13A80 
              13a5c      4 PTRIMMEDEBP STACK 0 displ mov     [rbp+0], rax
-             13a60     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             13a60     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              13a65      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
              13a6a      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
              13a6f      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
@@ -5759,10 +5759,10 @@
              13a79     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
              13a83     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_errno 
              13a8a     -1 INSTR LOCAL NoMetaUpdate call    _pa_strerror 
-             13aa0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-             13aa5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             13aa0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             13aa5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              13aa7     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
-             13aac     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             13aac     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              13aae     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_13A65 
              13ab0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
              13ab0      0 FUNC MMSAFENESS SAFE
@@ -5825,7 +5825,7 @@
              13b10     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 28h 
              13b10      6 INSTR BELONGTO 13ab0 
              13b10      6 INSTR DEADREGS  EFLAGS RDX RBX R8 ZZ mov     r8d, 28h 
-             13b16     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
+             13b16     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
              13b16      5 INSTR BELONGTO 13ab0 
              13b16      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 0A0h 
              13b1b      7 INSTR BELONGTO 13ab0 
@@ -5859,7 +5859,7 @@
              13b93     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              13b98     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+20h], 0 
              13b9d     -1 INSTR LOCAL NoMetaUpdate jz      short loc_13BE0 
-             13ba6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             13ba6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              13bab     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
              13bb8     -1 INSTR LOCAL NoMetaUpdate jmp     rax 
              13bd6     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -5926,7 +5926,7 @@
              13c5b      3 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     rdx, rbx 
              13c5e      2 INSTR BELONGTO 13c20 
              13c5e      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-             13c5e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             13c5e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              13c60      4 INSTR BELONGTO 13c20 
              13c60      4 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+28h+var_28], r12 
              13c60      4 PTRIMMEDESP STACK 0 displ mov     [rsp+28h+var_28], r12
@@ -5978,7 +5978,7 @@
              13ca9      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
              13cae      3 INSTR BELONGTO 13ca0 
              13cae      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-             13cb1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             13cb1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              13cb1      5 INSTR BELONGTO 13ca0 
              13cb1      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
              13cb6      7 INSTR BELONGTO 13ca0 
@@ -6031,20 +6031,20 @@
              13d28     -1 INSTR LOCAL NoMetaUpdate call    sub_9850 
              13d32     -1 INSTR LOCAL NoMetaUpdate call    sub_97F0 
              13d37     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-             13d3a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             13d3a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              13d3c      2 PTRIMMEDEBP STACK 0 displ mov     edx, ebp
              13d43     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_set_sink_input_mute 
              13d48     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
              13d4b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_13D70 
              13d50     -1 INSTR LOCAL NoMetaUpdate call    _pa_operation_unref 
-             13d55     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             13d55     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              13d5a      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
              13d5e      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
              13d63      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
              13d68     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
-             13d7e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             13d7e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
              13d83     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
-             13d88     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             13d88     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              13d8a     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_13D5A 
              13d90      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], rbx
              13d95      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbp
@@ -6055,20 +6055,20 @@
              13dc0     -1 INSTR LOCAL NoMetaUpdate call    sub_B8C0 
              13dcb     -1 INSTR LOCAL NoMetaUpdate call    sub_97F0 
              13dd0     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-             13dd3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             13dd3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              13ddb      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
              13ddd     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_set_sink_input_volume 
              13de2     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
              13de5     -1 INSTR LOCAL NoMetaUpdate jz      short loc_13E10 
-             13dea     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             13dea     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              13def      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
              13df4      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
              13df9      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
              13dfe      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
              13e03     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
-             13e1e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             13e1e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
              13e23     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
-             13e28     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             13e28     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              13e2a     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_13DEF 
              13e30      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
              13e30      0 FUNC MMSAFENESS SAFE
@@ -6131,7 +6131,7 @@
              13e90     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 28h 
              13e90      6 INSTR BELONGTO 13e30 
              13e90      6 INSTR DEADREGS  EFLAGS RDX RBX R8 ZZ mov     r8d, 28h 
-             13e96     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
+             13e96     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
              13e96      5 INSTR BELONGTO 13e30 
              13e96      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 0A0h 
              13e9b      7 INSTR BELONGTO 13e30 
@@ -6165,7 +6165,7 @@
              13f13     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              13f18     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+20h], 0 
              13f1d     -1 INSTR LOCAL NoMetaUpdate jz      short loc_13F60 
-             13f26     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             13f26     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              13f2b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
              13f38     -1 INSTR LOCAL NoMetaUpdate jmp     rax 
              13f56     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -6232,7 +6232,7 @@
              13fdb      3 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     rdx, rbx 
              13fde      2 INSTR BELONGTO 13fa0 
              13fde      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-             13fde     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             13fde     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              13fe0      4 INSTR BELONGTO 13fa0 
              13fe0      4 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+28h+var_28], r12 
              13fe0      4 PTRIMMEDESP STACK 0 displ mov     [rsp+28h+var_28], r12
@@ -6263,8 +6263,8 @@
              14013     40 DEALLOC STACK esp - 40 jmp     _g_type_check_instance_cast
              14013      5 INSTR BELONGTO 13fa0 
              14013      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ jmp     _g_type_check_instance_cast 
-             14027     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
-             14030     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             14027     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             14030     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              14040      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 2 3 -16 0 4 0 0 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
              14040      0 FUNC MMSAFENESS SAFE
              14040    111 FUNC GLOBAL sub_14040 FUNC_UNSAFE NOFP RET              140ae 
@@ -6286,7 +6286,7 @@
              14049      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
              1404e      3 INSTR BELONGTO 14040 
              1404e      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-             14051     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             14051     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              14051      5 INSTR BELONGTO 14040 
              14051      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
              14056      7 INSTR BELONGTO 14040 
@@ -6394,7 +6394,7 @@
              14110     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 28h 
              14110      6 INSTR BELONGTO 140b0 
              14110      6 INSTR DEADREGS  EFLAGS RDX RBX R8 ZZ mov     r8d, 28h 
-             14116     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
+             14116     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
              14116      5 INSTR BELONGTO 140b0 
              14116      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 0A0h 
              1411b      7 INSTR BELONGTO 140b0 
@@ -6428,7 +6428,7 @@
              14193     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              14198     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+20h], 0 
              1419d     -1 INSTR LOCAL NoMetaUpdate jz      short loc_141E0 
-             141a6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             141a6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              141ab     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
              141b8     -1 INSTR LOCAL NoMetaUpdate jmp     rax 
              141d6     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -6495,7 +6495,7 @@
              1425b      3 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     rdx, rbx 
              1425e      2 INSTR BELONGTO 14220 
              1425e      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-             1425e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             1425e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              14260      4 INSTR BELONGTO 14220 
              14260      4 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+28h+var_28], r12 
              14260      4 PTRIMMEDESP STACK 0 displ mov     [rsp+28h+var_28], r12
@@ -6547,7 +6547,7 @@
              142a9      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
              142ae      3 INSTR BELONGTO 142a0 
              142ae      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-             142b1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             142b1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              142b1      5 INSTR BELONGTO 142a0 
              142b1      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
              142b6      7 INSTR BELONGTO 142a0 
@@ -6577,7 +6577,7 @@
              142e3      6 INSTR DEADREGS  EFLAGS RCX RSI R8 ZZ mov     r8d, 7 
              142e9      2 INSTR BELONGTO 142a0 
              142e9      2 INSTR DEADREGS  EFLAGS RCX RSI ZZ xor     ecx, ecx 
-             142e9     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+             142e9     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
              142eb      4 INSTR BELONGTO 142a0 
              142eb      4 INSTR DEADREGS  EFLAGS RSI ZZ mov     [rbp+30h], rdx 
              142ef     -1 INSTR LOCAL MetadataRedundant lea     rdx, loc_14690 
@@ -6605,7 +6605,7 @@
              1432b      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_string 
              14330      3 INSTR BELONGTO 142a0 
              14330      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbp 
-             14333     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+             14333     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
              14333      5 INSTR BELONGTO 142a0 
              14333      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     esi, 1 
              14338      3 INSTR BELONGTO 142a0 
@@ -6637,12 +6637,12 @@
              14389     -1 INSTR LOCAL NoMetaUpdate call    sub_9910 
              14394     -1 INSTR LOCAL NoMetaUpdate call    sub_B8C0 
              1439f      8 PTRIMMEDESP STACK 160 displ lea     rdi, [rsp+0A0h]
-             143a7     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
+             143a7     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
              143b3      7 PTRIMMEDESP STACK 156 displ mov     [rsp+9Ch], edx
              143c0      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rax
              143c5     -1 INSTR LOCAL NoMetaUpdate call    sub_B850 
              143ca      5 PTRIMMEDESP STACK 24 displ lea     rdi, [rsp+18h]
-             143d2     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
+             143d2     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
              143de      4 PTRIMMEDEBP STACK 32 displ mov     rax, [rbp+20h]
              143e5      8 PTRIMMEDESP STACK 296 displ mov     [rsp+128h], r12d
              143ed      8 PTRIMMEDESP STACK 288 displ mov     [rsp+120h], rax
@@ -6653,20 +6653,20 @@
              1440d      5 PTRIMMEDESP STACK 16 displ lea     rdx, [rsp+10h]
              14412     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
              14415     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-             1441b     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-             14420     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+             1441b     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+             14420     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
              14428      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], 0
              14430     -1 INSTR LOCAL NoMetaUpdate call    _pa_ext_stream_restore_write 
              14435     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
              1443b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_14460 
              1443d     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
-             14440     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+             14440     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
              14445     -1 INSTR LOCAL NoMetaUpdate jz      short loc_1444A 
              1444a     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 138h 
-             1446e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-             14470     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             1446e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+             14470     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
              14475     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
-             1447a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             1447a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              1447c     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_1444A 
              14480      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
              14480      0 FUNC MMSAFENESS SAFE
@@ -6729,7 +6729,7 @@
              144e0     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 28h 
              144e0      6 INSTR BELONGTO 14480 
              144e0      6 INSTR DEADREGS  EFLAGS RDX RBX R8 ZZ mov     r8d, 28h 
-             144e6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
+             144e6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
              144e6      5 INSTR BELONGTO 14480 
              144e6      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 0A0h 
              144eb      7 INSTR BELONGTO 14480 
@@ -6755,7 +6755,7 @@
              14533     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              1453a      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
              1453f      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
-             14544     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+             14544     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
              14549     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
              1454d     -1 INSTR LOCAL NoMetaUpdate jmp     loc_14360 
              14560      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
@@ -6783,10 +6783,10 @@
              145ef     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
              145fe     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
              14603      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-             1462b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             1462b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
              14630      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
              14635      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-             14639     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             14639     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              1463b     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
              14640      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
              14645      5 PTRIMMEDESP STACK 48 displ mov     rbp, [rsp+30h]
@@ -6813,10 +6813,10 @@
              146d7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
              146e5     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
              146ea      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-             14712     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+             14712     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
              14717      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
              1471c      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-             14720     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             14720     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              14722     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
              14727      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
              1472c      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -6844,7 +6844,7 @@
              147ac     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
              147bf     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
              147cb     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
-             147d3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             147d3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              147d8      4 PTRIMMEDEBP STACK 0 displ mov     [rbp+0], rax
              147dc     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
              147e1      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
@@ -6871,7 +6871,7 @@
              1486c     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
              1486f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_148B8 
              14874     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
-             14880     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+             14880     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
              14885     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
              14892     -1 INSTR LOCAL NoMetaUpdate jmp     rax 
              148ae     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -6942,7 +6942,7 @@
              14943      5 PTRIMMEDESP STACK 8 displ mov     [rsp+38h+var_30], rdx
              14948      2 INSTR BELONGTO 14900 
              14948      2 INSTR DEADREGS  EFLAGS RAX RDX ZZ xor     eax, eax 
-             14948     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+             14948     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
              1494a      3 INSTR BELONGTO 14900 
              1494a      3 INSTR DEADREGS  EFLAGS RDX ZZ mov     rdx, rbx 
              1494d      5 INSTR BELONGTO 14900 
@@ -7026,7 +7026,7 @@
              149d8      2 INSTR BELONGTO 14990 
              149da      2 INSTR BELONGTO 14990 
              149da      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-             149da     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+             149da     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
              149dc      4 INSTR BELONGTO 14990 
              149e0      3 INSTR BELONGTO 14990 
              149e0      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
@@ -8826,8 +8826,8 @@
               6b95      7 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ lea     rsi, msgid      ; " — GNOME Volume Control Applet" 
               6b9c      2 INSTR BELONGTO 6b50 
               6b9c      2 INSTR DEADREGS  EFLAGS RDX RBX RDI ZZ xor     edi, edi        ; domainname 
-              6b9c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-              6b9e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+              6b9c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+              6b9e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
               6b9e      5 INSTR BELONGTO 6b50 
               6b9e      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 5          ; category 
               6ba3     -1 INSTR LOCAL MetadataUnused mov     [rsp+38h+var_28], 0 
@@ -8869,7 +8869,7 @@
               6bf0      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI ZZ mov     edi, cs:dword_21D174 
               6bf6      2 INSTR BELONGTO 6b50 
               6bf6      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI ZZ xor     ebx, ebx 
-              6bf6     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+              6bf6     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
               6bf8     -1 INSTR LOCAL NoMetaUpdate call    sub_8D70 
               6bf8      5 INSTR BELONGTO 6b50 
               6bf8      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ call    sub_8D70 
@@ -8913,7 +8913,7 @@
               6c38      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_unref 
               6c3d      2 INSTR BELONGTO 6b50 
               6c3d      2 INSTR DEADREGS  EFLAGS ZZ xor     ebp, ebp 
-              6c3d     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+              6c3d     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
               6c3f     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
               6c3f      3 INSTR BELONGTO 6b50 
               6c42     -1 INSTR LOCAL NoMetaUpdate jz      short loc_6C4C 
@@ -8927,7 +8927,7 @@
               6c4c      4 INSTR BELONGTO 6b50 
               6c50      2 INSTR BELONGTO 6b50 
               6c50      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, ebp 
-              6c50     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebp 
+              6c50     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebp 
               6c50     40 DEALLOC STACK esp - 40 mov     eax, ebp
               6c52      1 INSTR BELONGTO 6b50 
               6c52      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
@@ -8939,7 +8939,7 @@
               6c55      7 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ lea     rdi, aOrg_gnome_volu; "org.gnome.VolumeControlApplet" 
               6c5c      2 INSTR BELONGTO 6b50 
               6c5c      2 INSTR DEADREGS  EFLAGS RBX RSI ZZ xor     esi, esi 
-              6c5c     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              6c5c     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               6c5e      9 INSTR BELONGTO 6b50 
               6c5e      9 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+38h+var_20], 0 
               6c5e      9 PTRIMMEDESP STACK 24 displ mov     [rsp+38h+var_20], 0
@@ -8975,15 +8975,15 @@
               6c92      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ lea     rdx, aAppletIsAlread; "Applet is already running, exiting" 
               6c99      7 INSTR BELONGTO 6b50 
               6c99      7 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ lea     rdi, aSoundCcPanel; "sound-cc-panel" 
-              6ca0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              6ca0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               6ca0      5 INSTR BELONGTO 6b50 
               6ca0      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 10h 
               6ca5      2 INSTR BELONGTO 6b50 
               6ca5      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-              6ca5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              6ca5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               6ca7      2 INSTR BELONGTO 6b50 
               6ca7      2 INSTR DEADREGS  EFLAGS RBX ZZ xor     ebp, ebp 
-              6ca7     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+              6ca7     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
               6ca9     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               6ca9      5 INSTR BELONGTO 6b50 
               6ca9      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -8995,17 +8995,17 @@
               6cb5      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ lea     rdx, aSS_0+5    ; "%s" 
               6cbc      7 INSTR BELONGTO 6b50 
               6cbc      7 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI ZZ lea     rdi, aSoundCcPanel; "sound-cc-panel" 
-              6cc3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              6cc3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               6cc3      5 INSTR BELONGTO 6b50 
               6cc3      5 INSTR DEADREGS  EFLAGS RCX RBX RSI ZZ mov     esi, 10h 
-              6cc8     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+              6cc8     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
               6cc8      5 INSTR BELONGTO 6b50 
               6cc8      5 INSTR DEADREGS  EFLAGS RCX RBX ZZ mov     ebp, 1 
               6ccd      4 INSTR BELONGTO 6b50 
               6ccd      4 INSTR DEADREGS  EFLAGS RCX RBX ZZ mov     rcx, [rax+8] 
               6cd1      2 INSTR BELONGTO 6b50 
               6cd1      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-              6cd1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              6cd1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               6cd3     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               6cd3      5 INSTR BELONGTO 6b50 
               6cd3      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -9024,16 +9024,16 @@
               6ceb      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ lea     rdi, aSoundCcPanel; "sound-cc-panel" 
               6cf2      7 INSTR BELONGTO 6b50 
               6cf2      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ lea     rdx, aSS_0+5    ; "%s" 
-              6cf9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              6cf9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               6cf9      5 INSTR BELONGTO 6b50 
               6cf9      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 10h 
               6cfe      2 INSTR BELONGTO 6b50 
               6cfe      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-              6cfe     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              6cfe     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               6d00     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               6d00      5 INSTR BELONGTO 6b50 
               6d00      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
-              6d05     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
+              6d05     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
               6d05      5 INSTR BELONGTO 6b50 
               6d05      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 1          ; status 
               6d0a     -1 INSTR LOCAL NoMetaUpdate call    _exit 
@@ -9049,11 +9049,11 @@
               6d21      3 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     rsi, [rax] 
               6d24      2 INSTR BELONGTO 6b50 
               6d24      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-              6d24     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              6d24     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               6d26     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
               6d26      5 INSTR BELONGTO 6b50 
               6d26      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_print 
-              6d2b     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
+              6d2b     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
               6d2b      5 INSTR BELONGTO 6b50 
               6d2b      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 1          ; status 
               6d30     -1 INSTR LOCAL NoMetaUpdate call    _exit 
@@ -9366,7 +9366,7 @@
               6f68      3 INSTR BELONGTO 6e30 
               6f6b     -1 INSTR LOCAL NoMetaUpdate jz      loc_6EAC 
               6f6b      6 INSTR BELONGTO 6e30 
-              6f71     -2 INSTR LOCAL n EAX ZZ  NumericDEFs lea     eax, [r13+r13*2+0] 
+              6f71     -2 INSTR LOCAL n RAX ZZ  NumericDEFs lea     eax, [r13+r13*2+0] 
               6f71      5 INSTR BELONGTO 6e30 
               6f71      5 INSTR DEADREGS  EFLAGS RAX RDX R12 ZZ lea     eax, [r13+r13*2+0] 
               6f76      4 INSTR BELONGTO 6e30 
@@ -9388,7 +9388,7 @@
               6f91      6 INSTR BELONGTO 6e30 
               6f97     -1 INSTR LOCAL MetadataUnused mov     rax, [rdx] 
               6f97      3 INSTR BELONGTO 6e30 
-              6f9a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, r12d 
+              6f9a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, r12d 
               6f9a      3 INSTR BELONGTO 6e30 
               6f9a      3 INSTR DEADREGS  EFLAGS RCX ZZ mov     ecx, r12d 
               6f9d      4 INSTR BELONGTO 6e30 
@@ -9431,12 +9431,12 @@
               6fdb      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ call    sub_9EC0 
               6fe0      7 INSTR BELONGTO 6e30 
               6fe0      7 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ lea     rsi, aMuted     ; "Muted" 
-              6fe7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+              6fe7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
               6fe7      5 INSTR BELONGTO 6e30 
               6fe7      5 INSTR DEADREGS  EFLAGS RDX RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ mov     edx, 5          ; category 
               6fec      2 INSTR BELONGTO 6e30 
               6fec      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ xor     edi, edi        ; domainname 
-              6fec     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+              6fec     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
               6fee     -2 INSTR LOCAL n R12 ZZ  NumericDEFs mov     r12, rax 
               6fee      3 INSTR BELONGTO 6e30 
               6fee      3 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ mov     r12, rax 
@@ -9456,7 +9456,7 @@
               7008      3 INSTR DEADREGS  EFLAGS RDX R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ mov     rdx, rax 
               700b      2 INSTR BELONGTO 6e30 
               700b      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ xor     eax, eax 
-              700b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              700b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               700d     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
               700d      5 INSTR BELONGTO 6e30 
               700d      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 XMM1 XMM2 ZZ call    _g_strdup_printf 
@@ -9636,7 +9636,7 @@
               7170      5 INSTR DEADREGS  EFLAGS XMM0 ZZ call    sub_9C40 
               7175      2 INSTR BELONGTO 7100 
               7175      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 XMM0 ZZ mov     ebp, eax 
-              7175     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, eax 
+              7175     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     ebp, eax 
               7177     -1 INSTR LOCAL NoMetaUpdate call    sub_10190 
               7177      5 INSTR BELONGTO 7100 
               7177      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 XMM0 ZZ call    sub_10190 
@@ -9651,7 +9651,7 @@
               7187      5 INSTR DEADREGS  EFLAGS XMM0 ZZ call    _g_type_check_instance_cast 
               718c      2 INSTR BELONGTO 7100 
               718c      2 INSTR DEADREGS  EFLAGS RSI RDI XMM0 ZZ mov     esi, ebp 
-              718c     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, ebp 
+              718c     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, ebp 
               718e      3 INSTR BELONGTO 7100 
               718e      3 INSTR DEADREGS  EFLAGS RDI XMM0 ZZ mov     rdi, rax 
               7191     -1 INSTR LOCAL NoMetaUpdate call    sub_11000 
@@ -9752,7 +9752,7 @@
               7219      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_class_peek_parent 
               721e      3 INSTR BELONGTO 7210 
               721e      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
-              7221     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              7221     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               7221      5 INSTR BELONGTO 7210 
               7221      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
               7226      7 INSTR BELONGTO 7210 
@@ -9804,7 +9804,7 @@
               7290      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
               7293      3 INSTR BELONGTO 7210 
               7293      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-              7296     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+              7296     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
               7296      5 INSTR BELONGTO 7210 
               7296      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 2 
               729b     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -9821,7 +9821,7 @@
               72b5      6 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8d, 7 
               72bb      2 INSTR BELONGTO 7210 
               72bb      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-              72bb     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              72bb     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               72bd     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_string 
               72bd      5 INSTR BELONGTO 7210 
               72bd      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_string 
@@ -9829,7 +9829,7 @@
               72c2      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
               72c5      3 INSTR BELONGTO 7210 
               72c5      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-              72c8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              72c8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               72c8      5 INSTR BELONGTO 7210 
               72c8      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
               72cd     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -9854,7 +9854,7 @@
               72f5      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_boxed 
               72fa      3 INSTR BELONGTO 7210 
               72fa      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
-              72fd     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+              72fd     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
               72fd      5 INSTR BELONGTO 7210 
               72fd      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     esi, 3 
               7302      3 INSTR BELONGTO 7210 
@@ -9911,7 +9911,7 @@
               733f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    sub_11650 
               7344      2 INSTR BELONGTO 7320 
               7344      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     ebx, eax 
-              7344     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, eax 
+              7344     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     ebx, eax 
               7346      4 INSTR BELONGTO 7320 
               7346      4 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     rax, [rbp+20h] 
               734a      4 INSTR BELONGTO 7320 
@@ -9927,7 +9927,7 @@
               7357      4 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rax, [rbp+20h] 
               735b      2 INSTR BELONGTO 7320 
               735b      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, ebx 
-              735b     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, ebx 
+              735b     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, ebx 
               735d      4 INSTR BELONGTO 7320 
               735d      4 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, [rax+8] 
               7361     -1 INSTR LOCAL NoMetaUpdate call    sub_9D00 
@@ -10008,11 +10008,11 @@
               73e0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
               73e4      2 INSTR BELONGTO 73e0 
               73e4      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-              73e4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              73e4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               73e6     -1 INSTR LOCAL NoMetaUpdate call    sub_7390 
               73e6      5 INSTR BELONGTO 73e0 
               73e6      5 INSTR DEADREGS  EFLAGS ZZ call    sub_7390 
-              73eb     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              73eb     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               73eb      5 INSTR BELONGTO 73e0 
               73eb      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, 1 
               73f0     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
@@ -10028,8 +10028,8 @@
               741c      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r15
               742b      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], rdi
               7430     -1 INSTR LOCAL NoMetaUpdate call    _gtk_menu_new 
-              743c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-              7441     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              743c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+              7441     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               7446     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
               744e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_check_menu_item_new_with_mnemonic 
               745e     -1 INSTR LOCAL NoMetaUpdate call    sub_9C40 
@@ -10043,11 +10043,11 @@
               74a5      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               74ae     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               74b9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_menu_shell_append 
-              74c5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-              74ca     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              74c5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+              74ca     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               74cc     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
               74d4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_image_menu_item_new_with_mnemonic 
-              74e3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              74e3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               74e8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_image_new_from_icon_name 
               74ed      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rax
               74f2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_image_menu_item_get_type 
@@ -10066,8 +10066,8 @@
               7551      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               7557     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               755c      5 PTRIMMEDESP STACK 24 displ mov     r8, [rsp+18h]
-              756b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              756d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              756b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              756d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               7572      4 PTRIMMEDESP STACK 0 displ mov     [rsp], r14d
               7576     -1 INSTR LOCAL NoMetaUpdate call    _gtk_menu_popup 
               757b      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
@@ -10083,7 +10083,7 @@
               75a8      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], 0
               75b1     -1 INSTR LOCAL NoMetaUpdate call    _gdk_app_launch_context_new 
               75b6      5 PTRIMMEDESP STACK 8 displ lea     rcx, [rsp+8]
-              75c9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              75c9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               75ce     -1 INSTR LOCAL NoMetaUpdate call    _g_app_info_create_from_commandline 
               75d3     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
               75d9     -1 INSTR LOCAL NoMetaUpdate jz      short loc_75FD 
@@ -10091,23 +10091,23 @@
               75e0      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               75e6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               75eb      5 PTRIMMEDESP STACK 8 displ lea     rcx, [rsp+8]
-              75f3     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              75f3     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               75f8     -1 INSTR LOCAL NoMetaUpdate call    _g_app_info_launch 
               75fd      5 PTRIMMEDESP STACK 8 displ mov     rax, [rsp+8]
               7602     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
               7605     -1 INSTR LOCAL NoMetaUpdate jz      short loc_766C 
-              7612     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-              7617     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              7612     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+              7617     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               7619     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-              7624     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
-              7629     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
-              762e     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-              7630     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-              7632     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              7624     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+              7629     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+              762e     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+              7630     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+              7632     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               7634     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
               764a     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
               764d     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-              7650     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              7650     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               7655     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
               765d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
               7662      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
@@ -10246,7 +10246,7 @@
               7745      3 INSTR BELONGTO 7730 
               7748     -1 INSTR LOCAL NoMetaUpdate jz      short loc_7760 
               7748      2 INSTR BELONGTO 7730 
-              774a     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              774a     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               774a      5 INSTR BELONGTO 7730 
               774a      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
               774f      5 INSTR BELONGTO 7730 
@@ -10269,7 +10269,7 @@
               7768      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_widget_get_display 
               776d      2 INSTR BELONGTO 7730 
               776d      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-              776d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              776d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               776f      3 INSTR BELONGTO 7730 
               776f      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rbp, rax 
               7772      3 INSTR BELONGTO 7730 
@@ -10302,7 +10302,7 @@
               779e      2 INSTR BELONGTO 7730 
               77a0      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
               77a5      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
-              77aa     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              77aa     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               77ac      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
               77b5     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rsi], 4 
               77be     -1 INSTR LOCAL NoMetaUpdate jz      short loc_77D8 
@@ -10320,7 +10320,7 @@
               7816     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grab_remove 
               781b      4 PTRIMMEDEBP STACK 32 displ mov     rax, [rbp+20h]
               7823     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_hide 
-              7828     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              7828     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               782d     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_77C0 
               7830      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
               7830      0 FUNC MMSAFENESS SAFE
@@ -10332,10 +10332,10 @@
               7831      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI ZZ lea     rsi, aNotifyVisible+8; "visible" 
               7838      2 INSTR BELONGTO 7830 
               7838      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX ZZ xor     ecx, ecx 
-              7838     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              7838     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               783a      2 INSTR BELONGTO 7830 
               783a      2 INSTR DEADREGS  EFLAGS RAX RDX RBX ZZ xor     eax, eax 
-              783a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              783a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               783c     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
               783c      3 INSTR BELONGTO 7830 
               783f     16 DATAREF STACK 1086 esp + 0 PARENT LocalFrame LOCALFRAME
@@ -10395,7 +10395,7 @@
               78d9      5 PTRIMMEDESP STACK 48 displ mov     rbp, [rsp+30h]
               78e5     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               78ea      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
-              78f0     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+              78f0     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
               78f5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_screen 
               78fa      4 PTRIMMEDESP STACK 60 displ sub     ebp, [rsp+3Ch]
               78fe     -1 INSTR LOCAL NoMetaUpdate call    sub_10190 
@@ -10411,10 +10411,10 @@
               793a     -1 INSTR LOCAL NoMetaUpdate call    _gdk_screen_get_monitor_geometry 
               793f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_get_type 
               794f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              795b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              795b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               7960     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_foreach 
               7969      5 PTRIMMEDESP STACK 32 displ lea     rsi, [rsp+20h]
-              796e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              796e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               7974     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_preferred_size 
               7979     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rsp+3Ch], 1 
               7979      5 PTRIMMEDESP STACK 60 displ cmp     dword ptr [rsp+3Ch], 1
@@ -10435,32 +10435,32 @@
               79db      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
               79dd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_move 
               79ed     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              79f2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-              79f7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              79f2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+              79f7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               79ff     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_resize 
               7a0c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show_all 
               7a19     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grab_add 
               7a26     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_window 
               7a2b     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
               7a2e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-              7a31     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-              7a3b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              7a31     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+              7a3b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               7a40     -1 INSTR LOCAL NoMetaUpdate call    _gdk_pointer_grab 
               7a45     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               7a4f     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_7AC7 
               7a51     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_window 
-              7a56     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              7a5b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              7a56     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              7a5b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               7a60     -1 INSTR LOCAL NoMetaUpdate call    _gdk_keyboard_grab 
               7a65     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               7a6f     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_7AB0 
               7a71     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_grab_focus 
               7a76     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
-              7a96     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              7a96     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               7a9b     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               7aa0     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
               7ab0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_display 
-              7ab5     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              7ab5     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               7aba     -1 INSTR LOCAL NoMetaUpdate call    _gdk_display_pointer_ungrab 
               7ac7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grab_remove 
               7ad4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_hide 
@@ -10539,7 +10539,7 @@
               7b90     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 28h 
               7b90      6 INSTR BELONGTO 7b30 
               7b90      6 INSTR DEADREGS  EFLAGS RDX RBX R8 ZZ mov     r8d, 28h 
-              7b96     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0E0h 
+              7b96     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0E0h 
               7b96      5 INSTR BELONGTO 7b30 
               7b96      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 0E0h 
               7b9b      7 INSTR BELONGTO 7b30 
@@ -10574,10 +10574,10 @@
               7c15     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               7c24     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               7c29      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-              7c51     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              7c51     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               7c56      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
               7c5b      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              7c5f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              7c5f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               7c61     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               7c66      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
               7c6b      5 PTRIMMEDESP STACK 48 displ mov     rbp, [rsp+30h]
@@ -10641,7 +10641,7 @@
               7d48      4 INSTR BELONGTO 7d00 
               7d4c      8 INSTR BELONGTO 7d00 
               7d54      7 INSTR BELONGTO 7d00 
-              7d5b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              7d5b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               7d5b      5 INSTR BELONGTO 7d00 
               7d60     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               7d60      5 INSTR BELONGTO 7d00 
@@ -10671,7 +10671,7 @@
               7ddc     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
               7ddf     -1 INSTR LOCAL NoMetaUpdate jz      short loc_7E28 
               7de4     -1 INSTR LOCAL NoMetaUpdate call    _g_strfreev 
-              7df0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              7df0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               7df5     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               7e02     -1 INSTR LOCAL NoMetaUpdate jmp     rax 
               7e1e     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -10680,7 +10680,7 @@
               7e52     -3 INSTR LOCAL NoWarn push    r13 
               7e54     -3 INSTR LOCAL NoWarn push    r12 
               7e59     -3 INSTR LOCAL NoWarn push    rbp 
-              7e5c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              7e5c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               7e61     -3 INSTR LOCAL NoWarn push    rbx 
               7e6c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               7e74      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
@@ -10691,7 +10691,7 @@
               7e9c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_status_icon_get_type 
               7ea7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               7eb2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_status_icon_set_from_icon_name 
-              7ebb     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+              7ebb     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
               7ec0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_new 
               7ed9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_name 
               7ef0     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
@@ -10705,35 +10705,35 @@
               7f45     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
               7f4a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
               7f5a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              7f5f     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              7f5f     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               7f64     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_decorated 
-              7f69     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              7f69     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               7f6b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_frame_new 
               7f73     -1 INSTR LOCAL NoMetaUpdate call    _gtk_frame_get_type 
               7f7e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              7f83     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+              7f83     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
               7f8b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_frame_set_shadow_type 
               7f90     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_get_type 
               7fa3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               7fae     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
-              7fb3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
-              7fb8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+              7fb3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+              7fb8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
               7fbd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
               7fcb     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              7fd0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+              7fd0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
               7fd8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_set_border_width 
               7fe3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               7fee     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
               7ff7     -1 INSTR LOCAL NoMetaUpdate call    sub_12260 
               8001     -1 INSTR LOCAL NoMetaUpdate call    sub_10190 
               8011     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              8016     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              8016     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               801e     -1 INSTR LOCAL NoMetaUpdate call    sub_10C80 
               802b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_get_type 
               8036     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               8041     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-              8044     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-              8046     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+              8044     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+              8046     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
               804b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
               8065     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
               8068     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -10831,7 +10831,7 @@
               8159      3 INSTR BELONGTO 80d0 
               815c      2 INSTR BELONGTO 80d0 
               815c      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-              815c     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              815c     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               815e     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
               815e      5 INSTR BELONGTO 80d0 
               815e      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_connect_data 
@@ -10865,7 +10865,7 @@
               81f0      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               81f3     -1 INSTR LOCAL NoMetaUpdate call    _g_strdupv 
               81ff     -1 INSTR LOCAL NoMetaUpdate call    sub_6E30 
-              8207     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              8207     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               820c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               8211      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
               8215      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
@@ -10926,7 +10926,7 @@
               828f      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 R12 ZZ call    sub_6E30 
               8294      3 INSTR BELONGTO 8240 
               8294      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     rdi, rbx 
-              8297     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              8297     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               8297      5 INSTR BELONGTO 8240 
               8297      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 50h 
               829c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -11023,11 +11023,11 @@
               8346      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 ZZ xor     r8d, r8d 
               8349      2 INSTR BELONGTO 8300 
               8349      2 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ xor     ecx, ecx 
-              8349     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              8349     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               834b      2 INSTR BELONGTO 8300 
               834b      2 INSTR DEADREGS  EFLAGS RDX RSI ZZ xor     edx, edx 
-              834b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              834d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+              834b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              834d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
               834d      5 INSTR BELONGTO 8300 
               834d      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 18h 
               8352      4 INSTR BELONGTO 8300 
@@ -11044,10 +11044,10 @@
               8366      3 INSTR BELONGTO 8300 
               8369      2 INSTR BELONGTO 8300 
               8369      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-              8369     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              8369     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               836b      2 INSTR BELONGTO 8300 
               836b      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-              836b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              836b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               836d     -1 INSTR LOCAL MetadataRedundant mov     esi, 18h 
               836d      5 INSTR BELONGTO 8300 
               8372      4 INSTR BELONGTO 8300 
@@ -11179,7 +11179,7 @@
               8459      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 XMM0 ZZ call    sub_6E30 
               845e      3 INSTR BELONGTO 8300 
               845e      3 INSTR DEADREGS  EFLAGS RSI RDI XMM0 ZZ mov     rdi, rbx 
-              8461     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              8461     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               8461      5 INSTR BELONGTO 8300 
               8461      5 INSTR DEADREGS  EFLAGS RBX RSI XMM0 ZZ mov     esi, 50h 
               8466     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -11232,10 +11232,10 @@
               84f9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               8507     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               850c      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-              8534     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              8534     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               8539      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
               853e      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              8542     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              8542     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               8544     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               8549      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
               854e      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -11300,7 +11300,7 @@
               8630      3 INSTR DEADREGS  EFLAGS RAX RBX R9 ZZ xor     r9d, r9d 
               8633      2 INSTR BELONGTO 8600 
               8633      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-              8633     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              8633     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               8635     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
               8635      5 INSTR BELONGTO 8600 
               8635      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_object_new 
@@ -11373,7 +11373,7 @@
               8696      3 INSTR BELONGTO 8660 
               8699      3 INSTR BELONGTO 8660 
               8699      3 INSTR DEADREGS  RBX RSI RDI R13 ZZ mov     rdi, rax 
-              869c     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setnz   sil 
+              869c     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setnz   sil 
               869c      4 INSTR BELONGTO 8660 
               869c      4 INSTR DEADREGS  RBX RSI R13 ZZ setnz   sil 
               86a0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_status_icon_set_visible 
@@ -11451,7 +11451,7 @@
               871b      2 INSTR BELONGTO 8660 
               871d     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_86E0 
               871d      2 INSTR BELONGTO 8660 
-              871f     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+              871f     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
               871f      5 INSTR BELONGTO 8660 
               871f      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     ebx, 1 
               8724      5 INSTR BELONGTO 8660 
@@ -11487,7 +11487,7 @@
               8749      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 ZZ jmp     _g_slist_free 
               8750      2 INSTR BELONGTO 8660 
               8750      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ xor     ebx, ebx 
-              8750     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+              8750     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
               8752     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_8724 
               8752      2 INSTR BELONGTO 8660 
               8760      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -11522,7 +11522,7 @@
               8784      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
               8789      3 INSTR BELONGTO 8780 
               8789      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-              878c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              878c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               878c      5 INSTR BELONGTO 8780 
               878c      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
               8791      7 INSTR BELONGTO 8780 
@@ -11593,7 +11593,7 @@
               880f      5 INSTR BELONGTO 8890 
               8814      2 INSTR BELONGTO 8890 
               8814      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-              8814     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              8814     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               8816     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
               8816      5 INSTR BELONGTO 8890 
               8816      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_log 
@@ -11652,7 +11652,7 @@
               886f      5 INSTR BELONGTO 8830 
               8874      2 INSTR BELONGTO 8830 
               8874      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-              8874     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              8874     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               8876     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
               8876      5 INSTR BELONGTO 8830 
               8876      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_log 
@@ -11692,7 +11692,7 @@
               88b6      3 INSTR BELONGTO 8890 
               88b9      2 INSTR BELONGTO 8890 
               88b9      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-              88b9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              88b9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               88bb     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
               88bb      4 INSTR BELONGTO 8890 
               88bf     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
@@ -11763,12 +11763,12 @@
               893a     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h 
               893a      6 INSTR BELONGTO 88f0 
               893a      6 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 ZZ mov     r8d, 20h 
-              8940     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 88h 
+              8940     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 88h 
               8940      5 INSTR BELONGTO 88f0 
               8940      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 88h 
               8945      3 INSTR BELONGTO 88f0 
               8945      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-              8948     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+              8948     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
               8948      5 INSTR BELONGTO 88f0 
               8948      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
               894d      7 INSTR BELONGTO 88f0 
@@ -11788,7 +11788,7 @@
               8968      2 INSTR BELONGTO 88f0 
               8970     -3 INSTR LOCAL NoWarn push    r12 
               8975     -3 INSTR LOCAL NoWarn push    rbp 
-              8978     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              8978     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               897d     -3 INSTR LOCAL NoWarn push    rbx 
               8988     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               8990      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
@@ -11844,7 +11844,7 @@
               8abe      4 INSTR BELONGTO 8a90 
               8ac2      8 INSTR BELONGTO 8a90 
               8aca      7 INSTR BELONGTO 8a90 
-              8ad1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              8ad1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               8ad1      5 INSTR BELONGTO 8a90 
               8ad6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               8ad6      5 INSTR BELONGTO 8a90 
@@ -11873,7 +11873,7 @@
               8b43     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               8b48     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+18h], 0 
               8b4d     -1 INSTR LOCAL NoMetaUpdate jz      short loc_8B90 
-              8b56     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              8b56     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               8b5b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               8b68     -1 INSTR LOCAL NoMetaUpdate jmp     rax 
               8b86     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -11883,28 +11883,28 @@
               8bb3     -3 INSTR LOCAL NoWarn push    rbx 
               8bb7     -1 INSTR LOCAL NoMetaUpdate call    sub_88F0 
               8bc2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_instance_get_private 
-              8bd2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              8bd2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               8bd7     -1 INSTR LOCAL NoMetaUpdate call    sub_8600 
               8be3      4 PTRIMMEDEBP STACK 8 displ mov     [rbp+8], rax
-              8be7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-              8bec     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              8be7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+              8bec     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               8bee     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
               8bfe     -1 INSTR LOCAL NoMetaUpdate call    sub_8240 
-              8c0a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-              8c0f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              8c0a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+              8c0f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               8c11     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
               8c19     -1 INSTR LOCAL NoMetaUpdate call    _gtk_status_icon_get_type 
               8c25      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
               8c2c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               8c37     -1 INSTR LOCAL NoMetaUpdate call    _gtk_status_icon_set_title 
-              8c47     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              8c47     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               8c49     -1 INSTR LOCAL NoMetaUpdate call    sub_8600 
-              8c59     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-              8c5e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              8c59     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+              8c5e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               8c60     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
               8c6f     -1 INSTR LOCAL NoMetaUpdate call    sub_8240 
-              8c7b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-              8c80     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              8c7b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+              8c80     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               8c82     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
               8c8e      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
               8c94     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -11976,12 +11976,12 @@
               8d11      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ call    sub_88F0 
               8d16      2 INSTR BELONGTO 8d10 
               8d16      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-              8d16     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              8d16     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               8d18      3 INSTR BELONGTO 8d10 
               8d18      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
               8d1b      2 INSTR BELONGTO 8d10 
               8d1b      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-              8d1b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              8d1b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               8d1d     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
               8d1d      5 INSTR BELONGTO 8d10 
               8d1d      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_object_new 
@@ -12035,7 +12035,7 @@
               8d98      5 INSTR BELONGTO 8d70 
               8d9d      2 INSTR BELONGTO 8d70 
               8d9d      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ xor     eax, eax 
-              8d9d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              8d9d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               8d9f     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
               8d9f      5 INSTR BELONGTO 8d70 
               8d9f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ jmp     _g_log 
@@ -12045,12 +12045,12 @@
               8db0      3 INSTR BELONGTO 8db0 
               8db0      3 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ mov     edx, [rdi+10h] 
               8db0      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
-              8db3     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, [rsi+10h] 
+              8db3     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, [rsi+10h] 
               8db3      3 INSTR BELONGTO 8db0 
               8db3      3 INSTR DEADREGS  EFLAGS RAX RCX ZZ mov     ecx, [rsi+10h] 
               8db6      2 INSTR BELONGTO 8db0 
               8db6      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-              8db6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              8db6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               8db8     -1 INSTR LOCAL NoMetaUpdate cmp     edx, ecx 
               8db8      2 INSTR BELONGTO 8db0 
               8dba     -1 INSTR LOCAL NoMetaUpdate jz      short locret_8DC6 
@@ -12066,9 +12066,9 @@
               8dc6      2 INSTR BELONGTO 8db0 
               8dc6      2 INSTR DEADREGS  EFLAGS ZZ rep retn 
               8dc6     -4 INSTR LOCAL SafeReturn rep retn
-              8dd0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-              8de0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-              8df0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              8dd0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+              8de0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+              8df0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               8e00      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
               8e00      0 FUNC MMSAFENESS SAFE
               8e00      1 INSTR BELONGTO 8e00 
@@ -12117,7 +12117,7 @@
               8e29      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_class_peek_parent 
               8e2e      3 INSTR BELONGTO 8e20 
               8e2e      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
-              8e31     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              8e31     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               8e31      5 INSTR BELONGTO 8e20 
               8e31      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
               8e36      7 INSTR BELONGTO 8e20 
@@ -12145,7 +12145,7 @@
               8e68      7 INSTR BELONGTO 8e20 
               8e6f      2 INSTR BELONGTO 8e20 
               8e6f      2 INSTR DEADREGS  EFLAGS RCX R8 ZZ xor     ecx, ecx 
-              8e6f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              8e6f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               8e71     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8, 0FFFFFFFFFFFFFFFFh 
               8e71      7 INSTR BELONGTO 8e20 
               8e71      7 INSTR DEADREGS  EFLAGS R8 ZZ mov     r8, 0FFFFFFFFFFFFFFFFh 
@@ -12181,7 +12181,7 @@
               8ec8      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
               8ecb      3 INSTR BELONGTO 8e20 
               8ecb      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-              8ece     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+              8ece     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
               8ece      5 INSTR BELONGTO 8e20 
               8ece      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 4 
               8ed3     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12196,7 +12196,7 @@
               8ee6      3 INSTR DEADREGS  EFLAGS RCX RDI R8 R9 ZZ xor     r9d, r9d 
               8ee9      2 INSTR BELONGTO 8e20 
               8ee9      2 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ xor     ecx, ecx 
-              8ee9     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              8ee9     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               8eeb     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8, 0FFFFFFFFFFFFFFFFh 
               8eeb      7 INSTR BELONGTO 8e20 
               8eeb      7 INSTR DEADREGS  EFLAGS RDI R8 ZZ mov     r8, 0FFFFFFFFFFFFFFFFh 
@@ -12211,7 +12211,7 @@
               8f01      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
               8f04      3 INSTR BELONGTO 8e20 
               8f04      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-              8f07     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              8f07     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               8f07      5 INSTR BELONGTO 8e20 
               8f07      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
               8f0c     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12238,7 +12238,7 @@
               8f39      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
               8f3c      3 INSTR BELONGTO 8e20 
               8f3c      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-              8f3f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+              8f3f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
               8f3f      5 INSTR BELONGTO 8e20 
               8f3f      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 3 
               8f44     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12250,7 +12250,7 @@
               8f50      7 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ lea     rsi, aPulseaudioCont; "PulseAudio context" 
               8f57      7 INSTR BELONGTO 8e20 
               8f57      7 INSTR DEADREGS  EFLAGS RCX RDI ZZ lea     rdi, aPaContext ; "pa-context" 
-              8f5e     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Bh 
+              8f5e     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Bh 
               8f5e      5 INSTR BELONGTO 8e20 
               8f5e      5 INSTR DEADREGS  EFLAGS RCX ZZ mov     ecx, 0Bh 
               8f63     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_pointer 
@@ -12260,7 +12260,7 @@
               8f68      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
               8f6b      3 INSTR BELONGTO 8e20 
               8f6b      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-              8f6e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+              8f6e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
               8f6e      5 INSTR BELONGTO 8e20 
               8f6e      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 2 
               8f73     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12280,7 +12280,7 @@
               8f90      7 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8, 0FFFFFFFFFFFFFFFFh 
               8f97      2 INSTR BELONGTO 8e20 
               8f97      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-              8f97     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              8f97     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               8f99     -1 INSTR LOCAL MetadataRedundant mov     [rsp+28h+var_28], 3 
               8f99      7 INSTR BELONGTO 8e20 
               8fa0     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_ulong 
@@ -12290,7 +12290,7 @@
               8fa5      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
               8fa8      3 INSTR BELONGTO 8e20 
               8fa8      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-              8fab     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
+              8fab     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
               8fab      5 INSTR BELONGTO 8e20 
               8fab      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 0Ah 
               8fb0     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12308,7 +12308,7 @@
               8fcf      8 INSTR BELONGTO 8e20 
               8fd7      7 INSTR BELONGTO 8e20 
               8fd7      7 INSTR DEADREGS  EFLAGS RCX RDI XMM0 XMM1 XMM2 ZZ lea     rdi, aDecibel_0 ; "decibel" 
-              8fde     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 7 
+              8fde     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 7 
               8fde      5 INSTR BELONGTO 8e20 
               8fde      5 INSTR DEADREGS  EFLAGS RCX XMM0 XMM1 XMM2 ZZ mov     ecx, 7 
               8fe3     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_double 
@@ -12318,7 +12318,7 @@
               8fe8      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     rdi, rbx 
               8feb      3 INSTR BELONGTO 8e20 
               8feb      3 INSTR DEADREGS  EFLAGS RDX RSI XMM0 XMM1 XMM2 ZZ mov     rdx, rax 
-              8fee     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Bh 
+              8fee     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Bh 
               8fee      5 INSTR BELONGTO 8e20 
               8fee      5 INSTR DEADREGS  EFLAGS RSI XMM0 XMM1 XMM2 ZZ mov     esi, 0Bh 
               8ff3     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12332,7 +12332,7 @@
               9006      7 INSTR DEADREGS  EFLAGS RCX RDI R8 XMM0 XMM1 XMM2 ZZ lea     rdi, aName_0    ; "name" 
               900d      2 INSTR BELONGTO 8e20 
               900d      2 INSTR DEADREGS  EFLAGS RCX R8 XMM0 XMM1 XMM2 ZZ xor     ecx, ecx 
-              900d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              900d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               900f     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 7 
               900f      6 INSTR BELONGTO 8e20 
               900f      6 INSTR DEADREGS  EFLAGS R8 XMM0 XMM1 XMM2 ZZ mov     r8d, 7 
@@ -12343,7 +12343,7 @@
               901a      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     rdi, rbx 
               901d      3 INSTR BELONGTO 8e20 
               901d      3 INSTR DEADREGS  EFLAGS RDX RSI XMM0 XMM1 XMM2 ZZ mov     rdx, rax 
-              9020     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+              9020     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
               9020      5 INSTR BELONGTO 8e20 
               9020      5 INSTR DEADREGS  EFLAGS RSI XMM0 XMM1 XMM2 ZZ mov     esi, 5 
               9025     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12357,7 +12357,7 @@
               9038      7 INSTR DEADREGS  EFLAGS RCX RDI R8 XMM0 XMM1 XMM2 ZZ lea     rdi, aDescription_0; "description" 
               903f      2 INSTR BELONGTO 8e20 
               903f      2 INSTR DEADREGS  EFLAGS RCX R8 XMM0 XMM1 XMM2 ZZ xor     ecx, ecx 
-              903f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              903f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               9041     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 7 
               9041      6 INSTR BELONGTO 8e20 
               9041      6 INSTR DEADREGS  EFLAGS R8 XMM0 XMM1 XMM2 ZZ mov     r8d, 7 
@@ -12368,7 +12368,7 @@
               904c      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     rdi, rbx 
               904f      3 INSTR BELONGTO 8e20 
               904f      3 INSTR DEADREGS  EFLAGS RDX RSI XMM0 XMM1 XMM2 ZZ mov     rdx, rax 
-              9052     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+              9052     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
               9052      5 INSTR BELONGTO 8e20 
               9052      5 INSTR DEADREGS  EFLAGS RSI XMM0 XMM1 XMM2 ZZ mov     esi, 6 
               9057     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12382,7 +12382,7 @@
               906a      7 INSTR DEADREGS  EFLAGS RCX RDI R8 XMM0 XMM1 XMM2 ZZ lea     rdi, aApplicationId; "application-id" 
               9071      2 INSTR BELONGTO 8e20 
               9071      2 INSTR DEADREGS  EFLAGS RCX R8 XMM0 XMM1 XMM2 ZZ xor     ecx, ecx 
-              9071     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              9071     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               9073     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 7 
               9073      6 INSTR BELONGTO 8e20 
               9073      6 INSTR DEADREGS  EFLAGS R8 XMM0 XMM1 XMM2 ZZ mov     r8d, 7 
@@ -12393,7 +12393,7 @@
               907e      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     rdi, rbx 
               9081      3 INSTR BELONGTO 8e20 
               9081      3 INSTR DEADREGS  EFLAGS RDX RSI XMM0 XMM1 XMM2 ZZ mov     rdx, rax 
-              9084     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
+              9084     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
               9084      5 INSTR BELONGTO 8e20 
               9084      5 INSTR DEADREGS  EFLAGS RSI XMM0 XMM1 XMM2 ZZ mov     esi, 7 
               9089     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12410,7 +12410,7 @@
               90a3      6 INSTR DEADREGS  EFLAGS RCX R8 XMM0 XMM1 XMM2 ZZ mov     r8d, 7 
               90a9      2 INSTR BELONGTO 8e20 
               90a9      2 INSTR DEADREGS  EFLAGS RCX XMM0 XMM1 XMM2 ZZ xor     ecx, ecx 
-              90a9     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              90a9     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               90ab     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_string 
               90ab      5 INSTR BELONGTO 8e20 
               90ab      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 XMM2 ZZ call    _g_param_spec_string 
@@ -12418,7 +12418,7 @@
               90b0      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     rdi, rbx 
               90b3      3 INSTR BELONGTO 8e20 
               90b3      3 INSTR DEADREGS  EFLAGS RDX RSI XMM0 XMM1 XMM2 ZZ mov     rdx, rax 
-              90b6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+              90b6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
               90b6      5 INSTR BELONGTO 8e20 
               90b6      5 INSTR DEADREGS  EFLAGS RSI XMM0 XMM1 XMM2 ZZ mov     esi, 8 
               90bb     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12435,7 +12435,7 @@
               90d5      6 INSTR DEADREGS  EFLAGS RCX R8 XMM0 XMM1 XMM2 ZZ mov     r8d, 7 
               90db      2 INSTR BELONGTO 8e20 
               90db      2 INSTR DEADREGS  EFLAGS RCX XMM0 XMM1 XMM2 ZZ xor     ecx, ecx 
-              90db     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              90db     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               90dd     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_string 
               90dd      5 INSTR BELONGTO 8e20 
               90dd      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 XMM2 ZZ call    _g_param_spec_string 
@@ -12443,7 +12443,7 @@
               90e2      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     rdi, rbx 
               90e5      3 INSTR BELONGTO 8e20 
               90e5      3 INSTR DEADREGS  EFLAGS RDX RSI XMM0 XMM1 XMM2 ZZ mov     rdx, rax 
-              90e8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 9 
+              90e8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 9 
               90e8      5 INSTR BELONGTO 8e20 
               90e8      5 INSTR DEADREGS  EFLAGS RSI XMM0 XMM1 XMM2 ZZ mov     esi, 9 
               90ed     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12460,7 +12460,7 @@
               9107      6 INSTR DEADREGS  EFLAGS RCX R8 XMM0 XMM1 XMM2 ZZ mov     r8d, 7 
               910d      2 INSTR BELONGTO 8e20 
               910d      2 INSTR DEADREGS  EFLAGS RCX XMM0 XMM1 XMM2 ZZ xor     ecx, ecx 
-              910d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              910d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               910f     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_boolean 
               910f      5 INSTR BELONGTO 8e20 
               910f      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 XMM2 ZZ call    _g_param_spec_boolean 
@@ -12468,7 +12468,7 @@
               9114      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     rdi, rbx 
               9117      3 INSTR BELONGTO 8e20 
               9117      3 INSTR DEADREGS  EFLAGS RDX RSI XMM0 XMM1 XMM2 ZZ mov     rdx, rax 
-              911a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+              911a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
               911a      5 INSTR BELONGTO 8e20 
               911a      5 INSTR DEADREGS  EFLAGS RSI XMM0 XMM1 XMM2 ZZ mov     esi, 0Ch 
               911f     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12485,7 +12485,7 @@
               9139      6 INSTR DEADREGS  EFLAGS RCX R8 XMM0 XMM1 XMM2 ZZ mov     r8d, 7 
               913f      2 INSTR BELONGTO 8e20 
               913f      2 INSTR DEADREGS  EFLAGS RCX XMM0 XMM1 XMM2 ZZ xor     ecx, ecx 
-              913f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              913f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               9141     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_boolean 
               9141      5 INSTR BELONGTO 8e20 
               9141      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 XMM2 ZZ call    _g_param_spec_boolean 
@@ -12493,7 +12493,7 @@
               9146      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     rdi, rbx 
               9149      3 INSTR BELONGTO 8e20 
               9149      3 INSTR DEADREGS  EFLAGS RDX RSI XMM0 XMM1 XMM2 ZZ mov     rdx, rax 
-              914c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Dh 
+              914c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Dh 
               914c      5 INSTR BELONGTO 8e20 
               914c      5 INSTR DEADREGS  EFLAGS RSI XMM0 XMM1 XMM2 ZZ mov     esi, 0Dh 
               9151     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12510,7 +12510,7 @@
               916b      6 INSTR DEADREGS  EFLAGS RCX R8 XMM0 XMM1 XMM2 ZZ mov     r8d, 7 
               9171      2 INSTR BELONGTO 8e20 
               9171      2 INSTR DEADREGS  EFLAGS RCX XMM0 XMM1 XMM2 ZZ xor     ecx, ecx 
-              9171     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              9171     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               9173     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_boolean 
               9173      5 INSTR BELONGTO 8e20 
               9173      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 XMM2 ZZ call    _g_param_spec_boolean 
@@ -12518,7 +12518,7 @@
               9178      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     rdi, rbx 
               917b      3 INSTR BELONGTO 8e20 
               917b      3 INSTR DEADREGS  EFLAGS RDX RSI XMM0 XMM1 XMM2 ZZ mov     rdx, rax 
-              917e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Eh 
+              917e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Eh 
               917e      5 INSTR BELONGTO 8e20 
               917e      5 INSTR DEADREGS  EFLAGS RSI XMM0 XMM1 XMM2 ZZ mov     esi, 0Eh 
               9183     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12535,7 +12535,7 @@
               919d      6 INSTR DEADREGS  EFLAGS RCX R8 XMM0 XMM1 XMM2 ZZ mov     r8d, 7 
               91a3      2 INSTR BELONGTO 8e20 
               91a3      2 INSTR DEADREGS  EFLAGS RCX XMM0 XMM1 XMM2 ZZ xor     ecx, ecx 
-              91a3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              91a3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               91a5     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_boolean 
               91a5      5 INSTR BELONGTO 8e20 
               91a5      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 XMM2 ZZ call    _g_param_spec_boolean 
@@ -12543,7 +12543,7 @@
               91aa      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     rdi, rbx 
               91ad      3 INSTR BELONGTO 8e20 
               91ad      3 INSTR DEADREGS  EFLAGS RDX RSI XMM0 XMM1 XMM2 ZZ mov     rdx, rax 
-              91b0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Fh 
+              91b0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Fh 
               91b0      5 INSTR BELONGTO 8e20 
               91b0      5 INSTR DEADREGS  EFLAGS RSI XMM0 XMM1 XMM2 ZZ mov     esi, 0Fh 
               91b5     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12560,7 +12560,7 @@
               91cf      6 INSTR DEADREGS  EFLAGS RCX R8 XMM0 XMM1 XMM2 ZZ mov     r8d, 3 
               91d5      2 INSTR BELONGTO 8e20 
               91d5      2 INSTR DEADREGS  EFLAGS RCX XMM0 XMM1 XMM2 ZZ xor     ecx, ecx 
-              91d5     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              91d5     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               91d7     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_string 
               91d7      5 INSTR BELONGTO 8e20 
               91d7      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 XMM2 ZZ call    _g_param_spec_string 
@@ -12568,7 +12568,7 @@
               91dc      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     rdi, rbx 
               91df      3 INSTR BELONGTO 8e20 
               91df      3 INSTR DEADREGS  EFLAGS RDX RSI XMM0 XMM1 XMM2 ZZ mov     rdx, rax 
-              91e2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 11h 
+              91e2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 11h 
               91e2      5 INSTR BELONGTO 8e20 
               91e2      5 INSTR DEADREGS  EFLAGS RSI XMM0 XMM1 XMM2 ZZ mov     esi, 11h 
               91e7     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -12596,7 +12596,7 @@
               921b      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 XMM2 ZZ call    _g_param_spec_long 
               9220      3 INSTR BELONGTO 8e20 
               9220      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     rdi, rbx 
-              9223     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              9223     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               9223      5 INSTR BELONGTO 8e20 
               9223      5 INSTR DEADREGS  EFLAGS RDX RBX RSI XMM0 XMM1 XMM2 ZZ mov     esi, 10h 
               9228      3 INSTR BELONGTO 8e20 
@@ -12664,12 +12664,12 @@
               929a     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h 
               929a      6 INSTR BELONGTO 9250 
               929a      6 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 ZZ mov     r8d, 20h 
-              92a0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
+              92a0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
               92a0      5 INSTR BELONGTO 9250 
               92a0      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 0A0h 
               92a5      3 INSTR BELONGTO 9250 
               92a5      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-              92a8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+              92a8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
               92a8      5 INSTR BELONGTO 9250 
               92a8      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
               92ad      7 INSTR BELONGTO 9250 
@@ -12700,10 +12700,10 @@
               930f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               931e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               9323      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-              934b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              934b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               9350      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
               9355      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              9359     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              9359     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               935b     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               9360      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
               9365      5 PTRIMMEDESP STACK 48 displ mov     rbp, [rsp+30h]
@@ -12867,7 +12867,7 @@
               96b4      4 INSTR BELONGTO 95a0 
               96b8      7 INSTR BELONGTO 95a0 
               96bf      2 INSTR BELONGTO 95a0 
-              96bf     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              96bf     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               96c1      4 INSTR BELONGTO 95a0 
               96c5      8 INSTR BELONGTO 95a0 
               96cd     -1 INSTR LOCAL NoMetaUpdate call    _g_list_foreach 
@@ -12888,7 +12888,7 @@
               96f9      4 INSTR BELONGTO 95a0 
               96fd      8 INSTR BELONGTO 95a0 
               9705      7 INSTR BELONGTO 95a0 
-              970c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              970c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               970c      5 INSTR BELONGTO 95a0 
               9711     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               9711      5 INSTR BELONGTO 95a0 
@@ -12910,13 +12910,13 @@
               9750      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
               9755      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
               975d      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
-              9772     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              9772     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               9777     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               977f      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
               9784     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [rax+10h] 
               978a     -1 INSTR LOCAL NoMetaUpdate call    sub_9250 
               9795     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              97a4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+              97a4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
               97a9      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
               97ae      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
               97bb     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     esi, 1 
@@ -12995,7 +12995,7 @@
               982f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               9834      2 INSTR BELONGTO 97f0 
               9834      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              9834     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              9834     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               9836      1 INSTR BELONGTO 97f0 
               9836      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               9837      1 INSTR BELONGTO 97f0 
@@ -13056,7 +13056,7 @@
               988f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               9894      2 INSTR BELONGTO 9850 
               9894      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              9894     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              9894     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               9896      1 INSTR BELONGTO 9850 
               9896      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               9897      1 INSTR BELONGTO 9850 
@@ -13117,7 +13117,7 @@
               98ef      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               98f4      2 INSTR BELONGTO 98b0 
               98f4      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              98f4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              98f4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               98f6      1 INSTR BELONGTO 98b0 
               98f6      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               98f7      1 INSTR BELONGTO 98b0 
@@ -13178,7 +13178,7 @@
               994f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               9954      2 INSTR BELONGTO 9910 
               9954      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              9954     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              9954     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               9956      1 INSTR BELONGTO 9910 
               9956      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               9957      1 INSTR BELONGTO 9910 
@@ -13239,7 +13239,7 @@
               99af      5 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ call    _g_return_if_fail_warning 
               99b4      2 INSTR BELONGTO 9970 
               99b4      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 XMM0 ZZ xor     eax, eax 
-              99b4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              99b4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               99b6      1 INSTR BELONGTO 9970 
               99b6      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 XMM0 ZZ pop     rbx 
               99b7      1 INSTR BELONGTO 9970 
@@ -13335,7 +13335,7 @@
               9a50     -3 INSTR LOCAL NoWarn push    rbp 
               9a51      2 INSTR BELONGTO 9a50 
               9a51      2 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 ZZ mov     ebp, esi 
-              9a51     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, esi 
+              9a51     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     ebp, esi 
               9a53      1 INSTR BELONGTO 9a50 
               9a53      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ push    rbx 
               9a53     -3 INSTR LOCAL NoWarn push    rbx 
@@ -13385,7 +13385,7 @@
               9a99      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               9a9e      2 INSTR BELONGTO 9a50 
               9a9e      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              9a9e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              9a9e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               9aa0     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 98h 
               9aa0      7 INSTR BELONGTO 9a50 
               9aa7      1 INSTR BELONGTO 9a50 
@@ -13406,7 +13406,7 @@
               9ac0     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     rsi, rax 
               9ac0      3 INSTR BELONGTO 9a50 
               9ac0      3 INSTR DEADREGS  RCX RSI ZZ mov     rsi, rax 
-              9ac3     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
+              9ac3     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
               9ac3      5 INSTR BELONGTO 9a50 
               9ac3      5 INSTR DEADREGS  RAX RCX ZZ mov     ecx, 10h 
               9ac8      3 INSTR BELONGTO 9a50 
@@ -13415,7 +13415,7 @@
               9acb      2 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, [rsi] 
               9acd      2 INSTR BELONGTO 9a50 
               9acd      2 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, ebp 
-              9acd     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, ebp 
+              9acd     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, ebp 
               9acf      2 INSTR BELONGTO 9a50 
               9acf      2 INSTR DEADREGS  EFLAGS ZZ mov     [rdi], eax 
               9ad1      3 INSTR BELONGTO 9a50 
@@ -13444,7 +13444,7 @@
               9af1      2 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, eax 
               9af3      2 INSTR BELONGTO 9a50 
               9af3      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-              9af3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              9af3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               9af5     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
               9af5      2 INSTR BELONGTO 9a50 
               9af7     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_9AA0 
@@ -13461,7 +13461,7 @@
               9b04      5 INSTR DEADREGS  EFLAGS ZZ call    sub_B930 
               9b09      3 INSTR BELONGTO 9a50 
               9b09      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-              9b0c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              9b0c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               9b0c      5 INSTR BELONGTO 9a50 
               9b0c      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
               9b11     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -13477,7 +13477,7 @@
               9b25     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 98h 
               9b25      7 INSTR BELONGTO 9a50 
               9b2c    152 DEALLOC STACK esp - 152 mov     eax, 1
-              9b2c     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              9b2c     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               9b2c      5 INSTR BELONGTO 9a50 
               9b2c      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
               9b31      1 INSTR BELONGTO 9a50 
@@ -13499,14 +13499,14 @@
               9b6f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_is_a 
               9b74     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               9b76     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_9BA0 
-              9b8d     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+              9b8d     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
               9b8f     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               9b94     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 0A8h 
               9b9b      2 PTRIMMEDEBP STACK 0 displ mov     eax, ebp
-              9ba4     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+              9ba4     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
               9bad     -1 INSTR LOCAL NoMetaUpdate call    sub_B8C0 
               9bb2      5 PTRIMMEDESP STACK 16 displ lea     rdi, [rsp+10h]
-              9bba     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
+              9bba     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
               9bc2     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm0, qword ptr [rsp+8] 
               9bc2      6 PTRIMMEDESP STACK 8 displ movsd   xmm0, qword ptr [rsp+8]
               9bcc     -1 INSTR LOCAL NoMetaUpdate call    _pa_sw_volume_from_dB 
@@ -13518,9 +13518,9 @@
               9bf7     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               9bf9     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_9B94 
               9bff      5 PTRIMMEDESP STACK 16 displ lea     rsi, [rsp+10h]
-              9c04     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              9c04     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               9c0a     -1 INSTR LOCAL NoMetaUpdate call    sub_B930 
-              9c12     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              9c12     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               9c17     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               9c26     -1 INSTR LOCAL NoMetaUpdate call    _g_object_notify 
               9c2b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 0A8h 
@@ -13573,7 +13573,7 @@
               9c7f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               9c84      2 INSTR BELONGTO 9c40 
               9c84      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              9c84     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              9c84     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               9c86      1 INSTR BELONGTO 9c40 
               9c86      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               9c87      1 INSTR BELONGTO 9c40 
@@ -13634,7 +13634,7 @@
               9cdf      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               9ce4      2 INSTR BELONGTO 9ca0 
               9ce4      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              9ce4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              9ce4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               9ce6      1 INSTR BELONGTO 9ca0 
               9ce6      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               9ce7      1 INSTR BELONGTO 9ca0 
@@ -13666,7 +13666,7 @@
               9d12      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
               9d16      2 INSTR BELONGTO 9d00 
               9d16      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ mov     ebp, esi 
-              9d16     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, esi 
+              9d16     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     ebp, esi 
               9d18     -1 INSTR LOCAL NoMetaUpdate call    sub_9250 
               9d18      5 INSTR BELONGTO 9d00 
               9d18      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 ZZ call    sub_9250 
@@ -13707,7 +13707,7 @@
               9d56     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               9d56      5 INSTR BELONGTO 9d00 
               9d56      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
-              9d5b     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, r12d 
+              9d5b     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, r12d 
               9d5b      3 INSTR BELONGTO 9d00 
               9d5b      3 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, r12d 
               9d5e      4 INSTR BELONGTO 9d00 
@@ -13736,7 +13736,7 @@
               9d87      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
               9d8a      3 INSTR BELONGTO 9d00 
               9d8a      3 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     [rax+48h], ebp 
-              9d8d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              9d8d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               9d8d      5 INSTR BELONGTO 9d00 
               9d8d      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
               9d92     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -13810,7 +13810,7 @@
               9e06     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               9e06      5 INSTR BELONGTO 9db0 
               9e06      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
-              9e0b     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, r12d 
+              9e0b     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, r12d 
               9e0b      3 INSTR BELONGTO 9db0 
               9e0b      3 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, r12d 
               9e0e      4 INSTR BELONGTO 9db0 
@@ -13839,7 +13839,7 @@
               9e37      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
               9e3a      3 INSTR BELONGTO 9db0 
               9e3a      3 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     [rax+4Ch], ebp 
-              9e3d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              9e3d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               9e3d      5 INSTR BELONGTO 9db0 
               9e3d      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
               9e42     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -13902,7 +13902,7 @@
               9e9f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               9ea4      2 INSTR BELONGTO 9e60 
               9ea4      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              9ea4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              9ea4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               9ea6      1 INSTR BELONGTO 9e60 
               9ea6      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               9ea7      1 INSTR BELONGTO 9e60 
@@ -13963,7 +13963,7 @@
               9eff      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               9f04      2 INSTR BELONGTO 9ec0 
               9f04      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              9f04     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              9f04     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               9f06      1 INSTR BELONGTO 9ec0 
               9f06      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               9f07      1 INSTR BELONGTO 9ec0 
@@ -14034,7 +14034,7 @@
               9f74      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
               9f79      2 INSTR BELONGTO 9f20 
               9f79      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-              9f79     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              9f79     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               9f7b      4 INSTR BELONGTO 9f20 
               9f7b      4 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+18h+var_18] 
               9f7b      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp+18h+var_18]
@@ -14062,7 +14062,7 @@
               9fa4     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
               9fa4      5 INSTR BELONGTO 9f20 
               9fa4      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strdup 
-              9fa9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              9fa9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               9fa9      5 INSTR BELONGTO 9f20 
               9fa9      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 50h 
               9fae      3 INSTR BELONGTO 9f20 
@@ -14079,7 +14079,7 @@
               9fc5     -1 INSTR LOCAL NoMetaUpdate call    _g_object_notify 
               9fc5      5 INSTR BELONGTO 9f20 
               9fc5      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_object_notify 
-              9fca     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              9fca     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               9fca      5 INSTR BELONGTO 9f20 
               9fca      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ mov     eax, 1 
               9fcf     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_9F7B 
@@ -14142,7 +14142,7 @@
               a034      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
               a039      2 INSTR BELONGTO 9fe0 
               a039      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-              a039     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a039     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a03b      4 INSTR BELONGTO 9fe0 
               a03b      4 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+18h+var_18] 
               a03b      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp+18h+var_18]
@@ -14170,7 +14170,7 @@
               a064     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
               a064      5 INSTR BELONGTO 9fe0 
               a064      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strdup 
-              a069     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              a069     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               a069      5 INSTR BELONGTO 9fe0 
               a069      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 50h 
               a06e      3 INSTR BELONGTO 9fe0 
@@ -14187,7 +14187,7 @@
               a085     -1 INSTR LOCAL NoMetaUpdate call    _g_object_notify 
               a085      5 INSTR BELONGTO 9fe0 
               a085      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_object_notify 
-              a08a     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              a08a     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               a08a      5 INSTR BELONGTO 9fe0 
               a08a      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ mov     eax, 1 
               a08f     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_A03B 
@@ -14204,7 +14204,7 @@
               a0c6     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               a0c8     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_A0F0 
               a0df     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              a0e4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a0e4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a100      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -16 0 4 0 8 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
               a100      0 FUNC MMSAFENESS SAFE
               a100    135 FUNC GLOBAL sub_A100 FUNC_UNSAFE NOFP RET               a186 
@@ -14264,7 +14264,7 @@
               a14b      4 INSTR BELONGTO a100 
               a14f      2 INSTR BELONGTO a100 
               a14f      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              a14f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a14f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a151      1 INSTR BELONGTO a100 
               a151      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               a152      1 INSTR BELONGTO a100 
@@ -14275,7 +14275,7 @@
               a158      4 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rax, [rbx+18h] 
               a15c      3 INSTR BELONGTO a100 
               a15c      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-              a15f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              a15f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               a15f      5 INSTR BELONGTO a100 
               a15f      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
               a164      3 INSTR BELONGTO a100 
@@ -14292,7 +14292,7 @@
               a176      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_object_notify 
               a17b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
               a17b      4 INSTR BELONGTO a100 
-              a17f     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              a17f     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               a17f      5 INSTR BELONGTO a100 
               a17f      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
               a17f      8 DEALLOC STACK esp - 8 mov     eax, 1
@@ -14314,7 +14314,7 @@
               a1b6     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               a1b8     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_A1E0 
               a1cf     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              a1d4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a1d4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a1f0      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -16 0 4 0 8 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
               a1f0      0 FUNC MMSAFENESS SAFE
               a1f0    135 FUNC GLOBAL sub_A1F0 FUNC_UNSAFE NOFP RET               a276 
@@ -14374,7 +14374,7 @@
               a23b      4 INSTR BELONGTO a1f0 
               a23f      2 INSTR BELONGTO a1f0 
               a23f      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              a23f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a23f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a241      1 INSTR BELONGTO a1f0 
               a241      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               a242      1 INSTR BELONGTO a1f0 
@@ -14385,7 +14385,7 @@
               a248      4 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rax, [rbx+18h] 
               a24c      3 INSTR BELONGTO a1f0 
               a24c      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-              a24f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              a24f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               a24f      5 INSTR BELONGTO a1f0 
               a24f      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
               a254      3 INSTR BELONGTO a1f0 
@@ -14402,7 +14402,7 @@
               a266      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_object_notify 
               a26b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
               a26b      4 INSTR BELONGTO a1f0 
-              a26f     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              a26f     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               a26f      5 INSTR BELONGTO a1f0 
               a26f      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
               a26f      8 DEALLOC STACK esp - 8 mov     eax, 1
@@ -14460,7 +14460,7 @@
               a2bf      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               a2c4      2 INSTR BELONGTO a280 
               a2c4      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              a2c4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a2c4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a2c6      1 INSTR BELONGTO a280 
               a2c6      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               a2c7      1 INSTR BELONGTO a280 
@@ -14531,7 +14531,7 @@
               a334      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
               a339      2 INSTR BELONGTO a2e0 
               a339      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-              a339     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a339     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a33b      4 INSTR BELONGTO a2e0 
               a33b      4 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+18h+var_18] 
               a33b      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp+18h+var_18]
@@ -14559,7 +14559,7 @@
               a364     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
               a364      5 INSTR BELONGTO a2e0 
               a364      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strdup 
-              a369     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              a369     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               a369      5 INSTR BELONGTO a2e0 
               a369      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 50h 
               a36e      3 INSTR BELONGTO a2e0 
@@ -14576,7 +14576,7 @@
               a385     -1 INSTR LOCAL NoMetaUpdate call    _g_object_notify 
               a385      5 INSTR BELONGTO a2e0 
               a385      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_object_notify 
-              a38a     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              a38a     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               a38a      5 INSTR BELONGTO a2e0 
               a38a      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ mov     eax, 1 
               a38f     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_A33B 
@@ -14593,7 +14593,7 @@
               a3c6     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               a3c8     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_A3F0 
               a3df     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              a3e4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a3e4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a400     -3 INSTR LOCAL NoWarn push    rbx 
               a404     -1 INSTR LOCAL NoMetaUpdate call    sub_9250 
               a409     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -14606,7 +14606,7 @@
               a426     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               a428     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_A450 
               a43f     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              a444     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a444     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a460     -3 INSTR LOCAL NoWarn push    rbx 
               a464     -1 INSTR LOCAL NoMetaUpdate call    sub_9250 
               a469     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -14619,7 +14619,7 @@
               a486     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               a488     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_A4B0 
               a49f     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              a4a4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a4a4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a4b8     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
               a4bb     -1 INSTR LOCAL NoMetaUpdate jz      short loc_A4A4 
               a4be     -1 INSTR LOCAL NoMetaUpdate jmp     _g_themed_icon_new_with_default_fallbacks 
@@ -14681,7 +14681,7 @@
               a524      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
               a529      2 INSTR BELONGTO a4d0 
               a529      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-              a529     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a529     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a52b      4 INSTR BELONGTO a4d0 
               a52b      4 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+18h+var_18] 
               a52b      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp+18h+var_18]
@@ -14709,7 +14709,7 @@
               a554     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
               a554      5 INSTR BELONGTO a4d0 
               a554      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strdup 
-              a559     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              a559     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               a559      5 INSTR BELONGTO a4d0 
               a559      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 50h 
               a55e      3 INSTR BELONGTO a4d0 
@@ -14726,7 +14726,7 @@
               a575     -1 INSTR LOCAL NoMetaUpdate call    _g_object_notify 
               a575      5 INSTR BELONGTO a4d0 
               a575      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_object_notify 
-              a57a     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              a57a     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               a57a      5 INSTR BELONGTO a4d0 
               a57a      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ mov     eax, 1 
               a57f     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_A52B 
@@ -14789,7 +14789,7 @@
               a5e4      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
               a5e9      2 INSTR BELONGTO a590 
               a5e9      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-              a5e9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a5e9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a5eb      4 INSTR BELONGTO a590 
               a5eb      4 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+18h+var_18] 
               a5eb      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp+18h+var_18]
@@ -14817,7 +14817,7 @@
               a614     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
               a614      5 INSTR BELONGTO a590 
               a614      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strdup 
-              a619     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              a619     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               a619      5 INSTR BELONGTO a590 
               a619      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 50h 
               a61e      3 INSTR BELONGTO a590 
@@ -14834,7 +14834,7 @@
               a635     -1 INSTR LOCAL NoMetaUpdate call    _g_object_notify 
               a635      5 INSTR BELONGTO a590 
               a635      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_object_notify 
-              a63a     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              a63a     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               a63a      5 INSTR BELONGTO a590 
               a63a      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ mov     eax, 1 
               a63f     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_A5EB 
@@ -14851,7 +14851,7 @@
               a676     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               a678     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_A6A0 
               a68f     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              a694     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a694     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a6b0      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 4 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
               a6b0      0 FUNC MMSAFENESS SAFE
               a6b0    131 FUNC GLOBAL sub_A6B0 FUNC_UNSAFE NOFP RET               a732 
@@ -14908,7 +14908,7 @@
               a6fe      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               a703      2 INSTR BELONGTO a6b0 
               a703      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              a703     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a703     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a705      5 INSTR BELONGTO a6b0 
               a705      5 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ mov     rbx, [rsp+18h+var_10] 
               a705      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+18h+var_10]
@@ -14926,7 +14926,7 @@
               a71c      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+18h+var_10]
               a721      3 INSTR BELONGTO a6b0 
               a721      3 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ mov     [rax+58h], ebp 
-              a724     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              a724     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               a724      5 INSTR BELONGTO a6b0 
               a724      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, 1 
               a729      5 INSTR BELONGTO a6b0 
@@ -14950,7 +14950,7 @@
               a765     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_is_a 
               a76a     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               a76c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_A798 
-              a783     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+              a783     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
               a785     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               a78b      3 PTRIMMEDEBP STACK 0 displ mov     rax, rbp
               a7a1     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -14963,9 +14963,9 @@
               a7cd     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
               a7d0     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_A7B0 
               a7e7     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-              a7ea     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1ECh 
+              a7ea     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1ECh 
               a7ef     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message 
-              a809     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+              a809     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
               a80b     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               a811      3 PTRIMMEDEBP STACK 0 displ mov     rax, rbp
               a820      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -24 0 4 0 8 5 -16 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 -8 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -15024,7 +15024,7 @@
               a866      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
               a86b      2 INSTR BELONGTO a820 
               a86b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-              a86b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a86b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a86d      1 INSTR BELONGTO a820 
               a86d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
               a86e      1 INSTR BELONGTO a820 
@@ -15104,7 +15104,7 @@
               a900      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     [rbx+70h], rax 
               a904      3 INSTR BELONGTO a820 
               a904      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, r12 
-              a907     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              a907     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               a907      5 INSTR BELONGTO a820 
               a907      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 50h 
               a90c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -15121,7 +15121,7 @@
               a920      1 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
               a921      1 INSTR BELONGTO a820 
               a921      1 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ pop     rbp 
-              a922     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              a922     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               a922      5 INSTR BELONGTO a820 
               a922      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 ZZ mov     eax, 1 
               a927      2 INSTR BELONGTO a820 
@@ -15139,7 +15139,7 @@
               a93f      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_return_if_fail_warning 
               a944      2 INSTR BELONGTO a820 
               a944      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-              a944     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a944     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a946     -1 INSTR LOCAL NoMetaUpdate jmp     loc_A86D 
               a946      5 INSTR BELONGTO a820 
               a950      5 PTRIMMEDESP STACK -40 displ mov     [rsp-28h], rbx
@@ -15155,10 +15155,10 @@
               a9a9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               a9ae      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
               a9d3      3 PTRIMMEDEBP STACK 0 displ mov     r9d, ebp
-              a9d6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              a9d6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               a9db      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbx
               a9e0      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              a9e4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              a9e4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               a9e6     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               a9f0      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
               a9f5      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -15298,9 +15298,9 @@
               ad5d     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
               ad60     -1 INSTR LOCAL NoMetaUpdate jz      short loc_AD8F 
               ad69     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-              ad6c     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-              ad6e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              ad70     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+              ad6c     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+              ad6e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              ad70     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
               ad75      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rbx
               ad79     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_handlers_disconnect_matched 
               ad86     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
@@ -15310,7 +15310,7 @@
               adb0     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
               adb3     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
               adb6     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-              adbe     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              adbe     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               adc3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               adc8      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
               adcd      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -15334,7 +15334,7 @@
               ae3c     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               ae3e     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_AE70 
               ae55     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              ae5a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              ae5a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               ae5c      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
               ae60      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
               ae65      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
@@ -15357,7 +15357,7 @@
               aec6     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               aec8     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_AEF0 
               aedf     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              aee4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              aee4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               af00      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -16 0 4 0 8 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
               af00      0 FUNC MMSAFENESS SAFE
               af00    175 FUNC GLOBAL sub_AF00 FUNC_UNSAFE NOFP RET               afae 
@@ -15417,7 +15417,7 @@
               af4c      4 INSTR BELONGTO af00 
               af50      2 INSTR BELONGTO af00 
               af50      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              af50     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              af50     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               af52      1 INSTR BELONGTO af00 
               af52      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               af53      1 INSTR BELONGTO af00 
@@ -15443,7 +15443,7 @@
               af7d      4 INSTR BELONGTO af00 
               af81      2 INSTR BELONGTO af00 
               af81      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              af81     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              af81     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               af83      1 INSTR BELONGTO af00 
               af83      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               af84      1 INSTR BELONGTO af00 
@@ -15462,7 +15462,7 @@
               af9f      4 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ mov     [rbx+78h], rax 
               afa3     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
               afa3      4 INSTR BELONGTO af00 
-              afa7     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              afa7     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               afa7      5 INSTR BELONGTO af00 
               afa7      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
               afa7      8 DEALLOC STACK esp - 8 mov     eax, 1
@@ -15484,7 +15484,7 @@
               afd6     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               afd8     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_B000 
               afef     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              aff4     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
+              aff4     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0FFFFFFFFh 
               b010      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -16 0 4 0 8 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
               b010      0 FUNC MMSAFENESS SAFE
               b010    135 FUNC GLOBAL sub_B010 FUNC_UNSAFE NOFP RET               b096 
@@ -15544,7 +15544,7 @@
               b05b      4 INSTR BELONGTO b010 
               b05f      2 INSTR BELONGTO b010 
               b05f      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              b05f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b05f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b061      1 INSTR BELONGTO b010 
               b061      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               b062      1 INSTR BELONGTO b010 
@@ -15555,7 +15555,7 @@
               b068      4 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rax, [rbx+18h] 
               b06c      3 INSTR BELONGTO b010 
               b06c      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-              b06f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              b06f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               b06f      5 INSTR BELONGTO b010 
               b06f      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
               b074      3 INSTR BELONGTO b010 
@@ -15572,7 +15572,7 @@
               b086      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_object_notify 
               b08b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
               b08b      4 INSTR BELONGTO b010 
-              b08f     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              b08f     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               b08f      5 INSTR BELONGTO b010 
               b08f      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
               b08f      8 DEALLOC STACK esp - 8 mov     eax, 1
@@ -15634,7 +15634,7 @@
               b0e3      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               b0e8      2 INSTR BELONGTO b0a0 
               b0e8      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              b0e8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b0e8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b0ea     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 20h 
               b0ea      4 INSTR BELONGTO b0a0 
               b0ee      1 INSTR BELONGTO b0a0 
@@ -15643,7 +15643,7 @@
               b0ef      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
               b0f0      4 INSTR BELONGTO b0a0 
               b0f0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 ZZ mov     rdx, [rbx+18h] 
-              b0f4     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              b0f4     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               b0f4      5 INSTR BELONGTO b0a0 
               b0f4      5 INSTR DEADREGS  EFLAGS RAX RCX R8 ZZ mov     eax, 1 
               b0f9      3 INSTR BELONGTO b0a0 
@@ -15662,8 +15662,8 @@
               b10f      7 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ lea     rdx, aPushingNewVolu; "Pushing new volume to stream '%s' (%s)" 
               b116      2 INSTR BELONGTO b0a0 
               b116      2 INSTR DEADREGS  EFLAGS RAX RSI ZZ xor     eax, eax 
-              b116     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-              b118     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              b116     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+              b118     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
               b118      5 INSTR BELONGTO b0a0 
               b118      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 80h 
               b11d     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
@@ -15724,7 +15724,7 @@
               b174      3 INSTR BELONGTO b170 
               b177     -1 INSTR LOCAL NoMetaUpdate jz      short loc_B1A0 
               b177      2 INSTR BELONGTO b170 
-              b179     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              b179     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               b179      5 INSTR BELONGTO b170 
               b179      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 50h 
               b17e      3 INSTR BELONGTO b170 
@@ -15798,7 +15798,7 @@
               b215     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               b215      5 INSTR BELONGTO b1c0 
               b21a      2 INSTR BELONGTO b1c0 
-              b21a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b21a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b21c      4 INSTR BELONGTO b1c0 
               b21c      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp+18h+var_18]
               b220      5 INSTR BELONGTO b1c0 
@@ -15835,7 +15835,7 @@
               b265      3 INSTR BELONGTO b260 
               b268      2 INSTR BELONGTO b260 
               b268      2 INSTR DEADREGS  EFLAGS RDX RDI ZZ xor     edx, edx 
-              b268     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              b268     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               b26a      4 INSTR BELONGTO b260 
               b26a      4 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, [rax+60h] 
               b26e     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
@@ -15847,14 +15847,14 @@
               b273      5 INSTR DEADREGS  EFLAGS ZZ call    _pa_operation_get_state 
               b278     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               b278      2 INSTR BELONGTO b260 
-              b27a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+              b27a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
               b27a      5 INSTR BELONGTO b260 
               b27a      5 INSTR DEADREGS  RAX RDX ZZ mov     edx, 1 
               b27f     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_B288 
               b27f      2 INSTR BELONGTO b260 
               b281      2 INSTR BELONGTO b260 
               b281      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, edx 
-              b281     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edx 
+              b281     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edx 
               b283      1 INSTR BELONGTO b260 
               b283      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               b284      1 INSTR BELONGTO b260 
@@ -15870,12 +15870,12 @@
               b295      4 INSTR DEADREGS  EFLAGS RAX RDX R8 R9 R10 R11 ZZ mov     rax, [rbx+18h] 
               b299      2 INSTR BELONGTO b260 
               b299      2 INSTR DEADREGS  EFLAGS RDX RBX R8 R9 R10 R11 ZZ xor     edx, edx 
-              b299     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              b299     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               b29b      8 INSTR BELONGTO b260 
               b29b      8 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ mov     qword ptr [rax+60h], 0 
               b2a3      2 INSTR BELONGTO b260 
               b2a3      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, edx 
-              b2a3     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edx 
+              b2a3     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edx 
               b2a5      1 INSTR BELONGTO b260 
               b2a5      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               b2a6      1 INSTR BELONGTO b260 
@@ -15899,7 +15899,7 @@
               b2b8      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
               b2bd      3 INSTR BELONGTO b2b0 
               b2bd      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-              b2c0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              b2c0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               b2c0      5 INSTR BELONGTO b2b0 
               b2c0      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
               b2c5      7 INSTR BELONGTO b2b0 
@@ -15920,14 +15920,14 @@
               b2e5     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
               b2e5      3 INSTR BELONGTO b2b0 
               b2e5      3 INSTR DEADREGS  EFLAGS RCX R8 ZZ xor     r8d, r8d 
-              b2e8     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
+              b2e8     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
               b2e8      5 INSTR BELONGTO b2b0 
               b2e8      5 INSTR DEADREGS  EFLAGS RCX ZZ mov     ecx, 88h 
               b2ed      4 INSTR BELONGTO b2b0 
               b2ed      4 INSTR DEADREGS  EFLAGS ZZ mov     [rax+30h], rdx 
               b2f1      7 INSTR BELONGTO b2b0 
               b2f1      7 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     rax, cs:g_cclosure_marshal_VOID__BOOLEAN_ptr 
-              b2f8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+              b2f8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
               b2f8      5 INSTR BELONGTO b2b0 
               b2f8      5 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, 2 
               b2fd     -1 INSTR LOCAL MetadataUnused mov     [rsp+28h+var_10], 14h 
@@ -15943,7 +15943,7 @@
               b317      4 PTRIMMEDESP STACK 0 displ mov     [rsp+28h+var_28], rax
               b31b      2 INSTR BELONGTO b2b0 
               b31b      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-              b31b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b31b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b31d     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
               b31d      5 INSTR BELONGTO b2b0 
               b31d      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_new 
@@ -16007,12 +16007,12 @@
               b38a     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h 
               b38a      6 INSTR BELONGTO b340 
               b38a      6 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 ZZ mov     r8d, 20h 
-              b390     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 90h 
+              b390     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 90h 
               b390      5 INSTR BELONGTO b340 
               b390      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 90h 
               b395      3 INSTR BELONGTO b340 
               b395      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-              b398     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+              b398     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
               b398      5 INSTR BELONGTO b340 
               b398      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
               b39d      7 INSTR BELONGTO b340 
@@ -16046,7 +16046,7 @@
               b413     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               b418     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rax+18h], 0 
               b41d     -1 INSTR LOCAL NoMetaUpdate jz      short loc_B460 
-              b426     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              b426     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               b42b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               b438     -1 INSTR LOCAL NoMetaUpdate jmp     rax 
               b456     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
@@ -16090,9 +16090,9 @@
               b4d6     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               b4d8     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_B500 
               b4ef     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              b4f4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b4f4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b507     -1 INSTR LOCAL NoMetaUpdate call    _pa_channel_map_valid 
-              b50e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b50e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b510     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
               b512     -1 INSTR LOCAL NoMetaUpdate jz      short loc_B4F6 
               b520      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 4 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -16143,7 +16143,7 @@
               b55f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               b564      2 INSTR BELONGTO b520 
               b564      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              b564     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b564     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b566      1 INSTR BELONGTO b520 
               b566      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               b567      1 INSTR BELONGTO b520 
@@ -16204,7 +16204,7 @@
               b5bf      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               b5c4      2 INSTR BELONGTO b580 
               b5c4      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              b5c4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b5c4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b5c6      1 INSTR BELONGTO b580 
               b5c6      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               b5c7      1 INSTR BELONGTO b580 
@@ -16229,7 +16229,7 @@
               b606     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               b608     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_B630 
               b61f     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              b624     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b624     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b637     -1 INSTR LOCAL NoMetaUpdate call    _pa_channel_map_valid 
               b63c     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               b63e     -1 INSTR LOCAL NoMetaUpdate jz      short loc_B624 
@@ -16290,7 +16290,7 @@
               b69e      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               b6a3      2 INSTR BELONGTO b650 
               b6a3      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              b6a3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b6a3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b6a5      5 INSTR BELONGTO b650 
               b6a5      5 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ mov     rbx, [rsp+18h+var_10] 
               b6a5      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+18h+var_10]
@@ -16369,7 +16369,7 @@
               b723      5 INSTR DEADREGS  EFLAGS RBX R12 XMM0 ZZ call    _g_return_if_fail_warning 
               b728      2 INSTR BELONGTO b6e0 
               b728      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 XMM0 ZZ xor     eax, eax 
-              b728     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b728     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b72a      1 INSTR BELONGTO b6e0 
               b72a      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 XMM0 ZZ pop     rbx 
               b72b      1 INSTR BELONGTO b6e0 
@@ -16389,7 +16389,7 @@
               b73c      2 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, eax 
               b73e      2 INSTR BELONGTO b6e0 
               b73e      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-              b73e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b73e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b740     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
               b740      2 INSTR BELONGTO b6e0 
               b742     -1 INSTR LOCAL NoMetaUpdate jz      short loc_B72A 
@@ -16453,7 +16453,7 @@
               b7b9      3 INSTR BELONGTO b6e0 
               b7bc      8 INSTR BELONGTO b6e0 
               b7bc      8 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ movsd   qword ptr [rbx+120h], xmm0 
-              b7c4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
+              b7c4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
               b7c4      5 INSTR BELONGTO b6e0 
               b7c4      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 7 
               b7c9      3 INSTR BELONGTO b6e0 
@@ -16469,7 +16469,7 @@
               b7d7      2 INSTR BELONGTO b6e0 
               b7d9      7 INSTR BELONGTO b6e0 
               b7d9      7 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ lea     rdi, [rbx+88h] 
-              b7e0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 7 
+              b7e0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 7 
               b7e0      5 INSTR BELONGTO b6e0 
               b7e0      5 INSTR DEADREGS  EFLAGS RDX RSI R12 ZZ mov     edx, 7 
               b7e5      3 INSTR BELONGTO b6e0 
@@ -16561,7 +16561,7 @@
               b888      7 INSTR DEADREGS  EFLAGS RBX RDI ZZ lea     rdi, aSoundCcPanel; "sound-cc-panel" 
               b88f      2 INSTR BELONGTO b850 
               b88f      2 INSTR DEADREGS  EFLAGS RBX ZZ xor     ebx, ebx 
-              b88f     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+              b88f     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
               b891     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               b891      5 INSTR BELONGTO b850 
               b891      5 INSTR DEADREGS  EFLAGS ZZ call    _g_return_if_fail_warning 
@@ -16639,7 +16639,7 @@
               b8ff      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               b904      2 INSTR BELONGTO b8c0 
               b904      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              b904     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b904     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b906      1 INSTR BELONGTO b8c0 
               b906      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               b907      1 INSTR BELONGTO b8c0 
@@ -16657,7 +16657,7 @@
               b923      2 INSTR DEADREGS  EFLAGS RDX R8 R9 R10 R11 ZZ mov     edx, eax 
               b925      2 INSTR BELONGTO b8c0 
               b925      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ xor     eax, eax 
-              b925     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              b925     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               b927     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
               b927      2 INSTR BELONGTO b8c0 
               b929      4 INSTR BELONGTO b8c0 
@@ -16768,7 +16768,7 @@
               b9e5      2 INSTR BELONGTO b930 
               b9e7     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_BA13 
               b9e7      2 INSTR BELONGTO b930 
-              b9e9     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
+              b9e9     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
               b9e9      5 INSTR BELONGTO b930 
               b9e9      5 INSTR DEADREGS  RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 10h 
               b9ee      3 INSTR BELONGTO b930 
@@ -16817,14 +16817,14 @@
               ba41      5 INSTR BELONGTO b930 
               ba46      2 INSTR BELONGTO b930 
               ba46      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ xor     edx, edx 
-              ba46     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              ba46     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               ba48     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+28h+var_10] 
               ba48      5 INSTR BELONGTO b930 
               ba4d     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+28h+var_8] 
               ba4d      5 INSTR BELONGTO b930 
               ba52      2 INSTR BELONGTO b930 
               ba52      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ xor     eax, eax 
-              ba52     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              ba52     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               ba54     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
               ba54      4 INSTR BELONGTO b930 
               ba58     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
@@ -16837,8 +16837,8 @@
               ba67      5 INSTR BELONGTO b930 
               ba70     -3 INSTR LOCAL NoWarn push    rbx 
               ba71     -1 INSTR LOCAL NoMetaUpdate call    sub_B340 
-              ba76     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-              ba7b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              ba76     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+              ba7b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               ba7d     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
               ba85     -1 INSTR LOCAL NoMetaUpdate call    sub_B340 
               ba91     -1 INSTR LOCAL NoMetaUpdate jmp     _g_type_check_instance_cast 
@@ -16864,12 +16864,12 @@
               babb      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ call    sub_B340 
               bac0      2 INSTR BELONGTO baa0 
               bac0      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ xor     esi, esi 
-              bac0     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              bac0     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               bac2      3 INSTR BELONGTO baa0 
               bac2      3 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     rdi, rax 
               bac5      2 INSTR BELONGTO baa0 
               bac5      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-              bac5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              bac5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               bac7     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
               bac7      5 INSTR BELONGTO baa0 
               bac7      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_object_new 
@@ -16913,10 +16913,10 @@
               bb0d      8 INSTR DEADREGS  RCX RDX RSI ZZ mov     [r12+134h], eax 
               bb15      3 INSTR BELONGTO baa0 
               bb15      3 INSTR DEADREGS  RAX RCX RDX RSI R12 ZZ mov     rsi, rbp 
-              bb18     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
+              bb18     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
               bb18      5 INSTR BELONGTO baa0 
               bb18      5 INSTR DEADREGS  RAX RCX RDX R12 ZZ mov     ecx, 10h 
-              bb1d     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, 10000h 
+              bb1d     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, 10000h 
               bb1d      5 INSTR BELONGTO baa0 
               bb1d      5 INSTR DEADREGS  RAX RDX R12 ZZ mov     edx, 10000h 
               bb22      3 INSTR BELONGTO baa0 
@@ -16925,7 +16925,7 @@
               bb25      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ mov     eax, [rsi] 
               bb27      2 INSTR BELONGTO baa0 
               bb27      2 INSTR DEADREGS  EFLAGS RSI R12 ZZ mov     [rdi], eax 
-              bb29     -2 INSTR LOCAL n ESI ZZ  NumericDEFs movzx   esi, byte ptr [rbp+0] 
+              bb29     -2 INSTR LOCAL n RSI ZZ  NumericDEFs movzx   esi, byte ptr [rbp+0] 
               bb29      4 INSTR BELONGTO baa0 
               bb29      4 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ movzx   esi, byte ptr [rbp+0] 
               bb2d      4 INSTR BELONGTO baa0 
@@ -16964,7 +16964,7 @@
               bb76      7 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ lea     rsi, aGvcChannelMap_; "gvc-channel-map.c" 
               bb7d      7 INSTR BELONGTO baa0 
               bb7d      7 INSTR DEADREGS  EFLAGS RDX RDI R12 R13 ZZ lea     rdi, aSoundCcPanel; "sound-cc-panel" 
-              bb84     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0ECh 
+              bb84     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0ECh 
               bb84      5 INSTR BELONGTO baa0 
               bb84      5 INSTR DEADREGS  EFLAGS RDX R12 R13 ZZ mov     edx, 0ECh 
               bb89     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
@@ -17008,7 +17008,7 @@
               bbba      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 ZZ retn 
               bbc0      2 INSTR BELONGTO baa0 
               bbc0      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ xor     eax, eax 
-              bbc0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              bbc0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               bbc2      1 INSTR BELONGTO baa0 
               bbc2      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 ZZ pop     rbx 
               bbc3      1 INSTR BELONGTO baa0 
@@ -17037,7 +17037,7 @@
               bbec      5 INSTR DEADREGS  EFLAGS R12 ZZ call    sub_98B0 
               bbf1      2 INSTR BELONGTO bbd0 
               bbf1      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     esi, eax 
-              bbf1     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, eax 
+              bbf1     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, eax 
               bbf3      4 INSTR BELONGTO bbd0 
               bbf3      4 INSTR DEADREGS  EFLAGS RAX RDX RDI R12 ZZ mov     rax, [rbp+18h] 
               bbf7      3 INSTR BELONGTO bbd0 
@@ -17059,13 +17059,13 @@
               bc11      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     r12d, eax 
               bc14      3 INSTR BELONGTO bbd0 
               bc14      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbp 
-              bc17     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              bc17     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               bc17      5 INSTR BELONGTO bbd0 
               bc17      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
               bc1c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               bc1c      5 INSTR BELONGTO bbd0 
               bc1c      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-              bc21     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, r12d 
+              bc21     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, r12d 
               bc21      3 INSTR BELONGTO bbd0 
               bc21      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, r12d 
               bc24     -1 INSTR LOCAL MetadataUnused mov     esi, ebx 
@@ -17080,10 +17080,10 @@
               bc34      3 INSTR BELONGTO bbd0 
               bc37      2 INSTR BELONGTO bbd0 
               bc37      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     edx, edx 
-              bc37     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              bc37     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               bc39      2 INSTR BELONGTO bbd0 
               bc39      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-              bc39     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              bc39     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               bc3b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
               bc3b      4 INSTR BELONGTO bbd0 
               bc3f     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
@@ -17435,7 +17435,7 @@
               bee9      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     r12, [rbx+18h] 
               beed      2 INSTR BELONGTO be20 
               beed      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     esi, esi 
-              beed     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              beed     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               beef      3 INSTR BELONGTO be20 
               beef      3 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     rdx, rbp 
               bef2      5 INSTR BELONGTO be20 
@@ -17477,7 +17477,7 @@
               bf3e      7 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ lea     rsi, aGvcMixerContro; "gvc-mixer-control.c" 
               bf45      7 INSTR BELONGTO be20 
               bf45      7 INSTR DEADREGS  EFLAGS RDX RBX RDI R12 ZZ lea     rdi, aSoundCcPanel; "sound-cc-panel" 
-              bf4c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 756h 
+              bf4c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 756h 
               bf4c      5 INSTR BELONGTO be20 
               bf4c      5 INSTR DEADREGS  EFLAGS RDX RBX R12 ZZ mov     edx, 756h 
               bf51     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
@@ -17541,7 +17541,7 @@
               bfa7      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               bfac      2 INSTR BELONGTO bf60 
               bfac      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              bfac     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              bfac     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               bfae     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
               bfae      4 INSTR BELONGTO bf60 
               bfb2      1 INSTR BELONGTO bf60 
@@ -17591,7 +17591,7 @@
               bff9      4 INSTR BELONGTO bf60 
               bffd      2 INSTR BELONGTO bf60 
               bffd      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              bffd     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              bffd     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               bfff      1 INSTR BELONGTO bf60 
               bfff      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               c000      1 INSTR BELONGTO bf60 
@@ -17615,7 +17615,7 @@
               c01e     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     rsi, rax 
               c01e      3 INSTR BELONGTO bf60 
               c01e      3 INSTR DEADREGS  RDX RSI R8 R9 R10 R11 ZZ mov     rsi, rax 
-              c021     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setz    dl 
+              c021     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setz    dl 
               c021      3 INSTR BELONGTO bf60 
               c021      3 INSTR DEADREGS  RDX R8 R9 R10 R11 ZZ setz    dl 
               c024     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -17650,7 +17650,7 @@
               c04a      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
               c04b      1 INSTR BELONGTO bf60 
               c04b      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-              c050     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              c050     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               c050      5 INSTR BELONGTO bf60 
               c050      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
               c055     -1 INSTR LOCAL NoMetaUpdate jmp     loc_BFAE 
@@ -17732,7 +17732,7 @@
               c0c7      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               c0cc      2 INSTR BELONGTO c080 
               c0cc      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              c0cc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c0cc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c0ce     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
               c0ce      4 INSTR BELONGTO c080 
               c0d2      1 INSTR BELONGTO c080 
@@ -17782,7 +17782,7 @@
               c119      4 INSTR BELONGTO c080 
               c11d      2 INSTR BELONGTO c080 
               c11d      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              c11d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c11d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c11f      1 INSTR BELONGTO c080 
               c11f      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               c120      1 INSTR BELONGTO c080 
@@ -17806,7 +17806,7 @@
               c13e     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     rsi, rax 
               c13e      3 INSTR BELONGTO c080 
               c13e      3 INSTR DEADREGS  RDX RSI R8 R9 R10 R11 ZZ mov     rsi, rax 
-              c141     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setz    dl 
+              c141     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setz    dl 
               c141      3 INSTR BELONGTO c080 
               c141      3 INSTR DEADREGS  RDX R8 R9 R10 R11 ZZ setz    dl 
               c144     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -17841,7 +17841,7 @@
               c16a      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
               c16b      1 INSTR BELONGTO c080 
               c16b      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-              c170     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              c170     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               c170      5 INSTR BELONGTO c080 
               c170      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
               c175     -1 INSTR LOCAL NoMetaUpdate jmp     loc_C0CE 
@@ -17868,7 +17868,7 @@
               c189      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
               c18e      3 INSTR BELONGTO c180 
               c18e      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-              c191     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              c191     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               c191      5 INSTR BELONGTO c180 
               c191      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
               c196      7 INSTR BELONGTO c180 
@@ -17889,7 +17889,7 @@
               c1ba      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ lea     rdi, aName_0    ; "name" 
               c1c1      2 INSTR BELONGTO c180 
               c1c1      2 INSTR DEADREGS  EFLAGS RCX R8 ZZ xor     ecx, ecx 
-              c1c1     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              c1c1     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               c1c3      4 INSTR BELONGTO c180 
               c1c3      4 INSTR DEADREGS  EFLAGS R8 ZZ mov     [rbp+10h], rax 
               c1c7     -1 INSTR LOCAL MetadataRedundant lea     rax, sub_E8D0 
@@ -17918,7 +17918,7 @@
               c1fe      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbp 
               c201      3 INSTR BELONGTO c180 
               c201      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-              c204     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              c204     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               c204      5 INSTR BELONGTO c180 
               c204      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
               c209     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -17936,15 +17936,15 @@
               c222     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
               c222      3 INSTR BELONGTO c180 
               c222      3 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 ZZ xor     r8d, r8d 
-              c225     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
+              c225     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
               c225      5 INSTR BELONGTO c180 
               c225      5 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ mov     ecx, 88h 
-              c22a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+              c22a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
               c22a      5 INSTR BELONGTO c180 
               c22a      5 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     edx, 2 
               c22f      2 INSTR BELONGTO c180 
               c22f      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-              c22f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c22f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c231     -1 INSTR LOCAL MetadataUnused mov     [rsp+38h+var_20], 1Ch 
               c231      9 INSTR BELONGTO c180 
               c23a      4 INSTR BELONGTO c180 
@@ -17969,15 +17969,15 @@
               c261      3 INSTR BELONGTO c180 
               c264      6 INSTR BELONGTO c180 
               c264      6 INSTR DEADREGS  EFLAGS RCX RDX ZZ mov     cs:dword_21D1B0, eax 
-              c26a     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 90h 
+              c26a     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 90h 
               c26a      5 INSTR BELONGTO c180 
               c26a      5 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ mov     ecx, 90h 
-              c26f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+              c26f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
               c26f      5 INSTR BELONGTO c180 
               c26f      5 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     edx, 2 
               c274      2 INSTR BELONGTO c180 
               c274      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-              c274     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c274     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c276      4 INSTR BELONGTO c180 
               c276      4 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+38h+var_38], rbp 
               c276      4 PTRIMMEDESP STACK 0 displ mov     [rsp+38h+var_38], rbp
@@ -18000,15 +18000,15 @@
               c2a6      3 INSTR BELONGTO c180 
               c2a9      6 INSTR BELONGTO c180 
               c2a9      6 INSTR DEADREGS  EFLAGS RCX RDX ZZ mov     cs:dword_21D1B4, eax 
-              c2af     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 98h 
+              c2af     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 98h 
               c2af      5 INSTR BELONGTO c180 
               c2af      5 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ mov     ecx, 98h 
-              c2b4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+              c2b4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
               c2b4      5 INSTR BELONGTO c180 
               c2b4      5 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     edx, 2 
               c2b9      2 INSTR BELONGTO c180 
               c2b9      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-              c2b9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c2b9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c2bb      4 INSTR BELONGTO c180 
               c2bb      4 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+38h+var_38], rbp 
               c2bb      4 PTRIMMEDESP STACK 0 displ mov     [rsp+38h+var_38], rbp
@@ -18031,15 +18031,15 @@
               c2eb      3 INSTR BELONGTO c180 
               c2ee      6 INSTR BELONGTO c180 
               c2ee      6 INSTR DEADREGS  EFLAGS RCX RDX ZZ mov     cs:dword_21D1B8, eax 
-              c2f4     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0A0h 
+              c2f4     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0A0h 
               c2f4      5 INSTR BELONGTO c180 
               c2f4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ mov     ecx, 0A0h 
-              c2f9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+              c2f9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
               c2f9      5 INSTR BELONGTO c180 
               c2f9      5 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     edx, 2 
               c2fe      2 INSTR BELONGTO c180 
               c2fe      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-              c2fe     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c2fe     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c300      4 INSTR BELONGTO c180 
               c300      4 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+38h+var_38], rbp 
               c300      4 PTRIMMEDESP STACK 0 displ mov     [rsp+38h+var_38], rbp
@@ -18062,15 +18062,15 @@
               c330      3 INSTR BELONGTO c180 
               c333      6 INSTR BELONGTO c180 
               c333      6 INSTR DEADREGS  EFLAGS RCX RDX ZZ mov     cs:dword_21D1BC, eax 
-              c339     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0A8h 
+              c339     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0A8h 
               c339      5 INSTR BELONGTO c180 
               c339      5 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ mov     ecx, 0A8h 
-              c33e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+              c33e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
               c33e      5 INSTR BELONGTO c180 
               c33e      5 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     edx, 2 
               c343      2 INSTR BELONGTO c180 
               c343      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-              c343     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c343     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c345      4 INSTR BELONGTO c180 
               c345      4 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+38h+var_38], rbp 
               c345      4 PTRIMMEDESP STACK 0 displ mov     [rsp+38h+var_38], rbp
@@ -18093,15 +18093,15 @@
               c375      3 INSTR BELONGTO c180 
               c378      6 INSTR BELONGTO c180 
               c378      6 INSTR DEADREGS  EFLAGS RCX RDX ZZ mov     cs:dword_21D1C0, eax 
-              c37e     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0B0h 
+              c37e     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0B0h 
               c37e      5 INSTR BELONGTO c180 
               c37e      5 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ mov     ecx, 0B0h 
-              c383     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+              c383     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
               c383      5 INSTR BELONGTO c180 
               c383      5 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     edx, 2 
               c388      2 INSTR BELONGTO c180 
               c388      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-              c388     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c388     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c38a      4 INSTR BELONGTO c180 
               c38a      4 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+38h+var_38], rbp 
               c38a      4 PTRIMMEDESP STACK 0 displ mov     [rsp+38h+var_38], rbp
@@ -18124,15 +18124,15 @@
               c3bd      3 INSTR BELONGTO c180 
               c3c0     -1 INSTR LOCAL MetadataRedundant xor     r8d, r8d 
               c3c0      3 INSTR BELONGTO c180 
-              c3c3     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0B8h 
+              c3c3     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0B8h 
               c3c3      5 INSTR BELONGTO c180 
               c3c3      5 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ mov     ecx, 0B8h 
-              c3c8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+              c3c8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
               c3c8      5 INSTR BELONGTO c180 
               c3c8      5 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     edx, 2 
               c3cd      2 INSTR BELONGTO c180 
               c3cd      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-              c3cd     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c3cd     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c3cf      4 INSTR BELONGTO c180 
               c3cf      4 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+38h+var_38], rbp 
               c3cf      4 PTRIMMEDESP STACK 0 displ mov     [rsp+38h+var_38], rbp
@@ -18190,7 +18190,7 @@
               c427      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
               c430     -1 INSTR LOCAL MetadataUnused mov     ebx, cs:dword_21D1B0 
               c430      6 INSTR BELONGTO c410 
-              c436     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              c436     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               c436      5 INSTR BELONGTO c410 
               c436      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
               c43b     10 INSTR BELONGTO c410 
@@ -18198,19 +18198,19 @@
               c445     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               c445      5 INSTR BELONGTO c410 
               c445      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-              c44a     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+              c44a     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
               c44a      5 INSTR BELONGTO c410 
               c44a      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 1 
               c44f     -1 INSTR LOCAL MetadataUnused mov     rdi, rax 
               c44f      3 INSTR BELONGTO c410 
               c452      2 INSTR BELONGTO c410 
               c452      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R8 R9 R10 R11 ZZ xor     edx, edx 
-              c452     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              c452     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               c454     -1 INSTR LOCAL MetadataUnused mov     esi, ebx 
               c454      2 INSTR BELONGTO c410 
               c456      2 INSTR BELONGTO c410 
               c456      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-              c456     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c456     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c458      1 INSTR BELONGTO c410 
               c458      1 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx 
               c459     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
@@ -18288,19 +18288,19 @@
               c4cd      7 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 R10 R11 ZZ mov     dword ptr [rdx+38h], 1 
               c4d4      2 INSTR BELONGTO c4b0 
               c4d4      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, eax 
-              c4d4     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, eax 
+              c4d4     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, eax 
               c4d6     -1 INSTR LOCAL MetadataUnused mov     rdi, rbx 
               c4d6      3 INSTR BELONGTO c4b0 
               c4d9     -1 INSTR LOCAL MetadataUnused mov     esi, cs:dword_21D1C8 
               c4d9      6 INSTR BELONGTO c4b0 
               c4df      2 INSTR BELONGTO c4b0 
               c4df      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 ZZ xor     edx, edx 
-              c4df     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              c4df     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               c4e1      1 INSTR BELONGTO c4b0 
               c4e1      1 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx 
               c4e2      2 INSTR BELONGTO c4b0 
               c4e2      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-              c4e2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c4e2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c4e4     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
               c4e4      5 INSTR BELONGTO c4b0 
               c4e4      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_signal_emit 
@@ -18310,7 +18310,7 @@
               c4f1      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
               c4f8      4 INSTR BELONGTO c4b0 
               c4f8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ mov     rax, [rdi+18h] 
-              c4fc     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFFh 
+              c4fc     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFFh 
               c4fc      5 INSTR BELONGTO c4b0 
               c4fc      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 0FFFFFFFFh 
               c501      7 INSTR BELONGTO c4b0 
@@ -18349,19 +18349,19 @@
               c53d      7 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 R10 R11 ZZ mov     dword ptr [rdx+28h], 1 
               c544      2 INSTR BELONGTO c520 
               c544      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, eax 
-              c544     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, eax 
+              c544     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, eax 
               c546     -1 INSTR LOCAL MetadataUnused mov     rdi, rbx 
               c546      3 INSTR BELONGTO c520 
               c549     -1 INSTR LOCAL MetadataUnused mov     esi, cs:dword_21D1C4 
               c549      6 INSTR BELONGTO c520 
               c54f      2 INSTR BELONGTO c520 
               c54f      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 ZZ xor     edx, edx 
-              c54f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              c54f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               c551      1 INSTR BELONGTO c520 
               c551      1 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ pop     rbx 
               c552      2 INSTR BELONGTO c520 
               c552      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-              c552     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c552     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c554     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
               c554      5 INSTR BELONGTO c520 
               c554      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_signal_emit 
@@ -18381,7 +18381,7 @@
               c570      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     dword ptr [rax+2Ch], 0 
               c577      7 INSTR BELONGTO c520 
               c577      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     dword ptr [rax+28h], 0 
-              c57e     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFFh 
+              c57e     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0FFFFFFFFh 
               c57e      5 INSTR BELONGTO c520 
               c57e      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     ecx, 0FFFFFFFFh 
               c583     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_C546 
@@ -18392,13 +18392,13 @@
               c596     -3 INSTR LOCAL NoWarn push    r12 
               c59c     -3 INSTR LOCAL NoWarn push    rbp 
               c5a3     -3 INSTR LOCAL NoWarn push    rbx 
-              c5a7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 150h 
+              c5a7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 150h 
               c5b3      5 PTRIMMEDESP STACK 48 displ lea     r13, [rsp+30h]
               c5c1      8 PTRIMMEDESP STACK 392 displ mov     [rsp+188h], rax
-              c5c9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c5c9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c5ce     -1 INSTR LOCAL NoMetaUpdate call    _pa_channel_map_snprint 
-              c5eb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-              c5ed     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              c5eb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+              c5ed     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
               c5f2      4 PTRIMMEDESP STACK 0 displ mov     [rsp], r13
               c5f6     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               c5fb      4 PTRIMMEDEBP STACK 24 displ mov     rax, [rbp+18h]
@@ -18421,9 +18421,9 @@
               c699      4 PTRIMMEDESP STACK 44 displ mov     esi, [rsp+2Ch]
               c6a0     -1 INSTR LOCAL NoMetaUpdate call    sub_9A50 
               c6ae     -1 INSTR LOCAL NoMetaUpdate call    sub_9D00 
-              c6b3     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              c6b3     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               c6b5     -1 INSTR LOCAL NoMetaUpdate test    byte ptr [rbx+150h], 20h 
-              c6bf     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setnz   sil 
+              c6bf     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setnz   sil 
               c6c3     -1 INSTR LOCAL NoMetaUpdate call    sub_9DB0 
               c6d1     -1 INSTR LOCAL NoMetaUpdate call    sub_A6B0 
               c6dd     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
@@ -18441,7 +18441,7 @@
               c70e     -1 INSTR LOCAL NoMetaUpdate jz      short loc_C780 
               c710     -1 INSTR LOCAL NoMetaUpdate test    r12, r12 
               c713     -1 INSTR LOCAL NoMetaUpdate jz      loc_C890 
-              c719     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              c719     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               c721     -1 INSTR LOCAL NoMetaUpdate call    sub_B930 
               c726      8 PTRIMMEDESP STACK 392 displ mov     rax, [rsp+188h]
               c72e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     rax, fs:28h 
@@ -18456,8 +18456,8 @@
               c783      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               c786     -1 INSTR LOCAL NoMetaUpdate call    sub_C520 
               c78b     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_C710 
-              c79e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-              c7a3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c79e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              c7a3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c7a5     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               c7aa     -1 INSTR LOCAL NoMetaUpdate jmp     loc_C726 
               c7b3     -2 INSTR LOCAL n R15 ZZ  AlwaysNUM xor     r15d, r15d 
@@ -18467,7 +18467,7 @@
               c7da     -1 INSTR LOCAL NoMetaUpdate test    ecx, ecx 
               c7dc     -1 INSTR LOCAL NoMetaUpdate jz      loc_C871 
               c7e2     -2 INSTR LOCAL n R14 ZZ  AlwaysNUM xor     r14d, r14d 
-              c7e8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
+              c7e8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
               c7ed     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc0 
               c7ff     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     r14d, 1 
               c80a      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], rdx
@@ -18531,7 +18531,7 @@
               c8f1      4 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     rdi, [rdx+50h] 
               c8f5      2 INSTR BELONGTO c8b0 
               c8f5      2 INSTR DEADREGS  EFLAGS RSI R13 ZZ mov     esi, eax 
-              c8f5     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, eax 
+              c8f5     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, eax 
               c8f7     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_remove 
               c8f7      5 INSTR BELONGTO c8b0 
               c8f7      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_hash_table_remove 
@@ -18547,13 +18547,13 @@
               c90a      3 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     r13d, eax 
               c90d      3 INSTR BELONGTO c8b0 
               c90d      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, r12 
-              c910     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              c910     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               c910      5 INSTR BELONGTO c8b0 
               c910      5 INSTR DEADREGS  EFLAGS RSI R12 ZZ mov     esi, 50h 
               c915     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               c915      5 INSTR BELONGTO c8b0 
               c915      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_type_check_instance_cast 
-              c91a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, r13d 
+              c91a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, r13d 
               c91a      3 INSTR BELONGTO c8b0 
               c91a      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     ecx, r13d 
               c91d      3 INSTR BELONGTO c8b0 
@@ -18562,10 +18562,10 @@
               c920      2 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 ZZ mov     esi, ebp 
               c922      2 INSTR BELONGTO c8b0 
               c922      2 INSTR DEADREGS  EFLAGS RAX RDX R12 R13 ZZ xor     edx, edx 
-              c922     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              c922     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               c924      2 INSTR BELONGTO c8b0 
               c924      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-              c924     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              c924     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               c926     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
               c926      5 INSTR BELONGTO c8b0 
               c926      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_signal_emit 
@@ -18587,7 +18587,7 @@
               c946      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ jmp     _g_object_unref 
               c950      2 INSTR BELONGTO c8b0 
               c950      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 R13 ZZ xor     esi, esi 
-              c950     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              c950     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               c952      3 INSTR BELONGTO c8b0 
               c952      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 R9 R10 R11 R13 ZZ mov     rdi, r12 
               c955      4 INSTR BELONGTO c8b0 
@@ -18604,7 +18604,7 @@
               c967      2 INSTR BELONGTO c8b0 
               c970      2 INSTR BELONGTO c8b0 
               c970      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 R13 ZZ xor     esi, esi 
-              c970     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              c970     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               c972      3 INSTR BELONGTO c8b0 
               c972      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 R9 R10 R11 R13 ZZ mov     rdi, r12 
               c975      4 INSTR BELONGTO c8b0 
@@ -18615,7 +18615,7 @@
               c979      5 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 R13 ZZ call    sub_C520 
               c97e      5 INSTR BELONGTO c8b0 
               c97e      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R13 ZZ mov     rdx, [r12+18h] 
-              c983     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rsp+38h+var_30] 
+              c983     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rsp+38h+var_30] 
               c983      4 INSTR BELONGTO c8b0 
               c983      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R13 ZZ mov     eax, [rsp+38h+var_30] 
               c983      4 PTRIMMEDESP STACK 8 displ mov     eax, [rsp+38h+var_30]
@@ -19166,12 +19166,12 @@
               cdec     -1 INSTR LOCAL NoMetaUpdate jmp     loc_CD59 
               cdec      5 INSTR BELONGTO cc80 
               ce00     -3 INSTR LOCAL NoWarn push    r12 
-              ce02     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
+              ce02     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h 
               ce07     -3 INSTR LOCAL NoWarn push    rbp 
               ce0b     -3 INSTR LOCAL NoWarn push    rbx 
               ce1d      5 PTRIMMEDESP STACK 24 displ lea     rdi, [rsp+18h]
               ce25      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rax
-              ce2c     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     cl, 10h 
+              ce2c     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     cl, 10h 
               ce3d      8 PTRIMMEDESP STACK 160 displ lea     rdi, [rsp+0A0h]
               ce45      7 PTRIMMEDESP STACK 156 displ mov     [rsp+9Ch], eax
               ce55      7 PTRIMMEDESP STACK 296 displ mov     [rsp+128h], eax
@@ -19182,22 +19182,22 @@
               ce78      5 PTRIMMEDESP STACK 16 displ lea     rdx, [rsp+10h]
               ce7d     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
               ce80     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-              ce86     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-              ce8b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+              ce86     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+              ce8b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
               ce94      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], 0
               ce9c     -1 INSTR LOCAL NoMetaUpdate call    _pa_ext_stream_restore_write 
               cea1     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
               cea7     -1 INSTR LOCAL NoMetaUpdate jz      short loc_CEE8 
-              cec1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-              cec6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              cec1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              cec6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               cec8     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               ced0     -1 INSTR LOCAL NoMetaUpdate call    _pa_operation_unref 
               ced5     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 130h 
               cee8      4 PTRIMMEDEBP STACK 24 displ mov     rax, [rbp+18h]
               cef0     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_errno 
               cef7     -1 INSTR LOCAL NoMetaUpdate call    _pa_strerror 
-              cf0d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              cf12     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              cf0d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              cf12     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               cf14     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               cf19     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 130h 
               cf30     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
@@ -19251,12 +19251,12 @@
               cfaa     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h 
               cfaa      6 INSTR BELONGTO cf60 
               cfaa      6 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 ZZ mov     r8d, 20h 
-              cfb0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0C0h 
+              cfb0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0C0h 
               cfb0      5 INSTR BELONGTO cf60 
               cfb0      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 0C0h 
               cfb5      3 INSTR BELONGTO cf60 
               cfb5      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-              cfb8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+              cfb8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
               cfb8      5 INSTR BELONGTO cf60 
               cfb8      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
               cfbd      7 INSTR BELONGTO cf60 
@@ -19341,11 +19341,11 @@
               d037      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rax, [rbx+18h] 
               d03b      2 INSTR BELONGTO cfe0 
               d03b      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-              d03b     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              d03b     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               d03d      2 INSTR BELONGTO cfe0 
               d03d      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-              d03d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              d03f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2AFh 
+              d03d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              d03f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2AFh 
               d03f      5 INSTR BELONGTO cfe0 
               d03f      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 2AFh 
               d044      4 INSTR BELONGTO cfe0 
@@ -19367,7 +19367,7 @@
               d061     -1 INSTR LOCAL NoMetaUpdate call    sub_C460 
               d061      5 INSTR BELONGTO cfe0 
               d061      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ call    sub_C460 
-              d066     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
+              d066     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
               d066      5 INSTR BELONGTO cfe0 
               d066      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     esi, 0FFFFFFFFh 
               d06b      3 INSTR BELONGTO cfe0 
@@ -19451,11 +19451,11 @@
               d0fe      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rax, [rbx+18h] 
               d102      2 INSTR BELONGTO cfe0 
               d102      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ xor     ecx, ecx 
-              d102     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              d102     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               d104      2 INSTR BELONGTO cfe0 
               d104      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edx, edx 
-              d104     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              d106     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              d104     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              d106     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               d106      5 INSTR BELONGTO cfe0 
               d106      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 1 
               d10b      4 INSTR BELONGTO cfe0 
@@ -19484,17 +19484,17 @@
               d134      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     esi, cs:dword_21D1B0 
               d13a      2 INSTR BELONGTO cfe0 
               d13a      2 INSTR DEADREGS  EFLAGS RCX RDX RDI ZZ xor     edx, edx 
-              d13a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              d13a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               d13c      3 INSTR BELONGTO cfe0 
               d13c      3 INSTR DEADREGS  EFLAGS RCX RDI ZZ mov     rdi, rbx 
-              d13f     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
+              d13f     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
               d13f      5 INSTR BELONGTO cfe0 
               d13f      5 INSTR DEADREGS  EFLAGS RCX ZZ mov     ecx, 3 
               d144     10 INSTR BELONGTO cfe0 
               d144     10 INSTR DEADREGS  EFLAGS ZZ mov     dword ptr [rax+90h], 3 
               d14e      2 INSTR BELONGTO cfe0 
               d14e      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-              d14e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              d14e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               d150     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
               d150      5 INSTR BELONGTO cfe0 
               d150      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_emit 
@@ -19511,7 +19511,7 @@
               d164      7 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ lea     rsi, sub_F6E0 
               d16b      3 INSTR BELONGTO cfe0 
               d16b      3 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     rdx, rbx 
-              d16e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 5 
+              d16e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 5 
               d16e      5 INSTR BELONGTO cfe0 
               d16e      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 5 
               d173     -1 INSTR LOCAL NoMetaUpdate call    _g_timeout_add_seconds 
@@ -19555,7 +19555,7 @@
               d1b3      5 INSTR BELONGTO cfe0 
               d1b8      2 INSTR BELONGTO cfe0 
               d1b8      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-              d1b8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              d1b8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               d1ba     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
               d1ba      5 INSTR BELONGTO cfe0 
               d1ba      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_log 
@@ -19622,8 +19622,8 @@
               d315      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
               d321      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
               d326      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
-              d332     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              d337     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              d332     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              d337     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               d339     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
               d33d     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
               d350      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], rbx
@@ -19642,8 +19642,8 @@
               d3a1      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
               d3a6     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
               d3aa     -1 INSTR LOCAL NoMetaUpdate jmp     sub_C410 
-              d3c4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-              d3c9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              d3c4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              d3c9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               d3cb     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               d3d4     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
               d3d9      4 PTRIMMEDEBP STACK 24 displ mov     rdx, [rbp+18h]
@@ -19660,8 +19660,8 @@
               d41a      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
               d426      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
               d42b      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
-              d437     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              d43c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              d437     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              d43c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               d43e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
               d442     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
               d450      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
@@ -19698,8 +19698,8 @@
               d50a      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
               d516      5 PTRIMMEDESP STACK 24 displ mov     r12, [rsp+18h]
               d51b      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
-              d527     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              d52c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              d527     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              d52c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               d52e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
               d532     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
               d540      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
@@ -19727,8 +19727,8 @@
               d5c9      5 PTRIMMEDESP STACK 64 displ mov     r15, [rsp+40h]
               d5ce     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
               d5d2     -1 INSTR LOCAL NoMetaUpdate jmp     sub_C410 
-              d5f8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-              d5fa     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              d5f8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+              d5fa     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
               d5ff     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               d604     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rbx+134h], 0FFFFFFFFh 
               d60b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_D680 
@@ -19741,13 +19741,13 @@
               d62b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
               d633     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_errno 
               d638     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 5 
-              d642     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              d642     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               d647     -1 INSTR LOCAL NoMetaUpdate jz      short loc_D60D 
               d649      5 PTRIMMEDESP STACK 24 displ mov     rbx, [rsp+18h]
               d64e      5 PTRIMMEDESP STACK 32 displ mov     rbp, [rsp+20h]
               d65a      5 PTRIMMEDESP STACK 40 displ mov     r12, [rsp+28h]
               d65f      5 PTRIMMEDESP STACK 48 displ mov     r13, [rsp+30h]
-              d664     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              d664     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               d666      5 PTRIMMEDESP STACK 56 displ mov     r14, [rsp+38h]
               d66b      5 PTRIMMEDESP STACK 64 displ mov     r15, [rsp+40h]
               d670     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
@@ -19767,9 +19767,9 @@
               d6f4     -1 INSTR LOCAL NoMetaUpdate call    sub_BC50 
               d6ff     -1 INSTR LOCAL NoMetaUpdate call    sub_9A50 
               d70d     -1 INSTR LOCAL NoMetaUpdate call    sub_9D00 
-              d712     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              d712     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               d714     -1 INSTR LOCAL NoMetaUpdate test    byte ptr [rbx+150h], 20h 
-              d71e     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setnz   sil 
+              d71e     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setnz   sil 
               d722     -1 INSTR LOCAL NoMetaUpdate call    sub_9DB0 
               d730     -1 INSTR LOCAL NoMetaUpdate call    sub_A6B0 
               d73c     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
@@ -19800,7 +19800,7 @@
               d7ce      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               d7d1     -1 INSTR LOCAL NoMetaUpdate call    sub_BBD0 
               d7d6     -1 INSTR LOCAL NoMetaUpdate jmp     loc_D751 
-              d7e7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              d7e7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
               d7ec     -1 INSTR LOCAL NoMetaUpdate jmp     loc_D649 
               d7f5     -2 INSTR LOCAL n R15 ZZ  AlwaysNUM xor     r15d, r15d 
               d7f8     -1 INSTR LOCAL NoMetaUpdate call    sub_BAA0 
@@ -19809,7 +19809,7 @@
               d81d     -1 INSTR LOCAL NoMetaUpdate test    r8d, r8d 
               d820     -1 INSTR LOCAL NoMetaUpdate jz      loc_D8B6 
               d826     -2 INSTR LOCAL n R14 ZZ  AlwaysNUM xor     r14d, r14d 
-              d830     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
+              d830     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
               d835     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc0 
               d847     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     r14d, 1 
               d852      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rdx
@@ -19867,10 +19867,10 @@
               d9ef     -1 INSTR LOCAL NoMetaUpdate call    sub_9A50 
               d9fa      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               d9fd     -1 INSTR LOCAL NoMetaUpdate call    sub_9D00 
-              da02     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              da02     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               da04     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rbx+14h], 0FFFFFFFFh 
               da08      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-              da0b     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM setz    sil 
+              da0b     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM setz    sil 
               da0f     -1 INSTR LOCAL NoMetaUpdate call    sub_A1F0 
               da14     -1 INSTR LOCAL NoMetaUpdate test    r13d, r13d 
               da17     -1 INSTR LOCAL NoMetaUpdate jnz     loc_DA40 
@@ -19894,17 +19894,17 @@
               da88      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               da8b     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_errno 
               da90     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 5 
-              da9a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              da9a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               da9f     -1 INSTR LOCAL NoMetaUpdate jz      loc_DA1D 
               daa5      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
               daa9      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
               dab5      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
               daba      5 PTRIMMEDESP STACK 24 displ mov     r13, [rsp+18h]
-              dabf     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              dabf     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               dac1      5 PTRIMMEDESP STACK 32 displ mov     r14, [rsp+20h]
               dac6     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
               daca     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
-              dad7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              dad7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
               dadc     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_DAA5 
               dae4     -1 INSTR LOCAL NoMetaUpdate call    sub_BAA0 
               dafa     -1 INSTR LOCAL NoMetaUpdate call    sub_13FA0 
@@ -19927,10 +19927,10 @@
               db75      5 PTRIMMEDESP STACK 48 displ mov     r13, [rsp+30h]
               db7a     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
               db7e     -1 INSTR LOCAL NoMetaUpdate jmp     sub_C410 
-              dba3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              dba3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
               dba8     -2 INSTR LOCAL n R13 ZZ  AlwaysNUM xor     r13d, r13d 
               dbab      3 PTRIMMEDESP STACK 0 displ mov     [rsp], eax
-              dbae     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              dbae     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               dbb0     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               dbb5      4 PTRIMMEDEBP STACK 24 displ mov     rax, [rbp+18h]
               dbbf     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_lookup 
@@ -19967,8 +19967,8 @@
               dca2      5 PTRIMMEDESP STACK 32 displ mov     rbp, [rsp+20h]
               dcae      5 PTRIMMEDESP STACK 40 displ mov     r12, [rsp+28h]
               dcb3      5 PTRIMMEDESP STACK 48 displ mov     r13, [rsp+30h]
-              dcbf     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              dcc4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              dcbf     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              dcc4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               dcc6     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
               dcca     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
               dcd4     -1 INSTR LOCAL NoMetaUpdate call    sub_BAA0 
@@ -19990,12 +19990,12 @@
               dd47     -1 INSTR LOCAL NoMetaUpdate jz      short loc_DD60 
               dd4c     -1 INSTR LOCAL NoMetaUpdate call    sub_C410 
               dd51     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 58h 
-              dd79     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-              dd7b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              dd79     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+              dd7b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
               dd80     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               dd89     -1 INSTR LOCAL NoMetaUpdate test    r10d, r10d 
               dd8c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_DE0A 
-              dd9c     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+              dd9c     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
               dda0      2 PTRIMMEDEBP STACK 0 displ mov     eax, ebp
               dda2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM shl     rax, 5 
               ddbf      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], r8d
@@ -20004,9 +20004,9 @@
               ddce      5 PTRIMMEDESP STACK 32 displ mov     r9d, [rsp+20h]
               ddd3     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               ddd5      5 PTRIMMEDESP STACK 24 displ mov     r8d, [rsp+18h]
-              ddf2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              ddf2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
               ddf7      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              ddfb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              ddfb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               ddfd     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     ebp, 1 
               de00     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               de05     -1 INSTR LOCAL NoMetaUpdate cmp     ebp, [rbx+20h] 
@@ -20015,8 +20015,8 @@
               de13     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_DE44 
               de1f     -1 INSTR LOCAL NoMetaUpdate call    _pa_proplist_gets 
               de35      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-              de38     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-              de3d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              de38     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              de3d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               de3f     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               de48      5 PTRIMMEDESP STACK 72 displ lea     rsi, [rsp+48h]
               de4d     -1 INSTR LOCAL NoMetaUpdate call    _pa_proplist_iterate 
@@ -20033,19 +20033,19 @@
               dea9     -1 INSTR LOCAL NoMetaUpdate call    sub_12B60 
               deb2      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               deb8     -1 INSTR LOCAL NoMetaUpdate call    sub_12D00 
-              dec8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              dec8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               decd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               ded2      2 PTRIMMEDEBP STACK 0 displ mov     ecx, ebp
-              ded9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              dedb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              ded9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              dedb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               dedd     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
               dee2     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 58h 
               def8      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               defb     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_errno 
               df00     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 5 
               df03     -1 INSTR LOCAL NoMetaUpdate jz      loc_DD51 
-              df17     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-              df1c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              df17     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              df1c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               df1e     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               df23     -1 INSTR LOCAL NoMetaUpdate jmp     loc_DD51 
               df34      9 PTRIMMEDESP STACK 40 displ mov     qword ptr [rsp+28h], 0
@@ -20069,7 +20069,7 @@
               df87     -1 INSTR LOCAL NoMetaUpdate cmp     eax, [rbx+20h] 
               df8a     -1 INSTR LOCAL NoMetaUpdate jnb     loc_E0E0 
               df90      4 PTRIMMEDESP STACK 56 displ mov     eax, [rsp+38h]
-              df94     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
+              df94     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
               df99     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM shl     rax, 5 
               dfb3      5 PTRIMMEDESP STACK 48 displ mov     [rsp+30h], rdx
               dfb8      4 PTRIMMEDESP STACK 60 displ mov     [rsp+3Ch], eax
@@ -20083,23 +20083,23 @@
               dfea     -2 INSTR LOCAL n R12 ZZ  AlwaysNUM xor     r12d, r12d 
               dfed     -1 INSTR LOCAL NoMetaUpdate test    r13d, r13d 
               dff0     -1 INSTR LOCAL NoMetaUpdate jz      loc_DF50 
-              e004     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              e004     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               e009     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 5 
               e00f     -1 INSTR LOCAL NoMetaUpdate call    _dcngettext 
-              e01a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              e01a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               e01c     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
               e021     -1 INSTR LOCAL NoMetaUpdate test    r14d, r14d 
               e027     -1 INSTR LOCAL NoMetaUpdate jz      loc_DF59 
-              e03e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              e03e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               e040     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 5 
               e046     -1 INSTR LOCAL NoMetaUpdate call    _dcngettext 
-              e051     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              e051     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               e053     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
               e058     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
               e05e     -1 INSTR LOCAL NoMetaUpdate jz      loc_DF59 
               e064     -1 INSTR LOCAL NoMetaUpdate test    r12, r12 
               e067     -1 INSTR LOCAL NoMetaUpdate jz      short loc_E0D8 
-              e076     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              e076     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               e078      5 PTRIMMEDESP STACK 32 displ mov     [rsp+20h], rcx
               e07d     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
               e085      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], rax
@@ -20141,7 +20141,7 @@
               e1bc     -1 INSTR LOCAL NoMetaUpdate jmp     _pa_operation_unref 
               e1c8      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
               e1cd      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
-              e1e0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              e1e0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               e1e5     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
               e1e9     -1 INSTR LOCAL NoMetaUpdate jmp     _g_log 
               e1f0      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], rbx
@@ -20156,8 +20156,8 @@
               e239     -1 INSTR LOCAL NoMetaUpdate call    sub_C410 
               e247     -1 INSTR LOCAL NoMetaUpdate test    r11d, r11d 
               e24a     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_E288 
-              e24c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-              e24e     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 24h 
+              e24c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+              e24e     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 24h 
               e253      3 PTRIMMEDESP STACK 0 displ mov     rdi, rsp
               e260      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
               e266      8 PTRIMMEDESP STACK 140 displ mov     byte ptr [rsp+8Ch], 1
@@ -20169,7 +20169,7 @@
               e298      8 PTRIMMEDESP STACK 312 displ mov     r12, [rsp+138h]
               e2a0      8 PTRIMMEDESP STACK 320 displ mov     r13, [rsp+140h]
               e2a8     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 148h 
-              e2ba     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1Fh 
+              e2ba     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1Fh 
               e2bf     -1 INSTR LOCAL NoMetaUpdate repe cmpsb 
               e2c1     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_E288 
               e2c9     -1 INSTR LOCAL NoMetaUpdate call    sub_CC80 
@@ -20177,11 +20177,11 @@
               e2d0      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               e2d3     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_errno 
               e2da     -1 INSTR LOCAL NoMetaUpdate call    _pa_strerror 
-              e2f0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-              e2f5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              e2f0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              e2f5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               e2f7     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
-              e30a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
-              e30f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              e30a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              e30f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               e311     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               e316     -1 INSTR LOCAL NoMetaUpdate jmp     loc_E288 
               e320      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
@@ -20284,14 +20284,14 @@
               e5bd     -1 INSTR LOCAL NoMetaUpdate jmp     _g_hash_table_remove 
               e5cd      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
               e5d6     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_remove 
-              e5e4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              e5e4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               e5e9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               e5ee      2 PTRIMMEDEBP STACK 0 displ mov     ecx, ebp
               e5f0      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
               e5f5      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
               e5fc      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
-              e603     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              e605     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              e603     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              e605     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               e607     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
               e60b     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
               e610      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], rbx
@@ -20307,10 +20307,10 @@
               e64f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               e65e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               e663      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-              e68b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              e68b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               e690      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
               e695      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              e699     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              e699     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               e69b     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               e6a0      5 PTRIMMEDESP STACK 40 displ mov     rbx, [rsp+28h]
               e6a5      5 PTRIMMEDESP STACK 48 displ mov     rbp, [rsp+30h]
@@ -20337,10 +20337,10 @@
               e73b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               e74a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
               e74f      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-              e777     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              e777     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               e77c      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
               e781      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-              e785     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              e785     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               e787     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               e78c      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
               e791      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -20350,7 +20350,7 @@
               e7a5     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
               e7b8     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
               e7c4     -1 INSTR LOCAL NoMetaUpdate call    _g_value_dup_string 
-              e7cc     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              e7cc     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               e7d5     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               e7da      5 PTRIMMEDESP STACK 32 displ mov     rbx, [rsp+20h]
               e7df      5 PTRIMMEDESP STACK 40 displ mov     rbp, [rsp+28h]
@@ -20416,7 +20416,7 @@
               e883      5 INSTR BELONGTO e810 
               e888      4 INSTR BELONGTO e810 
               e88c      7 INSTR BELONGTO e810 
-              e893     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              e893     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               e893      5 INSTR BELONGTO e810 
               e898      8 INSTR BELONGTO e810 
               e8a0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
@@ -20558,7 +20558,7 @@
               ea0e      4 INSTR BELONGTO e8d0 
               ea12     11 INSTR BELONGTO e8d0 
               ea1d      7 INSTR BELONGTO e8d0 
-              ea24     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              ea24     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               ea24      5 INSTR BELONGTO e8d0 
               ea29     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               ea29      5 INSTR BELONGTO e8d0 
@@ -20580,7 +20580,7 @@
               ea60      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
               ea65      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
               ea6d      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
-              ea82     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              ea82     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               ea87     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
               ea8f      2 PTRIMMEDEBP STACK 0 displ mov     esi, ebp
               ea94     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [rax+10h] 
@@ -20606,44 +20606,44 @@
               eb19      4 PTRIMMEDEBP STACK 8 displ mov     [rbp+8], rax
               eb1d     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [r12+8], 0 
               eb23     -1 INSTR LOCAL NoMetaUpdate jz      loc_EC20 
-              eb30     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              eb32     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-              eb34     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              eb30     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              eb32     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+              eb34     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               eb36      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
               eb39     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_new_full 
               eb47      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-              eb4a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              eb4c     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-              eb4e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              eb4a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              eb4c     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+              eb4e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               eb50     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_new_full 
               eb5e      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-              eb61     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              eb63     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-              eb65     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              eb61     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              eb63     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+              eb65     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               eb67     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_new_full 
               eb75      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-              eb78     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              eb7a     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-              eb7c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              eb78     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              eb7a     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+              eb7c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               eb7e     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_new_full 
               eb8c      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-              eb8f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              eb91     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-              eb93     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              eb8f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              eb91     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+              eb93     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               eb95     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_new_full 
               eb9a      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-              eba2     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              eba8     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-              ebaa     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              eba2     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              eba8     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+              ebaa     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               ebac     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_new_full 
-              ebbc     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              ebc6     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-              ebc8     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              ebbc     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              ebc6     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+              ebc8     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               ebca     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_new_full 
               ebcf      4 PTRIMMEDEBP STACK 120 displ mov     [rbp+78h], rax
-              ec0c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 893h 
+              ec0c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 893h 
               ec11     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
-              ec3c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 896h 
+              ec3c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 896h 
               ec41     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
               ec50     -3 INSTR LOCAL NoWarn push    rbx 
               ec54     -1 INSTR LOCAL NoMetaUpdate call    sub_CF60 
@@ -20657,7 +20657,7 @@
               ec76     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               ec78     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_ECA0 
               ec8f     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              ec94     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              ec94     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               ecb0     -3 INSTR LOCAL NoWarn push    rbx 
               ecb4     -1 INSTR LOCAL NoMetaUpdate call    sub_CF60 
               ecb9     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -20670,7 +20670,7 @@
               ecd6     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               ecd8     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_ED00 
               ecef     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              ecf4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              ecf4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               ed0c     -1 INSTR LOCAL NoMetaUpdate jmp     _g_hash_table_lookup 
               ed20     -3 INSTR LOCAL NoWarn push    r12 
               ed22     -3 INSTR LOCAL NoWarn push    rbp 
@@ -20686,7 +20686,7 @@
               ed4c     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               ed4e     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_ED78 
               ed65     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              ed6a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              ed6a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               ed78     -1 INSTR LOCAL NoMetaUpdate call    sub_9250 
               ed7d     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
               ed83     -1 INSTR LOCAL NoMetaUpdate jz      short loc_ED9F 
@@ -20700,16 +20700,16 @@
               ed9b     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               ed9d     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_EDC0 
               edb4     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              edbb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              edbb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               edc0      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               edc3     -1 INSTR LOCAL NoMetaUpdate call    sub_9E60 
-              edcc     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-              edd5     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              edcc     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+              edd5     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               edd7     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_set_default_sink 
               eddc     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
               ede2     -1 INSTR LOCAL NoMetaUpdate jz      short loc_EE40 
               ede4     -1 INSTR LOCAL NoMetaUpdate call    _pa_operation_unref 
-              eded     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              eded     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               edf2      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               edfd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               ee0d     -1 INSTR LOCAL NoMetaUpdate call    _g_object_add_weak_pointer 
@@ -20717,13 +20717,13 @@
               ee29     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
               ee2c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_EE80 
               ee31     -1 INSTR LOCAL NoMetaUpdate call    _pa_operation_unref 
-              ee38     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              ee38     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               ee48     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_errno 
               ee4f     -1 INSTR LOCAL NoMetaUpdate call    _pa_strerror 
-              ee65     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-              ee67     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              ee65     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+              ee67     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               ee6c     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
-              ee71     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              ee71     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               ee73     -1 INSTR LOCAL NoMetaUpdate jmp     loc_ED6C 
               ee88     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_errno 
               ee8f     -1 INSTR LOCAL NoMetaUpdate call    _pa_strerror 
@@ -20741,7 +20741,7 @@
               eece     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               eed0     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_EEF8 
               eee7     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              eeec     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              eeec     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               eeee     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
               eef8     -1 INSTR LOCAL NoMetaUpdate call    sub_9250 
               eefd     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
@@ -20757,21 +20757,21 @@
               ef1d     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_EF48 
               ef34     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               ef39     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
-              ef3d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              ef3d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               ef48      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
               ef4b     -1 INSTR LOCAL NoMetaUpdate call    sub_9E60 
-              ef54     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-              ef5d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              ef54     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+              ef5d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               ef5f     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_set_default_source 
               ef64     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
               ef6a     -1 INSTR LOCAL NoMetaUpdate jz      short loc_EF80 
               ef6c     -1 INSTR LOCAL NoMetaUpdate call    _pa_operation_unref 
               ef71     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
-              ef75     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
-              ef8e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-              ef90     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              ef75     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              ef8e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+              ef90     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               ef95     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
-              ef9a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              ef9a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               ef9c     -1 INSTR LOCAL NoMetaUpdate jmp     loc_EEEE 
               efb0      0 FUNC FRAMERESTORE 0 0 96 1 0 0 2 0 4 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
               efb0      0 FUNC MMSAFENESS SAFE
@@ -20821,7 +20821,7 @@
               efef      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               eff4      2 INSTR BELONGTO efb0 
               eff4      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              eff4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              eff4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               eff6      1 INSTR BELONGTO efb0 
               eff6      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               eff7      1 INSTR BELONGTO efb0 
@@ -20891,7 +20891,7 @@
               f05f      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
               f064      2 INSTR BELONGTO f020 
               f064      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              f064     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f064     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f066      1 INSTR BELONGTO f020 
               f066      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               f067      1 INSTR BELONGTO f020 
@@ -20926,7 +20926,7 @@
               f0c5     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               f0c7     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_F0F8 
               f0de     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              f0e3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f0e3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f0e5      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
               f0ea      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
               f0ef     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
@@ -20948,7 +20948,7 @@
               f155     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               f157     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_F188 
               f16e     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              f173     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f173     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f175      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
               f17a      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
               f17f     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
@@ -20970,7 +20970,7 @@
               f1dc     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_F200 
               f1f3     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               f1f8     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
-              f1fc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f1fc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f204      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+8]
               f210      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], 0
               f220     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_foreach 
@@ -20990,7 +20990,7 @@
               f26c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_F290 
               f283     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               f288     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
-              f28c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f28c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f294      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+8]
               f2a0      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], 0
               f2ad     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_foreach 
@@ -21010,7 +21010,7 @@
               f2fc     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_F320 
               f313     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               f318     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
-              f31c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f31c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f324      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+8]
               f330      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], 0
               f33d     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_foreach 
@@ -21030,7 +21030,7 @@
               f38c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_F3B0 
               f3a3     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               f3a8     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
-              f3ac     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f3ac     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f3b4      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+8]
               f3c0      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], 0
               f3cd     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_foreach 
@@ -21050,7 +21050,7 @@
               f41c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_F440 
               f433     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               f438     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
-              f43c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f43c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f444      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+8]
               f450      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], 0
               f45d     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_foreach 
@@ -21111,7 +21111,7 @@
               f4c8      4 INSTR BELONGTO f480 
               f4cc      2 INSTR BELONGTO f480 
               f4cc      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              f4cc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f4cc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f4ce      1 INSTR BELONGTO f480 
               f4ce      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               f4cf      1 INSTR BELONGTO f480 
@@ -21160,7 +21160,7 @@
               f536     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
               f538     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_F560 
               f54f     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
-              f554     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f554     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f570      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -16 0 4 0 8 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
               f570      0 FUNC MMSAFENESS SAFE
               f570      1 INSTR BELONGTO f570 
@@ -21213,7 +21213,7 @@
               f5ad      7 INSTR DEADREGS  EFLAGS RBX RDI ZZ lea     rdi, aSoundCcPanel; "sound-cc-panel" 
               f5b4      2 INSTR BELONGTO f570 
               f5b4      2 INSTR DEADREGS  EFLAGS RBX ZZ xor     ebp, ebp 
-              f5b4     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+              f5b4     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
               f5b6     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               f5b6      5 INSTR BELONGTO f570 
               f5b6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
@@ -21258,7 +21258,7 @@
               f5fd      4 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rax, [rbx+18h] 
               f601      6 INSTR BELONGTO f570 
               f601      6 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     ebp, cs:dword_21D1B0 
-              f607     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              f607     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               f607      5 INSTR BELONGTO f570 
               f607      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 50h 
               f60c      3 INSTR BELONGTO f570 
@@ -21270,17 +21270,17 @@
               f619      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
               f61e      2 INSTR BELONGTO f570 
               f61e      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     edx, edx 
-              f61e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              f61e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               f620      2 INSTR BELONGTO f570 
               f620      2 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ mov     esi, ebp 
               f622      3 INSTR BELONGTO f570 
               f622      3 INSTR DEADREGS  EFLAGS RCX RDI ZZ mov     rdi, rax 
-              f625     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+              f625     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
               f625      5 INSTR BELONGTO f570 
               f625      5 INSTR DEADREGS  EFLAGS RAX RCX ZZ mov     ecx, 2 
               f62a      2 INSTR BELONGTO f570 
               f62a      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-              f62a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f62a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f62c     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
               f62c      5 INSTR BELONGTO f570 
               f62c      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_emit 
@@ -21288,11 +21288,11 @@
               f631      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rax, [rbx+18h] 
               f635      2 INSTR BELONGTO f570 
               f635      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-              f635     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              f635     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               f637      2 INSTR BELONGTO f570 
               f637      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     esi, esi 
-              f637     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-              f639     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+              f637     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+              f639     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
               f639      5 INSTR BELONGTO f570 
               f639      5 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edx, 2 
               f63e      4 INSTR BELONGTO f570 
@@ -21323,12 +21323,12 @@
               f66c      7 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI ZZ lea     rdi, aSoundCcPanel; "sound-cc-panel" 
               f673      3 INSTR BELONGTO f570 
               f673      3 INSTR DEADREGS  EFLAGS RCX RBX RSI ZZ mov     rcx, rax 
-              f676     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+              f676     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
               f676      5 INSTR BELONGTO f570 
               f676      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 10h 
               f67b      2 INSTR BELONGTO f570 
               f67b      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-              f67b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f67b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f67d     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
               f67d      5 INSTR BELONGTO f570 
               f67d      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -21350,7 +21350,7 @@
               f69e      7 INSTR DEADREGS  EFLAGS RBX RDI ZZ lea     rdi, aSoundCcPanel; "sound-cc-panel" 
               f6a5      2 INSTR BELONGTO f570 
               f6a5      2 INSTR DEADREGS  EFLAGS RBX ZZ xor     ebp, ebp 
-              f6a5     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+              f6a5     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
               f6a7     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               f6a7      5 INSTR BELONGTO f570 
               f6a7      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
@@ -21358,7 +21358,7 @@
               f6ac      4 INSTR BELONGTO f570 
               f6b0      2 INSTR BELONGTO f570 
               f6b0      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, ebp 
-              f6b0     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebp 
+              f6b0     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebp 
               f6b2      1 INSTR BELONGTO f570 
               f6b2      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               f6b3      1 INSTR BELONGTO f570 
@@ -21373,7 +21373,7 @@
               f6c6      7 INSTR DEADREGS  EFLAGS RBX RDI ZZ lea     rdi, aSoundCcPanel; "sound-cc-panel" 
               f6cd      2 INSTR BELONGTO f570 
               f6cd      2 INSTR DEADREGS  EFLAGS RBX ZZ xor     ebp, ebp 
-              f6cd     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+              f6cd     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
               f6cf     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               f6cf      5 INSTR BELONGTO f570 
               f6cf      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
@@ -21381,7 +21381,7 @@
               f6d4      4 INSTR BELONGTO f570 
               f6d8      2 INSTR BELONGTO f570 
               f6d8      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, ebp 
-              f6d8     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebp 
+              f6d8     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebp 
               f6d8      8 DEALLOC STACK esp - 8 mov     eax, ebp
               f6da      1 INSTR BELONGTO f570 
               f6da      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
@@ -21521,7 +21521,7 @@
               f7b1      4 INSTR BELONGTO f6e0 
               f7b5      2 INSTR BELONGTO f6e0 
               f7b5      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              f7b5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f7b5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f7b7      1 INSTR BELONGTO f6e0 
               f7b7      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
               f7b8      1 INSTR BELONGTO f6e0 
@@ -21539,7 +21539,7 @@
               f7da      4 INSTR BELONGTO f6e0 
               f7de      2 INSTR BELONGTO f6e0 
               f7de      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-              f7de     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f7de     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f7de     64 DEALLOC STACK esp - 64 xor     eax, eax
               f7e0      1 INSTR BELONGTO f6e0 
               f7e0      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
@@ -21561,24 +21561,24 @@
               f81e     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_F848 
               f835     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               f83a     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
-              f83e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f83e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f848      4 PTRIMMEDEBP STACK 24 displ mov     rax, [rbp+18h]
               f850     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
               f853     -1 INSTR LOCAL NoMetaUpdate jz      short loc_F8A0 
               f855     -1 INSTR LOCAL NoMetaUpdate call    _pa_context_disconnect 
               f85a      4 PTRIMMEDEBP STACK 24 displ mov     rax, [rbp+18h]
               f864      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-              f867     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              f867     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               f876     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-              f880     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-              f882     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-              f884     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              f880     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+              f882     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+              f884     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               f886     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
               f88b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
-              f88f     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+              f88f     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
               f8b5     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
               f8ba     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
-              f8be     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f8be     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f8d0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
               f8d0      0 FUNC MMSAFENESS SAFE
               f8d0      1 INSTR BELONGTO f8d0 
@@ -21599,10 +21599,10 @@
               f8e3      3 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ mov     rdx, rbx 
               f8e6      2 INSTR BELONGTO f8d0 
               f8e6      2 INSTR DEADREGS  EFLAGS RAX RCX RBX ZZ xor     ecx, ecx 
-              f8e6     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              f8e6     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               f8e8      2 INSTR BELONGTO f8d0 
               f8e8      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-              f8e8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f8e8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f8ea     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
               f8ea      5 INSTR BELONGTO f8d0 
               f8ea      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_object_new 
@@ -21652,7 +21652,7 @@
               f93c      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 XMM0 ZZ retn 
               f940     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rsi+34h], 1 
               f944     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_F94D 
-              f95b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+              f95b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
               f960      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 -24 0 4 0 0 5 -16 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 -8 0 13 0 0 14 0 0 15 0 0 ZZ
               f960      0 FUNC MMSAFENESS SAFE
               f960    292 FUNC GLOBAL sub_F960 FUNC_UNSAFE NOFP RET               fa83 
@@ -21694,7 +21694,7 @@
               f985      5 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, [r12+6Ch] 
               f98a     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
               f98a      2 INSTR BELONGTO f960 
-              f98c     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM setz    bpl 
+              f98c     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM setz    bpl 
               f98c      4 INSTR BELONGTO f960 
               f990     -1 INSTR LOCAL NoMetaUpdate call    _gtk_switch_get_type 
               f990      5 INSTR BELONGTO f960 
@@ -21708,7 +21708,7 @@
               f99d      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_type_check_instance_cast 
               f9a2      2 INSTR BELONGTO f960 
               f9a2      2 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, ebp 
-              f9a2     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, ebp 
+              f9a2     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, ebp 
               f9a4      3 INSTR BELONGTO f960 
               f9a4      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
               f9a7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_switch_set_active 
@@ -21777,11 +21777,11 @@
               fa0e      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R12 ZZ xor     r8d, r8d 
               fa11      2 INSTR BELONGTO f960 
               fa11      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 ZZ xor     ecx, ecx 
-              fa11     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              fa11     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               fa13      2 INSTR BELONGTO f960 
               fa13      2 INSTR DEADREGS  EFLAGS RDX RSI R12 ZZ xor     edx, edx 
-              fa13     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              fa15     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+              fa13     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              fa15     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
               fa15      5 INSTR BELONGTO f960 
               fa15      5 INSTR DEADREGS  EFLAGS RSI R12 ZZ mov     esi, 18h 
               fa1a      4 INSTR BELONGTO f960 
@@ -21809,11 +21809,11 @@
               fa3f      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 XMM0 ZZ xor     r8d, r8d 
               fa42      2 INSTR BELONGTO f960 
               fa42      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 XMM0 ZZ xor     ecx, ecx 
-              fa42     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              fa42     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               fa44      2 INSTR BELONGTO f960 
               fa44      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 XMM0 ZZ xor     edx, edx 
-              fa44     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-              fa46     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+              fa44     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+              fa46     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
               fa46      5 INSTR BELONGTO f960 
               fa46      5 INSTR DEADREGS  EFLAGS RSI RDI R12 XMM0 ZZ mov     esi, 18h 
               fa4b      4 INSTR BELONGTO f960 
@@ -21860,7 +21860,7 @@
               fa90      2 INSTR BELONGTO fa90 
               fa90      2 INSTR DEADREGS  EFLAGS RSI ZZ push    r15 
               fa90     -3 INSTR LOCAL NoWarn push    r15 
-              fa92     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+              fa92     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
               fa92      5 INSTR BELONGTO fa90 
               fa92      5 INSTR DEADREGS  EFLAGS RSI R15 ZZ mov     esi, 6 
               fa97      2 INSTR BELONGTO fa90 
@@ -21893,7 +21893,7 @@
               faae      6 INSTR BELONGTO fa90 
               fab4      2 INSTR BELONGTO fa90 
               fab4      2 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-              fab4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              fab4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               fab6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
               fab6      5 INSTR BELONGTO fa90 
               fab6      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _gtk_box_new 
@@ -21920,10 +21920,10 @@
               fad9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 ZZ xor     r8d, r8d 
               fadc      2 INSTR BELONGTO fa90 
               fadc      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ xor     ecx, ecx 
-              fadc     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              fadc     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               fade      2 INSTR BELONGTO fa90 
               fade      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ xor     edx, edx 
-              fade     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              fade     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               fae0      3 INSTR BELONGTO fa90 
               fae0      3 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     rsi, r14 
               fae3      3 INSTR BELONGTO fa90 
@@ -21935,18 +21935,18 @@
               faeb      4 INSTR DEADREGS  EFLAGS RSI RDI R14 R15 ZZ mov     rsi, [rbp+58h] 
               faef      2 INSTR BELONGTO fa90 
               faef      2 INSTR DEADREGS  EFLAGS RDI R14 R15 ZZ xor     edi, edi 
-              faef     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              faef     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               faf1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scale_new 
               faf1      5 INSTR BELONGTO fa90 
               faf1      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _gtk_scale_new 
-              faf6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+              faf6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
               faf6      5 INSTR BELONGTO fa90 
               faf6      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 R15 ZZ mov     edx, 0FFFFFFFFh 
               fafb      3 INSTR BELONGTO fa90 
               fafb      3 INSTR DEADREGS  EFLAGS RSI RDI R14 R15 ZZ mov     rdi, rax 
               fafe      4 INSTR BELONGTO fa90 
               fafe      4 INSTR DEADREGS  EFLAGS RSI R14 R15 ZZ mov     [rbp+38h], rax 
-              fb02     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
+              fb02     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
               fb02      5 INSTR BELONGTO fa90 
               fb02      5 INSTR DEADREGS  EFLAGS RSI R14 R15 ZZ mov     esi, 80h 
               fb07     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_size_request 
@@ -21956,7 +21956,7 @@
               fb0c      4 INSTR DEADREGS  EFLAGS RSI RDI R14 R15 ZZ mov     r15, [rbx+30h] 
               fb10      2 INSTR BELONGTO fa90 
               fb10      2 INSTR DEADREGS  EFLAGS RSI RDI R14 ZZ xor     edi, edi 
-              fb10     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+              fb10     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
               fb12     -1 INSTR LOCAL MetadataRedundant mov     esi, 6 
               fb12      5 INSTR BELONGTO fa90 
               fb17     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
@@ -21978,10 +21978,10 @@
               fb2e      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 ZZ xor     r8d, r8d 
               fb31      2 INSTR BELONGTO fa90 
               fb31      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ xor     ecx, ecx 
-              fb31     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              fb31     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               fb33      2 INSTR BELONGTO fa90 
               fb33      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ xor     edx, edx 
-              fb33     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              fb33     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               fb35      3 INSTR BELONGTO fa90 
               fb35      3 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     rdi, rax 
               fb38      3 INSTR BELONGTO fa90 
@@ -22003,10 +22003,10 @@
               fb4f      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
               fb52      2 INSTR BELONGTO fa90 
               fb52      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-              fb52     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              fb52     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               fb54      2 INSTR BELONGTO fa90 
               fb54      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-              fb54     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              fb54     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               fb56      3 INSTR BELONGTO fa90 
               fb56      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r15 
               fb59      3 INSTR BELONGTO fa90 
@@ -22031,10 +22031,10 @@
               fb79     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
               fb79      3 INSTR BELONGTO fa90 
               fb79      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
-              fb7c     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+              fb7c     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
               fb7c      5 INSTR BELONGTO fa90 
               fb7c      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, 1 
-              fb81     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+              fb81     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
               fb81      5 INSTR BELONGTO fa90 
               fb81      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 1 
               fb86      3 INSTR BELONGTO fa90 
@@ -22056,14 +22056,14 @@
               fba0     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
               fba0      3 INSTR BELONGTO fa90 
               fba0      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
-              fba3     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+              fba3     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
               fba3      5 INSTR BELONGTO fa90 
               fba3      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, 1 
               fba8      3 INSTR BELONGTO fa90 
               fba8      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rax 
               fbab      3 INSTR BELONGTO fa90 
               fbab      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rsi, r15 
-              fbae     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+              fbae     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
               fbae      5 INSTR BELONGTO fa90 
               fbae      5 INSTR DEADREGS  EFLAGS RDX R15 ZZ mov     edx, 1 
               fbb3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
@@ -22073,8 +22073,8 @@
               fbb8      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     rdx, [rbx+30h] 
               fbbc      2 INSTR BELONGTO fa90 
               fbbc      2 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ xor     edi, edi 
-              fbbc     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-              fbbe     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+              fbbc     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+              fbbe     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
               fbbe      5 INSTR BELONGTO fa90 
               fbbe      5 INSTR DEADREGS  EFLAGS RSI R15 ZZ mov     esi, 6 
               fbc3      4 INSTR BELONGTO fa90 
@@ -22104,10 +22104,10 @@
               fbe5      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rdi, rax 
               fbe8      2 INSTR BELONGTO fa90 
               fbe8      2 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ xor     ecx, ecx 
-              fbe8     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              fbe8     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               fbea      2 INSTR BELONGTO fa90 
               fbea      2 INSTR DEADREGS  EFLAGS RDX RSI ZZ xor     edx, edx 
-              fbea     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              fbea     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               fbec      3 INSTR BELONGTO fa90 
               fbec      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, r15 
               fbef     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
@@ -22135,10 +22135,10 @@
               fc10      3 INSTR DEADREGS  EFLAGS RCX RDX R8 ZZ xor     r8d, r8d 
               fc13      2 INSTR BELONGTO fa90 
               fc13      2 INSTR DEADREGS  EFLAGS RCX RDX ZZ xor     ecx, ecx 
-              fc13     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              fc13     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               fc15      2 INSTR BELONGTO fa90 
               fc15      2 INSTR DEADREGS  EFLAGS RDX ZZ xor     edx, edx 
-              fc15     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              fc15     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               fc17     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
               fc17      5 INSTR BELONGTO fa90 
               fc17      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_box_pack_start 
@@ -22167,10 +22167,10 @@
               fc3e      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 R12 ZZ xor     r8d, r8d 
               fc41      2 INSTR BELONGTO fa90 
               fc41      2 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 ZZ xor     ecx, ecx 
-              fc41     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              fc41     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               fc43      2 INSTR BELONGTO fa90 
               fc43      2 INSTR DEADREGS  EFLAGS RDX RDI R12 ZZ xor     edx, edx 
-              fc43     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              fc43     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               fc45      3 INSTR BELONGTO fa90 
               fc45      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
               fc48     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
@@ -22180,7 +22180,7 @@
               fc4d      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 ZZ mov     rax, [rbx+30h] 
               fc51      2 INSTR BELONGTO fa90 
               fc51      2 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ xor     esi, esi 
-              fc51     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              fc51     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               fc53      4 INSTR BELONGTO fa90 
               fc53      4 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, [rax+38h] 
               fc57     -1 INSTR LOCAL NoMetaUpdate call    _ca_gtk_widget_disable_sounds 
@@ -22197,7 +22197,7 @@
               fc69      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _gtk_widget_add_events 
               fc6e      4 INSTR BELONGTO fa90 
               fc6e      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 ZZ mov     rax, [rbx+30h] 
-              fc72     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              fc72     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               fc72      5 INSTR BELONGTO fa90 
               fc72      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 50h 
               fc77      4 INSTR BELONGTO fa90 
@@ -22225,7 +22225,7 @@
               fc9a      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_signal_connect_data 
               fc9f      4 INSTR BELONGTO fa90 
               fc9f      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 ZZ mov     rax, [rbx+30h] 
-              fca3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              fca3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               fca3      5 INSTR BELONGTO fa90 
               fca3      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 50h 
               fca8      4 INSTR BELONGTO fa90 
@@ -22253,7 +22253,7 @@
               fccb      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_signal_connect_data 
               fcd0      4 INSTR BELONGTO fa90 
               fcd0      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 ZZ mov     rax, [rbx+30h] 
-              fcd4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              fcd4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               fcd4      5 INSTR BELONGTO fa90 
               fcd4      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 50h 
               fcd9      4 INSTR BELONGTO fa90 
@@ -22312,7 +22312,7 @@
               fd33      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ call    _g_type_check_instance_cast 
               fd38      2 INSTR BELONGTO fa90 
               fd38      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R14 R15 ZZ xor     esi, esi 
-              fd38     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+              fd38     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
               fd3a      3 INSTR BELONGTO fa90 
               fd3a      3 INSTR DEADREGS  EFLAGS RBX RDI R12 R14 R15 ZZ mov     rdi, rax 
               fd3d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scale_set_draw_value 
@@ -22346,7 +22346,7 @@
               fd62      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ call    _gtk_size_group_add_widget 
               fd67     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_FD27 
               fd67      2 INSTR BELONGTO fa90 
-              fd70     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+              fd70     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
               fd70      5 INSTR BELONGTO fa90 
               fd70      5 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ mov     edi, 1 
               fd75     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
@@ -22361,12 +22361,12 @@
               fd85     -1 INSTR LOCAL NoMetaUpdate call    _gtk_vscale_new 
               fd85      5 INSTR BELONGTO fa90 
               fd85      5 INSTR DEADREGS  EFLAGS R12 R14 R15 ZZ call    _gtk_vscale_new 
-              fd8a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 80h 
+              fd8a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 80h 
               fd8a      5 INSTR BELONGTO fa90 
               fd8a      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 R15 ZZ mov     edx, 80h 
               fd8f      4 INSTR BELONGTO fa90 
               fd8f      4 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 ZZ mov     [rbp+38h], rax 
-              fd93     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
+              fd93     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
               fd93      5 INSTR BELONGTO fa90 
               fd93      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 ZZ mov     esi, 0FFFFFFFFh 
               fd98      3 INSTR BELONGTO fa90 
@@ -22384,7 +22384,7 @@
               fdac     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
               fdac      5 INSTR BELONGTO fa90 
               fdac      5 INSTR DEADREGS  EFLAGS R12 R14 R15 ZZ call    _g_type_check_instance_cast 
-              fdb1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              fdb1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               fdb1      5 INSTR BELONGTO fa90 
               fdb1      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 ZZ mov     esi, 1 
               fdb6      3 INSTR BELONGTO fa90 
@@ -22396,7 +22396,7 @@
               fdbe      4 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 ZZ mov     r12, [rbx+30h] 
               fdc2     -1 INSTR LOCAL MetadataRedundant mov     esi, 6 
               fdc2      5 INSTR BELONGTO fa90 
-              fdc7     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+              fdc7     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
               fdc7      5 INSTR BELONGTO fa90 
               fdc7      5 INSTR DEADREGS  EFLAGS RDI R14 R15 ZZ mov     edi, 1 
               fdcc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
@@ -22423,10 +22423,10 @@
               fdec      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 ZZ xor     r8d, r8d 
               fdef      2 INSTR BELONGTO fa90 
               fdef      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ xor     ecx, ecx 
-              fdef     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              fdef     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               fdf1      2 INSTR BELONGTO fa90 
               fdf1      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ xor     edx, edx 
-              fdf1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              fdf1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               fdf3      3 INSTR BELONGTO fa90 
               fdf3      3 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     rsi, r14 
               fdf6      3 INSTR BELONGTO fa90 
@@ -22448,10 +22448,10 @@
               fe0d      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
               fe10      2 INSTR BELONGTO fa90 
               fe10      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-              fe10     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              fe10     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               fe12      2 INSTR BELONGTO fa90 
               fe12      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-              fe12     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              fe12     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               fe14      3 INSTR BELONGTO fa90 
               fe14      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r15 
               fe17      3 INSTR BELONGTO fa90 
@@ -22473,10 +22473,10 @@
               fe2e      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
               fe31      2 INSTR BELONGTO fa90 
               fe31      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-              fe31     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              fe31     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               fe33      2 INSTR BELONGTO fa90 
               fe33      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-              fe33     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              fe33     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               fe35      3 INSTR BELONGTO fa90 
               fe35      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r15 
               fe38      3 INSTR BELONGTO fa90 
@@ -22498,10 +22498,10 @@
               fe4f      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
               fe52      2 INSTR BELONGTO fa90 
               fe52      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-              fe52     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              fe52     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               fe54      2 INSTR BELONGTO fa90 
               fe54      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-              fe54     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              fe54     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               fe56      3 INSTR BELONGTO fa90 
               fe56      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r15 
               fe59      3 INSTR BELONGTO fa90 
@@ -22526,14 +22526,14 @@
               fe79     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
               fe79      3 INSTR BELONGTO fa90 
               fe79      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
-              fe7c     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+              fe7c     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
               fe7c      5 INSTR BELONGTO fa90 
               fe7c      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, 1 
               fe81      3 INSTR BELONGTO fa90 
               fe81      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rax 
               fe84      3 INSTR BELONGTO fa90 
               fe84      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rsi, r15 
-              fe87     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+              fe87     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
               fe87      5 INSTR BELONGTO fa90 
               fe87      5 INSTR DEADREGS  EFLAGS RDX R15 ZZ mov     edx, 1 
               fe8c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
@@ -22541,10 +22541,10 @@
               fe8c      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _gtk_box_pack_start 
               fe91      4 INSTR BELONGTO fa90 
               fe91      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     rdx, [rbx+30h] 
-              fe95     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+              fe95     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
               fe95      5 INSTR BELONGTO fa90 
               fe95      5 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     esi, 6 
-              fe9a     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+              fe9a     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
               fe9a      5 INSTR BELONGTO fa90 
               fe9a      5 INSTR DEADREGS  EFLAGS RDI R15 ZZ mov     edi, 1 
               fe9f      4 INSTR BELONGTO fa90 
@@ -22572,10 +22572,10 @@
               febe      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
               fec1      2 INSTR BELONGTO fa90 
               fec1      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-              fec1     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              fec1     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               fec3      2 INSTR BELONGTO fa90 
               fec3      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-              fec3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              fec3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               fec5      3 INSTR BELONGTO fa90 
               fec5      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r15 
               fec8      3 INSTR BELONGTO fa90 
@@ -22605,10 +22605,10 @@
               feec      3 INSTR DEADREGS  EFLAGS RCX RDX R8 ZZ xor     r8d, r8d 
               feef      2 INSTR BELONGTO fa90 
               feef      2 INSTR DEADREGS  EFLAGS RCX RDX ZZ xor     ecx, ecx 
-              feef     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              feef     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               fef1      2 INSTR BELONGTO fa90 
               fef1      2 INSTR DEADREGS  EFLAGS RDX ZZ xor     edx, edx 
-              fef1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+              fef1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
               fef3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
               fef3      5 INSTR BELONGTO fa90 
               fef3      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_box_pack_start 
@@ -22640,7 +22640,7 @@
               ff19      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_class_peek_parent 
               ff1e      3 INSTR BELONGTO ff10 
               ff1e      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
-              ff21     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+              ff21     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
               ff21      5 INSTR BELONGTO ff10 
               ff21      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
               ff26      7 INSTR BELONGTO ff10 
@@ -22691,7 +22691,7 @@
               ff8f      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
               ff92      3 INSTR BELONGTO ff10 
               ff92      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-              ff95     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+              ff95     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
               ff95      5 INSTR BELONGTO ff10 
               ff95      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
               ff9a     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -22708,7 +22708,7 @@
               ffb4      6 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8d, 7 
               ffba      2 INSTR BELONGTO ff10 
               ffba      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-              ffba     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              ffba     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               ffbc     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_boolean 
               ffbc      5 INSTR BELONGTO ff10 
               ffbc      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_boolean 
@@ -22716,7 +22716,7 @@
               ffc1      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
               ffc4      3 INSTR BELONGTO ff10 
               ffc4      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-              ffc7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+              ffc7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
               ffc7      5 INSTR BELONGTO ff10 
               ffc7      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 3 
               ffcc     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -22733,7 +22733,7 @@
               ffe6      6 INSTR DEADREGS  EFLAGS RCX R8 ZZ mov     r8d, 7 
               ffec      2 INSTR BELONGTO ff10 
               ffec      2 INSTR DEADREGS  EFLAGS RCX ZZ xor     ecx, ecx 
-              ffec     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+              ffec     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
               ffee     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_boolean 
               ffee      5 INSTR BELONGTO ff10 
               ffee      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_boolean 
@@ -22741,7 +22741,7 @@
               fff3      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
               fff6      3 INSTR BELONGTO ff10 
               fff6      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-              fff9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+              fff9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
               fff9      5 INSTR BELONGTO ff10 
               fff9      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 2 
               fffe     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
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 9b035c02..9cedec76 100644
--- a/tests/commit/trimmed-sorted-save-gnome-sound-recorder.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-sound-recorder.psexe.annot
@@ -2494,8 +2494,8 @@
             406690    446 FUNC GLOBAL main FUNC_UNSAFE NOFP RET             40684d 
             406691      2 INSTR BELONGTO 406690 
             406691      2 INSTR DEADREGS  EFLAGS RAX RCX ZZ xor     eax, eax 
-            406691     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            406693     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Ch 
+            406691     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            406693     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Ch 
             406693      5 INSTR BELONGTO 406690 
             406693      5 INSTR DEADREGS  EFLAGS RCX ZZ mov     ecx, 0Ch 
             406698      1 INSTR BELONGTO 406690 
@@ -2529,7 +2529,7 @@
             4066c2      5 PTRIMMEDESP STACK 112 displ lea     rax, [rsp+98h+var_28]
             4066c7      2 INSTR BELONGTO 406690 
             4066c7      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            4066c7     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4066c7     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4066c9      9 INSTR BELONGTO 406690 
             4066c9      9 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+98h+var_88], (offset aErrorSDebugMes+1Ch); "" 
             4066c9      9 PTRIMMEDESP STACK 16 displ mov     [rsp+98h+var_88], (offset aErrorSDebugMes+1Ch); ""
@@ -2569,7 +2569,7 @@
             40671a     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_new 
             40671a      5 INSTR BELONGTO 406690 
             40671a      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_option_context_new 
-            40671f     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40671f     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40671f      5 INSTR BELONGTO 406690 
             40671f      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 1 
             406724      3 INSTR BELONGTO 406690 
@@ -2632,7 +2632,7 @@
             406783     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_default_icon_name 
             406783      5 INSTR BELONGTO 406690 
             406783      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _gtk_window_set_default_icon_name 
-            406788     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            406788     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             406788      5 INSTR BELONGTO 406690 
             406788      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 1 
             40678d      5 INSTR BELONGTO 406690 
@@ -2707,7 +2707,7 @@
             406806      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _gtk_main 
             40680b      2 INSTR BELONGTO 406690 
             40680b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40680b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40680b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40680d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 88h 
             40680d      7 INSTR BELONGTO 406690 
             406814    136 DEALLOC STACK esp - 136 pop     rbx
@@ -2719,7 +2719,7 @@
             406816      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             406817      2 INSTR BELONGTO 406690 
             406817      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ xor     edi, edi 
-            406817     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            406817     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             406819     -1 INSTR LOCAL NoMetaUpdate call    sub_406B00 
             406819      5 INSTR BELONGTO 406690 
             406819      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ call    sub_406B00 
@@ -2733,7 +2733,7 @@
             40682a      4 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, [rax+8] 
             40682e      2 INSTR BELONGTO 406690 
             40682e      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40682e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40682e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406830     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             406830      5 INSTR BELONGTO 406690 
             406830      5 INSTR DEADREGS  EFLAGS ZZ call    _g_printerr 
@@ -2749,7 +2749,7 @@
             406842     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_free 
             406842      5 INSTR BELONGTO 406690 
             406842      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_option_context_free 
-            406847     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            406847     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             406847      5 INSTR BELONGTO 406690 
             406847      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
             40684c     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40680D 
@@ -2880,7 +2880,7 @@
             406919      3 INSTR BELONGTO 406910 
             40691c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_406930 
             40691c      2 INSTR BELONGTO 406910 
-            40691e     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            40691e     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             40691e      5 INSTR BELONGTO 406910 
             406923     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             406923      3 INSTR BELONGTO 406910 
@@ -2938,21 +2938,21 @@
             406984      5 INSTR DEADREGS  EFLAGS RAX ZZ call    sub_409A30 
             406989      2 INSTR BELONGTO 406980 
             406989      2 INSTR DEADREGS  EFLAGS RDX ZZ xor     edx, edx 
-            406989     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            406989     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40698b     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40698b      2 INSTR BELONGTO 406980 
             40698d     -1 INSTR LOCAL NoMetaUpdate jz      short loc_406998 
             40698d      2 INSTR BELONGTO 406980 
             40698f      2 INSTR BELONGTO 406980 
             40698f      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, edx 
-            40698f     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edx 
+            40698f     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edx 
             406991      1 INSTR BELONGTO 406980 
             406991      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             406992      1 INSTR BELONGTO 406980 
             406992      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             406998      3 INSTR BELONGTO 406980 
             406998      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     rdi, rbx 
-            40699b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40699b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40699b      5 INSTR BELONGTO 406980 
             40699b      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     esi, 1 
             4069a0     -1 INSTR LOCAL NoMetaUpdate call    sub_40BF30 
@@ -2962,7 +2962,7 @@
             4069a5      2 INSTR BELONGTO 406980 
             4069a7     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             4069a7      2 INSTR BELONGTO 406980 
-            4069a9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setz    dl 
+            4069a9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setz    dl 
             4069a9      3 INSTR BELONGTO 406980 
             4069a9      3 INSTR DEADREGS  RAX RDX RBX R8 R9 R10 R11 ZZ setz    dl 
             4069ac     -1 INSTR LOCAL MetadataRedundant mov     eax, edx 
@@ -3005,7 +3005,7 @@
             4069d1      2 INSTR BELONGTO 4069b0 
             4069d3     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4069E6 
             4069d3      2 INSTR BELONGTO 4069b0 
-            4069d5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4069d5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4069d5      5 INSTR BELONGTO 4069b0 
             4069d5      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     esi, 1 
             4069da      3 INSTR BELONGTO 4069b0 
@@ -3045,16 +3045,16 @@
             406a01      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 ZZ mov     r8, rdi 
             406a04      2 INSTR BELONGTO 406a00 
             406a04      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ xor     eax, eax 
-            406a04     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            406a06     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 7 
+            406a04     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            406a06     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 7 
             406a06      5 INSTR BELONGTO 406a00 
             406a06      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, 7 
             406a0b      2 INSTR BELONGTO 406a00 
             406a0b      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            406a0b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            406a0b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             406a0d      2 INSTR BELONGTO 406a00 
             406a0d      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            406a0d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            406a0d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             406a0f      1 INSTR BELONGTO 406a00 
             406a0f      1 INSTR DEADREGS  EFLAGS RDI ZZ push    rbx 
             406a0f     -3 INSTR LOCAL NoWarn push    rbx 
@@ -3087,13 +3087,13 @@
             406a3a      6 INSTR BELONGTO 406a00 
             406a40      2 INSTR BELONGTO 406a00 
             406a40      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ xor     ecx, ecx 
-            406a40     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            406a40     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             406a42      2 INSTR BELONGTO 406a00 
             406a42      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     edx, edx 
-            406a42     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            406a42     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             406a44      2 INSTR BELONGTO 406a00 
             406a44      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            406a44     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            406a44     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             406a46      3 INSTR BELONGTO 406a00 
             406a46      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
             406a49     -1 INSTR LOCAL NoMetaUpdate call    _g_content_type_guess 
@@ -3134,7 +3134,7 @@
             406a84      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_get_prgname 
             406a89      2 INSTR BELONGTO 406a00 
             406a89      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ xor     ecx, ecx 
-            406a89     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            406a89     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             406a8b      3 INSTR BELONGTO 406a00 
             406a8b      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rsi, rax 
             406a8e      5 INSTR BELONGTO 406a00 
@@ -3143,7 +3143,7 @@
             406a93      5 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     edi, (offset asc_40D3C1+3); " " 
             406a98      2 INSTR BELONGTO 406a00 
             406a98      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            406a98     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406a98     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406a9a     -1 INSTR LOCAL NoMetaUpdate call    _g_strjoin 
             406a9a      5 INSTR BELONGTO 406a00 
             406a9a      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_strjoin 
@@ -3258,7 +3258,7 @@
             406b38      5 INSTR DEADREGS  EFLAGS ZZ call    _g_free 
             406b3d      3 INSTR BELONGTO 406b00 
             406b3d      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            406b40     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            406b40     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             406b40      5 INSTR BELONGTO 406b00 
             406b40      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             406b45     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -3272,8 +3272,8 @@
             406b4d      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             406b50      2 INSTR BELONGTO 406b00 
             406b50      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            406b50     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            406b52     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_406980 
+            406b50     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            406b52     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_406980 
             406b52      5 INSTR BELONGTO 406b00 
             406b52      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset sub_406980 
             406b57      5 INSTR BELONGTO 406b00 
@@ -3285,7 +3285,7 @@
             406b5f      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_connect_data 
             406b64      3 INSTR BELONGTO 406b00 
             406b64      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            406b67     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            406b67     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             406b67      5 INSTR BELONGTO 406b00 
             406b67      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             406b6c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -3299,8 +3299,8 @@
             406b74      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             406b77      2 INSTR BELONGTO 406b00 
             406b77      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            406b77     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            406b79     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_406940 
+            406b77     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            406b79     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_406940 
             406b79      5 INSTR BELONGTO 406b00 
             406b79      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset sub_406940 
             406b7e      5 INSTR BELONGTO 406b00 
@@ -3342,21 +3342,21 @@
             406bbd      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbp, rax 
             406bc0     -1 INSTR LOCAL NoMetaUpdate jmp     loc_406B17 
             406bc0      5 INSTR BELONGTO 406b00 
-            406bd0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 88888889h 
+            406bd0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 88888889h 
             406bd7     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 0FFFFFFC4h 
-            406bdd     -2 INSTR LOCAL n EAX EDX ZZ  AlwaysNUM mul     esi 
+            406bdd     -2 INSTR LOCAL n RAX RDX ZZ  AlwaysNUM mul     esi 
             406be2     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM shr     r8d, 5 
-            406be9     -2 INSTR LOCAL n EAX EDX ZZ  AlwaysNUM imul    esi 
-            406bef     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFC4h 
-            406bf4     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM sar     esi, 5 
-            406bf9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM imul    eax, edx 
-            406c02     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM imul    ecx, r9d 
-            406c06     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM imul    eax, esi, 0FFFFF1F0h 
+            406be9     -2 INSTR LOCAL n RAX RDX ZZ  AlwaysNUM imul    esi 
+            406bef     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFC4h 
+            406bf4     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM sar     esi, 5 
+            406bf9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM imul    eax, edx 
+            406c02     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM imul    ecx, r9d 
+            406c06     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM imul    eax, esi, 0FFFFF1F0h 
             406c10     -1 INSTR LOCAL NoMetaUpdate test    esi, esi 
             406c12     -1 INSTR LOCAL NoMetaUpdate jz      short loc_406C28 
-            406c1c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406c1c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406c1e     -1 INSTR LOCAL NoMetaUpdate jmp     _g_strdup_printf 
-            406c32     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406c32     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406c34     -1 INSTR LOCAL NoMetaUpdate jmp     _g_strdup_printf 
             406c40      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             406c40      0 FUNC MMSAFENESS SAFE
@@ -3385,7 +3385,7 @@
             406c5e      3 INSTR DEADREGS  EFLAGS R12 ZZ mov     r12d, ecx 
             406c61      2 INSTR BELONGTO 406c40 
             406c61      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, edx 
-            406c61     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, edx 
+            406c61     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     ebp, edx 
             406c63     -1 INSTR LOCAL NoMetaUpdate call    _gtk_table_get_type 
             406c63      5 INSTR BELONGTO 406c40 
             406c63      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_table_get_type 
@@ -3396,7 +3396,7 @@
             406c6e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             406c6e      5 INSTR BELONGTO 406c40 
             406c6e      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_type_check_instance_cast 
-            406c73     -2 INSTR LOCAL n ECX ZZ  NumericDEFs lea     ecx, [rbp+1] 
+            406c73     -2 INSTR LOCAL n RCX ZZ  NumericDEFs lea     ecx, [rbp+1] 
             406c73      3 INSTR BELONGTO 406c40 
             406c73      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R13 ZZ lea     ecx, [rbp+1] 
             406c76     -2 INSTR LOCAL n R9 ZZ  NumericDEFs lea     r9d, [r12+1] 
@@ -3407,7 +3407,7 @@
             406c7b      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R13 ZZ mov     r8d, r12d 
             406c7e      2 INSTR BELONGTO 406c40 
             406c7e      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     edx, ebp 
-            406c7e     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, ebp 
+            406c7e     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, ebp 
             406c80      3 INSTR BELONGTO 406c40 
             406c80      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     rsi, rbx 
             406c83      3 INSTR BELONGTO 406c40 
@@ -3489,7 +3489,7 @@
             406d0f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             406d0f      5 INSTR BELONGTO 406cd0 
             406d0f      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 ZZ call    _g_type_check_instance_cast 
-            406d14     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            406d14     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             406d14      5 INSTR BELONGTO 406cd0 
             406d14      5 INSTR DEADREGS  EFLAGS RSI RDI XMM0 XMM1 ZZ mov     esi, 1 
             406d19      3 INSTR BELONGTO 406cd0 
@@ -3504,7 +3504,7 @@
             406d27     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             406d27      5 INSTR BELONGTO 406cd0 
             406d27      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 ZZ call    _g_type_check_instance_cast 
-            406d2c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            406d2c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             406d2c      5 INSTR BELONGTO 406cd0 
             406d2c      5 INSTR DEADREGS  EFLAGS RSI RDI XMM0 XMM1 ZZ mov     esi, 2 
             406d31      3 INSTR BELONGTO 406cd0 
@@ -3529,14 +3529,14 @@
             406d50      2 INSTR BELONGTO 406d50 
             406d50      2 INSTR DEADREGS  EFLAGS RDX RDI ZZ push    r12 
             406d50     -3 INSTR LOCAL NoWarn push    r12 
-            406d52     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406d52     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406d52      5 INSTR BELONGTO 406d50 
             406d52      5 INSTR DEADREGS  EFLAGS RDX RDI R12 ZZ mov     edx, 5          ; category 
             406d57      3 INSTR BELONGTO 406d50 
             406d57      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     r12, rsi 
             406d5a      2 INSTR BELONGTO 406d50 
             406d5a      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            406d5a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            406d5a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             406d5c      5 INSTR BELONGTO 406d50 
             406d5c      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aASoundRecorder; "A sound recorder for GNOME\n gnome-mult"... 
             406d61      1 INSTR BELONGTO 406d50 
@@ -3573,7 +3573,7 @@
             406daf     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             406daf      5 INSTR BELONGTO 406d50 
             406daf      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _dcgettext 
-            406db4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            406db4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             406db4      5 INSTR BELONGTO 406d50 
             406db4      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             406db9      5 INSTR BELONGTO 406d50 
@@ -3629,7 +3629,7 @@
             406e17      5 PTRIMMEDESP STACK 32 displ mov     [rsp+0A8h+var_88], rax
             406e1c      2 INSTR BELONGTO 406d50 
             406e1c      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            406e1c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406e1c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406e1e      9 INSTR BELONGTO 406d50 
             406e1e      9 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     [rsp+0A8h+var_68], offset aGnomeSoundReco; "gnome-sound-recorder" 
             406e1e      9 PTRIMMEDESP STACK 64 displ mov     [rsp+0A8h+var_68], offset aGnomeSoundReco; "gnome-sound-recorder"
@@ -3725,15 +3725,15 @@
             406ebf      4 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     rcx, [rax+8] 
             406ec3      2 INSTR BELONGTO 406e70 
             406ec3      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ xor     edi, edi 
-            406ec3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            406ec3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             406ec5      5 INSTR BELONGTO 406e70 
             406ec5      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     edx, (offset aUnableToLoadFi+15h); "%s" 
-            406eca     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            406eca     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             406eca      5 INSTR BELONGTO 406e70 
             406eca      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 10h 
             406ecf      2 INSTR BELONGTO 406e70 
             406ecf      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            406ecf     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406ecf     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406ed1     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             406ed1      5 INSTR BELONGTO 406e70 
             406ed1      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -3759,7 +3759,7 @@
             406ef0     -3 INSTR LOCAL NoWarn push    rbp 
             406ef1      2 INSTR BELONGTO 406ef0 
             406ef1      2 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ xor     ecx, ecx 
-            406ef1     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            406ef1     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             406ef3      1 INSTR BELONGTO 406ef0 
             406ef3      1 INSTR DEADREGS  EFLAGS RDX RSI ZZ push    rbx 
             406ef3     -3 INSTR LOCAL NoWarn push    rbx 
@@ -3784,7 +3784,7 @@
             406f0a      5 PTRIMMEDESP STACK 8 displ cmp     [rsp+28h+var_20], 1
             406f0f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_406F80 
             406f0f      2 INSTR BELONGTO 406ef0 
-            406f11     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            406f11     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             406f11      5 INSTR BELONGTO 406ef0 
             406f11      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 2 
             406f16      3 INSTR BELONGTO 406ef0 
@@ -3797,7 +3797,7 @@
             406f1e      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, 0FFFFFFFFFFFFFFFFh 
             406f25      2 INSTR BELONGTO 406ef0 
             406f25      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            406f25     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            406f25     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             406f27     -1 INSTR LOCAL MetadataRedundant xor     esi, esi 
             406f27      2 INSTR BELONGTO 406ef0 
             406f29      3 INSTR BELONGTO 406ef0 
@@ -3816,7 +3816,7 @@
             406f3c      2 INSTR BELONGTO 406ef0 
             406f40      2 INSTR BELONGTO 406ef0 
             406f40      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            406f40     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            406f40     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             406f42      3 INSTR BELONGTO 406ef0 
             406f42      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
             406f45      3 INSTR BELONGTO 406ef0 
@@ -3840,7 +3840,7 @@
             406f5d      5 INSTR DEADREGS  EFLAGS ZZ call    _gst_object_unref 
             406f62      3 INSTR BELONGTO 406ef0 
             406f62      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            406f65     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            406f65     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             406f65      5 INSTR BELONGTO 406ef0 
             406f65      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             406f6a     -1 INSTR LOCAL NoMetaUpdate call    _gst_element_set_state 
@@ -3907,7 +3907,7 @@
             406fc8      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 XMM0 ZZ mov     rdi, cs:qword_610918 
             406fcf      2 INSTR BELONGTO 406fa0 
             406fcf      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 XMM0 ZZ xor     eax, eax 
-            406fcf     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            406fcf     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             406fd1     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             406fd1      3 INSTR BELONGTO 406fa0 
             406fd1      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R9 XMM0 ZZ xor     r9d, r9d 
@@ -3918,7 +3918,7 @@
             406fda      5 INSTR DEADREGS  EFLAGS RCX RDX RSI XMM0 ZZ mov     ecx, offset aStop_cb; "stop_cb" 
             406fdf      5 INSTR BELONGTO 406fa0 
             406fdf      5 INSTR DEADREGS  EFLAGS RDX RSI XMM0 ZZ mov     edx, offset aGsrWindow_c; "gsr-window.c" 
-            406fe4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            406fe4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             406fe4      5 INSTR BELONGTO 406fa0 
             406fe4      5 INSTR DEADREGS  EFLAGS RSI XMM0 ZZ mov     esi, 4 
             406fe9      8 INSTR BELONGTO 406fa0 
@@ -3966,7 +3966,7 @@
             407039      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 ZZ mov     rdi, cs:qword_610918 
             407040      2 INSTR BELONGTO 406fa0 
             407040      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 ZZ xor     eax, eax 
-            407040     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407040     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407042     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             407042      3 INSTR BELONGTO 406fa0 
             407042      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R9 ZZ xor     r9d, r9d 
@@ -3977,7 +3977,7 @@
             40704b      5 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ mov     ecx, offset aStop_cb; "stop_cb" 
             407050      5 INSTR BELONGTO 406fa0 
             407050      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, offset aGsrWindow_c; "gsr-window.c" 
-            407055     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            407055     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             407055      5 INSTR BELONGTO 406fa0 
             407055      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 4 
             40705a      8 INSTR BELONGTO 406fa0 
@@ -3990,7 +3990,7 @@
             407067      7 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rax, [rbx+0B0h] 
             40706e      4 INSTR BELONGTO 406fa0 
             40706e      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, [rax+18h] 
-            407072     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            407072     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             407072      5 INSTR BELONGTO 406fa0 
             407072      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
             407077     -1 INSTR LOCAL NoMetaUpdate call    _gst_element_set_state 
@@ -4000,7 +4000,7 @@
             40707c      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rax, [rbx+0B0h] 
             407083      2 INSTR BELONGTO 406fa0 
             407083      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     edx, edx 
-            407083     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407083     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407085     -1 INSTR LOCAL MetadataRedundant xor     esi, esi 
             407085      2 INSTR BELONGTO 406fa0 
             407087     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     rcx, 0FFFFFFFFFFFFFFFFh 
@@ -4036,12 +4036,12 @@
             4070c5      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ mov     ecx, offset aStop_cb; "stop_cb" 
             4070ca      5 INSTR BELONGTO 406fa0 
             4070ca      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aGsrWindow_c; "gsr-window.c" 
-            4070cf     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            4070cf     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             4070cf      5 INSTR BELONGTO 406fa0 
             4070cf      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 4 
             4070d4      2 INSTR BELONGTO 406fa0 
             4070d4      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4070d4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4070d4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4070d6      8 INSTR BELONGTO 406fa0 
             4070d6      8 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+28h+var_28], offset aStoppingReco_0; "Stopping recording pipeline" 
             4070d6      8 PTRIMMEDESP STACK 0 displ mov     [rsp+28h+var_28], offset aStoppingReco_0; "Stopping recording pipeline"
@@ -4059,7 +4059,7 @@
             4070f2      4 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     rax, [rbp+38h] 
             4070f6      2 INSTR BELONGTO 406fa0 
             4070f6      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            4070f6     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4070f6     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4070f8      4 INSTR BELONGTO 406fa0 
             4070f8      4 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, [rax+68h] 
             4070fc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
@@ -4143,12 +4143,12 @@
             407190      0 FUNC MMSAFENESS SAFE
             407190      2 INSTR BELONGTO 407190 
             407190      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R11 ZZ mov     eax, edi 
-            407190     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edi 
+            407190     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edi 
             407190    591 FUNC GLOBAL sub_407190 FUNC_UNSAFE NOFP RET             4073de 
-            407192     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 91A2B3C5h 
+            407192     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 91A2B3C5h 
             407192      5 INSTR BELONGTO 407190 
             407192      5 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R11 ZZ mov     edx, 91A2B3C5h 
-            407197     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88888889h 
+            407197     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88888889h 
             407197      5 INSTR BELONGTO 407190 
             407197      5 INSTR DEADREGS  EFLAGS RCX RSI R8 R11 ZZ mov     ecx, 88888889h 
             40719c     -1 INSTR LOCAL MetadataRedundant mul     edx 
@@ -4183,7 +4183,7 @@
             4071ca      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             4071ce      2 INSTR BELONGTO 407190 
             4071ce      2 INSTR DEADREGS  EFLAGS RBX RSI R8 R13 R14 R15 ZZ mov     ebx, edx 
-            4071ce     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, edx 
+            4071ce     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     ebx, edx 
             4071d0     -1 INSTR LOCAL MetadataRedundant mul     ecx 
             4071d0      2 INSTR BELONGTO 407190 
             4071d2     -1 INSTR LOCAL MetadataRedundant mov     eax, edi 
@@ -4195,7 +4195,7 @@
             4071d7      3 INSTR BELONGTO 407190 
             4071da      2 INSTR BELONGTO 407190 
             4071da      2 INSTR DEADREGS  EFLAGS RCX RSI RDI R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            4071da     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4071da     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4071dc     -1 INSTR LOCAL MetadataRedundant shl     r8, 4 
             4071dc      4 INSTR BELONGTO 407190 
             4071e0     -1 INSTR LOCAL MetadataRedundant mov     ecx, edx 
@@ -4210,7 +4210,7 @@
             4071ec      3 INSTR BELONGTO 407190 
             4071ef      2 INSTR BELONGTO 407190 
             4071ef      2 INSTR DEADREGS  EFLAGS RSI R13 R14 R15 ZZ mov     esi, ecx 
-            4071ef     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, ecx 
+            4071ef     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, ecx 
             4071f1     -1 INSTR LOCAL MetadataRedundant shr     edx, 10h 
             4071f1      3 INSTR BELONGTO 407190 
             4071f4     -1 INSTR LOCAL MetadataRedundant imul    rdx, 0FFFFFFFFFFFFFA60h 
@@ -4253,7 +4253,7 @@
             407239      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _dcngettext 
             40723e     -1 INSTR LOCAL MetadataRedundant xor     edi, edi        ; domainname 
             40723e      2 INSTR BELONGTO 407190 
-            407240     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, r12d       ; n 
+            407240     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, r12d       ; n 
             407240      3 INSTR BELONGTO 407190 
             407240      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R14 R15 ZZ mov     ecx, r12d       ; n 
             407243     -1 INSTR LOCAL MetadataRedundant mov     r8d, 5          ; category 
@@ -4279,7 +4279,7 @@
             40726a      6 INSTR BELONGTO 407190 
             407270     -1 INSTR LOCAL NoMetaUpdate test    r12d, r12d 
             407270      3 INSTR BELONGTO 407190 
-            407273     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407273     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407273      5 INSTR BELONGTO 407190 
             407273      5 INSTR DEADREGS  RDX RSI RDI ZZ mov     edx, 5          ; category 
             407278     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4072E0 
@@ -4288,7 +4288,7 @@
             40727a      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R15 ZZ mov     esi, offset aSAndS; "%s and %s" 
             40727f      2 INSTR BELONGTO 407190 
             40727f      2 INSTR DEADREGS  EFLAGS RDI R12 R15 ZZ xor     edi, edi        ; domainname 
-            40727f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40727f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407281     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             407281      5 INSTR BELONGTO 407190 
             407281      5 INSTR DEADREGS  EFLAGS R12 R15 ZZ call    _dcgettext 
@@ -4300,7 +4300,7 @@
             40728c      3 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 R15 ZZ mov     rsi, r14 
             40728f      2 INSTR BELONGTO 407190 
             40728f      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 ZZ xor     eax, eax 
-            40728f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40728f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407291     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             407291      5 INSTR BELONGTO 407190 
             407291      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_strdup_printf 
@@ -4316,7 +4316,7 @@
             40729f      3 INSTR DEADREGS  EFLAGS RAX RSI R13 R14 R15 ZZ mov     rsi, rbx 
             4072a2      2 INSTR BELONGTO 407190 
             4072a2      2 INSTR DEADREGS  EFLAGS RAX RBX R13 R14 R15 ZZ xor     eax, eax 
-            4072a2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4072a2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4072a4     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             4072a4      5 INSTR BELONGTO 407190 
             4072a4      5 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ call    _g_strdup_printf 
@@ -4349,7 +4349,7 @@
             4072d9      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
             4072e0      2 INSTR BELONGTO 407190 
             4072e0      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            4072e0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4072e0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4072e2      5 INSTR BELONGTO 407190 
             4072e2      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aS  ; "%s, " 
             4072e7     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -4365,7 +4365,7 @@
             4072f5      3 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 ZZ mov     rdi, rax 
             4072f8      2 INSTR BELONGTO 407190 
             4072f8      2 INSTR DEADREGS  EFLAGS RAX R13 R14 R15 ZZ xor     eax, eax 
-            4072f8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4072f8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4072fa     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             4072fa      5 INSTR BELONGTO 407190 
             4072fa      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_strdup_printf 
@@ -4376,7 +4376,7 @@
             407302      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R13 R14 R15 ZZ mov     r13, rax 
             407305      3 INSTR BELONGTO 407190 
             407305      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R14 R15 ZZ mov     rdi, rax 
-            407308     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, r12d 
+            407308     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, r12d 
             407308      3 INSTR BELONGTO 407190 
             407308      3 INSTR DEADREGS  EFLAGS RAX RCX RSI R14 R15 ZZ mov     ecx, r12d 
             40730b     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     rsi, rbx 
@@ -4384,7 +4384,7 @@
             40730b      3 INSTR DEADREGS  EFLAGS RAX RSI R12 R14 R15 ZZ mov     rsi, rbx 
             40730e      2 INSTR BELONGTO 407190 
             40730e      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R14 R15 ZZ xor     eax, eax 
-            40730e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40730e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407310     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             407310      5 INSTR BELONGTO 407190 
             407310      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ call    _g_strdup_printf 
@@ -4407,8 +4407,8 @@
             407334      2 INSTR BELONGTO 407190 
             407336      2 INSTR BELONGTO 407190 
             407336      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R14 ZZ xor     edi, edi        ; domainname 
-            407336     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            407338     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407336     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407338     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407338      5 INSTR BELONGTO 407190 
             407338      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R14 ZZ mov     edx, 5          ; category 
             40733d      5 INSTR BELONGTO 407190 
@@ -4424,7 +4424,7 @@
             40734d      3 INSTR DEADREGS  EFLAGS RBX RDI R13 R14 R15 ZZ mov     rdi, rax 
             407350      2 INSTR BELONGTO 407190 
             407350      2 INSTR DEADREGS  EFLAGS RAX RBX R13 R14 R15 ZZ xor     eax, eax 
-            407350     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407350     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407352     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             407352      5 INSTR BELONGTO 407190 
             407352      5 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ call    _g_strdup_printf 
@@ -4435,12 +4435,12 @@
             40735a      3 INSTR DEADREGS  EFLAGS RDX RBX RDI R13 R14 R15 ZZ mov     rbx, rax 
             40735d      3 INSTR BELONGTO 407190 
             40735d      3 INSTR DEADREGS  EFLAGS RDX RDI R13 R14 R15 ZZ mov     rdi, rax 
-            407360     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, r12d 
+            407360     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, r12d 
             407360      3 INSTR BELONGTO 407190 
             407360      3 INSTR DEADREGS  EFLAGS RAX RDX R13 R14 R15 ZZ mov     edx, r12d 
             407363      2 INSTR BELONGTO 407190 
             407363      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 ZZ xor     eax, eax 
-            407363     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407363     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407365     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             407365      5 INSTR BELONGTO 407190 
             407365      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_strdup_printf 
@@ -4465,7 +4465,7 @@
             407390      5 INSTR BELONGTO 407190 
             407395      2 INSTR BELONGTO 407190 
             407395      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     eax, eax 
-            407395     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407395     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407397     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+38h+var_18] 
             407397      5 INSTR BELONGTO 407190 
             40739c     -1 INSTR LOCAL MetadataUnused mov     r14, [rsp+38h+var_10] 
@@ -4495,7 +4495,7 @@
             4073cf      5 INSTR BELONGTO 407190 
             4073d4      2 INSTR BELONGTO 407190 
             4073d4      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     eax, eax 
-            4073d4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4073d4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4073d6     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
             4073d6      4 INSTR BELONGTO 407190 
             4073da     -1 INSTR LOCAL NoMetaUpdate jmp     _g_strdup_printf 
@@ -4553,10 +4553,10 @@
             40743c      7 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 XMM0 XMM1 ZZ mov     dword ptr [rax+28h], 0 
             407443      2 INSTR BELONGTO 4073e0 
             407443      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 XMM0 XMM1 ZZ xor     ebx, ebx 
-            407443     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            407443     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             407445      2 INSTR BELONGTO 4073e0 
             407445      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 XMM0 XMM1 ZZ mov     eax, ebx 
-            407445     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            407445     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             407447      5 INSTR BELONGTO 4073e0 
             407447      5 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 XMM0 XMM1 ZZ mov     rbp, [rsp+48h+var_10] 
             407447      5 PTRIMMEDESP STACK 56 displ mov     rbp, [rsp+48h+var_10]
@@ -4583,7 +4583,7 @@
             407471      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R12 XMM0 XMM1 ZZ xor     r9d, r9d 
             407474      2 INSTR BELONGTO 4073e0 
             407474      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R12 XMM0 XMM1 ZZ xor     eax, eax 
-            407474     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407474     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407476     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 56Ah 
             407476      6 INSTR BELONGTO 4073e0 
             407476      6 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R12 XMM0 XMM1 ZZ mov     r8d, 56Ah 
@@ -4591,7 +4591,7 @@
             40747c      5 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 XMM0 XMM1 ZZ mov     ecx, offset aPlay_tick_call; "play_tick_callback" 
             407481      5 INSTR BELONGTO 4073e0 
             407481      5 INSTR DEADREGS  EFLAGS RDX RSI R12 XMM0 XMM1 ZZ mov     edx, offset aGsrWindow_c; "gsr-window.c" 
-            407486     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            407486     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             407486      5 INSTR BELONGTO 4073e0 
             407486      5 INSTR DEADREGS  EFLAGS RSI R12 XMM0 XMM1 ZZ mov     esi, 4 
             40748b      8 INSTR BELONGTO 4073e0 
@@ -4612,13 +4612,13 @@
             4074ad      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 XMM0 XMM1 ZZ mov     esi, offset aPlay_tick_ca_0; "play_tick_callback" 
             4074b2      2 INSTR BELONGTO 4073e0 
             4074b2      2 INSTR DEADREGS  EFLAGS RBX RDI R12 XMM0 XMM1 ZZ xor     edi, edi 
-            4074b2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4074b2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4074b4     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             4074b4      5 INSTR BELONGTO 4073e0 
             4074b4      5 INSTR DEADREGS  EFLAGS RBX R12 XMM0 XMM1 ZZ call    _g_return_if_fail_warning 
             4074b9      2 INSTR BELONGTO 4073e0 
             4074b9      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 XMM0 XMM1 ZZ xor     ebx, ebx 
-            4074b9     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            4074b9     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             4074bb     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_407445 
             4074bb      2 INSTR BELONGTO 4073e0 
             4074c0      5 INSTR BELONGTO 4073e0 
@@ -4627,13 +4627,13 @@
             4074c5      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 XMM0 XMM1 ZZ mov     esi, offset aPlay_tick_ca_0; "play_tick_callback" 
             4074ca      2 INSTR BELONGTO 4073e0 
             4074ca      2 INSTR DEADREGS  EFLAGS RBX RDI R12 XMM0 XMM1 ZZ xor     edi, edi 
-            4074ca     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4074ca     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4074cc     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             4074cc      5 INSTR BELONGTO 4073e0 
             4074cc      5 INSTR DEADREGS  EFLAGS RBX R12 XMM0 XMM1 ZZ call    _g_return_if_fail_warning 
             4074d1      2 INSTR BELONGTO 4073e0 
             4074d1      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 XMM0 XMM1 ZZ xor     ebx, ebx 
-            4074d1     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            4074d1     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             4074d3     -1 INSTR LOCAL NoMetaUpdate jmp     loc_407445 
             4074d3      5 INSTR BELONGTO 4073e0 
             4074e0      5 INSTR BELONGTO 4073e0 
@@ -4678,7 +4678,7 @@
             40751d      3 INSTR BELONGTO 4073e0 
             407520      2 INSTR BELONGTO 4073e0 
             407520      2 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R11 R12 ZZ mov     edi, edx 
-            407520     -2 INSTR LOCAL n EDI ZZ  NumericDEFs mov     edi, edx 
+            407520     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     edi, edx 
             407522      6 INSTR BELONGTO 4073e0 
             407522      6 INSTR DEADREGS  EFLAGS RCX RSI R8 R11 R12 ZZ mov     [rax+0DCh], edx 
             407528     -1 INSTR LOCAL NoMetaUpdate call    sub_407190 
@@ -4737,7 +4737,7 @@
             407583      2 INSTR BELONGTO 4073e0 
             407585     -1 INSTR LOCAL NoMetaUpdate cmp     cs:__gst_debug_min, 3 
             407585      7 INSTR BELONGTO 4073e0 
-            40758c     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            40758c     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             40758c      5 INSTR BELONGTO 4073e0 
             40758c      5 INSTR DEADREGS  RAX RBX R8 R9 R12 XMM0 XMM1 ZZ mov     ebx, 1 
             407591     -1 INSTR LOCAL NoMetaUpdate jbe     loc_407445 
@@ -4761,7 +4761,7 @@
             4075ba      2 INSTR BELONGTO 4073e0 
             4075bc     -1 INSTR LOCAL NoMetaUpdate cmp     cs:__gst_debug_min, 3 
             4075bc      7 INSTR BELONGTO 4073e0 
-            4075c3     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            4075c3     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             4075c3      5 INSTR BELONGTO 4073e0 
             4075c3      5 INSTR DEADREGS  RAX RBX R8 R9 R12 XMM0 XMM1 ZZ mov     ebx, 1 
             4075c8     -1 INSTR LOCAL NoMetaUpdate jbe     loc_407445 
@@ -4781,12 +4781,12 @@
             4075e6      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R12 XMM0 XMM1 ZZ mov     ecx, offset aPlay_tick_call; "play_tick_callback" 
             4075eb      5 INSTR BELONGTO 4073e0 
             4075eb      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 XMM0 XMM1 ZZ mov     edx, offset aGsrWindow_c; "gsr-window.c" 
-            4075f0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            4075f0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             4075f0      5 INSTR BELONGTO 4073e0 
             4075f0      5 INSTR DEADREGS  EFLAGS RAX RSI R12 XMM0 XMM1 ZZ mov     esi, 4 
             4075f5      2 INSTR BELONGTO 4073e0 
             4075f5      2 INSTR DEADREGS  EFLAGS RAX R12 XMM0 XMM1 ZZ xor     eax, eax 
-            4075f5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4075f5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4075f7     -1 INSTR LOCAL NoMetaUpdate call    _gst_debug_log 
             4075f7      5 INSTR BELONGTO 4073e0 
             4075f7      5 INSTR DEADREGS  EFLAGS R12 XMM0 XMM1 ZZ call    _gst_debug_log 
@@ -4867,7 +4867,7 @@
             4076a5      4 INSTR DEADREGS  EFLAGS RSI RDI R12 XMM1 ZZ mov     rdi, [rbx+8] 
             4076a9      3 INSTR BELONGTO 4073e0 
             4076a9      3 INSTR DEADREGS  EFLAGS RBX RSI R12 XMM1 ZZ mov     rsi, rax 
-            4076ac     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            4076ac     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             4076ac      5 INSTR BELONGTO 4073e0 
             4076ac      5 INSTR DEADREGS  EFLAGS RBX R12 XMM1 ZZ mov     ebx, 1 
             4076b1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -4887,14 +4887,14 @@
             4076c7      5 INSTR DEADREGS  EFLAGS R12 XMM0 XMM1 ZZ call    _gtk_adjustment_set_value 
             4076cc     -1 INSTR LOCAL NoMetaUpdate jmp     loc_407445 
             4076cc      5 INSTR BELONGTO 4073e0 
-            4076d8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4076d8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4076d8      5 INSTR BELONGTO 4073e0 
             4076d8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 5          ; category 
             4076dd      5 INSTR BELONGTO 4073e0 
             4076dd      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aUnknown; "Unknown" 
             4076e2      2 INSTR BELONGTO 4073e0 
             4076e2      2 INSTR DEADREGS  EFLAGS RDI R12 ZZ xor     edi, edi        ; domainname 
-            4076e2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4076e2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4076e4     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4076e4      5 INSTR BELONGTO 4073e0 
             4076e4      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _dcgettext 
@@ -4925,7 +4925,7 @@
             407710      5 INSTR BELONGTO 4073e0 
             407718     -1 INSTR LOCAL NoMetaUpdate cmp     cs:__gst_debug_min, 3 
             407718      7 INSTR BELONGTO 4073e0 
-            40771f     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            40771f     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             40771f      5 INSTR BELONGTO 4073e0 
             40771f      5 INSTR DEADREGS  RAX RBX R8 R9 R12 XMM0 XMM1 ZZ mov     ebx, 1 
             407724     -1 INSTR LOCAL NoMetaUpdate jbe     loc_407445 
@@ -4982,7 +4982,7 @@
             40778d      2 INSTR BELONGTO 407750 
             40778f      2 INSTR BELONGTO 407750 
             40778f      2 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ xor     ebx, ebx 
-            40778f     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40778f     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             407791     -1 INSTR LOCAL NoMetaUpdate cmp     cs:__gst_debug_min, 3 
             407791      7 INSTR BELONGTO 407750 
             407798     -1 INSTR LOCAL NoMetaUpdate jbe     short loc_4077D2 
@@ -5005,12 +5005,12 @@
             4077b4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R12 R13 ZZ mov     ecx, offset aRecord_tick_ca; "record_tick_callback" 
             4077b9      5 INSTR BELONGTO 407750 
             4077b9      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 ZZ mov     edx, offset aGsrWindow_c; "gsr-window.c" 
-            4077be     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            4077be     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             4077be      5 INSTR BELONGTO 407750 
             4077be      5 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 ZZ mov     esi, 4 
             4077c3      2 INSTR BELONGTO 407750 
             4077c3      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            4077c3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4077c3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4077c5      8 INSTR BELONGTO 407750 
             4077c5      8 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     [rsp+48h+var_48], offset aPipelineInWron; "pipeline in wrong state: %s" 
             4077c5      8 PTRIMMEDESP STACK 0 displ mov     [rsp+48h+var_48], offset aPipelineInWron; "pipeline in wrong state: %s"
@@ -5019,7 +5019,7 @@
             4077cd      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _gst_debug_log 
             4077d2      2 INSTR BELONGTO 407750 
             4077d2      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 R12 R13 ZZ mov     eax, ebx 
-            4077d2     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            4077d2     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             4077d4      5 INSTR BELONGTO 407750 
             4077d4      5 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 ZZ mov     rbp, [rsp+48h+var_18] 
             4077d4      5 PTRIMMEDESP STACK 48 displ mov     rbp, [rsp+48h+var_18]
@@ -5037,7 +5037,7 @@
             4077ec     72 DEALLOC STACK esp - 72 retn
             4077f0      6 INSTR BELONGTO 407750 
             4077f0      6 INSTR DEADREGS  EFLAGS RCX RBX R12 R13 ZZ mov     ecx, [rdx+0FCh] 
-            4077f6     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            4077f6     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             4077f6      5 INSTR BELONGTO 407750 
             4077f6      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ mov     ebx, 1 
             4077fb     -1 INSTR LOCAL NoMetaUpdate test    ecx, ecx 
@@ -5069,7 +5069,7 @@
             40781e      2 INSTR BELONGTO 407750 
             407820     -1 INSTR LOCAL NoMetaUpdate cmp     cs:__gst_debug_min, 3 
             407820      7 INSTR BELONGTO 407750 
-            407827     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            407827     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             407827      5 INSTR BELONGTO 407750 
             407827      5 INSTR DEADREGS  RAX RBX R8 R9 R12 R13 ZZ mov     ebx, 1 
             40782c     -1 INSTR LOCAL NoMetaUpdate jbe     short loc_4077D2 
@@ -5086,12 +5086,12 @@
             40783e      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R12 R13 ZZ mov     ecx, offset aRecord_tick_ca; "record_tick_callback" 
             407843      5 INSTR BELONGTO 407750 
             407843      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 ZZ mov     edx, offset aGsrWindow_c; "gsr-window.c" 
-            407848     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            407848     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             407848      5 INSTR BELONGTO 407750 
             407848      5 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 ZZ mov     esi, 4 
             40784d      2 INSTR BELONGTO 407750 
             40784d      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            40784d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40784d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40784f      8 INSTR BELONGTO 407750 
             40784f      8 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     [rsp+48h+var_48], offset aFailedToQueryP; "failed to query position" 
             40784f      8 PTRIMMEDESP STACK 0 displ mov     [rsp+48h+var_48], offset aFailedToQueryP; "failed to query position"
@@ -5118,7 +5118,7 @@
             40787f      4 INSTR BELONGTO 407750 
             407883     -1 INSTR LOCAL MetadataRedundant sub     r13, rcx 
             407883      3 INSTR BELONGTO 407750 
-            407886     -2 INSTR LOCAL n EDI ZZ  NumericDEFs mov     edi, r13d 
+            407886     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     edi, r13d 
             407886      3 INSTR BELONGTO 407750 
             407886      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R11 R12 ZZ mov     edi, r13d 
             407889     -1 INSTR LOCAL NoMetaUpdate call    sub_407190 
@@ -5182,7 +5182,7 @@
             4078f4      4 INSTR BELONGTO 4078d0 
             4078f8     -1 INSTR LOCAL NoMetaUpdate jz      short loc_407920 
             4078f8      2 INSTR BELONGTO 4078d0 
-            4078fa     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4078fa     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4078fa      5 INSTR BELONGTO 4078d0 
             4078fa      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 XMM0 XMM1 ZZ mov     eax, 1 
             4078ff      5 INSTR BELONGTO 4078d0 
@@ -5248,7 +5248,7 @@
             407960      5 INSTR DEADREGS  EFLAGS RBX R14 ZZ call    _gtk_progress_bar_get_type 
             407965      2 INSTR BELONGTO 4078d0 
             407965      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R14 ZZ xor     ebx, ebx 
-            407965     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            407965     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             407967      3 INSTR BELONGTO 4078d0 
             407967      3 INSTR DEADREGS  EFLAGS RSI RDI R14 ZZ mov     r14, rax 
             40796a      6 INSTR BELONGTO 4078d0 
@@ -5261,7 +5261,7 @@
             407978      5 INSTR DEADREGS  EFLAGS ZZ call    _gst_structure_get_value 
             40797d      2 INSTR BELONGTO 4078d0 
             40797d      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, ebx 
-            40797d     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, ebx 
+            40797d     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, ebx 
             40797f      3 INSTR BELONGTO 4078d0 
             40797f      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             407982     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     ebx, 1 
@@ -5411,14 +5411,14 @@
             407ab8      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R12 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ mov     r8d, (offset aUnableToLoadFi+15h); "%s" 
             407abe      2 INSTR BELONGTO 407a20 
             407abe      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R12 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ xor     eax, eax 
-            407abe     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            407ac0     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            407abe     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            407ac0     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             407ac0      5 INSTR BELONGTO 407a20 
             407ac0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ mov     ecx, 2 
-            407ac5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            407ac5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             407ac5      5 INSTR BELONGTO 407a20 
             407ac5      5 INSTR DEADREGS  EFLAGS RDX RSI R12 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ mov     edx, 3 
-            407aca     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            407aca     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             407aca      5 INSTR BELONGTO 407a20 
             407aca      5 INSTR DEADREGS  EFLAGS RSI R12 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ mov     esi, 2 
             407acf     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
@@ -5439,7 +5439,7 @@
             407ae2      5 INSTR DEADREGS  EFLAGS RAX RDI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ mov     edi, offset aErrorSDebugMes; "ERROR: %s\nDEBUG MESSAGE: %s\n" 
             407ae7      2 INSTR BELONGTO 407a20 
             407ae7      2 INSTR DEADREGS  EFLAGS RAX XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ xor     eax, eax 
-            407ae7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407ae7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407ae9     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             407ae9      5 INSTR BELONGTO 407a20 
             407ae9      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 ZZ call    _g_printerr 
@@ -5558,13 +5558,13 @@
             407bbb      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 R12 R13 ZZ xor     r8d, r8d 
             407bbe      2 INSTR BELONGTO 407b30 
             407bbe      2 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 R13 ZZ xor     ecx, ecx 
-            407bbe     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            407bbe     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             407bc0      2 INSTR BELONGTO 407b30 
             407bc0      2 INSTR DEADREGS  EFLAGS RDX RDI R12 R13 ZZ xor     edx, edx 
-            407bc0     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407bc0     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407bc2      2 INSTR BELONGTO 407b30 
             407bc2      2 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ xor     edi, edi 
-            407bc2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407bc2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407bc4      5 INSTR BELONGTO 407b30 
             407bc4      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     [rsp+68h+var_60], rax 
             407bc4      5 PTRIMMEDESP STACK 8 displ mov     [rsp+68h+var_60], rax
@@ -5607,12 +5607,12 @@
             407c10      5 INSTR BELONGTO 407b30 
             407c10      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ mov     rax, [rsp+68h+var_30] 
             407c10      5 PTRIMMEDESP STACK 56 displ mov     rax, [rsp+68h+var_30]
-            407c15     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407c15     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407c15      5 INSTR BELONGTO 407b30 
             407c15      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     edx, 5          ; category 
             407c1a      2 INSTR BELONGTO 407b30 
             407c1a      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ xor     edi, edi        ; domainname 
-            407c1a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407c1a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407c1c      5 INSTR BELONGTO 407b30 
             407c1c      5 INSTR DEADREGS  EFLAGS RSI R12 R13 ZZ mov     esi, offset aThereWasAnErro; "There was an error starting %s: %s" 
             407c21      4 INSTR BELONGTO 407b30 
@@ -5642,10 +5642,10 @@
             407c46      3 INSTR BELONGTO 407b30 
             407c49      2 INSTR BELONGTO 407b30 
             407c49      2 INSTR DEADREGS  EFLAGS RAX RDX RSI R10 R11 R12 R13 ZZ xor     esi, esi 
-            407c49     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407c49     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407c4b      2 INSTR BELONGTO 407b30 
             407c4b      2 INSTR DEADREGS  EFLAGS RAX RDX R10 R11 R12 R13 ZZ xor     eax, eax 
-            407c4b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407c4b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407c4d     -1 INSTR LOCAL NoMetaUpdate call    sub_407A20 
             407c4d      5 INSTR BELONGTO 407b30 
             407c4d      5 INSTR DEADREGS  EFLAGS RDX R10 R11 R12 R13 ZZ call    sub_407A20 
@@ -5658,12 +5658,12 @@
             407c57      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_error_free 
             407c5c     -1 INSTR LOCAL NoMetaUpdate jmp     loc_407BDA 
             407c5c      5 INSTR BELONGTO 407b30 
-            407c68     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407c68     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407c68      5 INSTR BELONGTO 407b30 
             407c68      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 ZZ mov     edx, 5          ; category 
             407c6d      2 INSTR BELONGTO 407b30 
             407c6d      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ xor     edi, edi        ; domainname 
-            407c6d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407c6d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407c6f      5 INSTR BELONGTO 407b30 
             407c6f      5 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 ZZ mov     esi, offset aSIsNotInstalle; "%s is not installed in the path." 
             407c74     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -5689,10 +5689,10 @@
             407c94      3 INSTR BELONGTO 407b30 
             407c97      2 INSTR BELONGTO 407b30 
             407c97      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R10 R11 R12 R13 ZZ xor     esi, esi 
-            407c97     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407c97     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407c99      2 INSTR BELONGTO 407b30 
             407c99      2 INSTR DEADREGS  EFLAGS RAX RDX RBX R10 R11 R12 R13 ZZ xor     eax, eax 
-            407c99     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407c99     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407c9b     -1 INSTR LOCAL NoMetaUpdate call    sub_407A20 
             407c9b      5 INSTR BELONGTO 407b30 
             407c9b      5 INSTR DEADREGS  EFLAGS RDX RBX R10 R11 R12 R13 ZZ call    sub_407A20 
@@ -5733,7 +5733,7 @@
             407cd1      3 INSTR DEADREGS  EFLAGS RAX RSI XMM0 ZZ mov     rsi, rdi 
             407cd4      2 INSTR BELONGTO 407cd0 
             407cd4      2 INSTR DEADREGS  EFLAGS RAX RDI XMM0 ZZ xor     eax, eax 
-            407cd4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407cd4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407cd6      5 INSTR BELONGTO 407cd0 
             407cd6      5 INSTR DEADREGS  EFLAGS RDI XMM0 ZZ mov     edi, offset aSpanWeightBo_0; "<span weight=\"bold\">%s</span>" 
             407cdb      1 INSTR BELONGTO 407cd0 
@@ -5771,7 +5771,7 @@
             407d06     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407d06      5 INSTR BELONGTO 407cd0 
             407d06      5 INSTR DEADREGS  EFLAGS XMM0 ZZ call    _g_type_check_instance_cast 
-            407d0b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            407d0b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             407d0b      5 INSTR BELONGTO 407cd0 
             407d0b      5 INSTR DEADREGS  EFLAGS RSI RDI XMM0 ZZ mov     esi, 1 
             407d10      3 INSTR BELONGTO 407cd0 
@@ -5844,14 +5844,14 @@
             407d5f     -1 INSTR LOCAL NoMetaUpdate call    _g_path_get_basename 
             407d5f      5 INSTR BELONGTO 407d40 
             407d5f      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_path_get_basename 
-            407d64     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407d64     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407d64      5 INSTR BELONGTO 407d40 
             407d64      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             407d69      3 INSTR BELONGTO 407d40 
             407d69      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     r12, rax 
             407d6c      2 INSTR BELONGTO 407d40 
             407d6c      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            407d6c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407d6c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407d6e      5 INSTR BELONGTO 407d40 
             407d6e      5 INSTR DEADREGS  EFLAGS RBX RSI R13 R14 R15 ZZ mov     esi, offset aSInformation; "%s Information" 
             407d73     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -5863,7 +5863,7 @@
             407d7b      3 INSTR DEADREGS  EFLAGS RBX RDI R13 R14 R15 ZZ mov     rdi, rax 
             407d7e      2 INSTR BELONGTO 407d40 
             407d7e      2 INSTR DEADREGS  EFLAGS RAX RBX R13 R14 R15 ZZ xor     eax, eax 
-            407d7e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407d7e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407d80     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             407d80      5 INSTR BELONGTO 407d40 
             407d80      5 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ call    _g_strdup_printf 
@@ -5894,7 +5894,7 @@
             407da6      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R14 R15 ZZ mov     r8d, 0FFFFFFF9h 
             407dac      5 INSTR BELONGTO 407d40 
             407dac      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 ZZ mov     ecx, offset aGtkClose; "gtk-close" 
-            407db1     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            407db1     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             407db1      5 INSTR BELONGTO 407d40 
             407db1      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 ZZ mov     edx, 2 
             407db6      3 INSTR BELONGTO 407d40 
@@ -5903,7 +5903,7 @@
             407db9      3 INSTR DEADREGS  EFLAGS RAX RDI R13 R14 R15 ZZ mov     rdi, rbx 
             407dbc      2 INSTR BELONGTO 407d40 
             407dbc      2 INSTR DEADREGS  EFLAGS RAX R13 R14 R15 ZZ xor     eax, eax 
-            407dbc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            407dbc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             407dbe     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_new_with_buttons 
             407dbe      5 INSTR BELONGTO 407d40 
             407dbe      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _gtk_dialog_new_with_buttons 
@@ -5923,7 +5923,7 @@
             407dd4      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R15 ZZ call    _g_type_check_instance_cast 
             407dd9      2 INSTR BELONGTO 407d40 
             407dd9      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R15 ZZ xor     esi, esi 
-            407dd9     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407dd9     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407ddb      3 INSTR BELONGTO 407d40 
             407ddb      3 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R15 ZZ mov     rdi, rax 
             407dde     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_resizable 
@@ -5941,7 +5941,7 @@
             407df1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407df1      5 INSTR BELONGTO 407d40 
             407df1      5 INSTR DEADREGS  EFLAGS RBX R13 R15 ZZ call    _g_type_check_instance_cast 
-            407df6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+            407df6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
             407df6      5 INSTR BELONGTO 407d40 
             407df6      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 R15 ZZ mov     esi, 5 
             407dfb      3 INSTR BELONGTO 407d40 
@@ -5978,7 +5978,7 @@
             407e2e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407e2e      5 INSTR BELONGTO 407d40 
             407e2e      5 INSTR DEADREGS  EFLAGS RBX R15 ZZ call    _g_type_check_instance_cast 
-            407e33     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            407e33     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             407e33      5 INSTR BELONGTO 407d40 
             407e33      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R15 ZZ mov     esi, 2 
             407e38      3 INSTR BELONGTO 407d40 
@@ -5986,13 +5986,13 @@
             407e3b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_set_spacing 
             407e3b      5 INSTR BELONGTO 407d40 
             407e3b      5 INSTR DEADREGS  EFLAGS RBX R15 ZZ call    _gtk_box_set_spacing 
-            407e40     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 40h 
+            407e40     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 40h 
             407e40      5 INSTR BELONGTO 407d40 
             407e40      5 INSTR DEADREGS  EFLAGS RBX RDI R15 ZZ mov     edi, 40h 
             407e45     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc 
             407e45      5 INSTR BELONGTO 407d40 
             407e45      5 INSTR DEADREGS  EFLAGS RBX R15 ZZ call    _g_malloc 
-            407e4a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            407e4a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             407e4a      5 INSTR BELONGTO 407d40 
             407e4a      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R15 ZZ mov     esi, 50h 
             407e4f      3 INSTR BELONGTO 407d40 
@@ -6012,7 +6012,7 @@
             407e60      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 ZZ xor     r8d, r8d 
             407e63      3 INSTR BELONGTO 407d40 
             407e63      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ mov     rcx, rbx 
-            407e66     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_4079F0 
+            407e66     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_4079F0 
             407e66      5 INSTR BELONGTO 407d40 
             407e66      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     edx, offset loc_4079F0 
             407e6b      5 INSTR BELONGTO 407d40 
@@ -6024,8 +6024,8 @@
             407e73      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _g_signal_connect_data 
             407e78      2 INSTR BELONGTO 407d40 
             407e78      2 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ xor     edi, edi 
-            407e78     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            407e7a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 12h 
+            407e78     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            407e7a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 12h 
             407e7a      5 INSTR BELONGTO 407d40 
             407e7a      5 INSTR DEADREGS  EFLAGS RSI R15 ZZ mov     esi, 12h 
             407e7f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_vbox_new 
@@ -6040,7 +6040,7 @@
             407e8d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407e8d      5 INSTR BELONGTO 407d40 
             407e8d      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_type_check_instance_cast 
-            407e92     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+            407e92     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
             407e92      5 INSTR BELONGTO 407d40 
             407e92      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 5 
             407e97      3 INSTR BELONGTO 407d40 
@@ -6073,10 +6073,10 @@
             407ec2     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             407ec2      3 INSTR BELONGTO 407d40 
             407ec2      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 ZZ xor     r8d, r8d 
-            407ec5     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            407ec5     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             407ec5      5 INSTR BELONGTO 407d40 
             407ec5      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     ecx, 1 
-            407eca     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            407eca     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             407eca      5 INSTR BELONGTO 407d40 
             407eca      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 1 
             407ecf      3 INSTR BELONGTO 407d40 
@@ -6088,8 +6088,8 @@
             407ed5      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _gtk_box_pack_start 
             407eda      2 INSTR BELONGTO 407d40 
             407eda      2 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ xor     edi, edi 
-            407eda     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            407edc     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            407eda     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            407edc     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             407edc      5 INSTR BELONGTO 407d40 
             407edc      5 INSTR DEADREGS  EFLAGS RSI R12 ZZ mov     esi, 6 
             407ee1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_vbox_new 
@@ -6109,10 +6109,10 @@
             407ef4      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             407ef7      2 INSTR BELONGTO 407d40 
             407ef7      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            407ef7     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            407ef7     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             407ef9      2 INSTR BELONGTO 407d40 
             407ef9      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            407ef9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407ef9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407efb      3 INSTR BELONGTO 407d40 
             407efb      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r12 
             407efe      3 INSTR BELONGTO 407d40 
@@ -6120,14 +6120,14 @@
             407f01     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             407f01      5 INSTR BELONGTO 407d40 
             407f01      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_box_pack_start 
-            407f06     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            407f06     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             407f06      5 INSTR BELONGTO 407d40 
             407f06      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             407f0b      5 INSTR BELONGTO 407d40 
             407f0b      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aFileInformatio; "File Information" 
             407f10      2 INSTR BELONGTO 407d40 
             407f10      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            407f10     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            407f10     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             407f12     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             407f12      5 INSTR BELONGTO 407d40 
             407f12      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -6154,10 +6154,10 @@
             407f34      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 ZZ xor     r8d, r8d 
             407f37      2 INSTR BELONGTO 407d40 
             407f37      2 INSTR DEADREGS  EFLAGS RCX RDX RDI ZZ xor     ecx, ecx 
-            407f37     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            407f37     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             407f39      2 INSTR BELONGTO 407d40 
             407f39      2 INSTR DEADREGS  EFLAGS RDX RDI ZZ xor     edx, edx 
-            407f39     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407f39     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407f3b      3 INSTR BELONGTO 407d40 
             407f3b      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             407f3e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
@@ -6165,10 +6165,10 @@
             407f3e      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_box_pack_start 
             407f43      2 INSTR BELONGTO 407d40 
             407f43      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            407f43     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            407f43     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             407f45      2 INSTR BELONGTO 407d40 
             407f45      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            407f45     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            407f45     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             407f47     -1 INSTR LOCAL NoMetaUpdate call    _gtk_hbox_new 
             407f47      5 INSTR BELONGTO 407d40 
             407f47      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_hbox_new 
@@ -6188,10 +6188,10 @@
             407f61     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             407f61      3 INSTR BELONGTO 407d40 
             407f61      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 R12 ZZ xor     r8d, r8d 
-            407f64     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            407f64     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             407f64      5 INSTR BELONGTO 407d40 
             407f64      5 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 ZZ mov     ecx, 1 
-            407f69     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            407f69     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             407f69      5 INSTR BELONGTO 407d40 
             407f69      5 INSTR DEADREGS  EFLAGS RDX RDI R12 ZZ mov     edx, 1 
             407f6e      3 INSTR BELONGTO 407d40 
@@ -6219,24 +6219,24 @@
             407f90      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             407f93      2 INSTR BELONGTO 407d40 
             407f93      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            407f93     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            407f93     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             407f95      3 INSTR BELONGTO 407d40 
             407f95      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rsi, r12 
             407f98      3 INSTR BELONGTO 407d40 
             407f98      3 INSTR DEADREGS  EFLAGS RDX RDI R12 ZZ mov     rdi, rax 
             407f9b      2 INSTR BELONGTO 407d40 
             407f9b      2 INSTR DEADREGS  EFLAGS RDX R12 ZZ xor     edx, edx 
-            407f9b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            407f9b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             407f9d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             407f9d      5 INSTR BELONGTO 407d40 
             407f9d      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _gtk_box_pack_start 
             407fa2      2 INSTR BELONGTO 407d40 
             407fa2      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ xor     edx, edx 
-            407fa2     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            407fa4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            407fa2     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            407fa4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             407fa4      5 INSTR BELONGTO 407d40 
             407fa4      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 2 
-            407fa9     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
+            407fa9     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
             407fa9      5 INSTR BELONGTO 407d40 
             407fa9      5 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     edi, 3 
             407fae     -1 INSTR LOCAL NoMetaUpdate call    _gtk_table_new 
@@ -6257,7 +6257,7 @@
             407fc6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407fc6      5 INSTR BELONGTO 407d40 
             407fc6      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-            407fcb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            407fcb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             407fcb      5 INSTR BELONGTO 407d40 
             407fcb      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 0Ch 
             407fd0      3 INSTR BELONGTO 407d40 
@@ -6273,7 +6273,7 @@
             407fe0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407fe0      5 INSTR BELONGTO 407d40 
             407fe0      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-            407fe5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            407fe5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             407fe5      5 INSTR BELONGTO 407d40 
             407fe5      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 6 
             407fea      3 INSTR BELONGTO 407d40 
@@ -6292,27 +6292,27 @@
             407fff     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             407fff      3 INSTR BELONGTO 407d40 
             407fff      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
-            408002     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            408002     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             408002      5 INSTR BELONGTO 407d40 
             408002      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, 1 
             408007      3 INSTR BELONGTO 407d40 
             408007      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rsi, r12 
             40800a      3 INSTR BELONGTO 407d40 
             40800a      3 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     rdi, rax 
-            40800d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40800d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40800d      5 INSTR BELONGTO 407d40 
             40800d      5 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, 1 
             408012     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             408012      5 INSTR BELONGTO 407d40 
             408012      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_box_pack_start 
-            408017     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            408017     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             408017      5 INSTR BELONGTO 407d40 
             408017      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             40801c      5 INSTR BELONGTO 407d40 
             40801c      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aFolder; "Folder:" 
             408021      2 INSTR BELONGTO 407d40 
             408021      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            408021     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            408021     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             408023     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408023      5 INSTR BELONGTO 407d40 
             408023      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -6323,10 +6323,10 @@
             40802b      5 INSTR DEADREGS  EFLAGS ZZ call    sub_406CD0 
             408030      2 INSTR BELONGTO 407d40 
             408030      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            408030     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408030     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408032      2 INSTR BELONGTO 407d40 
             408032      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            408032     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            408032     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408034      3 INSTR BELONGTO 407d40 
             408034      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
             408037      3 INSTR BELONGTO 407d40 
@@ -6341,27 +6341,27 @@
             408044      5 INSTR DEADREGS  EFLAGS ZZ call    sub_406CD0 
             408049      2 INSTR BELONGTO 407d40 
             408049      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            408049     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408049     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40804b      3 INSTR BELONGTO 407d40 
             40804b      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rsi, rax 
             40804e      3 INSTR BELONGTO 407d40 
             40804e      3 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     rdi, r12 
             408051      4 INSTR BELONGTO 407d40 
             408051      4 INSTR DEADREGS  EFLAGS RDX ZZ mov     [rbx+8], rax 
-            408055     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            408055     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             408055      5 INSTR BELONGTO 407d40 
             408055      5 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, 1 
             40805a     -1 INSTR LOCAL NoMetaUpdate call    sub_406C40 
             40805a      5 INSTR BELONGTO 407d40 
             40805a      5 INSTR DEADREGS  EFLAGS ZZ call    sub_406C40 
-            40805f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40805f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40805f      5 INSTR BELONGTO 407d40 
             40805f      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             408064      5 INSTR BELONGTO 407d40 
             408064      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aFilename; "Filename:" 
             408069      2 INSTR BELONGTO 407d40 
             408069      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            408069     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            408069     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40806b     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40806b      5 INSTR BELONGTO 407d40 
             40806b      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -6372,8 +6372,8 @@
             408073      5 INSTR DEADREGS  EFLAGS ZZ call    sub_406CD0 
             408078      2 INSTR BELONGTO 407d40 
             408078      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     edx, edx 
-            408078     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40807a     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            408078     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40807a     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40807a      5 INSTR BELONGTO 407d40 
             40807a      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ mov     ecx, 1 
             40807f      3 INSTR BELONGTO 407d40 
@@ -6388,7 +6388,7 @@
             40808f     -1 INSTR LOCAL NoMetaUpdate call    sub_406CD0 
             40808f      5 INSTR BELONGTO 407d40 
             40808f      5 INSTR DEADREGS  EFLAGS ZZ call    sub_406CD0 
-            408094     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            408094     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             408094      5 INSTR BELONGTO 407d40 
             408094      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, 1 
             408099      3 INSTR BELONGTO 407d40 
@@ -6397,20 +6397,20 @@
             40809c      3 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     rdi, r12 
             40809f      4 INSTR BELONGTO 407d40 
             40809f      4 INSTR DEADREGS  EFLAGS RDX ZZ mov     [rbx+10h], rax 
-            4080a3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4080a3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4080a3      5 INSTR BELONGTO 407d40 
             4080a3      5 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, 1 
             4080a8     -1 INSTR LOCAL NoMetaUpdate call    sub_406C40 
             4080a8      5 INSTR BELONGTO 407d40 
             4080a8      5 INSTR DEADREGS  EFLAGS ZZ call    sub_406C40 
-            4080ad     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4080ad     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4080ad      5 INSTR BELONGTO 407d40 
             4080ad      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             4080b2      5 INSTR BELONGTO 407d40 
             4080b2      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aFileSize; "File size:" 
             4080b7      2 INSTR BELONGTO 407d40 
             4080b7      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            4080b7     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4080b7     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4080b9     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4080b9      5 INSTR BELONGTO 407d40 
             4080b9      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -6421,8 +6421,8 @@
             4080c1      5 INSTR DEADREGS  EFLAGS ZZ call    sub_406CD0 
             4080c6      2 INSTR BELONGTO 407d40 
             4080c6      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     edx, edx 
-            4080c6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            4080c8     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            4080c6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            4080c8     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             4080c8      5 INSTR BELONGTO 407d40 
             4080c8      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ mov     ecx, 2 
             4080cd      3 INSTR BELONGTO 407d40 
@@ -6437,10 +6437,10 @@
             4080dd     -1 INSTR LOCAL NoMetaUpdate call    sub_406CD0 
             4080dd      5 INSTR BELONGTO 407d40 
             4080dd      5 INSTR DEADREGS  EFLAGS ZZ call    sub_406CD0 
-            4080e2     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            4080e2     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             4080e2      5 INSTR BELONGTO 407d40 
             4080e2      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, 2 
-            4080e7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4080e7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4080e7      5 INSTR BELONGTO 407d40 
             4080e7      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 1 
             4080ec      3 INSTR BELONGTO 407d40 
@@ -6454,8 +6454,8 @@
             4080f6      5 INSTR DEADREGS  EFLAGS R12 ZZ call    sub_406C40 
             4080fb      2 INSTR BELONGTO 407d40 
             4080fb      2 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ xor     edi, edi 
-            4080fb     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            4080fd     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            4080fb     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            4080fd     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             4080fd      5 INSTR BELONGTO 407d40 
             4080fd      5 INSTR DEADREGS  EFLAGS RSI R12 ZZ mov     esi, 6 
             408102     -1 INSTR LOCAL NoMetaUpdate call    _gtk_vbox_new 
@@ -6475,10 +6475,10 @@
             408115      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 ZZ xor     r8d, r8d 
             408118      2 INSTR BELONGTO 407d40 
             408118      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ xor     ecx, ecx 
-            408118     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408118     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40811a      2 INSTR BELONGTO 407d40 
             40811a      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ xor     edx, edx 
-            40811a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40811a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40811c      3 INSTR BELONGTO 407d40 
             40811c      3 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     rsi, r12 
             40811f      3 INSTR BELONGTO 407d40 
@@ -6486,14 +6486,14 @@
             408122     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             408122      5 INSTR BELONGTO 407d40 
             408122      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _gtk_box_pack_start 
-            408127     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            408127     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             408127      5 INSTR BELONGTO 407d40 
             408127      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     edx, 5          ; category 
             40812c      5 INSTR BELONGTO 407d40 
             40812c      5 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     esi, offset aAudioInformati; "Audio Information" 
             408131      2 INSTR BELONGTO 407d40 
             408131      2 INSTR DEADREGS  EFLAGS RDI R15 ZZ xor     edi, edi        ; domainname 
-            408131     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            408131     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             408133     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408133      5 INSTR BELONGTO 407d40 
             408133      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _dcgettext 
@@ -6516,10 +6516,10 @@
             40814e      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             408151      2 INSTR BELONGTO 407d40 
             408151      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            408151     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408151     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408153      2 INSTR BELONGTO 407d40 
             408153      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            408153     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            408153     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408155      3 INSTR BELONGTO 407d40 
             408155      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r15 
             408158      3 INSTR BELONGTO 407d40 
@@ -6529,10 +6529,10 @@
             40815b      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _gtk_box_pack_start 
             408160      2 INSTR BELONGTO 407d40 
             408160      2 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ xor     esi, esi 
-            408160     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            408160     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             408162      2 INSTR BELONGTO 407d40 
             408162      2 INSTR DEADREGS  EFLAGS RDI R15 ZZ xor     edi, edi 
-            408162     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408162     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408164     -1 INSTR LOCAL NoMetaUpdate call    _gtk_hbox_new 
             408164      5 INSTR BELONGTO 407d40 
             408164      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _gtk_hbox_new 
@@ -6548,10 +6548,10 @@
             408177     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             408177      3 INSTR BELONGTO 407d40 
             408177      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 ZZ xor     r8d, r8d 
-            40817a     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40817a     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40817a      5 INSTR BELONGTO 407d40 
             40817a      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     ecx, 1 
-            40817f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40817f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40817f      5 INSTR BELONGTO 407d40 
             40817f      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 1 
             408184      3 INSTR BELONGTO 407d40 
@@ -6580,10 +6580,10 @@
             4081a7      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             4081aa      2 INSTR BELONGTO 407d40 
             4081aa      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            4081aa     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4081aa     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4081ac      2 INSTR BELONGTO 407d40 
             4081ac      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            4081ac     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4081ac     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4081ae      3 INSTR BELONGTO 407d40 
             4081ae      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, r12 
             4081b1      3 INSTR BELONGTO 407d40 
@@ -6593,11 +6593,11 @@
             4081b4      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _gtk_box_pack_start 
             4081b9      2 INSTR BELONGTO 407d40 
             4081b9      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ xor     edx, edx 
-            4081b9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            4081bb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            4081b9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            4081bb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             4081bb      5 INSTR BELONGTO 407d40 
             4081bb      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 2 
-            4081c0     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 4 
+            4081c0     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 4 
             4081c0      5 INSTR BELONGTO 407d40 
             4081c0      5 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     edi, 4 
             4081c5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_table_new 
@@ -6613,7 +6613,7 @@
             4081d5     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4081d5      5 INSTR BELONGTO 407d40 
             4081d5      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-            4081da     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            4081da     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             4081da      5 INSTR BELONGTO 407d40 
             4081da      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 0Ch 
             4081df      3 INSTR BELONGTO 407d40 
@@ -6629,7 +6629,7 @@
             4081ef     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4081ef      5 INSTR BELONGTO 407d40 
             4081ef      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-            4081f4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            4081f4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             4081f4      5 INSTR BELONGTO 407d40 
             4081f4      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 6 
             4081f9      3 INSTR BELONGTO 407d40 
@@ -6647,12 +6647,12 @@
             40820c     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40820c      3 INSTR BELONGTO 407d40 
             40820c      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R15 ZZ xor     r8d, r8d 
-            40820f     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40820f     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40820f      5 INSTR BELONGTO 407d40 
             40820f      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 ZZ mov     ecx, 1 
             408214      3 INSTR BELONGTO 407d40 
             408214      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 ZZ mov     rdi, rax 
-            408217     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            408217     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             408217      5 INSTR BELONGTO 407d40 
             408217      5 INSTR DEADREGS  EFLAGS RDX RSI R13 R15 ZZ mov     edx, 1 
             40821c      3 INSTR BELONGTO 407d40 
@@ -6660,14 +6660,14 @@
             40821f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40821f      5 INSTR BELONGTO 407d40 
             40821f      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    _gtk_box_pack_start 
-            408224     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            408224     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             408224      5 INSTR BELONGTO 407d40 
             408224      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 ZZ mov     edx, 5          ; category 
             408229      5 INSTR BELONGTO 407d40 
             408229      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 ZZ mov     esi, offset aFileDuration; "File duration:" 
             40822e      2 INSTR BELONGTO 407d40 
             40822e      2 INSTR DEADREGS  EFLAGS RDI R13 R15 ZZ xor     edi, edi        ; domainname 
-            40822e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40822e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             408230     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408230      5 INSTR BELONGTO 407d40 
             408230      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    _dcgettext 
@@ -6678,10 +6678,10 @@
             408238      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    sub_406CD0 
             40823d      2 INSTR BELONGTO 407d40 
             40823d      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 ZZ xor     ecx, ecx 
-            40823d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40823d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40823f      2 INSTR BELONGTO 407d40 
             40823f      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 ZZ xor     edx, edx 
-            40823f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40823f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408241      3 INSTR BELONGTO 407d40 
             408241      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 ZZ mov     rsi, rax 
             408244      3 INSTR BELONGTO 407d40 
@@ -6696,12 +6696,12 @@
             408251      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    sub_406CD0 
             408256      2 INSTR BELONGTO 407d40 
             408256      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 ZZ xor     ecx, ecx 
-            408256     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408256     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408258      3 INSTR BELONGTO 407d40 
             408258      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 ZZ mov     rsi, rax 
             40825b      4 INSTR BELONGTO 407d40 
             40825b      4 INSTR DEADREGS  EFLAGS RDX RDI R13 R15 ZZ mov     [rbx+20h], rax 
-            40825f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40825f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40825f      5 INSTR BELONGTO 407d40 
             40825f      5 INSTR DEADREGS  EFLAGS RDX RDI R13 R15 ZZ mov     edx, 1 
             408264      3 INSTR BELONGTO 407d40 
@@ -6709,14 +6709,14 @@
             408267     -1 INSTR LOCAL NoMetaUpdate call    sub_406C40 
             408267      5 INSTR BELONGTO 407d40 
             408267      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    sub_406C40 
-            40826c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40826c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40826c      5 INSTR BELONGTO 407d40 
             40826c      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 ZZ mov     edx, 5          ; category 
             408271      5 INSTR BELONGTO 407d40 
             408271      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 ZZ mov     esi, offset aNumberOfChanne; "Number of channels:" 
             408276      2 INSTR BELONGTO 407d40 
             408276      2 INSTR DEADREGS  EFLAGS RDI R13 R15 ZZ xor     edi, edi        ; domainname 
-            408276     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            408276     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             408278     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408278      5 INSTR BELONGTO 407d40 
             408278      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    _dcgettext 
@@ -6727,8 +6727,8 @@
             408280      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    sub_406CD0 
             408285      2 INSTR BELONGTO 407d40 
             408285      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 ZZ xor     edx, edx 
-            408285     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            408287     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            408285     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            408287     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             408287      5 INSTR BELONGTO 407d40 
             408287      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R13 R15 ZZ mov     ecx, 1 
             40828c      3 INSTR BELONGTO 407d40 
@@ -6743,14 +6743,14 @@
             40829c     -1 INSTR LOCAL NoMetaUpdate call    sub_406CD0 
             40829c      5 INSTR BELONGTO 407d40 
             40829c      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    sub_406CD0 
-            4082a1     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            4082a1     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             4082a1      5 INSTR BELONGTO 407d40 
             4082a1      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 ZZ mov     ecx, 1 
             4082a6      3 INSTR BELONGTO 407d40 
             4082a6      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 ZZ mov     rsi, rax 
             4082a9      4 INSTR BELONGTO 407d40 
             4082a9      4 INSTR DEADREGS  EFLAGS RDX RDI R13 R15 ZZ mov     [rbx+30h], rax 
-            4082ad     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4082ad     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4082ad      5 INSTR BELONGTO 407d40 
             4082ad      5 INSTR DEADREGS  EFLAGS RDX RDI R13 R15 ZZ mov     edx, 1 
             4082b2      3 INSTR BELONGTO 407d40 
@@ -6758,14 +6758,14 @@
             4082b5     -1 INSTR LOCAL NoMetaUpdate call    sub_406C40 
             4082b5      5 INSTR BELONGTO 407d40 
             4082b5      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    sub_406C40 
-            4082ba     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4082ba     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4082ba      5 INSTR BELONGTO 407d40 
             4082ba      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 ZZ mov     edx, 5          ; category 
             4082bf      5 INSTR BELONGTO 407d40 
             4082bf      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 ZZ mov     esi, offset aSampleRate; "Sample rate:" 
             4082c4      2 INSTR BELONGTO 407d40 
             4082c4      2 INSTR DEADREGS  EFLAGS RDI R13 R15 ZZ xor     edi, edi        ; domainname 
-            4082c4     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4082c4     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4082c6     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4082c6      5 INSTR BELONGTO 407d40 
             4082c6      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    _dcgettext 
@@ -6776,8 +6776,8 @@
             4082ce      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    sub_406CD0 
             4082d3      2 INSTR BELONGTO 407d40 
             4082d3      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 ZZ xor     edx, edx 
-            4082d3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            4082d5     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            4082d3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            4082d5     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             4082d5      5 INSTR BELONGTO 407d40 
             4082d5      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R13 R15 ZZ mov     ecx, 2 
             4082da      3 INSTR BELONGTO 407d40 
@@ -6792,14 +6792,14 @@
             4082ea     -1 INSTR LOCAL NoMetaUpdate call    sub_406CD0 
             4082ea      5 INSTR BELONGTO 407d40 
             4082ea      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    sub_406CD0 
-            4082ef     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            4082ef     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             4082ef      5 INSTR BELONGTO 407d40 
             4082ef      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 ZZ mov     ecx, 2 
             4082f4      3 INSTR BELONGTO 407d40 
             4082f4      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 ZZ mov     rsi, rax 
             4082f7      4 INSTR BELONGTO 407d40 
             4082f7      4 INSTR DEADREGS  EFLAGS RDX RDI R13 R15 ZZ mov     [rbx+28h], rax 
-            4082fb     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4082fb     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4082fb      5 INSTR BELONGTO 407d40 
             4082fb      5 INSTR DEADREGS  EFLAGS RDX RDI R13 R15 ZZ mov     edx, 1 
             408300      3 INSTR BELONGTO 407d40 
@@ -6807,14 +6807,14 @@
             408303     -1 INSTR LOCAL NoMetaUpdate call    sub_406C40 
             408303      5 INSTR BELONGTO 407d40 
             408303      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    sub_406C40 
-            408308     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            408308     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             408308      5 INSTR BELONGTO 407d40 
             408308      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 ZZ mov     edx, 5          ; category 
             40830d      5 INSTR BELONGTO 407d40 
             40830d      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 ZZ mov     esi, offset aBitRate; "Bit rate:" 
             408312      2 INSTR BELONGTO 407d40 
             408312      2 INSTR DEADREGS  EFLAGS RDI R13 R15 ZZ xor     edi, edi        ; domainname 
-            408312     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            408312     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             408314     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408314      5 INSTR BELONGTO 407d40 
             408314      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    _dcgettext 
@@ -6825,8 +6825,8 @@
             40831c      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    sub_406CD0 
             408321      2 INSTR BELONGTO 407d40 
             408321      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 ZZ xor     edx, edx 
-            408321     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            408323     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
+            408321     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            408323     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
             408323      5 INSTR BELONGTO 407d40 
             408323      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R13 R15 ZZ mov     ecx, 3 
             408328      3 INSTR BELONGTO 407d40 
@@ -6847,10 +6847,10 @@
             408340      4 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R13 R15 ZZ mov     [rbx+38h], rax 
             408344      3 INSTR BELONGTO 407d40 
             408344      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R13 R15 ZZ mov     rsi, rax 
-            408347     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
+            408347     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
             408347      5 INSTR BELONGTO 407d40 
             408347      5 INSTR DEADREGS  EFLAGS RCX RDX R12 R13 R15 ZZ mov     ecx, 3 
-            40834c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40834c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40834c      5 INSTR BELONGTO 407d40 
             40834c      5 INSTR DEADREGS  EFLAGS RDX R12 R13 R15 ZZ mov     edx, 1 
             408351     -1 INSTR LOCAL NoMetaUpdate call    sub_406C40 
@@ -6895,10 +6895,10 @@
             408399      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R15 ZZ xor     r8d, r8d 
             40839c      2 INSTR BELONGTO 407d40 
             40839c      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 ZZ xor     ecx, ecx 
-            40839c     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40839c     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40839e      2 INSTR BELONGTO 407d40 
             40839e      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 ZZ xor     edx, edx 
-            40839e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40839e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4083a0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             4083a0      7 INSTR BELONGTO 407d40 
             4083a0      7 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -6919,14 +6919,14 @@
             4083bf      2 INSTR BELONGTO 407d40 
             4083c1     -1 INSTR LOCAL NoMetaUpdate jz      loc_4086D0 
             4083c1      6 INSTR BELONGTO 407d40 
-            4083c7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4083c7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4083c7      5 INSTR BELONGTO 407d40 
             4083c7      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             4083cc      5 INSTR BELONGTO 407d40 
             4083cc      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aSHasNotBeenSav; "%s (Has not been saved)" 
             4083d1      2 INSTR BELONGTO 407d40 
             4083d1      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            4083d1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4083d1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4083d3     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4083d3      5 INSTR BELONGTO 407d40 
             4083d3      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -6936,7 +6936,7 @@
             4083db      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             4083de      2 INSTR BELONGTO 407d40 
             4083de      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4083de     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4083de     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4083e0     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             4083e0      5 INSTR BELONGTO 407d40 
             4083e0      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strdup_printf 
@@ -6979,7 +6979,7 @@
             408421      5 INSTR BELONGTO 407d40 
             408421      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 ZZ lea     rdx, [rsp+0E8h+stat_buf]; stat_buf 
             408421      5 PTRIMMEDESP STACK 32 displ lea     rdx, [rsp+0E8h+stat_buf]; stat_buf
-            408426     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            408426     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             408426      5 INSTR BELONGTO 407d40 
             408426      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 ZZ mov     edi, 1          ; ver 
             40842b      7 INSTR BELONGTO 407d40 
@@ -7012,7 +7012,7 @@
             40845d      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aSLluByte; "%s (%llu byte)" 
             408462      2 INSTR BELONGTO 407d40 
             408462      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            408462     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            408462     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             408464     -1 INSTR LOCAL NoMetaUpdate call    _dcngettext 
             408464      5 INSTR BELONGTO 407d40 
             408464      5 INSTR DEADREGS  EFLAGS ZZ call    _dcngettext 
@@ -7024,7 +7024,7 @@
             40846f      3 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     rsi, r15 
             408472      2 INSTR BELONGTO 407d40 
             408472      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            408472     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408472     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408474     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             408474      5 INSTR BELONGTO 407d40 
             408474      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strdup_printf 
@@ -7065,14 +7065,14 @@
             4084b3      2 INSTR BELONGTO 407d40 
             4084b5     -1 INSTR LOCAL NoMetaUpdate jnz     loc_408698 
             4084b5      6 INSTR BELONGTO 407d40 
-            4084bb     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4084bb     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4084bb      5 INSTR BELONGTO 407d40 
             4084bb      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     edx, 5          ; category 
             4084c0      5 INSTR BELONGTO 407d40 
             4084c0      5 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     esi, offset aUnknown; "Unknown" 
             4084c5      2 INSTR BELONGTO 407d40 
             4084c5      2 INSTR DEADREGS  EFLAGS RDI R15 ZZ xor     edi, edi        ; domainname 
-            4084c5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4084c5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4084c7     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4084c7      5 INSTR BELONGTO 407d40 
             4084c7      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _dcgettext 
@@ -7108,7 +7108,7 @@
             4084f6      3 INSTR BELONGTO 407d40 
             4084f9      4 INSTR BELONGTO 407d40 
             4084f9      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R15 ZZ mov     rax, [rbp+38h] 
-            4084fd     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4084fd     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4084fd      5 INSTR BELONGTO 407d40 
             4084fd      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     edx, 5          ; category 
             408502     -2 INSTR LOCAL n R15 ZZ  NumericDEFs mov     r15d, [rax+0ECh] 
@@ -7122,7 +7122,7 @@
             408512      5 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     esi, offset aUnknown; "Unknown" 
             408517      2 INSTR BELONGTO 407d40 
             408517      2 INSTR DEADREGS  EFLAGS RDI R15 ZZ xor     edi, edi        ; domainname 
-            408517     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            408517     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             408519     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408519      5 INSTR BELONGTO 407d40 
             408519      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _dcgettext 
@@ -7162,14 +7162,14 @@
             408556      3 INSTR BELONGTO 407d40 
             408559     -1 INSTR LOCAL NoMetaUpdate jle     loc_408730 
             408559      6 INSTR BELONGTO 407d40 
-            40855f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40855f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40855f      5 INSTR BELONGTO 407d40 
             40855f      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 XMM1 ZZ mov     edx, 5          ; category 
             408564      5 INSTR BELONGTO 407d40 
             408564      5 INSTR DEADREGS  EFLAGS RSI RDI R13 XMM1 ZZ mov     esi, offset a_0fKbS; "%.0f kb/s" 
             408569      2 INSTR BELONGTO 407d40 
             408569      2 INSTR DEADREGS  EFLAGS RDI R13 XMM1 ZZ xor     edi, edi        ; domainname 
-            408569     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            408569     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40856b     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40856b      5 INSTR BELONGTO 407d40 
             40856b      5 INSTR DEADREGS  EFLAGS R13 XMM1 ZZ call    _dcgettext 
@@ -7179,7 +7179,7 @@
             408575      8 INSTR BELONGTO 407d40 
             40857d      3 INSTR BELONGTO 407d40 
             40857d      3 INSTR DEADREGS  EFLAGS RDI R13 R15 XMM1 ZZ mov     rdi, rax 
-            408580     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            408580     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             408580      5 INSTR BELONGTO 407d40 
             408580      5 INSTR DEADREGS  EFLAGS RAX R13 R15 XMM1 ZZ mov     eax, 1 
             408585     -1 INSTR LOCAL NoMetaUpdate unpcklps xmm0, xmm0 
@@ -7228,14 +7228,14 @@
             4085d1      2 INSTR BELONGTO 407d40 
             4085d3     -1 INSTR LOCAL NoMetaUpdate jnz     loc_4086E8 
             4085d3      6 INSTR BELONGTO 407d40 
-            4085d9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4085d9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4085d9      5 INSTR BELONGTO 407d40 
             4085d9      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 XMM0 XMM1 ZZ mov     edx, 5          ; category 
             4085de      5 INSTR BELONGTO 407d40 
             4085de      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM0 XMM1 ZZ mov     esi, offset aUnknown; "Unknown" 
             4085e3      2 INSTR BELONGTO 407d40 
             4085e3      2 INSTR DEADREGS  EFLAGS RDI R13 R15 XMM0 XMM1 ZZ xor     edi, edi        ; domainname 
-            4085e3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4085e3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4085e5     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4085e5      5 INSTR BELONGTO 407d40 
             4085e5      5 INSTR DEADREGS  EFLAGS R13 R15 XMM0 XMM1 ZZ call    _dcgettext 
@@ -7258,10 +7258,10 @@
             40860c      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 R15 ZZ xor     r8d, r8d 
             40860f      2 INSTR BELONGTO 407d40 
             40860f      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R15 ZZ xor     ecx, ecx 
-            40860f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40860f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408611      2 INSTR BELONGTO 407d40 
             408611      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R15 ZZ xor     edx, edx 
-            408611     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            408611     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408613     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             408613      7 INSTR BELONGTO 407d40 
             408613      7 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -7309,7 +7309,7 @@
             408660      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset a_1fKhz; "%.1f kHz" 
             408665      2 INSTR BELONGTO 407d40 
             408665      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            408665     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            408665     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             408667     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408667      5 INSTR BELONGTO 407d40 
             408667      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -7317,7 +7317,7 @@
             40866c      5 INSTR BELONGTO 407d40 
             408671      3 INSTR BELONGTO 407d40 
             408671      3 INSTR DEADREGS  EFLAGS RDI R15 ZZ mov     rdi, rax 
-            408674     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            408674     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             408674      5 INSTR BELONGTO 407d40 
             408674      5 INSTR DEADREGS  EFLAGS RAX R15 ZZ mov     eax, 1 
             408679     -1 INSTR LOCAL NoMetaUpdate divss   xmm0, cs:dword_40E9F8 
@@ -7341,14 +7341,14 @@
             40869d      3 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     r15, rax 
             4086a0     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4084D7 
             4086a0      5 INSTR BELONGTO 407d40 
-            4086a8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4086a8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4086a8      5 INSTR BELONGTO 407d40 
             4086a8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 ZZ mov     edx, 5          ; category 
             4086ad      5 INSTR BELONGTO 407d40 
             4086ad      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 ZZ mov     esi, offset aUnknownSize; "Unknown size" 
             4086b2      2 INSTR BELONGTO 407d40 
             4086b2      2 INSTR DEADREGS  EFLAGS RDI R13 R15 ZZ xor     edi, edi        ; domainname 
-            4086b2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4086b2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             4086b4     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4086b4      5 INSTR BELONGTO 407d40 
             4086b4      5 INSTR DEADREGS  EFLAGS R13 R15 ZZ call    _dcgettext 
@@ -7379,7 +7379,7 @@
             4086e8      5 INSTR DEADREGS  EFLAGS RAX RDI R13 R15 XMM0 XMM1 ZZ mov     edi, offset aD  ; "%d" 
             4086ed      2 INSTR BELONGTO 407d40 
             4086ed      2 INSTR DEADREGS  EFLAGS RAX R13 R15 XMM0 XMM1 ZZ xor     eax, eax 
-            4086ed     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4086ed     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4086ef     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             4086ef      5 INSTR BELONGTO 407d40 
             4086ef      5 INSTR DEADREGS  EFLAGS R13 R15 XMM0 XMM1 ZZ call    _g_strdup_printf 
@@ -7431,7 +7431,7 @@
             408733     -2 INSTR LOCAL n R15 ZZ  NumericDEFs mov     r15d, [rax+0DCh] 
             408733      7 INSTR BELONGTO 407d40 
             408733      7 INSTR DEADREGS  RDX RSI RDI R15 ZZ mov     r15d, [rax+0DCh] 
-            40873a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40873a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40873a      5 INSTR BELONGTO 407d40 
             40873a      5 INSTR DEADREGS  RDX RSI RDI ZZ mov     edx, 5          ; category 
             40873f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_408780 
@@ -7442,7 +7442,7 @@
             408744      2 INSTR BELONGTO 407d40 
             408746      2 INSTR BELONGTO 407d40 
             408746      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     edi, edi        ; domainname 
-            408746     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            408746     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             408748      5 INSTR BELONGTO 407d40 
             408748      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset a_0fKbSEstimate; "%.0f kb/s (Estimated)" 
             40874d     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -7470,7 +7470,7 @@
             408780      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM0 XMM1 ZZ mov     esi, offset aUnknown; "Unknown" 
             408785      2 INSTR BELONGTO 407d40 
             408785      2 INSTR DEADREGS  EFLAGS RDI R13 R15 XMM0 XMM1 ZZ xor     edi, edi        ; domainname 
-            408785     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            408785     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             408787     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408787      5 INSTR BELONGTO 407d40 
             408787      5 INSTR DEADREGS  EFLAGS R13 R15 XMM0 XMM1 ZZ call    _dcgettext 
@@ -7483,14 +7483,14 @@
             408794      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM0 XMM1 ZZ mov     r13, rax 
             408797     -1 INSTR LOCAL NoMetaUpdate jmp     loc_408593 
             408797      5 INSTR BELONGTO 407d40 
-            4087a0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4087a0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             4087a0      5 INSTR BELONGTO 407d40 
             4087a0      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 XMM0 XMM1 ZZ mov     edx, 5 
             4087a5      5 INSTR BELONGTO 407d40 
             4087a5      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 XMM0 XMM1 ZZ mov     esi, offset a2Stereo; "2 (stereo)" 
             4087aa     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4085E3 
             4087aa      5 INSTR BELONGTO 407d40 
-            4087b0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4087b0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             4087b0      5 INSTR BELONGTO 407d40 
             4087b0      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 XMM0 XMM1 ZZ mov     edx, 5 
             4087b5      5 INSTR BELONGTO 407d40 
@@ -7990,12 +7990,12 @@
             408b32      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ mov     ecx, offset aProfile_chan_0; "profile_changed_cb" 
             408b37      5 INSTR BELONGTO 408a90 
             408b37      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aGsrWindow_c; "gsr-window.c" 
-            408b3c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            408b3c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             408b3c      5 INSTR BELONGTO 408a90 
             408b3c      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 4 
             408b41      2 INSTR BELONGTO 408a90 
             408b41      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            408b41     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408b41     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408b43      8 INSTR BELONGTO 408a90 
             408b43      8 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+18h+var_18], offset aProfileChanged; "profile changed to %s" 
             408b43      8 PTRIMMEDESP STACK 0 displ mov     [rsp+18h+var_18], offset aProfileChanged; "profile changed to %s"
@@ -8008,7 +8008,7 @@
             408b57      3 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ mov     rdx, rbx 
             408b5a      2 INSTR BELONGTO 408a90 
             408b5a      2 INSTR DEADREGS  EFLAGS RCX RSI ZZ xor     ecx, ecx 
-            408b5a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408b5a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408b5c      5 INSTR BELONGTO 408a90 
             408b5c      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aAppsGnomeSou_0; "/apps/gnome-sound-recorder/last-profile"... 
             408b61     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_set_string 
@@ -8044,8 +8044,8 @@
             408bc9     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 740h 
             408bcf     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             408bd2      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-            408be1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
-            408be6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408be1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            408be6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408be8      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], offset aRecordInputCha; "record input changed to '%s'"
             408bf0     -1 INSTR LOCAL NoMetaUpdate call    _gst_debug_log 
             408bf5     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -8078,7 +8078,7 @@
             408c88     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_610920, r13 
             408c8f     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_408C60 
             408c91      4 PTRIMMEDEBP STACK 56 displ mov     rax, [rbp+38h]
-            408c95     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            408c95     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408ca1     -1 INSTR LOCAL NoMetaUpdate call    _gst_mixer_set_record 
             408ca6     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_408C60 
             408cb7     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
@@ -8087,18 +8087,18 @@
             408cc1     -1 INSTR LOCAL NoMetaUpdate test    r14, r14 
             408ccb     -1 INSTR LOCAL NoMetaUpdate jz      loc_408C16 
             408cd1      4 PTRIMMEDEBP STACK 56 displ mov     rax, [rbp+38h]
-            408cd5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            408cd5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             408ce4     -1 INSTR LOCAL NoMetaUpdate call    _gst_mixer_set_record 
             408ce9     -1 INSTR LOCAL NoMetaUpdate cmp     cs:__gst_debug_min, 3 
             408cf0     -1 INSTR LOCAL NoMetaUpdate jbe     short loc_408D30 
             408d00     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             408d03     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 766h 
-            408d13     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            408d13     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             408d1c      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], offset aInputChangedTo; "input changed to: %s\n"
             408d24      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-            408d29     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408d29     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408d2b     -1 INSTR LOCAL NoMetaUpdate call    _gst_debug_log 
-            408d3e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408d3e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408d49     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
             408d55     -1 INSTR LOCAL NoMetaUpdate jmp     _gconf_client_set_string 
             408d5d     -1 INSTR LOCAL NoMetaUpdate call    _g_object_ref 
@@ -8120,22 +8120,22 @@
             408dc0      5 PTRIMMEDESP STACK 24 displ mov     r13, [rsp+18h]
             408dc5      5 PTRIMMEDESP STACK 32 displ mov     r14, [rsp+20h]
             408dca     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
-            408dd0     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            408dd2     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            408dd0     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            408dd2     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             408dd7     -1 INSTR LOCAL NoMetaUpdate call    _g_filename_from_uri 
             408ddc     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             408de2     -1 INSTR LOCAL NoMetaUpdate jz      short loc_408E37 
-            408de4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            408de4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             408dec     -1 INSTR LOCAL NoMetaUpdate call    _g_file_test 
             408df1     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             408df3     -1 INSTR LOCAL NoMetaUpdate jz      short loc_408E68 
             408dfa     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rax+0F0h], 1 
             408e01     -1 INSTR LOCAL NoMetaUpdate jz      loc_408F40 
-            408e07     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            408e07     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             408e0f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            408e14     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            408e14     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             408e19      3 PTRIMMEDEBP STACK 0 displ mov     rdx, rbp
-            408e1c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408e1c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408e23     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             408e37      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             408e3a     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
@@ -8147,20 +8147,20 @@
             408e5a     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
             408e5e     -1 INSTR LOCAL NoMetaUpdate jmp     _g_free 
             408e68     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            408e6b     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            408e6d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            408e6b     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            408e6d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408e6f      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             408e72     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             408e79     -1 INSTR LOCAL NoMetaUpdate call    _g_filename_to_utf8 
-            408e7e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            408e83     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408e7e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            408e83     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408e8d     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             408e95     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             408ea0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            408eab     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            408eb0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
-            408eb5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
-            408ebd     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408eab     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            408eb0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            408eb5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            408ebd     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408ebf     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             408eca     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             408ecf     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_type 
@@ -8168,7 +8168,7 @@
             408ee2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_run 
             408eea     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_destroy 
             408eef     -1 INSTR LOCAL NoMetaUpdate call    _gtk_recent_manager_get_default 
-            408ef4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            408ef4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             408efc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_recent_manager_remove_item 
             408f04     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             408f09     -1 INSTR LOCAL NoMetaUpdate jmp     loc_408E37 
@@ -8177,7 +8177,7 @@
             408f1e      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
             408f23      5 PTRIMMEDESP STACK 24 displ mov     r13, [rsp+18h]
             408f2d      5 PTRIMMEDESP STACK 32 displ mov     r14, [rsp+20h]
-            408f32     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            408f32     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             408f34     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
             408f38     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
             408f40      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -8186,16 +8186,16 @@
             408f50      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
             408f55      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
             408f5d      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
-            408f62     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            408f62     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             408f6b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             408f78     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get_data 
             408f7d     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             408f80     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409000 
-            408f82     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            408f82     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             408f8a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             408f8f      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+8]
-            408f94     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            408f9e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            408f94     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            408f9e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             408fa0     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             408fa5      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
             408faa     -1 INSTR LOCAL NoMetaUpdate test    rbp, rbp 
@@ -8210,7 +8210,7 @@
             408fec      5 PTRIMMEDESP STACK 24 displ mov     rbp, [rsp+18h]
             408ff1      5 PTRIMMEDESP STACK 32 displ mov     r12, [rsp+20h]
             408ff6     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
-            40900a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40900a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40900c     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             409011     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_408FE7 
             40902b     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
@@ -8220,9 +8220,9 @@
             409036     -1 INSTR LOCAL NoMetaUpdate divsd   xmm0, cs:qword_40EA00 
             40903e     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm1, dword ptr [rdx+0DCh] 
             409046     -1 INSTR LOCAL NoMetaUpdate mulsd   xmm1, xmm0 
-            40904a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM cvttsd2si edi, xmm1 
+            40904a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM cvttsd2si edi, xmm1 
             40904e     -1 INSTR LOCAL NoMetaUpdate jmp     loc_406BD0 
-            409058     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM cvttsd2si edi, xmm0 
+            409058     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM cvttsd2si edi, xmm0 
             40905c     -1 INSTR LOCAL NoMetaUpdate jmp     loc_406BD0 
             409070      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             409070      0 FUNC MMSAFENESS SAFE
@@ -8241,7 +8241,7 @@
             409081      3 INSTR BELONGTO 409070 
             409084      3 INSTR BELONGTO 409070 
             409084      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, [rbx] 
-            409087     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            409087     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             409087      5 INSTR BELONGTO 409070 
             409087      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
             40908c     -1 INSTR LOCAL NoMetaUpdate call    _gst_bus_set_flushing 
@@ -8254,7 +8254,7 @@
             409094      5 INSTR DEADREGS  EFLAGS ZZ call    _gst_bus_remove_signal_watch 
             409099      4 INSTR BELONGTO 409070 
             409099      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, [rbp+0] 
-            40909d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40909d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40909d      5 INSTR BELONGTO 409070 
             40909d      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
             4090a2     -1 INSTR LOCAL NoMetaUpdate call    _gst_element_set_state 
@@ -8342,7 +8342,7 @@
             409129     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             409129      3 INSTR BELONGTO 4090d0 
             409129      3 INSTR DEADREGS  EFLAGS RDX RSI R8 ZZ xor     r8d, r8d 
-            40912c     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_408F50 
+            40912c     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_408F50 
             40912c      5 INSTR BELONGTO 4090d0 
             40912c      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, offset loc_408F50 
             409131      5 INSTR BELONGTO 4090d0 
@@ -8362,7 +8362,7 @@
             40914b      3 INSTR BELONGTO 4090d0 
             40914e     -1 INSTR LOCAL MetadataUnused xor     r8d, r8d 
             40914e      3 INSTR BELONGTO 4090d0 
-            409151     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_407140 
+            409151     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_407140 
             409151      5 INSTR BELONGTO 4090d0 
             409151      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 R10 R11 ZZ mov     edx, offset sub_407140 
             409156     -1 INSTR LOCAL MetadataUnused mov     esi, offset byte_40D574 
@@ -8390,7 +8390,7 @@
             40917f      3 INSTR BELONGTO 409170 
             409182     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4091C8 
             409182      2 INSTR BELONGTO 409170 
-            409184     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            409184     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             409184      5 INSTR BELONGTO 409170 
             409184      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
             409189     -1 INSTR LOCAL NoMetaUpdate call    _gst_element_set_state 
@@ -8403,7 +8403,7 @@
             409192      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, 0FFFFFFFFFFFFFFFFh 
             409199      2 INSTR BELONGTO 409170 
             409199      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            409199     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409199     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40919b     -1 INSTR LOCAL MetadataRedundant xor     esi, esi 
             40919b      2 INSTR BELONGTO 409170 
             40919d      7 INSTR BELONGTO 409170 
@@ -8422,7 +8422,7 @@
             4091b9      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _gst_element_set_state 
             4091be      2 INSTR BELONGTO 409170 
             4091be      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            4091be     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4091be     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4091c0      1 INSTR BELONGTO 409170 
             4091c0      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             4091c1      1 INSTR BELONGTO 409170 
@@ -8433,13 +8433,13 @@
             4091cd      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aHandle_ebusy_e; "handle_ebusy_error" 
             4091d2      2 INSTR BELONGTO 409170 
             4091d2      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi 
-            4091d2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4091d2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4091d4     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             4091d4      5 INSTR BELONGTO 409170 
             4091d4      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             4091d9      2 INSTR BELONGTO 409170 
             4091d9      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            4091d9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4091d9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4091db      1 INSTR BELONGTO 409170 
             4091db      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             4091dc      1 INSTR BELONGTO 409170 
@@ -8461,7 +8461,7 @@
             4091ed     10 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ mov     dword ptr [rax+0FCh], 1 
             4091f7      2 INSTR BELONGTO 4091e0 
             4091f7      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ xor     eax, eax 
-            4091f7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4091f7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4091f9     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             4091f9      4 INSTR BELONGTO 4091e0 
             4091fd      1 INSTR BELONGTO 4091e0 
@@ -8472,13 +8472,13 @@
             409205      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aSeek_started; "seek_started" 
             40920a      2 INSTR BELONGTO 4091e0 
             40920a      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40920a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40920a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40920c     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40920c      5 INSTR BELONGTO 4091e0 
             40920c      5 INSTR DEADREGS  EFLAGS ZZ call    _g_return_if_fail_warning 
             409211      2 INSTR BELONGTO 4091e0 
             409211      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ xor     eax, eax 
-            409211     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409211     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409213     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             409213      4 INSTR BELONGTO 4091e0 
             409217      1 INSTR BELONGTO 4091e0 
@@ -8566,15 +8566,15 @@
             4092a0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R12 R13 ZZ mov     ecx, offset aGsrWindow_c; "gsr-window.c" 
             4092a5      5 INSTR BELONGTO 409220 
             4092a5      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 ZZ mov     edx, offset aFileSLineDSSho; "file %s: line %d (%s): should not be re"... 
-            4092aa     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            4092aa     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             4092aa      5 INSTR BELONGTO 409220 
             4092aa      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 R13 ZZ mov     esi, 8 
             4092af      2 INSTR BELONGTO 409220 
             4092af      2 INSTR DEADREGS  EFLAGS RAX RBX RDI R12 R13 ZZ xor     edi, edi 
-            4092af     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4092af     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4092b1      2 INSTR BELONGTO 409220 
             4092b1      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-            4092b1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4092b1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4092b3     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4092b3      5 INSTR BELONGTO 409220 
             4092b3      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_log 
@@ -8593,7 +8593,7 @@
             4092d0      1 INSTR BELONGTO 409220 
             4092d0      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 ZZ retn 
             4092d0     56 DEALLOC STACK esp - 56 retn
-            4092d8     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 2 
+            4092d8     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 2 
             4092d8      5 INSTR BELONGTO 409220 
             4092d8      5 INSTR DEADREGS  EFLAGS RAX R13 ZZ mov     eax, 2 
             4092dd     -1 INSTR LOCAL NoMetaUpdate cmp     [rbx+60h], eax 
@@ -8642,7 +8642,7 @@
             409317      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _gst_object_unref 
             40931c     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4092B8 
             40931c      2 INSTR BELONGTO 409220 
-            409320     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            409320     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             409320      5 INSTR BELONGTO 409220 
             409320      5 INSTR DEADREGS  EFLAGS RAX R13 ZZ mov     eax, 1 
             409325     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4092DD 
@@ -8702,7 +8702,7 @@
             40937f      2 INSTR BELONGTO 409220 
             409381      2 INSTR BELONGTO 409220 
             409381      2 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ xor     esi, esi 
-            409381     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409381     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409383      3 INSTR BELONGTO 409220 
             409383      3 INSTR DEADREGS  EFLAGS RDI R13 ZZ mov     rdi, rax 
             409386     -1 INSTR LOCAL NoMetaUpdate call    _gst_caps_get_structure 
@@ -8815,13 +8815,13 @@
             409442     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             409442      3 INSTR BELONGTO 409410 
             409442      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R9 ZZ xor     r9d, r9d 
-            409445     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            409445     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             409445      5 INSTR BELONGTO 409410 
             409445      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, 2 
-            40944a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40944a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40944a      5 INSTR BELONGTO 409410 
             40944a      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 1 
-            40944f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            40944f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             40944f      5 INSTR BELONGTO 409410 
             40944f      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 3 
             409454     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm1, dword ptr [rax+0DCh] 
@@ -8853,7 +8853,7 @@
             40949e     16 DEALLOC STACK esp - 16 xor     eax, eax
             40949e      2 INSTR BELONGTO 409410 
             40949e      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 XMM0 XMM1 ZZ xor     eax, eax 
-            40949e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40949e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4094a0      1 INSTR BELONGTO 409410 
             4094a0      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 XMM0 XMM1 ZZ pop     rbx 
             4094a1      1 INSTR BELONGTO 409410 
@@ -8923,11 +8923,11 @@
             4094f9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 ZZ xor     r8d, r8d 
             4094fc      2 INSTR BELONGTO 4094b0 
             4094fc      2 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ xor     ecx, ecx 
-            4094fc     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4094fc     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4094fe      2 INSTR BELONGTO 4094b0 
             4094fe      2 INSTR DEADREGS  EFLAGS RDX RSI ZZ xor     edx, edx 
-            4094fe     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            409500     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+            4094fe     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            409500     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
             409500      5 INSTR BELONGTO 4094b0 
             409500      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 18h 
             409505      4 INSTR BELONGTO 4094b0 
@@ -8944,10 +8944,10 @@
             409517      3 INSTR BELONGTO 4094b0 
             40951a      2 INSTR BELONGTO 4094b0 
             40951a      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI ZZ xor     ecx, ecx 
-            40951a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40951a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40951c      2 INSTR BELONGTO 4094b0 
             40951c      2 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ xor     edx, edx 
-            40951c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40951c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40951e     -1 INSTR LOCAL MetadataRedundant mov     esi, 18h 
             40951e      5 INSTR BELONGTO 4094b0 
             409523      4 INSTR BELONGTO 4094b0 
@@ -8971,7 +8971,7 @@
             409540      1 INSTR BELONGTO 409540 
             409540      1 INSTR DEADREGS  EFLAGS RSI ZZ push    rbp 
             409540     -3 INSTR LOCAL NoWarn push    rbp 
-            409541     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            409541     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             409541      5 INSTR BELONGTO 409540 
             409541      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             409546      3 INSTR BELONGTO 409540 
@@ -9002,8 +9002,8 @@
             409571      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
             409576      2 INSTR BELONGTO 409540 
             409576      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edi, edi        ; domainname 
-            409576     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            409578     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409576     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409578     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409578      5 INSTR BELONGTO 409540 
             409578      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             40957d      5 INSTR BELONGTO 409540 
@@ -9027,7 +9027,7 @@
             4095a6     -1 INSTR LOCAL NoMetaUpdate call    _g_param_spec_string 
             4095a6      5 INSTR BELONGTO 409540 
             4095a6      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_string 
-            4095ab     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4095ab     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4095ab      5 INSTR BELONGTO 409540 
             4095ab      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     esi, 1 
             4095b0      3 INSTR BELONGTO 409540 
@@ -9060,7 +9060,7 @@
             4095e0      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, offset aGnomeSoundRe_0; "Gnome Sound Recorder" 
             4095e5      2 INSTR BELONGTO 409540 
             4095e5      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            4095e5     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4095e5     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4095e7      5 INSTR BELONGTO 409540 
             4095e7      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, offset aGsr; "gsr" 
             4095ec     -1 INSTR LOCAL NoMetaUpdate call    __gst_debug_category_new 
@@ -9105,12 +9105,12 @@
             409621      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rbp, rdx 
             409624      5 INSTR BELONGTO 409600 
             409624      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     esi, offset aCouldNotCreate; "Could not create the GStreamer %s eleme"... 
-            409629     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409629     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409629      5 INSTR BELONGTO 409600 
             409629      5 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edx, 5          ; category 
             40962e      2 INSTR BELONGTO 409600 
             40962e      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            40962e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40962e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409630     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409630      5 INSTR BELONGTO 409600 
             409630      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -9124,12 +9124,12 @@
             40963e      3 INSTR BELONGTO 409600 
             409641      2 INSTR BELONGTO 409600 
             409641      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R10 R11 R13 ZZ xor     esi, esi 
-            409641     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409641     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409643     -1 INSTR LOCAL MetadataRedundant xor     edi, edi 
             409643      2 INSTR BELONGTO 409600 
             409645      2 INSTR BELONGTO 409600 
             409645      2 INSTR DEADREGS  EFLAGS RAX RDX RBX R10 R11 R13 ZZ xor     eax, eax 
-            409645     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409645     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409647      4 INSTR BELONGTO 409600 
             409647      4 INSTR DEADREGS  EFLAGS RDX RBX R10 R11 R13 ZZ mov     [rsp+38h+var_38], r12 
             409647      4 PTRIMMEDESP STACK 0 displ mov     [rsp+38h+var_38], r12
@@ -9181,7 +9181,7 @@
             409698      3 INSTR DEADREGS  RBX RSI RDI R12 ZZ mov     rbx, rax 
             40969b     -1 INSTR LOCAL NoMetaUpdate jz      loc_409748 
             40969b      6 INSTR BELONGTO 409670 
-            4096a1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            4096a1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             4096a1      5 INSTR BELONGTO 409670 
             4096a1      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 2 
             4096a6      3 INSTR BELONGTO 409670 
@@ -9235,7 +9235,7 @@
             4096f2      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _gst_implements_interface_cast 
             4096f7      7 INSTR BELONGTO 409670 
             4096f7      7 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ mov     [rbx+128h], rax 
-            4096fe     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4096fe     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4096fe      5 INSTR BELONGTO 409670 
             4096fe      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ mov     eax, 1 
             409703      4 INSTR BELONGTO 409670 
@@ -9251,43 +9251,43 @@
             409715      1 INSTR BELONGTO 409670 
             409715      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ retn 
             409715     24 DEALLOC STACK esp - 24 retn
-            409720     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409720     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409720      5 INSTR BELONGTO 409670 
             409720      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 5          ; category 
             409725      5 INSTR BELONGTO 409670 
             409725      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset aYourAudioCaptu; "Your audio capture settings are invalid"... 
             40972a      2 INSTR BELONGTO 409670 
             40972a      2 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ xor     edi, edi        ; domainname 
-            40972a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40972a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40972c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40972c      5 INSTR BELONGTO 409670 
             40972c      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _dcgettext 
             409731      2 INSTR BELONGTO 409670 
             409731      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R10 R11 R12 ZZ xor     esi, esi 
-            409731     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409731     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409733     -1 INSTR LOCAL MetadataUnused mov     rdx, rax 
             409733      3 INSTR BELONGTO 409670 
             409736     -1 INSTR LOCAL MetadataRedundant xor     edi, edi 
             409736      2 INSTR BELONGTO 409670 
             409738      2 INSTR BELONGTO 409670 
             409738      2 INSTR DEADREGS  EFLAGS RAX RDX RBX R10 R11 R12 ZZ xor     eax, eax 
-            409738     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409738     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40973a     -1 INSTR LOCAL NoMetaUpdate call    sub_407A20 
             40973a      5 INSTR BELONGTO 409670 
             40973a      5 INSTR DEADREGS  EFLAGS RDX RBX R10 R11 R12 ZZ call    sub_407A20 
             40973f      2 INSTR BELONGTO 409670 
             40973f      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            40973f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40973f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409741     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_409703 
             409741      2 INSTR BELONGTO 409670 
-            409748     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409748     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409748      5 INSTR BELONGTO 409670 
             409748      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 5          ; category 
             40974d      5 INSTR BELONGTO 409670 
             40974d      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset aGconfAudioReco; "GConf audio recording" 
             409752      2 INSTR BELONGTO 409670 
             409752      2 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ xor     edi, edi        ; domainname 
-            409752     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409752     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409754     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409754      5 INSTR BELONGTO 409670 
             409754      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _dcgettext 
@@ -9304,7 +9304,7 @@
             40976b      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    sub_409600 
             409770      2 INSTR BELONGTO 409670 
             409770      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            409770     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409770     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409772     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_409703 
             409772      2 INSTR BELONGTO 409670 
             409780      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 -40 0 4 0 8 5 -32 0 6 0 4 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 -24 0 13 -16 0 14 -8 0 15 0 0 ZZ
@@ -9377,7 +9377,7 @@
             4097e9      3 INSTR DEADREGS  RBX RDI R13 ZZ mov     r13, rax 
             4097ec     -1 INSTR LOCAL NoMetaUpdate jz      loc_4099A8 
             4097ec      6 INSTR BELONGTO 409780 
-            4097f2     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 30h 
+            4097f2     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 30h 
             4097f2      5 INSTR BELONGTO 409780 
             4097f2      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 30h 
             4097f7     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc0 
@@ -9385,7 +9385,7 @@
             4097f7      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_malloc0 
             4097fc      2 INSTR BELONGTO 409780 
             4097fc      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ xor     ecx, ecx 
-            4097fc     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4097fc     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4097fe      3 INSTR BELONGTO 409780 
             4097fe      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rbx, rax 
             409801      3 INSTR BELONGTO 409780 
@@ -9398,7 +9398,7 @@
             409814      3 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rdx, r14 
             409817      2 INSTR BELONGTO 409780 
             409817      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R14 ZZ xor     eax, eax 
-            409817     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409817     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409819      5 INSTR BELONGTO 409780 
             409819      5 INSTR DEADREGS  EFLAGS RSI RDI R14 ZZ mov     esi, offset word_40D682 
             40981e      3 INSTR BELONGTO 409780 
@@ -9414,7 +9414,7 @@
             409829      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R14 ZZ xor     r8d, r8d 
             40982c      3 INSTR BELONGTO 409780 
             40982c      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 ZZ mov     rcx, r12 
-            40982f     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_409220 
+            40982f     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_409220 
             40982f      5 INSTR BELONGTO 409780 
             40982f      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 ZZ mov     edx, offset sub_409220 
             409834      5 INSTR BELONGTO 409780 
@@ -9429,7 +9429,7 @@
             409844     -1 INSTR LOCAL NoMetaUpdate call    _gst_element_get_bus 
             409844      5 INSTR BELONGTO 409780 
             409844      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _gst_element_get_bus 
-            409849     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFF9Ch 
+            409849     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFF9Ch 
             409849      5 INSTR BELONGTO 409780 
             409849      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 ZZ mov     esi, 0FFFFFF9Ch 
             40984e      3 INSTR BELONGTO 409780 
@@ -9449,7 +9449,7 @@
             409861      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R13 R14 ZZ xor     r8d, r8d 
             409864      3 INSTR BELONGTO 409780 
             409864      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 R14 ZZ mov     rcx, r12 
-            409867     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40AEB0 
+            409867     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40AEB0 
             409867      5 INSTR BELONGTO 409780 
             409867      5 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 ZZ mov     edx, offset sub_40AEB0 
             40986c      5 INSTR BELONGTO 409780 
@@ -9465,7 +9465,7 @@
             40987d      3 INSTR BELONGTO 409780 
             409880      3 INSTR BELONGTO 409780 
             409880      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 R14 ZZ mov     rcx, r12 
-            409883     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40AB70 
+            409883     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40AB70 
             409883      5 INSTR BELONGTO 409780 
             409883      5 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 ZZ mov     edx, offset sub_40AB70 
             409888      5 INSTR BELONGTO 409780 
@@ -9481,7 +9481,7 @@
             409899      3 INSTR BELONGTO 409780 
             40989c      3 INSTR BELONGTO 409780 
             40989c      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 R14 ZZ mov     rcx, r12 
-            40989f     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40AAE0 
+            40989f     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40AAE0 
             40989f      5 INSTR BELONGTO 409780 
             40989f      5 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 ZZ mov     edx, offset sub_40AAE0 
             4098a4      5 INSTR BELONGTO 409780 
@@ -9520,7 +9520,7 @@
             4098e3      5 INSTR BELONGTO 409780 
             4098e8      2 INSTR BELONGTO 409780 
             4098e8      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R14 ZZ xor     ecx, ecx 
-            4098e8     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4098e8     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4098ea      3 INSTR BELONGTO 409780 
             4098ea      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 ZZ mov     rdx, rbx 
             4098ed      5 INSTR BELONGTO 409780 
@@ -9531,7 +9531,7 @@
             4098f9      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 ZZ mov     rdi, [rax] 
             4098fc      2 INSTR BELONGTO 409780 
             4098fc      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 ZZ xor     eax, eax 
-            4098fc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4098fc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4098fe     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             4098fe      5 INSTR BELONGTO 409780 
             4098fe      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _g_object_set 
@@ -9577,14 +9577,14 @@
             40994a      6 INSTR BELONGTO 409780 
             409950     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4098C1 
             409950      5 INSTR BELONGTO 409780 
-            409958     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409958     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409958      5 INSTR BELONGTO 409780 
             409958      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 ZZ mov     edx, 5          ; category 
             40995d      5 INSTR BELONGTO 409780 
             40995d      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 ZZ mov     esi, offset aGconfAudioOutp; "GConf audio output" 
             409962      2 INSTR BELONGTO 409780 
             409962      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 ZZ xor     edi, edi        ; domainname 
-            409962     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409962     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409964     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409964      5 INSTR BELONGTO 409780 
             409964      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ call    _dcgettext 
@@ -9627,8 +9627,8 @@
             4099ab      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ call    _gst_object_unref 
             4099b0      2 INSTR BELONGTO 409780 
             4099b0      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 ZZ xor     edi, edi        ; domainname 
-            4099b0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            4099b2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4099b0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            4099b2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4099b2      5 INSTR BELONGTO 409780 
             4099b2      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R14 ZZ mov     edx, 5          ; category 
             4099b7      5 INSTR BELONGTO 409780 
@@ -9657,7 +9657,7 @@
             4099e0     79 FUNC GLOBAL sub_4099E0 FUNC_UNSAFE NOFP RET             409a2e 
             4099e1      2 INSTR BELONGTO 4099e0 
             4099e1      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4099e1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4099e1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4099e3     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     rbp, rdi 
             4099e3      3 INSTR BELONGTO 4099e0 
             4099e3      3 INSTR DEADREGS  EFLAGS ZZ mov     rbp, rdi 
@@ -9676,7 +9676,7 @@
             4099f1     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             4099f1      5 INSTR BELONGTO 4099e0 
             4099f1      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_strdup_printf 
-            4099f6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            4099f6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             4099f6      5 INSTR BELONGTO 4099e0 
             4099f6      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             4099fb      3 INSTR BELONGTO 4099e0 
@@ -9685,7 +9685,7 @@
             4099fe      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aPleaseVerifyIt; "Please verify its settings.\nYou may be"... 
             409a03      2 INSTR BELONGTO 4099e0 
             409a03      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            409a03     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409a03     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409a05     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409a05      5 INSTR BELONGTO 4099e0 
             409a05      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -9702,7 +9702,7 @@
             409a15      5 INSTR BELONGTO 4099e0 
             409a1a      2 INSTR BELONGTO 4099e0 
             409a1a      2 INSTR DEADREGS  EFLAGS RAX RDX R10 R11 ZZ xor     eax, eax 
-            409a1a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409a1a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409a1c     -1 INSTR LOCAL NoMetaUpdate call    sub_407A20 
             409a1c      5 INSTR BELONGTO 4099e0 
             409a1c      5 INSTR DEADREGS  EFLAGS RDX R10 R11 ZZ call    sub_407A20 
@@ -9761,7 +9761,7 @@
             409a60      1 INSTR DEADREGS  EFLAGS RDI ZZ push    rbx 
             409a60     -3 INSTR LOCAL NoWarn push    rbx 
             409a60     70 FUNC GLOBAL sub_409A60 FUNC_UNSAFE NOFP RET             409aa5 
-            409a61     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 12h 
+            409a61     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 12h 
             409a61      5 INSTR BELONGTO 409a60 
             409a61      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 12h 
             409a66     16 DATAREF STACK 817 esp + 0 PARENT LocalFrame LOCALFRAME
@@ -9775,7 +9775,7 @@
             409a6a      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_malloc 
             409a6f      2 INSTR BELONGTO 409a60 
             409a6f      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; timer 
-            409a6f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; timer 
+            409a6f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; timer 
             409a71      3 INSTR BELONGTO 409a60 
             409a71      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rax 
             409a74     -1 INSTR LOCAL NoMetaUpdate call    _time 
@@ -9796,7 +9796,7 @@
             409a8b      3 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ mov     rcx, rax        ; tp 
             409a8e      5 INSTR BELONGTO 409a60 
             409a8e      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, offset format; "%Y-%m-%d-%H%M%S" 
-            409a93     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 12h        ; maxsize 
+            409a93     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 12h        ; maxsize 
             409a93      5 INSTR BELONGTO 409a60 
             409a93      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 12h        ; maxsize 
             409a98     -1 INSTR LOCAL NoMetaUpdate call    _strftime 
@@ -9828,7 +9828,7 @@
             409ac0      3 INSTR BELONGTO 409ab0 
             409ac0      3 INSTR DEADREGS  RCX RDI ZZ mov     rdi, rsp 
             409ac0      3 PTRIMMEDESP STACK 0 displ mov     rdi, rsp
-            409ac3     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 9 
+            409ac3     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 9 
             409ac3      5 INSTR BELONGTO 409ab0 
             409ac3      5 INSTR DEADREGS  RCX ZZ mov     ecx, 9 
             409ac8      3 INSTR BELONGTO 409ab0 
@@ -9849,7 +9849,7 @@
             409aea      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_window_get_type 
             409aef      2 INSTR BELONGTO 409ab0 
             409aef      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            409aef     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            409aef     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             409af1      3 INSTR BELONGTO 409ab0 
             409af1      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, rsp 
             409af1      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp
@@ -9880,8 +9880,8 @@
             409b3a     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_610900, 0 
             409b45      4 PTRIMMEDEBP STACK 56 displ mov     [rbp+38h], rax
             409b49     -1 INSTR LOCAL NoMetaUpdate jz      loc_40AA78 
-            409b4f     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            409b51     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            409b4f     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            409b51     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             409b53     -1 INSTR LOCAL NoMetaUpdate call    _gtk_vbox_new 
             409b5b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_get_type 
             409b60      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -9895,10 +9895,10 @@
             409b9f      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             409ba8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409bb3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_add_accel_group 
-            409bb8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            409bc4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409bb8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            409bc4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409bc6     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
-            409bcb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            409bcb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             409bd6     -1 INSTR LOCAL NoMetaUpdate call    _g_file_test 
             409bdb     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             409bdd     -1 INSTR LOCAL NoMetaUpdate jz      loc_40AA30 
@@ -9918,63 +9918,63 @@
             409c3c      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
             409c49     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             409c53     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_new 
-            409c58     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409c58     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409c64     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_set_translation_domain 
             409c70      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-            409c73     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 10h 
+            409c73     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 10h 
             409c7d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_add_actions 
-            409c8d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409c8d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409c8f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_insert_action_group 
             409ca0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
-            409ca5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            409caa     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            409ca5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            409caa     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             409cb4     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            409cb9     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            409cc1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409cb9     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            409cc1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409cc8     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             409cd9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
-            409cde     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            409ce3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            409cde     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            409ce3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             409ced     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            409cf2     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            409cfa     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409cf2     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            409cfa     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409d01     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             409d12     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_get_action 
-            409d17     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            409d1c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            409d17     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            409d1c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             409d26     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            409d2b     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            409d33     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409d2b     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            409d33     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409d3a     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
-            409d3f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409d3f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409d46      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             409d49     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
-            409d4e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409d4e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409d55      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             409d58     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
-            409d5d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409d5d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409d64      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             409d67     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
-            409d6c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409d6c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409d73      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             409d76     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
             409d84     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_get_widget 
             409d8c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_get_type 
             409d9a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409d9f     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            409da2     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            409da4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409da2     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            409da4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409dac     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             409db4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             409dc2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_get_widget 
             409dca     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toolbar_get_type 
             409dd5     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409dda     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            409dda     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             409ddf     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toolbar_set_show_arrow 
             409dea     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409def     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            409df2     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            409df4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409df2     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            409df4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409dfc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             409e04     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             409e12     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_get_widget 
@@ -9985,10 +9985,10 @@
             409e40     -1 INSTR LOCAL NoMetaUpdate call    _gtk_recent_chooser_menu_new 
             409e4f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_recent_chooser_get_type 
             409e5d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409e62     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            409e62     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             409e6a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_recent_chooser_set_local_only 
             409e79     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409e7e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+            409e7e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
             409e86     -1 INSTR LOCAL NoMetaUpdate call    _gtk_recent_chooser_set_limit 
             409e8b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_recent_filter_new 
             409e97     -1 INSTR LOCAL NoMetaUpdate call    _g_get_application_name 
@@ -9999,17 +9999,17 @@
             409ed6     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             409ed9      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
             409ee6     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            409eeb     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            409eed     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
+            409eeb     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            409eed     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7 
             409ef2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_vbox_new 
             409ef7      5 PTRIMMEDESP STACK 80 displ mov     rsi, [rsp+50h]
             409f02     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409f07     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            409f07     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             409f0f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_set_border_width 
             409f1a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             409f1f     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            409f22     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            409f27     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            409f22     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            409f27     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             409f32     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             409f3a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             409f3f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_adjustment_get_type 
@@ -10037,28 +10037,28 @@
             409fe0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scale_get_type 
             409fe5      4 PTRIMMEDEBP STACK 56 displ mov     rdx, [rbp+38h]
             409ff0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            409ff5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            409ff5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             409ffd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scale_set_value_pos 
             40a002      4 PTRIMMEDEBP STACK 56 displ mov     rax, [rbp+38h]
-            40a006     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a006     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a00c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
             40a01b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a020     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40a022     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a020     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a022     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a024     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 6 
             40a030     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40a035      4 PTRIMMEDEBP STACK 56 displ mov     rax, [rbp+38h]
             40a03d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-            40a042     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40a044     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            40a042     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40a044     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             40a049     -1 INSTR LOCAL NoMetaUpdate call    _gtk_hbox_new 
             40a057     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a05c     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a05f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40a061     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a05f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a061     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a069     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
-            40a06e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a078     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a06e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a078     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a07a     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a082     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new_with_mnemonic 
             40a08b      5 PTRIMMEDESP STACK 40 displ mov     [rsp+28h], rax
@@ -10072,9 +10072,9 @@
             40a0c4      5 PTRIMMEDESP STACK 48 displ mov     [rsp+30h], rax
             40a0c9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a0ce      5 PTRIMMEDESP STACK 48 displ mov     rsi, [rsp+30h]
-            40a0d3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a0d3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40a0d5     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a0d8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a0d8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a0dd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40a0e2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_new 
             40a0eb      5 PTRIMMEDESP STACK 40 displ mov     [rsp+28h], rax
@@ -10087,8 +10087,8 @@
             40a125     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a12a      5 PTRIMMEDESP STACK 48 displ mov     rsi, [rsp+30h]
             40a12f     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a135     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40a13a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40a135     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40a13a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40a13f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40a144      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40a147     -1 INSTR LOCAL NoMetaUpdate call    sub_409670 
@@ -10098,18 +10098,18 @@
             40a15b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40a15e      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
             40a16b     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            40a170     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            40a172     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            40a170     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            40a172     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             40a177     -1 INSTR LOCAL NoMetaUpdate call    _gtk_hbox_new 
             40a182      5 PTRIMMEDESP STACK 48 displ mov     [rsp+30h], rax
             40a187     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a18c      5 PTRIMMEDESP STACK 48 displ mov     rsi, [rsp+30h]
             40a191     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a194     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40a196     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a194     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a196     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a19b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
-            40a1a0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a1aa     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a1a0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a1aa     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a1ac     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a1b4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new_with_mnemonic 
             40a1b9      5 PTRIMMEDESP STACK 64 displ mov     rsi, [rsp+40h]
@@ -10120,8 +10120,8 @@
             40a1dc      5 PTRIMMEDESP STACK 48 displ mov     rdi, [rsp+30h]
             40a1e4     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a1e9     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a1ec     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40a1ee     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a1ec     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a1ee     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a1f6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40a1fb     -1 INSTR LOCAL NoMetaUpdate call    _gm_audio_profile_choose_new 
             40a200      5 PTRIMMEDESP STACK 72 displ mov     rsi, [rsp+48h]
@@ -10135,8 +10135,8 @@
             40a23b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a240      5 PTRIMMEDESP STACK 56 displ mov     rsi, [rsp+38h]
             40a245     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a248     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40a24d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40a248     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40a24d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40a255     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40a25a      4 PTRIMMEDEBP STACK 56 displ mov     rax, [rbp+38h]
             40a262     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
@@ -10147,9 +10147,9 @@
             40a284      5 PTRIMMEDESP STACK 48 displ mov     rsi, [rsp+30h]
             40a290     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a298     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_accessible 
-            40a2a0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            40a2a0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             40a2a8     -1 INSTR LOCAL NoMetaUpdate call    _atk_object_add_relationship 
-            40a2b4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a2b4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a2bb     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_get_string 
             40a2c0     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40a2c6     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40A2E0 
@@ -10160,42 +10160,42 @@
             40a2e7     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40a2ea      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
             40a2f7     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            40a2fc     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40a2fe     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a2fc     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40a2fe     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a300     -1 INSTR LOCAL NoMetaUpdate call    _gtk_hbox_new 
             40a30b      5 PTRIMMEDESP STACK 56 displ mov     [rsp+38h], rax
             40a310     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a315      5 PTRIMMEDESP STACK 56 displ mov     rsi, [rsp+38h]
             40a31a     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a31d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40a31f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a31d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a31f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a324     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40a32e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
             40a333      5 PTRIMMEDESP STACK 56 displ mov     rdi, [rsp+38h]
             40a33e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a343     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a346     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40a348     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a346     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a348     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a350     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
-            40a355     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40a357     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
-            40a35c     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
+            40a355     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40a357     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40a35c     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
             40a361     -1 INSTR LOCAL NoMetaUpdate call    _gtk_table_new 
             40a369     -1 INSTR LOCAL NoMetaUpdate call    _gtk_table_get_type 
             40a377     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a37c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            40a37c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             40a384     -1 INSTR LOCAL NoMetaUpdate call    _gtk_table_set_col_spacings 
             40a38f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a394     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            40a394     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             40a39c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_table_set_row_spacings 
             40a3a1      5 PTRIMMEDESP STACK 56 displ mov     rdi, [rsp+38h]
             40a3a9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a3ae     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a3b1     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40a3bc     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40a3b1     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40a3bc     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40a3c1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
-            40a3c6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a3d0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a3c6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a3d0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a3d2     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a3da     -1 INSTR LOCAL NoMetaUpdate call    sub_407CD0 
             40a3df      5 PTRIMMEDESP STACK 64 displ mov     rsi, [rsp+40h]
@@ -10208,15 +10208,15 @@
             40a40f      5 PTRIMMEDESP STACK 40 displ mov     r10, [rsp+28h]
             40a414     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40a417     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 1 
-            40a41d     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
-            40a422     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a41d     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            40a422     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a427      8 PTRIMMEDESP STACK 24 displ mov     dword ptr [rsp+18h], 0
             40a42f      8 PTRIMMEDESP STACK 16 displ mov     dword ptr [rsp+10h], 0
             40a43a      8 PTRIMMEDESP STACK 8 displ mov     dword ptr [rsp+8], 0
             40a442      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [rsp], 4
             40a449     -1 INSTR LOCAL NoMetaUpdate call    _gtk_table_attach 
-            40a44e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a458     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a44e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a458     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a45a     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a462     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
             40a467      5 PTRIMMEDESP STACK 64 displ mov     rsi, [rsp+40h]
@@ -10229,24 +10229,24 @@
             40a497      5 PTRIMMEDESP STACK 56 displ mov     rsi, [rsp+38h]
             40a49c     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 2 
             40a4a2     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-            40a4a8     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40a4ad     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a4a8     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40a4ad     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a4b2      8 PTRIMMEDESP STACK 24 displ mov     dword ptr [rsp+18h], 0
             40a4ba      8 PTRIMMEDESP STACK 16 displ mov     dword ptr [rsp+10h], 0
             40a4c2      8 PTRIMMEDESP STACK 8 displ mov     dword ptr [rsp+8], 0
             40a4ca      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [rsp], 4
             40a4d1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_table_attach 
-            40a4d6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a4e0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a4d6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a4e0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a4e2     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a4ea     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
             40a4ef      5 PTRIMMEDESP STACK 72 displ mov     rsi, [rsp+48h]
             40a4fb     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a500     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40a500     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40a508     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_set_selectable 
             40a511      5 PTRIMMEDESP STACK 72 displ mov     rsi, [rsp+48h]
             40a516     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a51b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40a51b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40a523     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_set_line_wrap 
             40a528      5 PTRIMMEDESP STACK 64 displ mov     rsi, [rsp+40h]
             40a531     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -10258,8 +10258,8 @@
             40a55d      5 PTRIMMEDESP STACK 88 displ mov     rsi, [rsp+58h]
             40a562     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 2 
             40a568     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-            40a56e     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
-            40a573     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40a56e     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            40a573     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40a57b      8 PTRIMMEDESP STACK 24 displ mov     dword ptr [rsp+18h], 0
             40a583      8 PTRIMMEDESP STACK 16 displ mov     dword ptr [rsp+10h], 0
             40a58b      8 PTRIMMEDESP STACK 8 displ mov     dword ptr [rsp+8], 0
@@ -10274,10 +10274,10 @@
             40a5c4     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a5cc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_accessible 
             40a5d1      5 PTRIMMEDESP STACK 40 displ mov     rdx, [rsp+28h]
-            40a5d6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            40a5d6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             40a5de     -1 INSTR LOCAL NoMetaUpdate call    _atk_object_add_relationship 
-            40a5e3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a5ed     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a5e3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a5ed     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a5ef     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a5f7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
             40a5fc      5 PTRIMMEDESP STACK 64 displ mov     rsi, [rsp+40h]
@@ -10288,10 +10288,10 @@
             40a61c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_misc_set_alignment 
             40a627     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a62c      5 PTRIMMEDESP STACK 56 displ mov     rsi, [rsp+38h]
-            40a631     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a631     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a633     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 3 
             40a639     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 2 
-            40a63f     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40a63f     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40a647      8 PTRIMMEDESP STACK 24 displ mov     dword ptr [rsp+18h], 0
             40a64f      8 PTRIMMEDESP STACK 16 displ mov     dword ptr [rsp+10h], 0
             40a657      8 PTRIMMEDESP STACK 8 displ mov     dword ptr [rsp+8], 0
@@ -10300,7 +10300,7 @@
             40a670     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
             40a675      5 PTRIMMEDESP STACK 72 displ mov     rsi, [rsp+48h]
             40a681     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a686     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40a686     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40a68e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_set_selectable 
             40a693      5 PTRIMMEDESP STACK 64 displ mov     rsi, [rsp+40h]
             40a69c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -10312,8 +10312,8 @@
             40a6c8      5 PTRIMMEDESP STACK 64 displ mov     rsi, [rsp+40h]
             40a6cd     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 3 
             40a6d3     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 2 
-            40a6d9     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
-            40a6de     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40a6d9     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            40a6de     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40a6e6      8 PTRIMMEDESP STACK 24 displ mov     dword ptr [rsp+18h], 0
             40a6ee      8 PTRIMMEDESP STACK 16 displ mov     dword ptr [rsp+10h], 0
             40a6f6      8 PTRIMMEDESP STACK 8 displ mov     dword ptr [rsp+8], 0
@@ -10326,24 +10326,24 @@
             40a721      5 PTRIMMEDESP STACK 48 displ mov     rsi, [rsp+30h]
             40a72d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a735     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_accessible 
-            40a73d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            40a73d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             40a745     -1 INSTR LOCAL NoMetaUpdate call    _atk_object_add_relationship 
             40a74a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_new 
-            40a74f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40a74f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40a75e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_can_focus 
             40a770     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a775     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a778     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40a77a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a778     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a77a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a782     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_end 
             40a78e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40a79a      5 PTRIMMEDESP STACK 48 displ mov     rsi, [rsp+30h]
             40a79f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a7a4      5 PTRIMMEDESP STACK 108 displ lea     rdx, [rsp+6Ch]
-            40a7a9     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40a7b3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a7a9     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a7b3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a7b5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_style_get 
-            40a7ba     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a7ba     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a7bc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_frame_new 
             40a7c1      5 PTRIMMEDESP STACK 108 displ mov     r15d, [rsp+6Ch]
             40a7c9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_frame_get_type 
@@ -10353,64 +10353,64 @@
             40a7ec     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40a7fb     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a800     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a803     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40a808     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a803     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40a808     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a810     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_end 
-            40a815     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40a817     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a815     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40a817     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a819     -1 INSTR LOCAL NoMetaUpdate call    _gtk_hbox_new 
             40a81e      5 PTRIMMEDESP STACK 80 displ mov     rsi, [rsp+50h]
             40a829     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a834     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
             40a83f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a844     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            40a844     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             40a84c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_set_spacing 
-            40a851     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a85b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a851     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a85b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a85d     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a865     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
             40a877     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a87c     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a87f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40a881     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40a87f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40a881     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40a88c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40a891     -1 INSTR LOCAL NoMetaUpdate xorps   xmm1, xmm1 
-            40a894     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a894     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a896     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm2, cs:dword_40E9FC 
             40a8a3     -1 INSTR LOCAL NUMViaFPRegDest movaps  xmm0, xmm1 
             40a8a6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_aspect_frame_new 
             40a8ab      5 PTRIMMEDESP STACK 40 displ mov     r9, [rsp+28h]
             40a8b9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a8be     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a8be     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a8c3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_frame_set_shadow_type 
             40a8cb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40a8d6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a8db     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a8de     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40a8e0     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a8de     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a8e0     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a8e8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40a8ed     -1 INSTR LOCAL NoMetaUpdate call    _gtk_progress_bar_new 
             40a8f2      5 PTRIMMEDESP STACK 80 displ mov     rsi, [rsp+50h]
             40a901     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a90c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
             40a911      4 PTRIMMEDEBP STACK 56 displ mov     rax, [rbp+38h]
-            40a915     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a915     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a91b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
             40a920      4 PTRIMMEDEBP STACK 56 displ mov     rax, [rbp+38h]
-            40a924     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a924     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a92a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
             40a92f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_get_type 
             40a941     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a94e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_get_context_id 
             40a963     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a970     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_get_context_id 
-            40a975     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40a97a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40a975     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40a97a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40a987     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40a9a0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40a9ae     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_push 
             40a9b6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show_all 
-            40a9c2     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a9c2     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a9c9     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_get_string 
             40a9ce      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40a9d7     -1 INSTR LOCAL NoMetaUpdate call    sub_4087E0 
@@ -10419,10 +10419,10 @@
             40a9e4     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40aa1d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 78h 
             40aa33     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
-            40aa38     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40aa44     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40aa38     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40aa44     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40aa46     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
-            40aa4b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40aa4b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40aa56     -1 INSTR LOCAL NoMetaUpdate call    _g_file_test 
             40aa5b     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40aa5d     -1 INSTR LOCAL NoMetaUpdate jnz     loc_409BE3 
@@ -10431,19 +10431,19 @@
             40aa6e     -1 INSTR LOCAL NoMetaUpdate jmp     loc_409BE3 
             40aa78     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_get_default 
             40aa84     -1 INSTR LOCAL NoMetaUpdate jmp     loc_409B4F 
-            40aa89     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40aa93     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40aa89     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40aa93     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40aa95     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40aa9d      5 PTRIMMEDESP STACK 96 displ mov     rax, [rsp+60h]
             40aaa5      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40aaac     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40aab7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40aab7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40aabc     -1 INSTR LOCAL NoMetaUpdate call    sub_407A20 
             40aac1      5 PTRIMMEDESP STACK 96 displ mov     rdi, [rsp+60h]
             40aac6     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
-            40aacb     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40aacb     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40aad0     -1 INSTR LOCAL NoMetaUpdate call    _exit 
-            40aad5     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40aad5     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40aada     -1 INSTR LOCAL NoMetaUpdate call    _exit 
             40aae0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 16 3 -8 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             40aae0      0 FUNC MMSAFENESS SAFE
@@ -10516,12 +10516,12 @@
             40ab41      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ mov     ecx, offset aPlay_eos_msg_0; "play_eos_msg_cb" 
             40ab46      5 INSTR BELONGTO 40aae0 
             40ab46      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aGsrWindow_c; "gsr-window.c" 
-            40ab4b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            40ab4b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             40ab4b      5 INSTR BELONGTO 40aae0 
             40ab4b      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 4 
             40ab50      2 INSTR BELONGTO 40aae0 
             40ab50      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40ab50     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ab50     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ab52      8 INSTR BELONGTO 40aae0 
             40ab52      8 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+18h+var_18], offset aEos; "EOS" 
             40ab52      8 PTRIMMEDESP STACK 0 displ mov     [rsp+18h+var_18], offset aEos; "EOS"
@@ -10604,7 +10604,7 @@
             40abbc      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, offset aPipeline_error; "pipeline_error_cb" 
             40abc1      2 INSTR BELONGTO 40ab70 
             40abc1      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ xor     edi, edi 
-            40abc1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40abc1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40abc3     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40abc3      5 INSTR BELONGTO 40ab70 
             40abc3      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_return_if_fail_warning 
@@ -10682,10 +10682,10 @@
             40ac3f      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, offset aNotgst_element; "notgst_element_get_toplevel" 
             40ac44      2 INSTR BELONGTO 40ab70 
             40ac44      2 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ xor     edi, edi 
-            40ac44     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40ac44     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40ac46      2 INSTR BELONGTO 40ab70 
             40ac46      2 INSTR DEADREGS  EFLAGS R12 R13 ZZ xor     ebp, ebp 
-            40ac46     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40ac46     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40ac48     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40ac48      5 INSTR BELONGTO 40ab70 
             40ac48      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_return_if_fail_warning 
@@ -10739,7 +10739,7 @@
             40ac9d      3 INSTR DEADREGS  EFLAGS RDX RDI R10 R11 R12 R13 ZZ mov     rdi, rax 
             40aca0      2 INSTR BELONGTO 40ab70 
             40aca0      2 INSTR DEADREGS  EFLAGS RAX RDX R10 R11 R12 R13 ZZ xor     eax, eax 
-            40aca0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40aca0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40aca2     -1 INSTR LOCAL NoMetaUpdate call    sub_407A20 
             40aca2      5 INSTR BELONGTO 40ab70 
             40aca2      5 INSTR DEADREGS  EFLAGS RDX R10 R11 R12 R13 ZZ call    sub_407A20 
@@ -10752,7 +10752,7 @@
             40acae      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _gtk_widget_get_window 
             40acb3      2 INSTR BELONGTO 40ab70 
             40acb3      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ xor     esi, esi 
-            40acb3     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40acb3     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40acb5      3 INSTR BELONGTO 40ab70 
             40acb5      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rax 
             40acb8     -1 INSTR LOCAL NoMetaUpdate call    _gdk_window_set_cursor 
@@ -10762,7 +10762,7 @@
             40acbd      3 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ mov     rdi, rbx 
             40acc0      2 INSTR BELONGTO 40ab70 
             40acc0      2 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 ZZ xor     edx, edx 
-            40acc0     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40acc0     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40acc2      5 INSTR BELONGTO 40ab70 
             40acc2      5 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 ZZ mov     esi, offset aStop; "Stop" 
             40acc7     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
@@ -10770,7 +10770,7 @@
             40acc7      5 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ call    sub_407CB0 
             40accc      3 INSTR BELONGTO 40ab70 
             40accc      3 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ mov     rdi, rbx 
-            40accf     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40accf     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40accf      5 INSTR BELONGTO 40ab70 
             40accf      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 ZZ mov     edx, 1 
             40acd4      5 INSTR BELONGTO 40ab70 
@@ -10780,7 +10780,7 @@
             40acd9      5 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ call    sub_407CB0 
             40acde      3 INSTR BELONGTO 40ab70 
             40acde      3 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ mov     rdi, rbx 
-            40ace1     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40ace1     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40ace1      5 INSTR BELONGTO 40ab70 
             40ace1      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 ZZ mov     edx, 1 
             40ace6      5 INSTR BELONGTO 40ab70 
@@ -10790,7 +10790,7 @@
             40aceb      5 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ call    sub_407CB0 
             40acf0      3 INSTR BELONGTO 40ab70 
             40acf0      3 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ mov     rdi, rbx 
-            40acf3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40acf3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40acf3      5 INSTR BELONGTO 40ab70 
             40acf3      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 ZZ mov     edx, 1 
             40acf8      5 INSTR BELONGTO 40ab70 
@@ -10798,7 +10798,7 @@
             40acfd     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
             40acfd      5 INSTR BELONGTO 40ab70 
             40acfd      5 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ call    sub_407CB0 
-            40ad02     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40ad02     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40ad02      5 INSTR BELONGTO 40ab70 
             40ad02      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ mov     edx, 1 
             40ad07      3 INSTR BELONGTO 40ab70 
@@ -10810,7 +10810,7 @@
             40ad0f      5 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ call    sub_407CB0 
             40ad14      4 INSTR BELONGTO 40ab70 
             40ad14      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ mov     rax, [rbx+38h] 
-            40ad18     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40ad18     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40ad18      5 INSTR BELONGTO 40ab70 
             40ad18      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, 1 
             40ad1d      4 INSTR BELONGTO 40ab70 
@@ -10841,14 +10841,14 @@
             40ad4e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_pop 
             40ad4e      5 INSTR BELONGTO 40ab70 
             40ad4e      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _gtk_statusbar_pop 
-            40ad53     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40ad53     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40ad53      5 INSTR BELONGTO 40ab70 
             40ad53      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     edx, 5          ; category 
             40ad58      5 INSTR BELONGTO 40ab70 
             40ad58      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, offset aReady; "Ready" 
             40ad5d      2 INSTR BELONGTO 40ab70 
             40ad5d      2 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ xor     edi, edi        ; domainname 
-            40ad5d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40ad5d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40ad5f     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40ad5f      5 INSTR BELONGTO 40ab70 
             40ad5f      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _dcgettext 
@@ -10939,7 +10939,7 @@
             40adfc      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, offset aPipeline_error; "pipeline_error_cb" 
             40ae01      2 INSTR BELONGTO 40ab70 
             40ae01      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ xor     edi, edi 
-            40ae01     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40ae01     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40ae03     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40ae03      5 INSTR BELONGTO 40ab70 
             40ae03      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_return_if_fail_warning 
@@ -10962,7 +10962,7 @@
             40ae1d      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, offset aNotgst_element; "notgst_element_get_toplevel" 
             40ae22      2 INSTR BELONGTO 40ab70 
             40ae22      2 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ xor     edi, edi 
-            40ae22     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40ae22     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40ae24     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40ae24      5 INSTR BELONGTO 40ab70 
             40ae24      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_return_if_fail_warning 
@@ -10970,7 +10970,7 @@
             40ae29      5 INSTR BELONGTO 40ab70 
             40ae2e      2 INSTR BELONGTO 40ab70 
             40ae2e      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ xor     edx, edx 
-            40ae2e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ae2e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ae30      3 INSTR BELONGTO 40ab70 
             40ae30      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ mov     rdi, rbx 
             40ae33      5 INSTR BELONGTO 40ab70 
@@ -10980,7 +10980,7 @@
             40ae38      5 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ call    sub_407CB0 
             40ae3d      2 INSTR BELONGTO 40ab70 
             40ae3d      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ xor     edx, edx 
-            40ae3d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ae3d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ae3f      3 INSTR BELONGTO 40ab70 
             40ae3f      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ mov     rdi, rbx 
             40ae42      5 INSTR BELONGTO 40ab70 
@@ -10990,7 +10990,7 @@
             40ae47      5 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ call    sub_407CB0 
             40ae4c      2 INSTR BELONGTO 40ab70 
             40ae4c      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ xor     edx, edx 
-            40ae4c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ae4c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ae4e      3 INSTR BELONGTO 40ab70 
             40ae4e      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ mov     rdi, rbx 
             40ae51      5 INSTR BELONGTO 40ab70 
@@ -11000,7 +11000,7 @@
             40ae56      5 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ call    sub_407CB0 
             40ae5b      2 INSTR BELONGTO 40ab70 
             40ae5b      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ xor     edx, edx 
-            40ae5b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ae5b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ae5d      3 INSTR BELONGTO 40ab70 
             40ae5d      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ mov     rdi, rbx 
             40ae60      5 INSTR BELONGTO 40ab70 
@@ -11012,10 +11012,10 @@
             40ae6a      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     r12, [rbx+38h] 
             40ae6e      3 INSTR BELONGTO 40ab70 
             40ae6e      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     rdx, rbx 
-            40ae71     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_409170 
+            40ae71     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_409170 
             40ae71      5 INSTR BELONGTO 40ab70 
             40ae71      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 ZZ mov     esi, offset sub_409170 
-            40ae76     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
+            40ae76     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
             40ae76      5 INSTR BELONGTO 40ab70 
             40ae76      5 INSTR DEADREGS  EFLAGS RBX RDI R13 ZZ mov     edi, 3 
             40ae7b      8 INSTR BELONGTO 40ab70 
@@ -11064,10 +11064,10 @@
             40aece      5 PTRIMMEDESP STACK 28 displ lea     rdx, [rsp+48h+var_2C]
             40aed3      2 INSTR BELONGTO 40aeb0 
             40aed3      2 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 R13 ZZ xor     ecx, ecx 
-            40aed3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40aed3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40aed5      2 INSTR BELONGTO 40aeb0 
             40aed5      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ xor     esi, esi 
-            40aed5     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40aed5     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40aed7      3 INSTR BELONGTO 40aeb0 
             40aed7      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rbp 
             40aeda     -1 INSTR LOCAL NoMetaUpdate call    _gst_message_parse_state_changed 
@@ -11107,7 +11107,7 @@
             40af0a      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 XMM0 ZZ mov     esi, offset aPlay_state_cha; "play_state_changed_cb" 
             40af0f      2 INSTR BELONGTO 40aeb0 
             40af0f      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 XMM0 ZZ xor     edi, edi 
-            40af0f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40af0f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40af11     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40af11      5 INSTR BELONGTO 40aeb0 
             40af11      5 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM0 ZZ call    _g_return_if_fail_warning 
@@ -11177,12 +11177,12 @@
             40af89      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R12 R13 ZZ mov     ecx, offset aPlay_state_c_0; "play_state_changed_cb" 
             40af8e      5 INSTR BELONGTO 40aeb0 
             40af8e      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 ZZ mov     edx, offset aGsrWindow_c; "gsr-window.c" 
-            40af93     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            40af93     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             40af93      5 INSTR BELONGTO 40aeb0 
             40af93      5 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 ZZ mov     esi, 4 
             40af98      2 INSTR BELONGTO 40aeb0 
             40af98      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            40af98     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40af98     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40af9a      8 INSTR BELONGTO 40aeb0 
             40af9a      8 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     [rsp+48h+var_48], offset aPlaybinStateS; "playbin state: %s" 
             40af9a      8 PTRIMMEDESP STACK 0 displ mov     [rsp+48h+var_48], offset aPlaybinStateS; "playbin state: %s"
@@ -11240,7 +11240,7 @@
             40affd      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 XMM0 ZZ mov     rax, [rbx+38h] 
             40b001      2 INSTR BELONGTO 40aeb0 
             40b001      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 ZZ xor     esi, esi 
-            40b001     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40b001     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40b003      4 INSTR BELONGTO 40aeb0 
             40b003      4 INSTR DEADREGS  EFLAGS RDI R12 R13 XMM0 ZZ mov     rdi, [rax+8] 
             40b007     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
@@ -11248,7 +11248,7 @@
             40b007      5 INSTR DEADREGS  EFLAGS R12 R13 XMM0 ZZ call    _gtk_widget_set_sensitive 
             40b00c      2 INSTR BELONGTO 40aeb0 
             40b00c      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 XMM0 ZZ xor     edx, edx 
-            40b00c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b00c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b00e      3 INSTR BELONGTO 40aeb0 
             40b00e      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 XMM0 ZZ mov     rdi, rbx 
             40b011      5 INSTR BELONGTO 40aeb0 
@@ -11258,7 +11258,7 @@
             40b016      5 INSTR DEADREGS  EFLAGS RAX R12 R13 XMM0 ZZ call    sub_407CB0 
             40b01b      3 INSTR BELONGTO 40aeb0 
             40b01b      3 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 XMM0 ZZ mov     rdi, rbx 
-            40b01e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b01e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40b01e      5 INSTR BELONGTO 40aeb0 
             40b01e      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 XMM0 ZZ mov     edx, 1 
             40b023      5 INSTR BELONGTO 40aeb0 
@@ -11268,7 +11268,7 @@
             40b028      5 INSTR DEADREGS  EFLAGS RAX R12 R13 XMM0 ZZ call    sub_407CB0 
             40b02d      3 INSTR BELONGTO 40aeb0 
             40b02d      3 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 XMM0 ZZ mov     rdi, rbx 
-            40b030     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b030     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40b030      5 INSTR BELONGTO 40aeb0 
             40b030      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 XMM0 ZZ mov     edx, 1 
             40b035      5 INSTR BELONGTO 40aeb0 
@@ -11278,7 +11278,7 @@
             40b03a      5 INSTR DEADREGS  EFLAGS RAX R12 R13 XMM0 ZZ call    sub_407CB0 
             40b03f      3 INSTR BELONGTO 40aeb0 
             40b03f      3 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 XMM0 ZZ mov     rdi, rbx 
-            40b042     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b042     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40b042      5 INSTR BELONGTO 40aeb0 
             40b042      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 XMM0 ZZ mov     edx, 1 
             40b047      5 INSTR BELONGTO 40aeb0 
@@ -11286,7 +11286,7 @@
             40b04c     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
             40b04c      5 INSTR BELONGTO 40aeb0 
             40b04c      5 INSTR DEADREGS  EFLAGS RAX R12 R13 XMM0 ZZ call    sub_407CB0 
-            40b051     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b051     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40b051      5 INSTR BELONGTO 40aeb0 
             40b051      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 XMM0 ZZ mov     edx, 1 
             40b056      3 INSTR BELONGTO 40aeb0 
@@ -11319,12 +11319,12 @@
             40b08b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_pop 
             40b08b      5 INSTR BELONGTO 40aeb0 
             40b08b      5 INSTR DEADREGS  EFLAGS R12 R13 XMM0 ZZ call    _gtk_statusbar_pop 
-            40b090     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40b090     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40b090      5 INSTR BELONGTO 40aeb0 
             40b090      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 XMM0 ZZ mov     edx, 5          ; category 
             40b095      2 INSTR BELONGTO 40aeb0 
             40b095      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 ZZ xor     edi, edi        ; domainname 
-            40b095     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40b095     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40b097      5 INSTR BELONGTO 40aeb0 
             40b097      5 INSTR DEADREGS  EFLAGS RSI R12 R13 XMM0 ZZ mov     esi, offset aReady; "Ready" 
             40b09c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -11364,7 +11364,7 @@
             40b0df      3 INSTR BELONGTO 40aeb0 
             40b0e2     -1 INSTR LOCAL NoMetaUpdate jz      loc_40B1F0 
             40b0e2      6 INSTR BELONGTO 40aeb0 
-            40b0e8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b0e8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40b0e8      5 INSTR BELONGTO 40aeb0 
             40b0e8      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 XMM0 ZZ mov     edx, 1 
             40b0ed      5 INSTR BELONGTO 40aeb0 
@@ -11376,7 +11376,7 @@
             40b0f5      5 INSTR DEADREGS  EFLAGS RAX R12 R13 XMM0 ZZ call    sub_407CB0 
             40b0fa      2 INSTR BELONGTO 40aeb0 
             40b0fa      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 XMM0 ZZ xor     edx, edx 
-            40b0fa     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b0fa     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b0fc      5 INSTR BELONGTO 40aeb0 
             40b0fc      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 XMM0 ZZ mov     esi, offset aPlay; "Play" 
             40b101      3 INSTR BELONGTO 40aeb0 
@@ -11386,7 +11386,7 @@
             40b104      5 INSTR DEADREGS  EFLAGS RAX R12 R13 XMM0 ZZ call    sub_407CB0 
             40b109      2 INSTR BELONGTO 40aeb0 
             40b109      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 XMM0 ZZ xor     edx, edx 
-            40b109     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b109     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b10b      5 INSTR BELONGTO 40aeb0 
             40b10b      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 XMM0 ZZ mov     esi, offset aRecord; "Record" 
             40b110      3 INSTR BELONGTO 40aeb0 
@@ -11396,7 +11396,7 @@
             40b113      5 INSTR DEADREGS  EFLAGS RAX R12 R13 XMM0 ZZ call    sub_407CB0 
             40b118      2 INSTR BELONGTO 40aeb0 
             40b118      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 XMM0 ZZ xor     edx, edx 
-            40b118     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b118     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b11a      5 INSTR BELONGTO 40aeb0 
             40b11a      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 XMM0 ZZ mov     esi, offset aFilesave; "FileSave" 
             40b11f      3 INSTR BELONGTO 40aeb0 
@@ -11406,7 +11406,7 @@
             40b122      5 INSTR DEADREGS  EFLAGS RAX R12 R13 XMM0 ZZ call    sub_407CB0 
             40b127      2 INSTR BELONGTO 40aeb0 
             40b127      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 XMM0 ZZ xor     edx, edx 
-            40b127     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b127     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b129      5 INSTR BELONGTO 40aeb0 
             40b129      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 XMM0 ZZ mov     esi, offset aFilesaveas; "FileSaveAs" 
             40b12e      3 INSTR BELONGTO 40aeb0 
@@ -11416,7 +11416,7 @@
             40b131      5 INSTR DEADREGS  EFLAGS RAX R12 R13 XMM0 ZZ call    sub_407CB0 
             40b136      4 INSTR BELONGTO 40aeb0 
             40b136      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 XMM0 ZZ mov     rax, [rbx+38h] 
-            40b13a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40b13a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40b13a      5 INSTR BELONGTO 40aeb0 
             40b13a      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 ZZ mov     esi, 1 
             40b13f      4 INSTR BELONGTO 40aeb0 
@@ -11447,12 +11447,12 @@
             40b170     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_pop 
             40b170      5 INSTR BELONGTO 40aeb0 
             40b170      5 INSTR DEADREGS  EFLAGS R12 R13 XMM0 ZZ call    _gtk_statusbar_pop 
-            40b175     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40b175     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40b175      5 INSTR BELONGTO 40aeb0 
             40b175      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 XMM0 ZZ mov     edx, 5          ; category 
             40b17a      2 INSTR BELONGTO 40aeb0 
             40b17a      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 ZZ xor     edi, edi        ; domainname 
-            40b17a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40b17a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40b17c      5 INSTR BELONGTO 40aeb0 
             40b17c      5 INSTR DEADREGS  EFLAGS RSI R12 R13 XMM0 ZZ mov     esi, offset aPlayingtaj; "Playing…" 
             40b181     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -11501,10 +11501,10 @@
             40b1e1      5 INSTR BELONGTO 40aeb0 
             40b1f0      3 INSTR BELONGTO 40aeb0 
             40b1f0      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 XMM0 ZZ mov     rdx, rbx 
-            40b1f3     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_4073E0 
+            40b1f3     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_4073E0 
             40b1f3      5 INSTR BELONGTO 40aeb0 
             40b1f3      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 ZZ mov     esi, offset sub_4073E0 
-            40b1f8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0C8h 
+            40b1f8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0C8h 
             40b1f8      5 INSTR BELONGTO 40aeb0 
             40b1f8      5 INSTR DEADREGS  EFLAGS RDI R12 R13 XMM0 ZZ mov     edi, 0C8h 
             40b1fd     -1 INSTR LOCAL NoMetaUpdate call    _g_timeout_add 
@@ -11601,12 +11601,12 @@
             40b299      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ mov     ecx, offset aRecord_eos_m_0; "record_eos_msg_cb" 
             40b29e      5 INSTR BELONGTO 40b230 
             40b29e      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aGsrWindow_c; "gsr-window.c" 
-            40b2a3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            40b2a3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             40b2a3      5 INSTR BELONGTO 40b230 
             40b2a3      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 4 
             40b2a8      2 INSTR BELONGTO 40b230 
             40b2a8      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40b2a8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b2a8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b2aa      8 INSTR BELONGTO 40b230 
             40b2aa      8 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+28h+var_28], offset aEos_FinishedRe; "EOS. Finished recording" 
             40b2aa      8 PTRIMMEDESP STACK 0 displ mov     [rsp+28h+var_28], offset aEos_FinishedRe; "EOS. Finished recording"
@@ -11694,10 +11694,10 @@
             40b34e      5 PTRIMMEDESP STACK 28 displ lea     rdx, [rsp+48h+var_2C]
             40b353      2 INSTR BELONGTO 40b330 
             40b353      2 INSTR DEADREGS  EFLAGS RCX RSI RDI R12 R13 ZZ xor     ecx, ecx 
-            40b353     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b353     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b355      2 INSTR BELONGTO 40b330 
             40b355      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ xor     esi, esi 
-            40b355     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40b355     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40b357      3 INSTR BELONGTO 40b330 
             40b357      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rbp 
             40b35a     -1 INSTR LOCAL NoMetaUpdate call    _gst_message_parse_state_changed 
@@ -11737,7 +11737,7 @@
             40b38a      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 XMM0 ZZ mov     esi, offset aRecord_state_c; "record_state_changed_cb" 
             40b38f      2 INSTR BELONGTO 40b330 
             40b38f      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 XMM0 ZZ xor     edi, edi 
-            40b38f     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b38f     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b391     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40b391      5 INSTR BELONGTO 40b330 
             40b391      5 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM0 ZZ call    _g_return_if_fail_warning 
@@ -11807,12 +11807,12 @@
             40b409      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R12 R13 ZZ mov     ecx, offset aRecord_state_0; "record_state_changed_cb" 
             40b40e      5 INSTR BELONGTO 40b330 
             40b40e      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 ZZ mov     edx, offset aGsrWindow_c; "gsr-window.c" 
-            40b413     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            40b413     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             40b413      5 INSTR BELONGTO 40b330 
             40b413      5 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 ZZ mov     esi, 4 
             40b418      2 INSTR BELONGTO 40b330 
             40b418      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            40b418     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b418     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b41a      8 INSTR BELONGTO 40b330 
             40b41a      8 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     [rsp+48h+var_48], offset aRecordPipeline; "record pipeline state: %s" 
             40b41a      8 PTRIMMEDESP STACK 0 displ mov     [rsp+48h+var_48], offset aRecordPipeline; "record pipeline state: %s"
@@ -11862,7 +11862,7 @@
             40b46f      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 XMM0 ZZ mov     rax, [rbx+38h] 
             40b473      2 INSTR BELONGTO 40b330 
             40b473      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 ZZ xor     esi, esi 
-            40b473     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40b473     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40b475      4 INSTR BELONGTO 40b330 
             40b475      4 INSTR DEADREGS  EFLAGS RDI R12 R13 XMM0 ZZ mov     rdi, [rax+8] 
             40b479     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
@@ -11900,7 +11900,7 @@
             40b4b2      5 INSTR DEADREGS  EFLAGS R12 R13 XMM0 ZZ call    _gtk_widget_set_sensitive 
             40b4b7      2 INSTR BELONGTO 40b330 
             40b4b7      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 XMM0 ZZ xor     edx, edx 
-            40b4b7     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b4b7     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b4b9      5 INSTR BELONGTO 40b330 
             40b4b9      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 XMM0 ZZ mov     esi, offset aStop; "Stop" 
             40b4be      3 INSTR BELONGTO 40b330 
@@ -11908,7 +11908,7 @@
             40b4c1     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
             40b4c1      5 INSTR BELONGTO 40b330 
             40b4c1      5 INSTR DEADREGS  EFLAGS RAX R12 R13 XMM0 ZZ call    sub_407CB0 
-            40b4c6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b4c6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40b4c6      5 INSTR BELONGTO 40b330 
             40b4c6      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 XMM0 ZZ mov     edx, 1 
             40b4cb      5 INSTR BELONGTO 40b330 
@@ -11918,7 +11918,7 @@
             40b4d3     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
             40b4d3      5 INSTR BELONGTO 40b330 
             40b4d3      5 INSTR DEADREGS  EFLAGS RAX R12 R13 XMM0 ZZ call    sub_407CB0 
-            40b4d8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b4d8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40b4d8      5 INSTR BELONGTO 40b330 
             40b4d8      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 XMM0 ZZ mov     edx, 1 
             40b4dd      5 INSTR BELONGTO 40b330 
@@ -11928,7 +11928,7 @@
             40b4e5     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
             40b4e5      5 INSTR BELONGTO 40b330 
             40b4e5      5 INSTR DEADREGS  EFLAGS RAX R12 R13 XMM0 ZZ call    sub_407CB0 
-            40b4ea     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b4ea     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40b4ea      5 INSTR BELONGTO 40b330 
             40b4ea      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 XMM0 ZZ mov     edx, 1 
             40b4ef      5 INSTR BELONGTO 40b330 
@@ -11938,7 +11938,7 @@
             40b4f7     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
             40b4f7      5 INSTR BELONGTO 40b330 
             40b4f7      5 INSTR DEADREGS  EFLAGS RAX R12 R13 XMM0 ZZ call    sub_407CB0 
-            40b4fc     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b4fc     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40b4fc      5 INSTR BELONGTO 40b330 
             40b4fc      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 XMM0 ZZ mov     edx, 1 
             40b501      5 INSTR BELONGTO 40b330 
@@ -11952,7 +11952,7 @@
             40b50e      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 XMM0 ZZ mov     rax, [rbx+38h] 
             40b512      2 INSTR BELONGTO 40b330 
             40b512      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 ZZ xor     esi, esi 
-            40b512     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40b512     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40b514      4 INSTR BELONGTO 40b330 
             40b514      4 INSTR DEADREGS  EFLAGS RDI R12 R13 XMM0 ZZ mov     rdi, [rax+8] 
             40b518     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
@@ -11999,12 +11999,12 @@
             40b569     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_pop 
             40b569      5 INSTR BELONGTO 40b330 
             40b569      5 INSTR DEADREGS  EFLAGS R12 R13 XMM0 ZZ call    _gtk_statusbar_pop 
-            40b56e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40b56e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40b56e      5 INSTR BELONGTO 40b330 
             40b56e      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 XMM0 ZZ mov     edx, 5          ; category 
             40b573      2 INSTR BELONGTO 40b330 
             40b573      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 ZZ xor     edi, edi        ; domainname 
-            40b573     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40b573     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40b575      5 INSTR BELONGTO 40b330 
             40b575      5 INSTR DEADREGS  EFLAGS RSI R12 R13 XMM0 ZZ mov     esi, offset aReady; "Ready" 
             40b57a     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -12053,7 +12053,7 @@
             40b5d8      4 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 ZZ mov     rbp, [rbx+38h] 
             40b5dc      3 INSTR BELONGTO 40b330 
             40b5dc      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 ZZ mov     rsi, rbx 
-            40b5df     -2 INSTR LOCAL n EDI ZZ  NumericDEFs mov     edi, offset sub_40B660 
+            40b5df     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     edi, offset sub_40B660 
             40b5df      5 INSTR BELONGTO 40b330 
             40b5df      5 INSTR DEADREGS  EFLAGS RDI R12 R13 XMM0 ZZ mov     edi, offset sub_40B660 
             40b5e4     -1 INSTR LOCAL NoMetaUpdate call    _g_idle_add 
@@ -12077,7 +12077,7 @@
             40b607      5 INSTR DEADREGS  EFLAGS R12 R13 XMM0 ZZ call    _gm_audio_profile_choose_get_active 
             40b60c      2 INSTR BELONGTO 40b330 
             40b60c      2 INSTR DEADREGS  EFLAGS RDI R12 R13 XMM0 ZZ xor     edi, edi 
-            40b60c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b60c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b60e     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40b60e      3 INSTR BELONGTO 40b330 
             40b611      4 INSTR BELONGTO 40b330 
@@ -12100,7 +12100,7 @@
             40b62e      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 XMM0 ZZ mov     rax, [rbx+38h] 
             40b632      2 INSTR BELONGTO 40b330 
             40b632      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 XMM0 ZZ xor     esi, esi 
-            40b632     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40b632     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40b634      4 INSTR BELONGTO 40b330 
             40b634      4 INSTR DEADREGS  EFLAGS RDI R12 R13 XMM0 ZZ mov     rdi, [rax+10h] 
             40b638     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
@@ -12196,12 +12196,12 @@
             40b6de      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _gtk_label_set_text 
             40b6e3      4 INSTR BELONGTO 40b660 
             40b6e3      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ mov     rax, [rbx+38h] 
-            40b6e7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40b6e7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40b6e7      5 INSTR BELONGTO 40b660 
             40b6e7      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     edx, 5          ; category 
             40b6ec      2 INSTR BELONGTO 40b660 
             40b6ec      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ xor     edi, edi        ; domainname 
-            40b6ec     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40b6ec     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40b6ee      5 INSTR BELONGTO 40b660 
             40b6ee      5 INSTR DEADREGS  EFLAGS RSI R12 R13 ZZ mov     esi, offset aSTafSoundRecor; "%s — Sound Recorder" 
             40b6f3      7 INSTR BELONGTO 40b660 
@@ -12213,7 +12213,7 @@
             40b6ff      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     rdi, rax 
             40b702      2 INSTR BELONGTO 40b660 
             40b702      2 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 ZZ xor     eax, eax 
-            40b702     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b702     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b704      3 INSTR BELONGTO 40b660 
             40b704      3 INSTR DEADREGS  EFLAGS RSI R12 R13 ZZ mov     rsi, rbp 
             40b707     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
@@ -12247,10 +12247,10 @@
             40b732      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     rbp, [rbx+38h] 
             40b736      3 INSTR BELONGTO 40b660 
             40b736      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     rdx, rbx 
-            40b739     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_407750 
+            40b739     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_407750 
             40b739      5 INSTR BELONGTO 40b660 
             40b739      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, offset sub_407750 
-            40b73e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0C8h 
+            40b73e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0C8h 
             40b73e      5 INSTR BELONGTO 40b660 
             40b73e      5 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     edi, 0C8h 
             40b743     10 INSTR BELONGTO 40b660 
@@ -12262,7 +12262,7 @@
             40b752      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     rdi, rbx 
             40b755      6 INSTR BELONGTO 40b660 
             40b755      6 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 ZZ mov     [rbp+104h], eax 
-            40b75b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b75b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40b75b      5 INSTR BELONGTO 40b660 
             40b75b      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 ZZ mov     edx, 1 
             40b760      5 INSTR BELONGTO 40b660 
@@ -12272,7 +12272,7 @@
             40b765      5 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ call    sub_407CB0 
             40b76a      2 INSTR BELONGTO 40b660 
             40b76a      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ xor     edx, edx 
-            40b76a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b76a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b76c      3 INSTR BELONGTO 40b660 
             40b76c      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ mov     rdi, rbx 
             40b76f      5 INSTR BELONGTO 40b660 
@@ -12282,7 +12282,7 @@
             40b774      5 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ call    sub_407CB0 
             40b779      2 INSTR BELONGTO 40b660 
             40b779      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ xor     edx, edx 
-            40b779     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b779     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b77b      3 INSTR BELONGTO 40b660 
             40b77b      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ mov     rdi, rbx 
             40b77e      5 INSTR BELONGTO 40b660 
@@ -12292,7 +12292,7 @@
             40b783      5 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ call    sub_407CB0 
             40b788      2 INSTR BELONGTO 40b660 
             40b788      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ xor     edx, edx 
-            40b788     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b788     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b78a      3 INSTR BELONGTO 40b660 
             40b78a      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ mov     rdi, rbx 
             40b78d      5 INSTR BELONGTO 40b660 
@@ -12302,7 +12302,7 @@
             40b792      5 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ call    sub_407CB0 
             40b797      2 INSTR BELONGTO 40b660 
             40b797      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R13 ZZ xor     edx, edx 
-            40b797     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b797     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b799      3 INSTR BELONGTO 40b660 
             40b799      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ mov     rdi, rbx 
             40b79c      5 INSTR BELONGTO 40b660 
@@ -12314,7 +12314,7 @@
             40b7a6      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 R13 ZZ mov     rax, [rbx+38h] 
             40b7aa      2 INSTR BELONGTO 40b660 
             40b7aa      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ xor     esi, esi 
-            40b7aa     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40b7aa     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40b7ac      4 INSTR BELONGTO 40b660 
             40b7ac      4 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, [rax+8] 
             40b7b0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
@@ -12343,12 +12343,12 @@
             40b7dd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_pop 
             40b7dd      5 INSTR BELONGTO 40b660 
             40b7dd      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _gtk_statusbar_pop 
-            40b7e2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40b7e2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40b7e2      5 INSTR BELONGTO 40b660 
             40b7e2      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     edx, 5          ; category 
             40b7e7      2 INSTR BELONGTO 40b660 
             40b7e7      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ xor     edi, edi        ; domainname 
-            40b7e7     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40b7e7     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40b7e9      5 INSTR BELONGTO 40b660 
             40b7e9      5 INSTR DEADREGS  EFLAGS RSI R12 R13 ZZ mov     esi, offset aRecordingtaj; "Recording…" 
             40b7ee     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -12382,7 +12382,7 @@
             40b822     10 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 ZZ mov     dword ptr [rax+108h], 0 
             40b82c      2 INSTR BELONGTO 40b660 
             40b82c      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 ZZ xor     eax, eax 
-            40b82c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b82c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b82e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             40b82e      4 INSTR BELONGTO 40b660 
             40b832      1 INSTR BELONGTO 40b660 
@@ -12400,14 +12400,14 @@
             40b840      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 R13 ZZ mov     r8d, offset aWindowPrivTick; "window->priv->tick_id == 0" 
             40b846      5 INSTR BELONGTO 40b660 
             40b846      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R13 ZZ mov     ecx, offset aRecord_start; "record_start" 
-            40b84b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6BBh 
+            40b84b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 6BBh 
             40b84b      5 INSTR BELONGTO 40b660 
             40b84b      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 ZZ mov     edx, 6BBh 
             40b850      5 INSTR BELONGTO 40b660 
             40b850      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, offset aGsrWindow_c; "gsr-window.c" 
             40b855      2 INSTR BELONGTO 40b660 
             40b855      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ xor     edi, edi 
-            40b855     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b855     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b857     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40b857      5 INSTR BELONGTO 40b660 
             40b857      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_assertion_message_expr 
@@ -12475,7 +12475,7 @@
             40b89c      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, offset aFile_save_as_c; "file_save_as_cb" 
             40b8a1      2 INSTR BELONGTO 40b860 
             40b8a1      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            40b8a1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40b8a1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40b8a3     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40b8a3      5 INSTR BELONGTO 40b860 
             40b8a3      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_return_if_fail_warning 
@@ -12509,10 +12509,10 @@
             40b8ce      5 INSTR DEADREGS  EFLAGS R12 R13 R15 ZZ call    _g_type_check_instance_cast 
             40b8d3      2 INSTR BELONGTO 40b860 
             40b8d3      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R15 ZZ xor     edi, edi        ; domainname 
-            40b8d3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40b8d3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40b8d5      3 INSTR BELONGTO 40b860 
             40b8d5      3 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R15 ZZ mov     rbp, rax 
-            40b8d8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40b8d8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40b8d8      5 INSTR BELONGTO 40b860 
             40b8d8      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R15 ZZ mov     edx, 5          ; category 
             40b8dd      5 INSTR BELONGTO 40b860 
@@ -12531,12 +12531,12 @@
             40b8f3      6 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R12 R13 R15 ZZ mov     r8d, 0FFFFFFFAh 
             40b8f9      5 INSTR BELONGTO 40b860 
             40b8f9      5 INSTR DEADREGS  EFLAGS RAX RCX RDX R12 R13 R15 ZZ mov     ecx, offset aGtkCancel; "gtk-cancel" 
-            40b8fe     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b8fe     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40b8fe      5 INSTR BELONGTO 40b860 
             40b8fe      5 INSTR DEADREGS  EFLAGS RAX RDX R12 R13 R15 ZZ mov     edx, 1 
             40b903      2 INSTR BELONGTO 40b860 
             40b903      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R15 ZZ xor     eax, eax 
-            40b903     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b903     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b905      9 INSTR BELONGTO 40b860 
             40b905      9 INSTR DEADREGS  EFLAGS R12 R13 R15 ZZ mov     [rsp+88h+var_80], 0 
             40b905      9 PTRIMMEDESP STACK 8 displ mov     [rsp+88h+var_80], 0
@@ -12550,7 +12550,7 @@
             40b91a      7 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R15 ZZ mov     rdi, cs:qword_610900 
             40b921      2 INSTR BELONGTO 40b860 
             40b921      2 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R15 ZZ xor     edx, edx 
-            40b921     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b921     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b923      5 INSTR BELONGTO 40b860 
             40b923      5 INSTR DEADREGS  EFLAGS RSI R12 R13 R15 ZZ mov     esi, offset aAppsGnomeSound; "/apps/gnome-sound-recorder/system-state"... 
             40b928      3 INSTR BELONGTO 40b860 
@@ -12589,10 +12589,10 @@
             40b962      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 R15 ZZ xor     r8d, r8d 
             40b965      2 INSTR BELONGTO 40b860 
             40b965      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 R15 ZZ xor     ecx, ecx 
-            40b965     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40b965     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40b967      2 INSTR BELONGTO 40b860 
             40b967      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R15 ZZ xor     edx, edx 
-            40b967     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b967     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b969     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             40b969      7 INSTR BELONGTO 40b860 
             40b969      7 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R15 ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -12655,7 +12655,7 @@
             40b9cb      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aS_S; "%s.%s" 
             40b9d0      2 INSTR BELONGTO 40b860 
             40b9d0      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40b9d0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b9d0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b9d2     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40b9d2      5 INSTR BELONGTO 40b860 
             40b9d2      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strdup_printf 
@@ -12749,10 +12749,10 @@
             40ba60      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R15 ZZ xor     r8d, r8d 
             40ba63      2 INSTR BELONGTO 40b860 
             40ba63      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R15 ZZ xor     ecx, ecx 
-            40ba63     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ba63     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40ba65      2 INSTR BELONGTO 40b860 
             40ba65      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R15 ZZ xor     edx, edx 
-            40ba65     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ba65     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ba67     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             40ba67      7 INSTR BELONGTO 40b860 
             40ba67      7 INSTR DEADREGS  EFLAGS RSI RDI R13 R15 ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -12767,7 +12767,7 @@
             40ba79      3 INSTR DEADREGS  RDI R13 R15 ZZ mov     r13, rax 
             40ba7c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40BA8F 
             40ba7c      2 INSTR BELONGTO 40b860 
-            40ba7e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40ba7e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40ba7e      5 INSTR BELONGTO 40b860 
             40ba7e      5 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     esi, 10h 
             40ba83      3 INSTR BELONGTO 40b860 
@@ -12836,10 +12836,10 @@
             40baec      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R15 ZZ xor     r8d, r8d 
             40baef      2 INSTR BELONGTO 40b860 
             40baef      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ xor     ecx, ecx 
-            40baef     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40baef     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40baf1      2 INSTR BELONGTO 40b860 
             40baf1      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ xor     edx, edx 
-            40baf1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40baf1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40baf3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             40baf3      7 INSTR BELONGTO 40b860 
             40baf3      7 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -12859,7 +12859,7 @@
             40bb0f      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R15 ZZ mov     rdi, cs:qword_610900 
             40bb16      2 INSTR BELONGTO 40b860 
             40bb16      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R15 ZZ xor     ecx, ecx 
-            40bb16     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40bb16     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40bb18      5 INSTR BELONGTO 40b860 
             40bb18      5 INSTR DEADREGS  EFLAGS RDX RSI R15 ZZ mov     esi, offset aAppsGnomeSound; "/apps/gnome-sound-recorder/system-state"... 
             40bb1d      3 INSTR BELONGTO 40b860 
@@ -12912,7 +12912,7 @@
             40bb73      5 INSTR BELONGTO 40b860 
             40bb73      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, [rsp+88h+var_70] 
             40bb73      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+88h+var_70]
-            40bb78     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40bb78     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40bb78      5 INSTR BELONGTO 40b860 
             40bb78      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 10h 
             40bb7d     -1 INSTR LOCAL NoMetaUpdate call    _g_file_test 
@@ -12930,10 +12930,10 @@
             40bb8f      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 ZZ xor     r8d, r8d 
             40bb92      2 INSTR BELONGTO 40b860 
             40bb92      2 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ xor     ecx, ecx 
-            40bb92     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40bb92     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40bb94      2 INSTR BELONGTO 40b860 
             40bb94      2 INSTR DEADREGS  EFLAGS RDX RSI ZZ xor     edx, edx 
-            40bb94     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40bb94     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40bb96     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             40bb96      7 INSTR BELONGTO 40b860 
             40bb96      7 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -12952,8 +12952,8 @@
             40bbad      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
             40bbb2      2 INSTR BELONGTO 40b860 
             40bbb2      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edi, edi        ; domainname 
-            40bbb2     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            40bbb4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40bbb2     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40bbb4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40bbb4      5 INSTR BELONGTO 40b860 
             40bbb4      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             40bbb9      5 INSTR BELONGTO 40b860 
@@ -12979,16 +12979,16 @@
             40bbdc      5 PTRIMMEDESP STACK 32 displ mov     rdi, [rsp+88h+var_68]
             40bbe1      2 INSTR BELONGTO 40b860 
             40bbe1      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ xor     ecx, ecx 
-            40bbe1     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40bbe3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40bbe1     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40bbe3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40bbe3      5 INSTR BELONGTO 40b860 
             40bbe3      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, 2 
-            40bbe8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40bbe8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40bbe8      5 INSTR BELONGTO 40b860 
             40bbe8      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 2 
             40bbed      2 INSTR BELONGTO 40b860 
             40bbed      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40bbed     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bbed     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bbef     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             40bbef      5 INSTR BELONGTO 40b860 
             40bbef      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_message_dialog_new 
@@ -13002,7 +13002,7 @@
             40bbff     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40bbff      5 INSTR BELONGTO 40b860 
             40bbff      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-            40bc04     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFAh 
+            40bc04     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFAh 
             40bc04      5 INSTR BELONGTO 40b860 
             40bc04      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 0FFFFFFFAh 
             40bc09      5 INSTR BELONGTO 40b860 
@@ -13014,8 +13014,8 @@
             40bc11      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_dialog_add_button 
             40bc16      2 INSTR BELONGTO 40b860 
             40bc16      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edi, edi        ; domainname 
-            40bc16     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            40bc18     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40bc16     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40bc18     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40bc18      5 INSTR BELONGTO 40b860 
             40bc18      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             40bc1d      5 INSTR BELONGTO 40b860 
@@ -13073,7 +13073,7 @@
             40bc74      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGsr_dialog_add; "gsr_dialog_add_button" 
             40bc79      2 INSTR BELONGTO 40b860 
             40bc79      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40bc79     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40bc79     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40bc7b     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40bc7b      5 INSTR BELONGTO 40b860 
             40bc7b      5 INSTR DEADREGS  EFLAGS ZZ call    _g_return_if_fail_warning 
@@ -13085,7 +13085,7 @@
             40bc88     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40bc88      5 INSTR BELONGTO 40b860 
             40bc88      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
-            40bc8d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFAh 
+            40bc8d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFAh 
             40bc8d      5 INSTR BELONGTO 40b860 
             40bc8d      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 0FFFFFFFAh 
             40bc92      3 INSTR BELONGTO 40b860 
@@ -13103,7 +13103,7 @@
             40bca2      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_check_instance_cast 
             40bca7      2 INSTR BELONGTO 40b860 
             40bca7      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            40bca7     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40bca7     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40bca9      3 INSTR BELONGTO 40b860 
             40bca9      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             40bcac     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_resizable 
@@ -13180,8 +13180,8 @@
             40bd22      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 ZZ xor     r8d, r8d 
             40bd25      2 INSTR BELONGTO 40b860 
             40bd25      2 INSTR DEADREGS  EFLAGS RCX RDX RDI ZZ xor     ecx, ecx 
-            40bd25     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40bd27     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40bd25     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40bd27     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40bd27      5 INSTR BELONGTO 40b860 
             40bd27      5 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edx, 1 
             40bd2c      3 INSTR BELONGTO 40b860 
@@ -13204,24 +13204,24 @@
             40bd45      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R15 ZZ xor     r8d, r8d 
             40bd48      2 INSTR BELONGTO 40b860 
             40bd48      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R15 ZZ xor     ecx, ecx 
-            40bd48     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40bd48     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40bd4a      2 INSTR BELONGTO 40b860 
             40bd4a      2 INSTR DEADREGS  EFLAGS RDX RSI R15 ZZ xor     edx, edx 
-            40bd4a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40bd4a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40bd4c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             40bd4c      7 INSTR BELONGTO 40b860 
             40bd4c      7 INSTR DEADREGS  EFLAGS RSI R15 ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
             40bd53     -1 INSTR LOCAL NoMetaUpdate call    _g_filename_to_utf8 
             40bd53      5 INSTR BELONGTO 40b860 
             40bd53      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _g_filename_to_utf8 
-            40bd58     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40bd58     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40bd58      5 INSTR BELONGTO 40b860 
             40bd58      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R15 ZZ mov     edx, 5          ; category 
             40bd5d      5 INSTR BELONGTO 40b860 
             40bd5d      5 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ mov     esi, offset aCouldNotSaveTh; "Could not save the file \"%s\"" 
             40bd62      2 INSTR BELONGTO 40b860 
             40bd62      2 INSTR DEADREGS  EFLAGS RDI R15 ZZ xor     edi, edi        ; domainname 
-            40bd62     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40bd62     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40bd64      3 INSTR BELONGTO 40b860 
             40bd64      3 INSTR DEADREGS  EFLAGS R15 ZZ mov     r15, rax 
             40bd67     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -13244,10 +13244,10 @@
             40bd84      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R10 R11 R14 ZZ mov     rcx, r15 
             40bd87      2 INSTR BELONGTO 40b860 
             40bd87      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R10 R11 R14 ZZ xor     esi, esi 
-            40bd87     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40bd87     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40bd89      2 INSTR BELONGTO 40b860 
             40bd89      2 INSTR DEADREGS  EFLAGS RAX RDX RBX R10 R11 R14 ZZ xor     eax, eax 
-            40bd89     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bd89     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bd8b     -1 INSTR LOCAL NoMetaUpdate call    sub_407A20 
             40bd8b      5 INSTR BELONGTO 40b860 
             40bd8b      5 INSTR DEADREGS  EFLAGS RDX RBX R10 R11 R14 ZZ call    sub_407A20 
@@ -13290,7 +13290,7 @@
             40bdd0      5 PTRIMMEDESP STACK 24 displ mov     [rsp+88h+var_70], rax
             40bdd5     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40B9DC 
             40bdd5      5 INSTR BELONGTO 40b860 
-            40bde0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40bde0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40bde0      5 INSTR BELONGTO 40b860 
             40bde0      5 INSTR DEADREGS  EFLAGS RSI RDI R14 ZZ mov     esi, 50h 
             40bde5      3 INSTR BELONGTO 40b860 
@@ -13303,14 +13303,14 @@
             40bded      5 PTRIMMEDESP STACK 24 displ mov     rdx, [rsp+88h+var_70]
             40bdf2      2 INSTR BELONGTO 40b860 
             40bdf2      2 INSTR DEADREGS  EFLAGS RCX RSI RDI R14 ZZ xor     ecx, ecx 
-            40bdf2     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40bdf2     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40bdf4      3 INSTR BELONGTO 40b860 
             40bdf4      3 INSTR DEADREGS  EFLAGS RSI RDI R14 ZZ mov     rdi, rax 
             40bdf7      5 INSTR BELONGTO 40b860 
             40bdf7      5 INSTR DEADREGS  EFLAGS RAX RSI R14 ZZ mov     esi, offset aLocation_0; "location" 
             40bdfc      2 INSTR BELONGTO 40b860 
             40bdfc      2 INSTR DEADREGS  EFLAGS RAX R14 ZZ xor     eax, eax 
-            40bdfc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bdfc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bdfe     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             40bdfe      5 INSTR BELONGTO 40b860 
             40bdfe      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _g_object_set 
@@ -13341,7 +13341,7 @@
             40be4c      7 INSTR DEADREGS  EFLAGS RDX ZZ mov     rdx, [rax+0C8h] 
             40be53      2 INSTR BELONGTO 40b860 
             40be53      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40be53     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40be53     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40be55     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40be55      5 INSTR BELONGTO 40b860 
             40be55      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strdup_printf 
@@ -13356,7 +13356,7 @@
             40be69      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R14 R15 ZZ mov     esi, offset aReplace_dialog; "replace_dialog" 
             40be6e      2 INSTR BELONGTO 40b860 
             40be6e      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R14 R15 ZZ xor     edi, edi 
-            40be6e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40be6e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40be70     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40be70      5 INSTR BELONGTO 40b860 
             40be70      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ call    _g_return_if_fail_warning 
@@ -13382,7 +13382,7 @@
             40be9a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_new_with_mnemonic 
             40be9a      5 INSTR BELONGTO 40b860 
             40be9a      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_button_new_with_mnemonic 
-            40be9f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            40be9f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             40be9f      5 INSTR BELONGTO 40b860 
             40be9f      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 4 
             40bea4      5 INSTR BELONGTO 40b860 
@@ -13418,7 +13418,7 @@
             40bed7      5 INSTR BELONGTO 40b860 
             40bed7      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, [rsp+88h+var_60] 
             40bed7      5 PTRIMMEDESP STACK 40 displ mov     rdi, [rsp+88h+var_60]
-            40bedc     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40bedc     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40bedc      5 INSTR BELONGTO 40b860 
             40bedc      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
             40bee1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_can_default 
@@ -13436,7 +13436,7 @@
             40bef5      5 INSTR BELONGTO 40b860 
             40bef5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rsi, [rsp+88h+var_60] 
             40bef5      5 PTRIMMEDESP STACK 40 displ mov     rsi, [rsp+88h+var_60]
-            40befa     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF8h 
+            40befa     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF8h 
             40befa      5 INSTR BELONGTO 40b860 
             40befa      5 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edx, 0FFFFFFF8h 
             40beff      3 INSTR BELONGTO 40b860 
@@ -13452,7 +13452,7 @@
             40bf11      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aGsr_dialog_add; "gsr_dialog_add_button" 
             40bf16      2 INSTR BELONGTO 40b860 
             40bf16      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            40bf16     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40bf16     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40bf18     -1 INSTR LOCAL NoMetaUpdate call    _g_return_if_fail_warning 
             40bf18      5 INSTR BELONGTO 40b860 
             40bf18      5 INSTR DEADREGS  EFLAGS ZZ call    _g_return_if_fail_warning 
@@ -13464,7 +13464,7 @@
             40bf30      2 INSTR DEADREGS  EFLAGS RDX ZZ push    r14 
             40bf30     -3 INSTR LOCAL NoWarn push    r14 
             40bf30    465 FUNC GLOBAL sub_40BF30 FUNC_UNSAFE NOFP RET             40c100 
-            40bf32     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40bf32     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40bf32      5 INSTR BELONGTO 40bf30 
             40bf32      5 INSTR DEADREGS  EFLAGS RDX R14 ZZ mov     edx, 5          ; category 
             40bf37      2 INSTR BELONGTO 40bf30 
@@ -13495,7 +13495,7 @@
             40bf4c      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R14 ZZ mov     esi, offset aSaveRecordingB; "Save recording before closing?" 
             40bf51      2 INSTR BELONGTO 40bf30 
             40bf51      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R14 ZZ xor     edi, edi        ; domainname 
-            40bf51     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40bf51     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40bf53     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40bf53      5 INSTR BELONGTO 40bf30 
             40bf53      5 INSTR DEADREGS  EFLAGS RBX R12 R14 ZZ call    _dcgettext 
@@ -13521,27 +13521,27 @@
             40bf74      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R14 ZZ mov     r8d, offset aSpanWeightBold; "<span weight=\"bold\" size=\"larger\">%"... 
             40bf7a      2 INSTR BELONGTO 40bf30 
             40bf7a      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R14 ZZ xor     ecx, ecx 
-            40bf7a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40bf7c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40bf7a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40bf7c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40bf7c      5 INSTR BELONGTO 40bf30 
             40bf7c      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R14 ZZ mov     edx, 1 
-            40bf81     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40bf81     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40bf81      5 INSTR BELONGTO 40bf30 
             40bf81      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R14 ZZ mov     esi, 1 
             40bf86      2 INSTR BELONGTO 40bf30 
             40bf86      2 INSTR DEADREGS  EFLAGS RAX RBX R14 ZZ xor     eax, eax 
-            40bf86     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bf86     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bf88     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new_with_markup 
             40bf88      5 INSTR BELONGTO 40bf30 
             40bf88      5 INSTR DEADREGS  EFLAGS RBX R14 ZZ call    _gtk_message_dialog_new_with_markup 
-            40bf8d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40bf8d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40bf8d      5 INSTR BELONGTO 40bf30 
             40bf8d      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R14 ZZ mov     edx, 5          ; category 
             40bf92      5 INSTR BELONGTO 40bf30 
             40bf92      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R14 ZZ mov     esi, offset aClose_withoutS; "Close _without Saving" 
             40bf97      2 INSTR BELONGTO 40bf30 
             40bf97      2 INSTR DEADREGS  EFLAGS RBX RDI R14 ZZ xor     edi, edi        ; domainname 
-            40bf97     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40bf97     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40bf99      3 INSTR BELONGTO 40bf30 
             40bf99      3 INSTR DEADREGS  EFLAGS RBX R14 ZZ mov     rbx, rax 
             40bf9c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -13568,7 +13568,7 @@
             40bfbd      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 0FFFFFFFAh 
             40bfc3      5 INSTR BELONGTO 40bf30 
             40bfc3      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aGtkCancel; "gtk-cancel" 
-            40bfc8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF8h 
+            40bfc8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF8h 
             40bfc8      5 INSTR BELONGTO 40bf30 
             40bfc8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 0FFFFFFF8h 
             40bfcd      3 INSTR BELONGTO 40bf30 
@@ -13577,7 +13577,7 @@
             40bfd0      3 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     rsi, r14 
             40bfd3      2 INSTR BELONGTO 40bf30 
             40bfd3      2 INSTR DEADREGS  EFLAGS RAX R14 ZZ xor     eax, eax 
-            40bfd3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bfd3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bfd5     -1 INSTR LOCAL MetadataUnused mov     [rsp+38h+var_30], 0 
             40bfd5      9 INSTR BELONGTO 40bf30 
             40bfde      7 INSTR BELONGTO 40bf30 
@@ -13593,7 +13593,7 @@
             40bff0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40bff0      5 INSTR BELONGTO 40bf30 
             40bff0      5 INSTR DEADREGS  EFLAGS R14 ZZ call    _g_type_check_instance_cast 
-            40bff5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFF7h 
+            40bff5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFF7h 
             40bff5      5 INSTR BELONGTO 40bf30 
             40bff5      5 INSTR DEADREGS  EFLAGS RSI RDI R14 ZZ mov     esi, 0FFFFFFF7h 
             40bffa      3 INSTR BELONGTO 40bf30 
@@ -13620,12 +13620,12 @@
             40c01d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_accessible 
             40c01d      5 INSTR BELONGTO 40bf30 
             40c01d      5 INSTR DEADREGS  EFLAGS R12 R14 ZZ call    _gtk_widget_get_accessible 
-            40c022     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40c022     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40c022      5 INSTR BELONGTO 40bf30 
             40c022      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 ZZ mov     edx, 5          ; category 
             40c027      2 INSTR BELONGTO 40bf30 
             40c027      2 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 ZZ xor     edi, edi        ; domainname 
-            40c027     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40c027     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40c029      3 INSTR BELONGTO 40bf30 
             40c029      3 INSTR DEADREGS  EFLAGS RSI R12 R14 ZZ mov     r12, rax 
             40c02c      5 INSTR BELONGTO 40bf30 
@@ -13660,7 +13660,7 @@
             40c05d      2 INSTR BELONGTO 40bf30 
             40c05f     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 0FFFFFFF8h 
             40c05f      3 INSTR BELONGTO 40bf30 
-            40c062     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM setz    bpl 
+            40c062     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM setz    bpl 
             40c062      4 INSTR BELONGTO 40bf30 
             40c062      4 INSTR DEADREGS  RDI R12 R13 R14 ZZ setz    bpl 
             40c066      3 INSTR BELONGTO 40bf30 
@@ -13673,7 +13673,7 @@
             40c072     16 DEALLOC STACK esp - 16 mov     eax, ebp
             40c072      2 INSTR BELONGTO 40bf30 
             40c072      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 ZZ mov     eax, ebp 
-            40c072     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebp 
+            40c072     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebp 
             40c074      1 INSTR BELONGTO 40bf30 
             40c074      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 ZZ pop     rbx 
             40c075      1 INSTR BELONGTO 40bf30 
@@ -13690,7 +13690,7 @@
             40c080      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R14 ZZ mov     esi, offset aSaveRecording?; "Save recording?" 
             40c085      2 INSTR BELONGTO 40bf30 
             40c085      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R14 ZZ xor     edi, edi        ; domainname 
-            40c085     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40c085     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40c087     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40c087      5 INSTR BELONGTO 40bf30 
             40c087      5 INSTR DEADREGS  EFLAGS RBX R12 R14 ZZ call    _dcgettext 
@@ -13716,27 +13716,27 @@
             40c0a8      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R14 ZZ mov     r8d, offset aSpanWeightBold; "<span weight=\"bold\" size=\"larger\">%"... 
             40c0ae      2 INSTR BELONGTO 40bf30 
             40c0ae      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R14 ZZ xor     ecx, ecx 
-            40c0ae     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40c0b0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40c0ae     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40c0b0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40c0b0      5 INSTR BELONGTO 40bf30 
             40c0b0      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R14 ZZ mov     edx, 1 
-            40c0b5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40c0b5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40c0b5      5 INSTR BELONGTO 40bf30 
             40c0b5      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R14 ZZ mov     esi, 1 
             40c0ba      2 INSTR BELONGTO 40bf30 
             40c0ba      2 INSTR DEADREGS  EFLAGS RAX RBX R14 ZZ xor     eax, eax 
-            40c0ba     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c0ba     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c0bc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new_with_markup 
             40c0bc      5 INSTR BELONGTO 40bf30 
             40c0bc      5 INSTR DEADREGS  EFLAGS RBX R14 ZZ call    _gtk_message_dialog_new_with_markup 
-            40c0c1     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40c0c1     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40c0c1      5 INSTR BELONGTO 40bf30 
             40c0c1      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R14 ZZ mov     edx, 5          ; category 
             40c0c6      5 INSTR BELONGTO 40bf30 
             40c0c6      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R14 ZZ mov     esi, offset aContinue_witho; "Continue _without Saving" 
             40c0cb      2 INSTR BELONGTO 40bf30 
             40c0cb      2 INSTR DEADREGS  EFLAGS RBX RDI R14 ZZ xor     edi, edi        ; domainname 
-            40c0cb     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40c0cb     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40c0cd      3 INSTR BELONGTO 40bf30 
             40c0cd      3 INSTR DEADREGS  EFLAGS RBX R14 ZZ mov     rbx, rax 
             40c0d0     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -13755,7 +13755,7 @@
             40c0e8      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 ZZ mov     rsi, r13 
             40c0eb      2 INSTR BELONGTO 40bf30 
             40c0eb      2 INSTR DEADREGS  EFLAGS RDI R12 R14 ZZ xor     edi, edi 
-            40c0eb     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40c0eb     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40c0ed     -1 INSTR LOCAL NoMetaUpdate call    sub_40B860 
             40c0ed      5 INSTR BELONGTO 40bf30 
             40c0ed      5 INSTR DEADREGS  EFLAGS R12 R14 ZZ call    sub_40B860 
@@ -13882,7 +13882,7 @@
             40c1de      3 INSTR DEADREGS  RDI R13 R14 ZZ mov     r13, rax 
             40c1e1     -1 INSTR LOCAL NoMetaUpdate jz      loc_40C641 
             40c1e1      6 INSTR BELONGTO 40c110 
-            40c1e7     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 30h 
+            40c1e7     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 30h 
             40c1e7      5 INSTR BELONGTO 40c110 
             40c1e7      5 INSTR DEADREGS  EFLAGS RDI R14 ZZ mov     edi, 30h 
             40c1ec     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc 
@@ -13995,7 +13995,7 @@
             40c2b0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ mov     ecx, offset aMake_record_pi; "make_record_pipeline" 
             40c2b5      5 INSTR BELONGTO 40c110 
             40c2b5      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, offset aGsrWindow_c; "gsr-window.c" 
-            40c2ba     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            40c2ba     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             40c2ba      5 INSTR BELONGTO 40c110 
             40c2ba      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 4 
             40c2bf      8 INSTR BELONGTO 40c110 
@@ -14006,7 +14006,7 @@
             40c2c7      5 PTRIMMEDESP STACK 8 displ mov     [rsp+78h+var_70], rax
             40c2cc      2 INSTR BELONGTO 40c110 
             40c2cc      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40c2cc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c2cc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c2ce     -1 INSTR LOCAL NoMetaUpdate call    _gst_debug_log 
             40c2ce      5 INSTR BELONGTO 40c110 
             40c2ce      5 INSTR DEADREGS  EFLAGS ZZ call    _gst_debug_log 
@@ -14015,7 +14015,7 @@
             40c2d3      5 PTRIMMEDESP STACK 24 displ mov     rsi, [rsp+78h+var_60]
             40c2d8      2 INSTR BELONGTO 40c110 
             40c2d8      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ xor     eax, eax 
-            40c2d8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c2d8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c2da      5 INSTR BELONGTO 40c110 
             40c2da      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, offset aAudioconvertS; "audioconvert ! %s" 
             40c2df     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
@@ -14032,7 +14032,7 @@
             40c2f4      5 PTRIMMEDESP STACK 56 displ lea     rdx, [rsp+78h+var_40]
             40c2f9      3 INSTR BELONGTO 40c110 
             40c2f9      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, r10 
-            40c2fc     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40c2fc     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40c2fc      5 INSTR BELONGTO 40c110 
             40c2fc      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
             40c301      5 INSTR BELONGTO 40c110 
@@ -14114,12 +14114,12 @@
             40c37f      5 PTRIMMEDESP STACK 32 displ mov     rdx, [rsp+78h+var_58]
             40c384      2 INSTR BELONGTO 40c110 
             40c384      2 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ xor     ecx, ecx 
-            40c384     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40c384     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40c386      3 INSTR BELONGTO 40c110 
             40c386      3 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rsi, r14 
             40c389      2 INSTR BELONGTO 40c110 
             40c389      2 INSTR DEADREGS  EFLAGS RAX RDI R14 ZZ xor     eax, eax 
-            40c389     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c389     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c38b      3 INSTR BELONGTO 40c110 
             40c38b      3 INSTR DEADREGS  EFLAGS RDI R14 ZZ mov     rdi, r15 
             40c38e     -1 INSTR LOCAL NoMetaUpdate call    _gst_element_link_many 
@@ -14127,7 +14127,7 @@
             40c38e      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _gst_element_link_many 
             40c393     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40c393      2 INSTR BELONGTO 40c110 
-            40c395     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40c395     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             40c395      5 INSTR BELONGTO 40c110 
             40c395      5 INSTR DEADREGS  RDX RSI RDI R14 R15 ZZ mov     edx, 5 
             40c39a      5 INSTR BELONGTO 40c110 
@@ -14156,7 +14156,7 @@
             40c3c1      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R13 R14 R15 ZZ xor     r8d, r8d 
             40c3c4      3 INSTR BELONGTO 40c110 
             40c3c4      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 R14 R15 ZZ mov     rcx, rbx 
-            40c3c7     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_409220 
+            40c3c7     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_409220 
             40c3c7      5 INSTR BELONGTO 40c110 
             40c3c7      5 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 R15 ZZ mov     edx, offset sub_409220 
             40c3cc      5 INSTR BELONGTO 40c110 
@@ -14186,7 +14186,7 @@
             40c3f2      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R13 R14 R15 ZZ xor     r8d, r8d 
             40c3f5      3 INSTR BELONGTO 40c110 
             40c3f5      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 R14 R15 ZZ mov     rcx, rbx 
-            40c3f8     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_4078D0 
+            40c3f8     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_4078D0 
             40c3f8      5 INSTR BELONGTO 40c110 
             40c3f8      5 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 R15 ZZ mov     edx, offset sub_4078D0 
             40c3fd      5 INSTR BELONGTO 40c110 
@@ -14202,7 +14202,7 @@
             40c40e      3 INSTR BELONGTO 40c110 
             40c411      3 INSTR BELONGTO 40c110 
             40c411      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 R14 R15 ZZ mov     rcx, rbx 
-            40c414     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40B330 
+            40c414     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40B330 
             40c414      5 INSTR BELONGTO 40c110 
             40c414      5 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 R15 ZZ mov     edx, offset sub_40B330 
             40c419      5 INSTR BELONGTO 40c110 
@@ -14218,7 +14218,7 @@
             40c42a      3 INSTR BELONGTO 40c110 
             40c42d      3 INSTR BELONGTO 40c110 
             40c42d      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 R14 R15 ZZ mov     rcx, rbx 
-            40c430     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40AB70 
+            40c430     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40AB70 
             40c430      5 INSTR BELONGTO 40c110 
             40c430      5 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 R15 ZZ mov     edx, offset sub_40AB70 
             40c435      5 INSTR BELONGTO 40c110 
@@ -14234,7 +14234,7 @@
             40c446      3 INSTR BELONGTO 40c110 
             40c449      3 INSTR BELONGTO 40c110 
             40c449      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 R14 R15 ZZ mov     rcx, rbx 
-            40c44c     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40B230 
+            40c44c     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40B230 
             40c44c      5 INSTR BELONGTO 40c110 
             40c44c      5 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 R15 ZZ mov     edx, offset sub_40B230 
             40c451      5 INSTR BELONGTO 40c110 
@@ -14256,7 +14256,7 @@
             40c47e     10 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ mov     dword ptr [rax+0F4h], 0 
             40c488      2 INSTR BELONGTO 40c110 
             40c488      2 INSTR DEADREGS  EFLAGS RAX R13 R14 R15 ZZ xor     eax, eax 
-            40c488     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c488     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c48a     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             40c48a      5 INSTR BELONGTO 40c110 
             40c48a      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_print 
@@ -14264,7 +14264,7 @@
             40c48f      8 INSTR DEADREGS  EFLAGS RAX RSI RDI R13 R14 R15 ZZ mov     rax, [r12+0B0h] 
             40c497      8 INSTR BELONGTO 40c110 
             40c497      8 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ mov     rbp, [r12+0B8h] 
-            40c49f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40c49f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40c49f      5 INSTR BELONGTO 40c110 
             40c49f      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ mov     esi, 50h 
             40c4a4      4 INSTR BELONGTO 40c110 
@@ -14274,7 +14274,7 @@
             40c4a8      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_type_check_instance_cast 
             40c4ad      2 INSTR BELONGTO 40c110 
             40c4ad      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 ZZ xor     ecx, ecx 
-            40c4ad     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40c4ad     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40c4af      3 INSTR BELONGTO 40c110 
             40c4af      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 ZZ mov     rdx, rbp 
             40c4b2      3 INSTR BELONGTO 40c110 
@@ -14283,13 +14283,13 @@
             40c4b5      5 INSTR DEADREGS  EFLAGS RAX RSI R13 R14 R15 ZZ mov     esi, offset aLocation_0; "location" 
             40c4ba      2 INSTR BELONGTO 40c110 
             40c4ba      2 INSTR DEADREGS  EFLAGS RAX R13 R14 R15 ZZ xor     eax, eax 
-            40c4ba     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c4ba     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c4bc     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             40c4bc      5 INSTR BELONGTO 40c110 
             40c4bc      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_object_set 
             40c4c1      8 INSTR BELONGTO 40c110 
             40c4c1      8 INSTR DEADREGS  EFLAGS RAX RSI RDI R13 R14 R15 ZZ mov     rax, [r12+0B0h] 
-            40c4c9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            40c4c9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             40c4c9      5 INSTR BELONGTO 40c110 
             40c4c9      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ mov     esi, 4 
             40c4ce      3 INSTR BELONGTO 40c110 
@@ -14319,7 +14319,7 @@
             40c4fa      5 INSTR BELONGTO 40c110 
             40c500      2 INSTR BELONGTO 40c110 
             40c500      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     esi, esi 
-            40c500     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40c500     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40c502      3 INSTR BELONGTO 40c110 
             40c502      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rdi, rbx 
             40c505     -1 INSTR LOCAL NoMetaUpdate call    sub_40BF30 
@@ -14335,14 +14335,14 @@
             40c516      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 ZZ mov     r12, rax 
             40c519     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40C14C 
             40c519      5 INSTR BELONGTO 40c110 
-            40c520     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40c520     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40c520      5 INSTR BELONGTO 40c110 
             40c520      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R13 R14 R15 ZZ mov     edx, 5          ; category 
             40c525      5 INSTR BELONGTO 40c110 
             40c525      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 R14 R15 ZZ mov     esi, offset aCouldNotWriteT; "Could not write to a file using the '%s"... 
             40c52a      2 INSTR BELONGTO 40c110 
             40c52a      2 INSTR DEADREGS  EFLAGS RBX RDI R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            40c52a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40c52a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40c52c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40c52c      5 INSTR BELONGTO 40c110 
             40c52c      5 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ call    _dcgettext 
@@ -14398,12 +14398,12 @@
             40c5a5      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ mov     ecx, offset aMake_record_pi; "make_record_pipeline" 
             40c5aa      5 INSTR BELONGTO 40c110 
             40c5aa      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aGsrWindow_c; "gsr-window.c" 
-            40c5af     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            40c5af     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             40c5af      5 INSTR BELONGTO 40c110 
             40c5af      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 4 
             40c5b4      2 INSTR BELONGTO 40c110 
             40c5b4      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40c5b4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c5b4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c5b6      5 INSTR BELONGTO 40c110 
             40c5b6      5 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+78h+var_68], r10 
             40c5b6      5 PTRIMMEDESP STACK 16 displ mov     [rsp+78h+var_68], r10
@@ -14420,8 +14420,8 @@
             40c5cd      5 INSTR BELONGTO 40c110 
             40c5d8      2 INSTR BELONGTO 40c110 
             40c5d8      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R14 R15 ZZ xor     edi, edi        ; domainname 
-            40c5d8     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            40c5da     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40c5d8     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40c5da     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40c5da      5 INSTR BELONGTO 40c110 
             40c5da      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R14 R15 ZZ mov     edx, 5          ; category 
             40c5df      5 INSTR BELONGTO 40c110 
@@ -14452,7 +14452,7 @@
             40c60e      4 INSTR DEADREGS  EFLAGS RDX RBX R14 R15 ZZ mov     rdx, [rax+8] 
             40c612      2 INSTR BELONGTO 40c110 
             40c612      2 INSTR DEADREGS  EFLAGS RAX RBX R14 R15 ZZ xor     eax, eax 
-            40c612     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c612     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c614     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             40c614      5 INSTR BELONGTO 40c110 
             40c614      5 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ call    _g_printerr 
@@ -14482,8 +14482,8 @@
             40c63c      5 INSTR BELONGTO 40c110 
             40c641      2 INSTR BELONGTO 40c110 
             40c641      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R13 R14 ZZ xor     edi, edi        ; domainname 
-            40c641     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            40c643     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40c641     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40c643     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40c643      5 INSTR BELONGTO 40c110 
             40c643      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R13 R14 ZZ mov     edx, 5          ; category 
             40c648      5 INSTR BELONGTO 40c110 
@@ -14511,8 +14511,8 @@
             40c671      5 INSTR BELONGTO 40c110 
             40c676      2 INSTR BELONGTO 40c110 
             40c676      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R13 R14 ZZ xor     edi, edi        ; domainname 
-            40c676     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
-            40c678     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40c676     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40c678     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40c678      5 INSTR BELONGTO 40c110 
             40c678      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R13 R14 ZZ mov     edx, 5          ; category 
             40c67d      5 INSTR BELONGTO 40c110 
@@ -14557,7 +14557,7 @@
             40c6be      2 INSTR BELONGTO 40c6b0 
             40c6c0     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40C6D3 
             40c6c0      2 INSTR BELONGTO 40c6b0 
-            40c6c2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40c6c2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40c6c2      5 INSTR BELONGTO 40c6b0 
             40c6c2      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     esi, 1 
             40c6c7      3 INSTR BELONGTO 40c6b0 
@@ -14665,10 +14665,10 @@
             40c77b      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _g_type_check_instance_cast 
             40c780      2 INSTR BELONGTO 40c6f0 
             40c780      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            40c780     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40c780     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40c782      3 INSTR BELONGTO 40c6f0 
             40c782      3 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 ZZ mov     rbp, rax 
-            40c785     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40c785     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40c785      5 INSTR BELONGTO 40c6f0 
             40c785      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 ZZ mov     edx, 5          ; category 
             40c78a      5 INSTR BELONGTO 40c6f0 
@@ -14678,7 +14678,7 @@
             40c78f      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ call    _dcgettext 
             40c794      2 INSTR BELONGTO 40c6f0 
             40c794      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R12 R13 R14 R15 ZZ xor     edx, edx 
-            40c794     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c794     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c796      3 INSTR BELONGTO 40c6f0 
             40c796      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 R12 R13 R14 R15 ZZ mov     rsi, rbp 
             40c799      3 INSTR BELONGTO 40c6f0 
@@ -14692,7 +14692,7 @@
             40c7a8      5 INSTR DEADREGS  EFLAGS RAX RCX R12 R13 R14 R15 ZZ mov     ecx, offset aGtkCancel; "gtk-cancel" 
             40c7ad      2 INSTR BELONGTO 40c6f0 
             40c7ad      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 ZZ xor     eax, eax 
-            40c7ad     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c7ad     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c7af     -1 INSTR LOCAL MetadataUnused mov     [rsp+48h+var_40], 0 
             40c7af      9 INSTR BELONGTO 40c6f0 
             40c7b8      7 INSTR BELONGTO 40c6f0 
@@ -14705,7 +14705,7 @@
             40c7c4      7 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     rdi, cs:qword_610900 
             40c7cb      2 INSTR BELONGTO 40c6f0 
             40c7cb      2 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 R14 R15 ZZ xor     edx, edx 
-            40c7cb     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c7cb     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c7cd      5 INSTR BELONGTO 40c6f0 
             40c7cd      5 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 R15 ZZ mov     esi, offset aAppsGnomeSou_2; "/apps/gnome-sound-recorder/system-state"... 
             40c7d2      3 INSTR BELONGTO 40c6f0 
@@ -14772,10 +14772,10 @@
             40c840      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R14 R15 ZZ xor     r8d, r8d 
             40c843      2 INSTR BELONGTO 40c6f0 
             40c843      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 ZZ xor     ecx, ecx 
-            40c843     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40c843     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40c845      2 INSTR BELONGTO 40c6f0 
             40c845      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 ZZ xor     edx, edx 
-            40c845     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c845     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c847     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             40c847      7 INSTR BELONGTO 40c6f0 
             40c847      7 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -14790,7 +14790,7 @@
             40c859      3 INSTR DEADREGS  RDI R13 R14 R15 ZZ mov     r13, rax 
             40c85c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40C86F 
             40c85c      2 INSTR BELONGTO 40c6f0 
-            40c85e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40c85e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40c85e      5 INSTR BELONGTO 40c6f0 
             40c85e      5 INSTR DEADREGS  EFLAGS RSI RDI R14 R15 ZZ mov     esi, 10h 
             40c863      3 INSTR BELONGTO 40c6f0 
@@ -14859,10 +14859,10 @@
             40c8cc      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R14 R15 ZZ xor     r8d, r8d 
             40c8cf      2 INSTR BELONGTO 40c6f0 
             40c8cf      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 R15 ZZ xor     ecx, ecx 
-            40c8cf     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40c8cf     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40c8d1      2 INSTR BELONGTO 40c6f0 
             40c8d1      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 R15 ZZ xor     edx, edx 
-            40c8d1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c8d1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c8d3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             40c8d3      7 INSTR BELONGTO 40c6f0 
             40c8d3      7 INSTR DEADREGS  EFLAGS RSI RDI R14 R15 ZZ mov     rsi, 0FFFFFFFFFFFFFFFFh 
@@ -14882,7 +14882,7 @@
             40c8ed      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 ZZ mov     rdi, cs:qword_610900 
             40c8f4      2 INSTR BELONGTO 40c6f0 
             40c8f4      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R14 ZZ xor     ecx, ecx 
-            40c8f4     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40c8f4     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40c8f6      3 INSTR BELONGTO 40c6f0 
             40c8f6      3 INSTR DEADREGS  EFLAGS RDX RSI R14 ZZ mov     rdx, rax 
             40c8f9      5 INSTR BELONGTO 40c6f0 
@@ -14908,7 +14908,7 @@
             40c91a      7 INSTR BELONGTO 40c6f0 
             40c921     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40C960 
             40c921      2 INSTR BELONGTO 40c6f0 
-            40c923     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40c923     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40c923      5 INSTR BELONGTO 40c6f0 
             40c923      5 INSTR DEADREGS  EFLAGS RSI RDI R14 R15 ZZ mov     esi, 50h 
             40c928      3 INSTR BELONGTO 40c6f0 
@@ -14918,14 +14918,14 @@
             40c92b      5 INSTR DEADREGS  EFLAGS R14 R15 ZZ call    _g_type_check_instance_cast 
             40c930      2 INSTR BELONGTO 40c6f0 
             40c930      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R14 R15 ZZ xor     ecx, ecx 
-            40c930     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40c930     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40c932      3 INSTR BELONGTO 40c6f0 
             40c932      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 R15 ZZ mov     rdi, rax 
             40c935      3 INSTR BELONGTO 40c6f0 
             40c935      3 INSTR DEADREGS  EFLAGS RAX RDX RSI R14 R15 ZZ mov     rdx, r13 
             40c938      2 INSTR BELONGTO 40c6f0 
             40c938      2 INSTR DEADREGS  EFLAGS RAX RSI R14 R15 ZZ xor     eax, eax 
-            40c938     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c938     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c93a      5 INSTR BELONGTO 40c6f0 
             40c93a      5 INSTR DEADREGS  EFLAGS RSI R14 R15 ZZ mov     esi, offset aLocation_0; "location" 
             40c93f     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
@@ -15039,20 +15039,20 @@
             40cac0     -1 INSTR LOCAL NoMetaUpdate call    _g_path_get_basename 
             40cac5      7 PTRIMMEDEBP STACK 192 displ mov     rsi, [rbp+0C0h]
             40cacc      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp
-            40cacf     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40cacf     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40cad7     -1 INSTR LOCAL NoMetaUpdate call    ___xstat 
             40cadc     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40cae2     -1 INSTR LOCAL NoMetaUpdate jz      loc_40CC40 
             40caf9     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
-            40cafe     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2Eh 
+            40cafe     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2Eh 
             40cb06     -1 INSTR LOCAL NoMetaUpdate call    _strrchr 
             40cb0b     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40cb0e     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40CB1A 
             40cb10     -1 INSTR LOCAL NoMetaUpdate cmp     byte ptr [rax+1], 0 
             40cb14     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40CC60 
             40cb29     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40cb2c     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40cb2e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40cb2c     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40cb2e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40cb30     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             40cb3a     -1 INSTR LOCAL NoMetaUpdate call    _g_filename_to_utf8 
             40cb3f      4 PTRIMMEDEBP STACK 72 displ mov     r14, [rbp+48h]
@@ -15063,10 +15063,10 @@
             40cb61     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_set_text 
             40cb66      7 PTRIMMEDEBP STACK 192 displ mov     rdi, [rbp+0C0h]
             40cb6d     -1 INSTR LOCAL NoMetaUpdate call    sub_406A00 
-            40cb72     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40cb77     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40cb72     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40cb77     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40cb7e     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            40cb89     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cb89     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cb8b     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40cb93     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             40cb9e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -15076,23 +15076,23 @@
             40cbb1     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40cbb9     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40cbc1     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
-            40cbca     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40cbca     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40cbda     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
-            40cbdc     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setnz   dl 
+            40cbdc     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setnz   dl 
             40cbdf     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
-            40cbe4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40cbe4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40cbee     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
-            40cbf6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40cbf6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40cc00     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
-            40cc09     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40cc09     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40cc19     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
-            40cc1b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setnz   dl 
+            40cc1b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setnz   dl 
             40cc1e     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
-            40cc23     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40cc23     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40cc30     -1 INSTR LOCAL NoMetaUpdate call    sub_407CB0 
             40cc35     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40CA06 
             40cc4a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40CAF2 
-            40cc50     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40cc50     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40cc52     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40CA80 
             40cc68     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
             40cc74     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40CB29 
@@ -15105,8 +15105,8 @@
             40cca9     -1 INSTR LOCAL NoMetaUpdate jbe     short loc_40CCD9 
             40ccb2     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40ccb5     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0A3Fh 
-            40ccc5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
-            40ccca     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ccc5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            40ccca     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cccc      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], offset aFinalizing___; "finalizing ..."
             40ccd4     -1 INSTR LOCAL NoMetaUpdate call    _gst_debug_log 
             40ccd9     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -15137,7 +15137,7 @@
             40cd9b     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40cda7     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40cdb3     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
-            40cdbf     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40cdbf     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40cdc4     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             40cdcc     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [rax+30h] 
             40cdcf      8 PTRIMMEDEBP STACK 56 displ mov     qword ptr [rbp+38h], 0
@@ -15179,7 +15179,7 @@
             40ce3d      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 ZZ call    sub_409AB0 
             40ce42      2 INSTR BELONGTO 40ce30 
             40ce42      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 ZZ xor     ecx, ecx 
-            40ce42     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ce42     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40ce44      3 INSTR BELONGTO 40ce30 
             40ce44      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     rdx, rbx 
             40ce47      5 INSTR BELONGTO 40ce30 
@@ -15188,7 +15188,7 @@
             40ce4c      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rax 
             40ce4f      2 INSTR BELONGTO 40ce30 
             40ce4f      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            40ce4f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ce4f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ce51     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             40ce51      5 INSTR BELONGTO 40ce30 
             40ce51      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_object_new 
@@ -15201,7 +15201,7 @@
             40ce60     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
             40ce60      5 INSTR BELONGTO 40ce30 
             40ce60      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_strdup 
-            40ce65     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 11h 
+            40ce65     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 11h 
             40ce65      5 INSTR BELONGTO 40ce30 
             40ce65      5 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     esi, 11h 
             40ce6a      3 INSTR BELONGTO 40ce30 
@@ -15232,7 +15232,7 @@
             40cea4      5 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 ZZ mov     edi, offset aGsrRecordSD_xx; "gsr-record-%s-%d.XXXXXX" 
             40cea9      2 INSTR BELONGTO 40ce30 
             40cea9      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            40cea9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cea9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ceab     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40ceab      5 INSTR BELONGTO 40ce30 
             40ceab      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_strdup_printf 
@@ -15240,7 +15240,7 @@
             40ceb0      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     r13, [rbp+38h] 
             40ceb4      2 INSTR BELONGTO 40ce30 
             40ceb4      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ xor     edx, edx 
-            40ceb4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ceb4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ceb6      3 INSTR BELONGTO 40ce30 
             40ceb6      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     r12, rax 
             40ceb9      3 INSTR BELONGTO 40ce30 
@@ -15300,12 +15300,12 @@
             40cf2d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40cf2d      5 INSTR BELONGTO 40ce30 
             40cf2d      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _g_type_check_instance_cast 
-            40cf32     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 200h 
+            40cf32     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 200h 
             40cf32      5 INSTR BELONGTO 40ce30 
             40cf32      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 ZZ mov     esi, 200h 
             40cf37      3 INSTR BELONGTO 40ce30 
             40cf37      3 INSTR DEADREGS  EFLAGS RDX RBX RDI R12 R13 ZZ mov     rdi, rax 
-            40cf3a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0C8h 
+            40cf3a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0C8h 
             40cf3a      5 INSTR BELONGTO 40ce30 
             40cf3a      5 INSTR DEADREGS  EFLAGS RDX RBX R12 R13 ZZ mov     edx, 0C8h 
             40cf3f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_default_size 
@@ -15398,7 +15398,7 @@
             40cfd8      2 INSTR BELONGTO 40cf90 
             40cfda      2 INSTR BELONGTO 40cf90 
             40cfda      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            40cfda     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40cfda     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40cfdc      4 INSTR BELONGTO 40cf90 
             40cfe0      3 INSTR BELONGTO 40cf90 
             40cfe0      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 12c2c94a..8c3bb6ca 100644
--- a/tests/commit/trimmed-sorted-save-gnome-system-log.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-system-log.psexe.annot
@@ -3677,14 +3677,14 @@
             409b40     47 FUNC GLOBAL sub_409B40 FUNC_UNSAFE NOFP RET             409b6e 
             409b40      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
             409b40      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            409b41     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409b41     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409b41      5 INSTR BELONGTO 409b40 
             409b41      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             409b46      5 INSTR BELONGTO 409b40 
             409b46      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aErrorWhileUnco; "Error while uncompressing the GZipped l"... 
             409b4b      2 INSTR BELONGTO 409b40 
             409b4b      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; domainname 
-            409b4b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409b4b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409b4d     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409b4d      5 INSTR BELONGTO 409b40 
             409b4d      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _dcgettext 
@@ -3758,8 +3758,8 @@
             409ba3      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 ZZ xor     r8d, r8d 
             409ba6      2 INSTR BELONGTO 409b96 
             409ba6      2 INSTR DEADREGS  EFLAGS RCX RDX RDI ZZ xor     ecx, ecx 
-            409ba6     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            409ba8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            409ba6     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            409ba8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             409ba8      5 INSTR BELONGTO 409b96 
             409ba8      5 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edx, 1 
             409bad      3 INSTR BELONGTO 409b96 
@@ -3780,7 +3780,7 @@
             409bc2      2 INSTR BELONGTO 409b96 
             409bc4      2 INSTR BELONGTO 409b96 
             409bc4      2 INSTR DEADREGS  EFLAGS RAX RBX R9 R10 R11 ZZ xor     eax, eax 
-            409bc4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409bc4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409bc6     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
             409bc6      4 INSTR BELONGTO 409b96 
             409bca     16 DEALLOC STACK esp - 16 pop     rbx
@@ -3833,11 +3833,11 @@
             409c14      5 PTRIMMEDESP STACK 16 displ lea     rdi, [rsp+0B8h+var_A8]
             409c19      2 INSTR BELONGTO 409bd0 
             409c19      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI ZZ xor     eax, eax 
-            409c19     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            409c1b     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 12h 
+            409c19     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            409c1b     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 12h 
             409c1b      5 INSTR BELONGTO 409bd0 
             409c1b      5 INSTR DEADREGS  RCX RDX RBX RSI ZZ mov     ecx, 12h 
-            409c20     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409c20     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409c20      5 INSTR BELONGTO 409bd0 
             409c20      5 INSTR DEADREGS  RDX RBX RSI ZZ mov     edx, 5          ; category 
             409c25      5 INSTR BELONGTO 409bd0 
@@ -3846,7 +3846,7 @@
             409c2a      3 INSTR DEADREGS  RBX ZZ rep stosq 
             409c2d      2 INSTR BELONGTO 409bd0 
             409c2d      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; domainname 
-            409c2d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409c2d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409c2f      9 INSTR BELONGTO 409bd0 
             409c2f      9 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+0B8h+var_A8], offset aVersion; "version" 
             409c2f      9 PTRIMMEDESP STACK 16 displ mov     [rsp+0B8h+var_A8], offset aVersion; "version"
@@ -3904,7 +3904,7 @@
             409cac     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_add_main_entries 
             409cac      5 INSTR BELONGTO 409bd0 
             409cac      5 INSTR DEADREGS  EFLAGS ZZ call    _g_option_context_add_main_entries 
-            409cb1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            409cb1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             409cb1      5 INSTR BELONGTO 409bd0 
             409cb1      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 1 
             409cb6      3 INSTR BELONGTO 409bd0 
@@ -3912,7 +3912,7 @@
             409cb9     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_set_ignore_unknown_options 
             409cb9      5 INSTR BELONGTO 409bd0 
             409cb9      5 INSTR DEADREGS  EFLAGS ZZ call    _g_option_context_set_ignore_unknown_options 
-            409cbe     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            409cbe     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             409cbe      5 INSTR BELONGTO 409bd0 
             409cbe      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 1 
             409cc3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_get_option_group 
@@ -3952,14 +3952,14 @@
             409cfb     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_free 
             409cfb      5 INSTR BELONGTO 409bd0 
             409cfb      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_option_context_free 
-            409d00     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            409d00     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             409d00      5 INSTR BELONGTO 409bd0 
             409d00      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             409d05      5 INSTR BELONGTO 409bd0 
             409d05      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aLogViewer; "Log Viewer" 
             409d0a      2 INSTR BELONGTO 409bd0 
             409d0a      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; domainname 
-            409d0a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            409d0a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             409d0c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             409d0c      5 INSTR BELONGTO 409bd0 
             409d0c      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _dcgettext 
@@ -3985,8 +3985,8 @@
             409d29      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             409d2c      2 INSTR BELONGTO 409bd0 
             409d2c      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            409d2c     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            409d2e     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40A870 
+            409d2c     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            409d2e     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40A870 
             409d2e      5 INSTR BELONGTO 409bd0 
             409d2e      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset loc_40A870 
             409d33      5 INSTR BELONGTO 409bd0 
@@ -4016,7 +4016,7 @@
             409d63    176 DEALLOC STACK esp - 176 xor     eax, eax
             409d63      2 INSTR BELONGTO 409bd0 
             409d63      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            409d63     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409d63     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409d65      1 INSTR BELONGTO 409bd0 
             409d65      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             409d66      1 INSTR BELONGTO 409bd0 
@@ -4025,12 +4025,12 @@
             409d67      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, [rax+8] 
             409d6b      5 INSTR BELONGTO 409bd0 
             409d6b      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edx, offset aUnableToParseA; "Unable to parse arguments: %s" 
-            409d70     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            409d70     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             409d70      5 INSTR BELONGTO 409bd0 
             409d70      5 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     esi, 8 
             409d75      2 INSTR BELONGTO 409bd0 
             409d75      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ xor     eax, eax 
-            409d75     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409d75     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409d77      5 INSTR BELONGTO 409bd0 
             409d77      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, offset domainname; "gnome-system-log" 
             409d7c     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
@@ -4048,7 +4048,7 @@
             409d91     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_free 
             409d91      5 INSTR BELONGTO 409bd0 
             409d91      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_option_context_free 
-            409d96     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
+            409d96     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
             409d96      5 INSTR BELONGTO 409bd0 
             409d96      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 1          ; status 
             409d9b     -1 INSTR LOCAL NoMetaUpdate call    _exit 
@@ -4058,16 +4058,16 @@
             409da0      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     edi, offset domainname; "gnome-system-log" 
             409da5      5 INSTR BELONGTO 409bd0 
             409da5      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     edx, offset aUnableToCreate; "Unable to create the user interface." 
-            409daa     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            409daa     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
             409daa      5 INSTR BELONGTO 409bd0 
             409daa      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 8 
             409daf      2 INSTR BELONGTO 409bd0 
             409daf      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            409daf     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            409daf     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             409db1     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             409db1      5 INSTR BELONGTO 409bd0 
             409db1      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
-            409db6     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
+            409db6     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
             409db6      5 INSTR BELONGTO 409bd0 
             409db6      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 1          ; status 
             409dbb     -1 INSTR LOCAL NoMetaUpdate call    _exit 
@@ -4199,7 +4199,7 @@
             409e89      3 INSTR BELONGTO 409e80 
             409e8c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409EA0 
             409e8c      2 INSTR BELONGTO 409e80 
-            409e8e     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            409e8e     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             409e8e      5 INSTR BELONGTO 409e80 
             409e93     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             409e93      3 INSTR BELONGTO 409e80 
@@ -4266,7 +4266,7 @@
             409ef9      7 INSTR BELONGTO 409eb0 
             409f00      3 INSTR BELONGTO 409eb0 
             409f00      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R14 ZZ mov     rdx, r13        ; stream 
-            409f03     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2000h      ; n 
+            409f03     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2000h      ; n 
             409f03      5 INSTR BELONGTO 409eb0 
             409f03      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 ZZ mov     esi, 2000h      ; n 
             409f08      3 INSTR BELONGTO 409eb0 
@@ -4279,7 +4279,7 @@
             409f10      3 INSTR BELONGTO 409eb0 
             409f13     -1 INSTR LOCAL NoMetaUpdate jz      loc_409FDD 
             409f13      6 INSTR BELONGTO 409eb0 
-            409f19     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, [rsp+2048h+var_2048] 
+            409f19     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, [rsp+2048h+var_2048] 
             409f19      4 INSTR BELONGTO 409eb0 
             409f19      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 R14 ZZ movzx   eax, [rsp+2048h+var_2048] 
             409f19      4 PTRIMMEDESP STACK 0 displ movzx   eax, [rsp+2048h+var_2048]
@@ -4295,7 +4295,7 @@
             409f2f      1 INSTR BELONGTO 409eb0 
             409f30     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rdi, 1 
             409f30      4 INSTR BELONGTO 409eb0 
-            409f34     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
+            409f34     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
             409f34      3 INSTR BELONGTO 409eb0 
             409f34      3 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R14 ZZ movzx   eax, byte ptr [rdi] 
             409f37     -1 INSTR LOCAL MetadataUnused movzx   edx, al 
@@ -4319,7 +4319,7 @@
             409f50      2 INSTR BELONGTO 409eb0 
             409f52      2 INSTR BELONGTO 409eb0 
             409f52      2 INSTR DEADREGS  EFLAGS RDX RSI R12 R14 ZZ xor     edx, edx 
-            409f52     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409f52     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409f54      5 INSTR BELONGTO 409eb0 
             409f54      5 INSTR DEADREGS  EFLAGS RSI R12 R14 ZZ mov     esi, offset asc_4140B5; ", -\t()\n" 
             409f59     -1 INSTR LOCAL NoMetaUpdate call    _g_strsplit_set 
@@ -4353,7 +4353,7 @@
             409f88      3 INSTR BELONGTO 409eb0 
             409f8b     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_409F78 
             409f8b      2 INSTR BELONGTO 409eb0 
-            409f8d     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset _g_ascii_strcasecmp 
+            409f8d     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset _g_ascii_strcasecmp 
             409f8d      5 INSTR BELONGTO 409eb0 
             409f8d      5 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edx, offset _g_ascii_strcasecmp 
             409f92      3 INSTR BELONGTO 409eb0 
@@ -4376,7 +4376,7 @@
             409faa      5 INSTR DEADREGS  EFLAGS ZZ call    _g_strdup 
             409faf      2 INSTR BELONGTO 409eb0 
             409faf      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            409faf     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            409faf     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             409fb1      3 INSTR BELONGTO 409eb0 
             409fb1      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
             409fb4      3 INSTR BELONGTO 409eb0 
@@ -4445,7 +4445,7 @@
             40a03c      4 PTRIMMEDEBP STACK 0 displ mov     rdx, [rbp+0]
             40a040      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40a047     -1 INSTR LOCAL NoMetaUpdate call    sub_40B010 
-            40a051     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a051     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a053      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40a056     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_foreach 
             40a05b      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -4453,7 +4453,7 @@
             40a066     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             40a06e      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             40a073      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
-            40a078     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
+            40a078     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
             40a07d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             40a081     -1 INSTR LOCAL NoMetaUpdate jmp     _g_slice_free1 
             40a090      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
@@ -4461,7 +4461,7 @@
             40a09d      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
             40a0ac     -1 INSTR LOCAL NoMetaUpdate call    _g_file_get_type 
             40a0b7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a0bc     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a0bc     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a0c4     -1 INSTR LOCAL NoMetaUpdate call    _g_file_enumerate_children_finish 
             40a0c9     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40a0cc     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40A100 
@@ -4469,9 +4469,9 @@
             40a0d1      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
             40a0d5      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
             40a0da      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
-            40a0e5     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40a0e7     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40a0e9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7FFFFFFFh 
+            40a0e5     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a0e7     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40a0e9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 7FFFFFFFh 
             40a0f1     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             40a0f5     -1 INSTR LOCAL NoMetaUpdate jmp     _g_file_enumerator_next_files_async 
             40a100      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -4488,7 +4488,7 @@
             40a12f     -3 INSTR LOCAL NoWarn push    rbx 
             40a137     -1 INSTR LOCAL NoMetaUpdate call    _g_file_enumerator_get_type 
             40a145     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40a14a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a14a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a152     -1 INSTR LOCAL NoMetaUpdate call    _g_file_enumerator_next_files_finish 
             40a157     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40a15d     -1 INSTR LOCAL NoMetaUpdate jz      loc_40A28B 
@@ -4523,14 +4523,14 @@
             40a20a     -1 INSTR LOCAL NoMetaUpdate call    _g_content_type_is_a 
             40a20f     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40a211     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40A198 
-            40a213     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40a215     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a213     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a215     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a21f     -1 INSTR LOCAL NoMetaUpdate call    _g_regex_match_simple 
             40a224     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40a226     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40A198 
             40a22c      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+18h]
-            40a231     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40a236     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a231     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40a236     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a238     -1 INSTR LOCAL NoMetaUpdate call    _g_build_filename 
             40a23d      5 PTRIMMEDESP STACK 16 displ mov     rdi, [rsp+10h]
             40a24d     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_find_custom 
@@ -4562,19 +4562,19 @@
             40a2ca      3 INSTR DEADREGS  EFLAGS RAX RCX RDI ZZ mov     rdi, rdx 
             40a2cd      2 INSTR BELONGTO 40a2c0 
             40a2cd      2 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ xor     eax, eax 
-            40a2cd     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a2cd     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a2cf      2 INSTR BELONGTO 40a2c0 
             40a2cf      2 INSTR DEADREGS  EFLAGS RCX RDX ZZ xor     ecx, ecx 
-            40a2cf     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a2cf     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40a2d1      2 INSTR BELONGTO 40a2c0 
             40a2d1      2 INSTR DEADREGS  EFLAGS RDX ZZ xor     edx, edx 
-            40a2d1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a2d1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a2d3     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
             40a2d3      5 INSTR BELONGTO 40a2c0 
             40a2d3      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_emit 
             40a2d8      2 INSTR BELONGTO 40a2c0 
             40a2d8      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40a2d8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a2d8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a2da     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             40a2da      4 INSTR BELONGTO 40a2c0 
             40a2de      1 INSTR BELONGTO 40a2c0 
@@ -4599,7 +4599,7 @@
             40a2e8      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
             40a2ed      3 INSTR BELONGTO 40a2e0 
             40a2ed      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            40a2f0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40a2f0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40a2f0      5 INSTR BELONGTO 40a2e0 
             40a2f0      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             40a2f5      7 INSTR BELONGTO 40a2e0 
@@ -4628,15 +4628,15 @@
             40a32d     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40a32d      3 INSTR BELONGTO 40a2e0 
             40a32d      3 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 ZZ xor     r8d, r8d 
-            40a330     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
+            40a330     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
             40a330      5 INSTR BELONGTO 40a2e0 
             40a330      5 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ mov     ecx, 88h 
-            40a335     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40a335     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40a335      5 INSTR BELONGTO 40a2e0 
             40a335      5 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     edx, 2 
             40a33a      2 INSTR BELONGTO 40a2e0 
             40a33a      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40a33a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a33a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a33c     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             40a33c      5 INSTR BELONGTO 40a2e0 
             40a33c      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_new 
@@ -4697,15 +4697,15 @@
             40a39e     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h 
             40a39e      6 INSTR BELONGTO 40a360 
             40a39e      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 20h 
-            40a3a4     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_40A2E0 
+            40a3a4     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_40A2E0 
             40a3a4      5 INSTR BELONGTO 40a360 
             40a3a4      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset sub_40A2E0 
-            40a3a9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 90h 
+            40a3a9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 90h 
             40a3a9      5 INSTR BELONGTO 40a360 
             40a3a9      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 90h 
             40a3ae      3 INSTR BELONGTO 40a360 
             40a3ae      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-            40a3b1     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+            40a3b1     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
             40a3b1      5 INSTR BELONGTO 40a360 
             40a3b1      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
             40a3b6      7 INSTR BELONGTO 40a360 
@@ -4751,7 +4751,7 @@
             40a410     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             40a410      5 INSTR BELONGTO 40a3e0 
             40a415      7 INSTR BELONGTO 40a3e0 
-            40a41c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40a41c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40a41c      5 INSTR BELONGTO 40a3e0 
             40a421     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             40a421      5 INSTR BELONGTO 40a3e0 
@@ -4816,12 +4816,12 @@
             40a4c8      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 ZZ call    sub_40A360 
             40a4cd      2 INSTR BELONGTO 40a490 
             40a4cd      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ xor     esi, esi 
-            40a4cd     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40a4cd     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40a4cf      3 INSTR BELONGTO 40a490 
             40a4cf      3 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     rdi, rax 
             40a4d2      2 INSTR BELONGTO 40a490 
             40a4d2      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            40a4d2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a4d2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a4d4     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             40a4d4      5 INSTR BELONGTO 40a490 
             40a4d4      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _g_object_new 
@@ -4861,7 +4861,7 @@
             40a50a      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R12 ZZ xor     r8d, r8d 
             40a50d      3 INSTR BELONGTO 40a490 
             40a50d      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 ZZ mov     rcx, rbx 
-            40a510     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40A2C0 
+            40a510     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40A2C0 
             40a510      5 INSTR BELONGTO 40a490 
             40a510      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 ZZ mov     edx, offset sub_40A2C0 
             40a515      5 INSTR BELONGTO 40a490 
@@ -4946,7 +4946,7 @@
             40a5b5      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R13 ZZ mov     r8d, offset aLogview_is_app; "LOGVIEW_IS_APP (app)" 
             40a5bb      5 INSTR BELONGTO 40a570 
             40a5bb      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R13 ZZ mov     ecx, offset aLogview_app_in; "logview_app_initialize" 
-            40a5c0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 151h 
+            40a5c0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 151h 
             40a5c0      5 INSTR BELONGTO 40a570 
             40a5c0      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R13 ZZ mov     edx, 151h 
             40a5c5      5 INSTR BELONGTO 40a570 
@@ -4967,7 +4967,7 @@
             40a5e2      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     rdi, [rbx+8] 
             40a5e6      2 INSTR BELONGTO 40a570 
             40a5e6      2 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 ZZ xor     edx, edx 
-            40a5e6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a5e6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a5e8      3 INSTR BELONGTO 40a570 
             40a5e8      3 INSTR DEADREGS  EFLAGS RSI R12 R13 ZZ mov     rsi, rbp 
             40a5eb     -1 INSTR LOCAL NoMetaUpdate call    sub_40B120 
@@ -5047,7 +5047,7 @@
             40a672     -1 INSTR LOCAL NoMetaUpdate call    sub_409EB0 
             40a672      5 INSTR BELONGTO 40a570 
             40a672      5 INSTR DEADREGS  EFLAGS RAX RSI RDI R13 ZZ call    sub_409EB0 
-            40a677     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
+            40a677     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
             40a677      5 INSTR BELONGTO 40a570 
             40a677      5 INSTR DEADREGS  EFLAGS RDI R13 ZZ mov     edi, 10h 
             40a67c      3 INSTR BELONGTO 40a570 
@@ -5083,10 +5083,10 @@
             40a6ad      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R12 ZZ xor     r8d, r8d 
             40a6b0      2 INSTR BELONGTO 40a570 
             40a6b0      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 ZZ xor     ecx, ecx 
-            40a6b0     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40a6b0     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40a6b2      2 INSTR BELONGTO 40a570 
             40a6b2      2 INSTR DEADREGS  EFLAGS RDX RSI R12 ZZ xor     edx, edx 
-            40a6b2     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40a6b2     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40a6b4      5 INSTR BELONGTO 40a570 
             40a6b4      5 INSTR DEADREGS  EFLAGS RSI R12 ZZ mov     esi, offset aStandardAccess; "standard::*,access::can-read" 
             40a6b9      4 INSTR BELONGTO 40a570 
@@ -5153,7 +5153,7 @@
             40a712      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_app; "LOGVIEW_IS_APP (app)" 
             40a718      5 INSTR BELONGTO 40a6d0 
             40a718      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_app_ad; "logview_app_add_error" 
-            40a71d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 176h 
+            40a71d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 176h 
             40a71d      5 INSTR BELONGTO 40a6d0 
             40a71d      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 176h 
             40a722      5 INSTR BELONGTO 40a6d0 
@@ -5166,14 +5166,14 @@
             40a731      7 INSTR BELONGTO 40a6d0 
             40a738      4 INSTR BELONGTO 40a6d0 
             40a738      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rax, [rbx+18h] 
-            40a73c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40a73c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40a73c      5 INSTR BELONGTO 40a6d0 
             40a73c      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 5          ; category 
             40a741      5 INSTR BELONGTO 40a6d0 
             40a741      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset aImpossibleToOp; "Impossible to open the file %s" 
             40a746      2 INSTR BELONGTO 40a6d0 
             40a746      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; domainname 
-            40a746     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40a746     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40a748      4 INSTR BELONGTO 40a6d0 
             40a748      4 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, [rax+10h] 
             40a74c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
@@ -5185,7 +5185,7 @@
             40a754      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             40a757      2 INSTR BELONGTO 40a6d0 
             40a757      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            40a757     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a757     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a759     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40a759      5 INSTR BELONGTO 40a6d0 
             40a759      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_strdup_printf 
@@ -5264,7 +5264,7 @@
             40a7c2      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_app; "LOGVIEW_IS_APP (app)" 
             40a7c8      5 INSTR BELONGTO 40a790 
             40a7c8      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_app__0; "logview_app_add_errors" 
-            40a7cd     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 186h 
+            40a7cd     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 186h 
             40a7cd      5 INSTR BELONGTO 40a790 
             40a7cd      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 186h 
             40a7d2      5 INSTR BELONGTO 40a790 
@@ -5344,13 +5344,13 @@
             40a851      5 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     edx, offset a3_4_1; "3.4.1" 
             40a856      2 INSTR BELONGTO 40a840 
             40a856      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40a856     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a856     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a858     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             40a858      5 INSTR BELONGTO 40a840 
             40a858      5 INSTR DEADREGS  EFLAGS ZZ call    _g_print 
             40a85d      2 INSTR BELONGTO 40a840 
             40a85d      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; status 
-            40a85d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; status 
+            40a85d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; status 
             40a85f     -1 INSTR LOCAL NoMetaUpdate call    _exit 
             40a85f      5 INSTR BELONGTO 40a840 
             40a85f      5 INSTR DEADREGS  EFLAGS ZZ call    _exit 
@@ -5360,7 +5360,7 @@
             40a886     -3 INSTR LOCAL NoWarn push    rbx 
             40a88b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
             40a890      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-            40a893     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40a893     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40a89f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             40a8af     -1 INSTR LOCAL NoMetaUpdate call    sub_410040 
             40a8b4      8 PTRIMMEDESP STACK 16 displ mov     dword ptr [rsp+10h], 1
@@ -5369,9 +5369,9 @@
             40a8c4      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], 4
             40a8cd      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], offset _g_cclosure_marshal_VOID__OBJECT
             40a8d5     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a8db     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
-            40a8e0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
-            40a8ea     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a8db     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
+            40a8e0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40a8ea     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a8ec     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             40a8f7     -1 INSTR LOCAL NoMetaUpdate call    sub_410040 
             40a8fc      8 PTRIMMEDESP STACK 16 displ mov     dword ptr [rsp+10h], 1
@@ -5380,9 +5380,9 @@
             40a90c      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], 4
             40a915      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], offset _g_cclosure_marshal_VOID__OBJECT
             40a91d     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a923     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 90h 
-            40a928     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
-            40a932     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a923     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 90h 
+            40a928     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40a932     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a934     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             40a93f     -1 INSTR LOCAL NoMetaUpdate call    sub_410040 
             40a947     -1 INSTR LOCAL NoMetaUpdate call    sub_410040 
@@ -5393,13 +5393,13 @@
             40a96c     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40a96f      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], offset loc_413EF0
             40a97a     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40a97d     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 98h 
-            40a982     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
-            40a987     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40a97d     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 98h 
+            40a982     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40a987     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40a989     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             40a994     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 30h 
             40a998      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-            40a99f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40a99f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40a9a4     -1 INSTR LOCAL NoMetaUpdate jmp     _g_type_class_add_private 
             40a9b0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             40a9b0      0 FUNC MMSAFENESS SAFE
@@ -5444,15 +5444,15 @@
             40a9ee     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h 
             40a9ee      6 INSTR BELONGTO 40a9b0 
             40a9ee      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 20h 
-            40a9f4     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset loc_40A880 
+            40a9f4     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset loc_40A880 
             40a9f4      5 INSTR BELONGTO 40a9b0 
             40a9f4      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset loc_40A880 
-            40a9f9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
+            40a9f9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
             40a9f9      5 INSTR BELONGTO 40a9b0 
             40a9f9      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 0A0h 
             40a9fe      3 INSTR BELONGTO 40a9b0 
             40a9fe      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-            40aa01     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+            40aa01     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
             40aa01      5 INSTR BELONGTO 40a9b0 
             40aa01      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
             40aa06      7 INSTR BELONGTO 40a9b0 
@@ -5502,7 +5502,7 @@
             40aa65     -1 INSTR LOCAL NoMetaUpdate call    _g_hash_table_destroy 
             40aa65      5 INSTR BELONGTO 40aa30 
             40aa6a      7 INSTR BELONGTO 40aa30 
-            40aa71     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40aa71     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40aa71      5 INSTR BELONGTO 40aa30 
             40aa76     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             40aa76      5 INSTR BELONGTO 40aa30 
@@ -5547,12 +5547,12 @@
             40ab08      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_40A9B0 
             40ab0d      2 INSTR BELONGTO 40aaf0 
             40ab0d      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            40ab0d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40ab0d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40ab0f      3 INSTR BELONGTO 40aaf0 
             40ab0f      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             40ab12      2 INSTR BELONGTO 40aaf0 
             40ab12      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40ab12     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ab12     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ab14     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             40ab14      5 INSTR BELONGTO 40aaf0 
             40ab14      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_new 
@@ -5618,7 +5618,7 @@
             40ab79      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R14 ZZ mov     r8d, offset aLogview_is_man; "LOGVIEW_IS_MANAGER (manager)" 
             40ab7f      5 INSTR BELONGTO 40ab30 
             40ab7f      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 ZZ mov     ecx, offset aLogview_manage; "logview_manager_set_active_log" 
-            40ab84     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 122h 
+            40ab84     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 122h 
             40ab84      5 INSTR BELONGTO 40ab30 
             40ab84      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 ZZ mov     edx, 122h 
             40ab89      5 INSTR BELONGTO 40ab30 
@@ -5681,10 +5681,10 @@
             40abf0      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R13 R14 ZZ xor     r9d, r9d 
             40abf3      2 INSTR BELONGTO 40ab30 
             40abf3      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R13 R14 ZZ xor     edx, edx 
-            40abf3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40abf3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40abf5      2 INSTR BELONGTO 40ab30 
             40abf5      2 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R13 R14 ZZ xor     eax, eax 
-            40abf5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40abf5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40abf7      3 INSTR BELONGTO 40ab30 
             40abf7      3 INSTR DEADREGS  EFLAGS RCX RDI R8 R13 R14 ZZ mov     r8, rbp 
             40abfa      3 INSTR BELONGTO 40ab30 
@@ -5825,7 +5825,7 @@
             40ace6      5 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ call    sub_40AB30 
             40aceb     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40ACB1 
             40aceb      2 INSTR BELONGTO 40ac50 
-            40acf0     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
+            40acf0     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
             40acf0      5 INSTR BELONGTO 40ac50 
             40acf0      5 INSTR DEADREGS  EFLAGS RDI R15 ZZ mov     edi, 18h 
             40acf5     -1 INSTR LOCAL NoMetaUpdate call    _g_slice_alloc0 
@@ -5846,7 +5846,7 @@
             40ad0b      5 INSTR DEADREGS  EFLAGS RBX R12 R14 ZZ call    _g_object_ref 
             40ad10      3 INSTR BELONGTO 40ac50 
             40ad10      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R14 ZZ mov     rdx, r15 
-            40ad13     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset loc_40AD30 
+            40ad13     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset loc_40AD30 
             40ad13      5 INSTR BELONGTO 40ac50 
             40ad13      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R14 ZZ mov     esi, offset loc_40AD30 
             40ad18      3 INSTR BELONGTO 40ac50 
@@ -5874,8 +5874,8 @@
             40ad92     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             40ada0     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40ada3      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-            40ada6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40ada8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ada6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40ada8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40adaa     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
             40adb2     -1 INSTR LOCAL NoMetaUpdate test    ecx, ecx 
             40adb4     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40AE00 
@@ -5889,7 +5889,7 @@
             40ade2      5 PTRIMMEDESP STACK 24 displ mov     rbx, [rsp+18h]
             40ade7      5 PTRIMMEDESP STACK 40 displ mov     r12, [rsp+28h]
             40adec      5 PTRIMMEDESP STACK 48 displ mov     r13, [rsp+30h]
-            40adf1     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
+            40adf1     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
             40adf6     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
             40adfa     -1 INSTR LOCAL NoMetaUpdate jmp     _g_slice_free1 
             40ae03      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
@@ -5898,14 +5898,14 @@
             40ae14     -1 INSTR LOCAL NoMetaUpdate call    sub_40A490 
             40ae1c      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40ae1f     -1 INSTR LOCAL NoMetaUpdate call    sub_40A790 
-            40ae2b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ae2b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ae32      4 PTRIMMEDEBP STACK 8 displ mov     rdi, [rbp+8]
             40ae36     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_foreach 
             40ae3b      4 PTRIMMEDEBP STACK 8 displ mov     rdi, [rbp+8]
-            40ae3f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40ae3f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40ae44     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_free 
             40ae49      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
-            40ae4c     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
+            40ae4c     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
             40ae51     -1 INSTR LOCAL NoMetaUpdate call    _g_slice_free1 
             40ae61     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40ADD1 
             40ae74      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rsi
@@ -5919,7 +5919,7 @@
             40aea4      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40aea7     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40aeac     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40ADB6 
-            40aeb8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
+            40aeb8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
             40aebd      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rsi
             40aec2     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc0 
             40aec7      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -5969,7 +5969,7 @@
             40af3a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_man; "LOGVIEW_IS_MANAGER (manager)" 
             40af40      5 INSTR BELONGTO 40af10 
             40af40      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_mana_2; "logview_manager_get_active_log" 
-            40af45     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 13Ah 
+            40af45     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 13Ah 
             40af45      5 INSTR BELONGTO 40af10 
             40af45      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 13Ah 
             40af4a      5 INSTR BELONGTO 40af10 
@@ -5995,7 +5995,7 @@
             40af6e      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_object_ref 
             40af78      2 INSTR BELONGTO 40af10 
             40af78      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40af78     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40af78     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40af7a      1 INSTR BELONGTO 40af10 
             40af7a      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40af7b      1 INSTR BELONGTO 40af10 
@@ -6051,7 +6051,7 @@
             40afc2      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_man; "LOGVIEW_IS_MANAGER (manager)" 
             40afc8      5 INSTR BELONGTO 40af80 
             40afc8      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_mana_3; "logview_manager_add_log_from_gfile" 
-            40afcd     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 146h 
+            40afcd     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 146h 
             40afcd      5 INSTR BELONGTO 40af80 
             40afcd      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 146h 
             40afd2      5 INSTR BELONGTO 40af80 
@@ -6074,7 +6074,7 @@
             40aff6      4 INSTR BELONGTO 40af80 
             40affa      2 INSTR BELONGTO 40af80 
             40affa      2 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     ecx, ecx 
-            40affa     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40affa     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40affc     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+18h+var_8] 
             40affc      5 INSTR BELONGTO 40af80 
             40b001     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
@@ -6140,7 +6140,7 @@
             40b048      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R14 ZZ mov     r8d, offset aLogview_is_man; "LOGVIEW_IS_MANAGER (manager)" 
             40b04e      5 INSTR BELONGTO 40b010 
             40b04e      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 ZZ mov     ecx, offset aLogview_mana_1; "logview_manager_add_logs_from_name_list" 
-            40b053     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 152h 
+            40b053     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 152h 
             40b053      5 INSTR BELONGTO 40b010 
             40b053      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 ZZ mov     edx, 152h 
             40b058      5 INSTR BELONGTO 40b010 
@@ -6159,7 +6159,7 @@
             40b07a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R14 ZZ mov     r8d, offset aOpNull; "op == NULL" 
             40b080      5 INSTR BELONGTO 40b010 
             40b080      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 ZZ mov     ecx, offset aLogview_mana_1; "logview_manager_add_logs_from_name_list" 
-            40b085     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 153h 
+            40b085     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 153h 
             40b085      5 INSTR BELONGTO 40b010 
             40b085      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 ZZ mov     edx, 153h 
             40b08a      5 INSTR BELONGTO 40b010 
@@ -6174,7 +6174,7 @@
             40b09c     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_length 
             40b09c      5 INSTR BELONGTO 40b010 
             40b09c      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _g_slist_length 
-            40b0a1     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
+            40b0a1     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
             40b0a1      5 INSTR BELONGTO 40b010 
             40b0a1      5 INSTR DEADREGS  EFLAGS RDI R13 R14 ZZ mov     edi, 10h 
             40b0a6      3 INSTR BELONGTO 40b010 
@@ -6219,10 +6219,10 @@
             40b0e8      3 INSTR BELONGTO 40b010 
             40b0eb      3 INSTR BELONGTO 40b010 
             40b0eb      3 INSTR DEADREGS  RCX RDX RSI RDI R13 R14 ZZ mov     r13, rax 
-            40b0ee     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setz    dl 
+            40b0ee     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setz    dl 
             40b0ee      3 INSTR BELONGTO 40b010 
             40b0ee      3 INSTR DEADREGS  RCX RDX RSI RDI R14 ZZ setz    dl 
-            40b0f1     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40b0f1     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40b0f1      5 INSTR BELONGTO 40b010 
             40b0f1      5 INSTR DEADREGS  EFLAGS RCX RSI RDI R14 ZZ mov     ecx, 1 
             40b0f6      3 INSTR BELONGTO 40b010 
@@ -6312,7 +6312,7 @@
             40b158      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R14 ZZ mov     r8d, offset aLogview_is_man; "LOGVIEW_IS_MANAGER (manager)" 
             40b15e      5 INSTR BELONGTO 40b120 
             40b15e      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R14 ZZ mov     ecx, offset aLogview_mana_0; "logview_manager_add_logs_from_names" 
-            40b163     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 166h 
+            40b163     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 166h 
             40b163      5 INSTR BELONGTO 40b120 
             40b163      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R14 ZZ mov     edx, 166h 
             40b168      5 INSTR BELONGTO 40b120 
@@ -6331,7 +6331,7 @@
             40b18a      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R14 ZZ mov     r8d, offset aOpNull; "op == NULL" 
             40b190      5 INSTR BELONGTO 40b120 
             40b190      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R14 ZZ mov     ecx, offset aLogview_mana_0; "logview_manager_add_logs_from_names" 
-            40b195     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 167h 
+            40b195     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 167h 
             40b195      5 INSTR BELONGTO 40b120 
             40b195      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R14 ZZ mov     edx, 167h 
             40b19a      5 INSTR BELONGTO 40b120 
@@ -6346,7 +6346,7 @@
             40b1ac     -1 INSTR LOCAL NoMetaUpdate call    _g_strv_length 
             40b1ac      5 INSTR BELONGTO 40b120 
             40b1ac      5 INSTR DEADREGS  EFLAGS RBX R14 ZZ call    _g_strv_length 
-            40b1b1     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
+            40b1b1     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
             40b1b1      5 INSTR BELONGTO 40b120 
             40b1b1      5 INSTR DEADREGS  EFLAGS RBX RDI R14 ZZ mov     edi, 10h 
             40b1b6      2 INSTR BELONGTO 40b120 
@@ -6400,14 +6400,14 @@
             40b20d     -1 INSTR LOCAL NoMetaUpdate call    _g_file_new_for_path 
             40b20d      5 INSTR BELONGTO 40b120 
             40b20d      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_file_new_for_path 
-            40b212     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40b212     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40b212      5 INSTR BELONGTO 40b120 
             40b212      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ mov     ecx, 1 
             40b217      3 INSTR BELONGTO 40b120 
             40b217      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     r13, rax 
             40b21a      3 INSTR BELONGTO 40b120 
             40b21a      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rsi, rax 
-            40b21d     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, r14d 
+            40b21d     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, r14d 
             40b21d      3 INSTR BELONGTO 40b120 
             40b21d      3 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edx, r14d 
             40b220      3 INSTR BELONGTO 40b120 
@@ -6453,7 +6453,7 @@
             40b271     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_is_a 
             40b276     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40b278     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40B2A0 
-            40b285     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 175h 
+            40b285     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 175h 
             40b294     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             40b2a8     -1 INSTR LOCAL NoMetaUpdate jmp     _g_hash_table_size 
             40b2b0      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -16 0 4 0 8 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -6506,7 +6506,7 @@
             40b2e2      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_man; "LOGVIEW_IS_MANAGER (manager)" 
             40b2e8      5 INSTR BELONGTO 40b2b0 
             40b2e8      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_mana_5; "logview_manager_get_if_loaded" 
-            40b2ed     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 17Fh 
+            40b2ed     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 17Fh 
             40b2ed      5 INSTR BELONGTO 40b2b0 
             40b2ed      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 17Fh 
             40b2f2      5 INSTR BELONGTO 40b2b0 
@@ -6545,7 +6545,7 @@
             40b330      4 INSTR BELONGTO 40b2b0 
             40b334      2 INSTR BELONGTO 40b2b0 
             40b334      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40b334     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b334     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b334      8 DEALLOC STACK esp - 8 xor     eax, eax
             40b336      1 INSTR BELONGTO 40b2b0 
             40b336      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
@@ -6600,7 +6600,7 @@
             40b381      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 R13 ZZ mov     r8d, offset aLogview_is_man; "LOGVIEW_IS_MANAGER (manager)" 
             40b387      5 INSTR BELONGTO 40d6c0 
             40b387      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 ZZ mov     ecx, offset aLogview_mana_6; "logview_manager_close_active_log" 
-            40b38c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 191h 
+            40b38c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 191h 
             40b38c      5 INSTR BELONGTO 40d6c0 
             40b38c      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     edx, 191h 
             40b391      5 INSTR BELONGTO 40d6c0 
@@ -6635,14 +6635,14 @@
             40b3c4      3 INSTR DEADREGS  EFLAGS RDX RDI R8 R12 ZZ xor     r8d, r8d 
             40b3c7      2 INSTR BELONGTO 40d6c0 
             40b3c7      2 INSTR DEADREGS  EFLAGS RDX RDI R12 ZZ xor     edx, edx 
-            40b3c7     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b3c7     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b3c9      3 INSTR BELONGTO 40d6c0 
             40b3c9      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     r12, rax 
             40b3cc      3 INSTR BELONGTO 40d6c0 
             40b3cc      3 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     rdi, rbx 
             40b3cf      2 INSTR BELONGTO 40d6c0 
             40b3cf      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40b3cf     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b3cf     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b3d1     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
             40b3d1      5 INSTR BELONGTO 40d6c0 
             40b3d1      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_emit 
@@ -6740,7 +6740,7 @@
             40b46a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_man; "LOGVIEW_IS_MANAGER (manager)" 
             40b470      5 INSTR BELONGTO 40b430 
             40b470      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_mana_7; "logview_manager_log_is_active" 
-            40b475     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1AAh 
+            40b475     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1AAh 
             40b475      5 INSTR BELONGTO 40b430 
             40b475      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 1AAh 
             40b47a      5 INSTR BELONGTO 40b430 
@@ -6761,7 +6761,7 @@
             40b49d      5 INSTR BELONGTO 40b430 
             40b49d      5 INSTR DEADREGS  RAX R8 R9 R10 R11 ZZ mov     rbp, [rsp+18h+var_8] 
             40b49d      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+18h+var_8]
-            40b4a2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setz    al 
+            40b4a2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setz    al 
             40b4a2      3 INSTR BELONGTO 40b430 
             40b4a2      3 INSTR DEADREGS  RAX R8 R9 R10 R11 ZZ setz    al 
             40b4a5     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
@@ -6835,11 +6835,11 @@
             40b508      4 INSTR BELONGTO 40b4c0 
             40b508      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     esi, [rsp+68h+var_58] 
             40b508      4 PTRIMMEDESP STACK 16 displ mov     esi, [rsp+68h+var_58]
-            40b50c     -2 INSTR LOCAL n EDI ZZ  NumericDEFs movzx   edi, [rsp+68h+var_5C] 
+            40b50c     -2 INSTR LOCAL n RDI ZZ  NumericDEFs movzx   edi, [rsp+68h+var_5C] 
             40b50c      5 INSTR BELONGTO 40b4c0 
             40b50c      5 INSTR DEADREGS  EFLAGS RDX RDI R12 ZZ movzx   edi, [rsp+68h+var_5C] 
             40b50c      5 PTRIMMEDESP STACK 12 displ movzx   edi, [rsp+68h+var_5C]
-            40b511     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40b511     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40b511      5 INSTR BELONGTO 40b4c0 
             40b511      5 INSTR DEADREGS  EFLAGS RDX R12 ZZ mov     edx, 1 
             40b516     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     esi, 1 
@@ -6959,7 +6959,7 @@
             40b5ca      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             40b5ce     -1 INSTR LOCAL MetadataUnused mov     rbp, rdi 
             40b5ce      3 INSTR BELONGTO 40b5c0 
-            40b5d1     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
+            40b5d1     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
             40b5d1      5 INSTR BELONGTO 40b5c0 
             40b5d1      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 18h 
             40b5d6     -1 INSTR LOCAL NoMetaUpdate call    _g_slice_alloc0 
@@ -7012,7 +7012,7 @@
             40b620     61 FUNC GLOBAL sub_40B620 FUNC_UNSAFE NOFP RET             40b65c 
             40b621      2 INSTR BELONGTO 40b620 
             40b621      2 INSTR DEADREGS  EFLAGS ZZ xor     ebp, ebp 
-            40b621     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40b621     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40b623      1 INSTR BELONGTO 40b620 
             40b623      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             40b623     -3 INSTR LOCAL NoWarn push    rbx 
@@ -7109,12 +7109,12 @@
             40b694      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _localtime 
             40b699      3 INSTR BELONGTO 40b660 
             40b699      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 ZZ mov     rdi, [rbx] 
-            40b69c     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, [rax+14h] 
+            40b69c     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     ebp, [rax+14h] 
             40b69c      3 INSTR BELONGTO 40b660 
             40b69c      3 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ mov     ebp, [rax+14h] 
             40b69f      2 INSTR BELONGTO 40b660 
             40b69f      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 ZZ xor     eax, eax 
-            40b69f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b69f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b6a1     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             40b6a1      3 INSTR BELONGTO 40b660 
             40b6a4     -1 INSTR LOCAL NoMetaUpdate jz      loc_40B80A 
@@ -7165,7 +7165,7 @@
             40b6f1      5 INSTR BELONGTO 40b660 
             40b6f6     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     r15d, 1 
             40b6f6      4 INSTR BELONGTO 40b660 
-            40b6fa     -2 INSTR LOCAL n ESI ZZ  NumericDEFs movzx   esi, bp 
+            40b6fa     -2 INSTR LOCAL n RSI ZZ  NumericDEFs movzx   esi, bp 
             40b6fa      3 INSTR BELONGTO 40b660 
             40b6fa      3 INSTR DEADREGS  EFLAGS RSI R12 R14 ZZ movzx   esi, bp 
             40b6fd      5 INSTR BELONGTO 40b660 
@@ -7176,7 +7176,7 @@
             40b705     -1 INSTR LOCAL NoMetaUpdate call    _g_date_set_year 
             40b705      5 INSTR BELONGTO 40b660 
             40b705      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_date_set_year 
-            40b70a     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
+            40b70a     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
             40b70a      5 INSTR BELONGTO 40b660 
             40b70a      5 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     edi, 18h 
             40b70f     -1 INSTR LOCAL NoMetaUpdate call    _g_slice_alloc0 
@@ -7213,7 +7213,7 @@
             40b742      4 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     [rax+8], r13d 
             40b746      7 INSTR BELONGTO 40b660 
             40b746      7 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     dword ptr [rax+0Ch], 0FFFFFFFFh 
-            40b74d     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rsp+88h+var_3C] 
+            40b74d     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rsp+88h+var_3C] 
             40b74d      4 INSTR BELONGTO 40b660 
             40b74d      4 INSTR DEADREGS  EFLAGS RAX RDI R12 ZZ mov     eax, [rsp+88h+var_3C] 
             40b74d      4 PTRIMMEDESP STACK 76 displ mov     eax, [rsp+88h+var_3C]
@@ -7303,7 +7303,7 @@
             40b7fb      5 INSTR BELONGTO 40b660 
             40b7fb      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 ZZ mov     rdi, [rsp+88h+var_60] 
             40b7fb      5 PTRIMMEDESP STACK 40 displ mov     rdi, [rsp+88h+var_60]
-            40b800     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_40B4B0 
+            40b800     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_40B4B0 
             40b800      5 INSTR BELONGTO 40b660 
             40b800      5 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 R14 R15 XMM0 XMM1 ZZ mov     esi, offset sub_40B4B0 
             40b805     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_sort 
@@ -7423,7 +7423,7 @@
             40b8d3      3 INSTR DEADREGS  RDI ZZ mov     [rcx+0Ch], eax 
             40b8d6     -1 INSTR LOCAL NoMetaUpdate jz      loc_40B96A 
             40b8d6      6 INSTR BELONGTO 40b660 
-            40b8dc     -2 INSTR LOCAL n ESI ZZ  NumericDEFs movzx   esi, [rsp+88h+var_56] 
+            40b8dc     -2 INSTR LOCAL n RSI ZZ  NumericDEFs movzx   esi, [rsp+88h+var_56] 
             40b8dc      5 INSTR BELONGTO 40b660 
             40b8dc      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 ZZ movzx   esi, [rsp+88h+var_56] 
             40b8dc      5 PTRIMMEDESP STACK 50 displ movzx   esi, [rsp+88h+var_56]
@@ -7457,7 +7457,7 @@
             40b90a      5 PTRIMMEDESP STACK 8 displ mov     rdx, [rsp+88h+var_80]
             40b90f     -1 INSTR LOCAL NoMetaUpdate jle     loc_40B99D 
             40b90f      6 INSTR BELONGTO 40b660 
-            40b915     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
+            40b915     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
             40b915      5 INSTR BELONGTO 40b660 
             40b915      5 INSTR DEADREGS  EFLAGS RDI R13 R14 ZZ mov     edi, 18h 
             40b91a      5 INSTR BELONGTO 40b660 
@@ -7502,7 +7502,7 @@
             40b958      4 INSTR DEADREGS  EFLAGS RDI ZZ mov     [rax+8], r12d 
             40b95c      7 INSTR BELONGTO 40b660 
             40b95c      7 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     dword ptr [rax+0Ch], 0FFFFFFFFh 
-            40b963     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rsp+88h+var_3C] 
+            40b963     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rsp+88h+var_3C] 
             40b963      4 INSTR BELONGTO 40b660 
             40b963      4 INSTR DEADREGS  EFLAGS RAX RDI R12 ZZ mov     eax, [rsp+88h+var_3C] 
             40b963      4 PTRIMMEDESP STACK 76 displ mov     eax, [rsp+88h+var_3C]
@@ -7528,7 +7528,7 @@
             40b988      5 INSTR BELONGTO 40b660 
             40b98d      2 INSTR BELONGTO 40b660 
             40b98d      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI ZZ xor     edx, edx 
-            40b98d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40b98d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40b98f     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
             40b98f      2 INSTR BELONGTO 40b660 
             40b991     -1 INSTR LOCAL NoMetaUpdate cmp     r15d, r12d 
@@ -7539,7 +7539,7 @@
             40b998      5 INSTR BELONGTO 40b660 
             40b99d      3 INSTR BELONGTO 40b660 
             40b99d      3 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 ZZ mov     rdi, rdx 
-            40b9a0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40b9a0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40b9a0      5 INSTR BELONGTO 40b660 
             40b9a0      5 INSTR DEADREGS  EFLAGS RSI R13 R14 ZZ mov     esi, 1 
             40b9a5     -1 INSTR LOCAL NoMetaUpdate call    _g_date_add_years 
@@ -7566,7 +7566,7 @@
             40b9cd      4 INSTR BELONGTO 40b660 
             40b9d1      2 INSTR BELONGTO 40b660 
             40b9d1      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 ZZ xor     eax, eax 
-            40b9d1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b9d1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b9d3      1 INSTR BELONGTO 40b660 
             40b9d3      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 ZZ pop     rbx 
             40b9d4      1 INSTR BELONGTO 40b660 
@@ -7597,7 +7597,7 @@
             40b9f2      4 INSTR BELONGTO 40b660 
             40b9f6      2 INSTR BELONGTO 40b660 
             40b9f6      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 ZZ xor     eax, eax 
-            40b9f6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40b9f6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40b9f6     88 DEALLOC STACK esp - 88 xor     eax, eax
             40b9f8      1 INSTR BELONGTO 40b660 
             40b9f8      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 ZZ pop     rbx 
@@ -7682,12 +7682,12 @@
             40ba60      5 PTRIMMEDESP STACK 40 displ lea     rcx, [rsp+48h+var_20]
             40ba65      2 INSTR BELONGTO 40ba20 
             40ba65      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R8 R12 ZZ xor     edx, edx 
-            40ba65     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ba65     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ba67      3 INSTR BELONGTO 40ba20 
             40ba67      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R12 ZZ mov     rdi, rbx 
             40ba6a      2 INSTR BELONGTO 40ba20 
             40ba6a      2 INSTR DEADREGS  EFLAGS RAX RSI R8 R12 ZZ xor     eax, eax 
-            40ba6a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ba6a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ba6c     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
             40ba6c      6 INSTR BELONGTO 40ba20 
             40ba6c      6 INSTR DEADREGS  EFLAGS RSI R8 R12 ZZ mov     r8d, 0FFFFFFFFh 
@@ -7841,7 +7841,7 @@
             40bb4c      5 PTRIMMEDESP STACK 96 displ lea     rdi, [rsp+168h+var_108]
             40bb51      5 INSTR BELONGTO 40bad0 
             40bb51      5 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ mov     edx, offset aAEB; "%A, %e %b" 
-            40bb56     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0C8h 
+            40bb56     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0C8h 
             40bb56      5 INSTR BELONGTO 40bad0 
             40bb56      5 INSTR DEADREGS  EFLAGS RCX RSI ZZ mov     esi, 0C8h 
             40bb5b      4 INSTR BELONGTO 40bad0 
@@ -7861,7 +7861,7 @@
             40bb73      5 INSTR BELONGTO 40bad0 
             40bb73      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ lea     rsi, [rsp+168h+var_148] 
             40bb73      5 PTRIMMEDESP STACK 32 displ lea     rsi, [rsp+168h+var_148]
-            40bb78     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, r12d 
+            40bb78     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, r12d 
             40bb78      3 INSTR BELONGTO 40bad0 
             40bb78      3 INSTR DEADREGS  EFLAGS RCX RDX RDI ZZ mov     ecx, r12d 
             40bb7b      3 INSTR BELONGTO 40bad0 
@@ -7894,11 +7894,11 @@
             40bba6      3 INSTR DEADREGS  EFLAGS RAX RDX R8 R9 ZZ mov     r9, r13 
             40bba9      2 INSTR BELONGTO 40bad0 
             40bba9      2 INSTR DEADREGS  EFLAGS RAX RDX R8 R13 ZZ xor     eax, eax 
-            40bba9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bba9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bbab     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 4 
             40bbab      6 INSTR BELONGTO 40bad0 
             40bbab      6 INSTR DEADREGS  EFLAGS RDX R8 R13 ZZ mov     r8d, 4 
-            40bbb1     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40bbb1     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40bbb1      5 INSTR BELONGTO 40bad0 
             40bbb1      5 INSTR DEADREGS  EFLAGS RDX R13 ZZ mov     edx, 1 
             40bbb6      7 INSTR BELONGTO 40bad0 
@@ -7979,14 +7979,14 @@
             40bc3a      6 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 R12 R13 R14 ZZ mov     r8d, 0FFFFFFFFh 
             40bc40      5 INSTR BELONGTO 40bad0 
             40bc40      5 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 R13 R14 ZZ mov     ecx, (offset asc_41464A+2); "" 
-            40bc45     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40bc45     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40bc45      5 INSTR BELONGTO 40bad0 
             40bc45      5 INSTR DEADREGS  EFLAGS RDX RDI R12 R13 R14 ZZ mov     edx, 1 
             40bc4a      3 INSTR BELONGTO 40bad0 
             40bc4a      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 ZZ mov     rdi, [rax] 
             40bc4d      2 INSTR BELONGTO 40bad0 
             40bc4d      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 ZZ xor     eax, eax 
-            40bc4d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bc4d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bc4f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_store_set 
             40bc4f      5 INSTR BELONGTO 40bad0 
             40bc4f      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ call    _gtk_tree_store_set 
@@ -8042,7 +8042,7 @@
             40bc99      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_class_peek_parent 
             40bc9e      3 INSTR BELONGTO 40bc90 
             40bc9e      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
-            40bca1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40bca1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40bca1      5 INSTR BELONGTO 40bc90 
             40bca1      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             40bca6      7 INSTR BELONGTO 40bc90 
@@ -8073,17 +8073,17 @@
             40bce5     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40bce5      3 INSTR BELONGTO 40bc90 
             40bce5      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 ZZ xor     r8d, r8d 
-            40bce8     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 488h 
+            40bce8     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 488h 
             40bce8      5 INSTR BELONGTO 40bc90 
             40bce8      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI ZZ mov     ecx, 488h 
-            40bced     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40bced     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40bced      5 INSTR BELONGTO 40bc90 
             40bced      5 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ mov     edx, 2 
             40bcf2      5 INSTR BELONGTO 40bc90 
             40bcf2      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aDaySelected; "day-selected" 
             40bcf7      2 INSTR BELONGTO 40bc90 
             40bcf7      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40bcf7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bcf7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bcf9     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             40bcf9      5 INSTR BELONGTO 40bc90 
             40bcf9      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_new 
@@ -8103,15 +8103,15 @@
             40bd22      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     cs:dword_61A300, eax 
             40bd28     -1 INSTR LOCAL MetadataRedundant xor     r8d, r8d 
             40bd28      3 INSTR BELONGTO 40bc90 
-            40bd2b     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 490h 
+            40bd2b     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 490h 
             40bd2b      5 INSTR BELONGTO 40bc90 
             40bd2b      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX ZZ mov     ecx, 490h 
-            40bd30     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40bd30     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40bd30      5 INSTR BELONGTO 40bc90 
             40bd30      5 INSTR DEADREGS  EFLAGS RAX RDX RBX ZZ mov     edx, 2 
             40bd35      2 INSTR BELONGTO 40bc90 
             40bd35      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40bd35     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bd35     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bd37     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             40bd37      5 INSTR BELONGTO 40bc90 
             40bd37      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_signal_new 
@@ -8166,7 +8166,7 @@
             40bd80      5 PTRIMMEDESP STACK 8 displ lea     rcx, [rsp+28h+var_20]
             40bd85      2 INSTR BELONGTO 40bd60 
             40bd85      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 ZZ xor     edx, edx 
-            40bd85     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40bd85     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40bd87      3 INSTR BELONGTO 40bd60 
             40bd87      3 INSTR DEADREGS  EFLAGS RSI RDI R8 ZZ mov     rdi, rax 
             40bd8a     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
@@ -8174,7 +8174,7 @@
             40bd8a      6 INSTR DEADREGS  EFLAGS RAX RSI R8 ZZ mov     r8d, 0FFFFFFFFh 
             40bd90      2 INSTR BELONGTO 40bd60 
             40bd90      2 INSTR DEADREGS  EFLAGS RAX RSI ZZ xor     eax, eax 
-            40bd90     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bd90     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bd92      3 INSTR BELONGTO 40bd60 
             40bd92      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, rbp 
             40bd95     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
@@ -8240,17 +8240,17 @@
             40be59     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40be61     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_selection 
             40be6f     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40be72     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40be74     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40be76     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+            40be72     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40be74     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40be76     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
             40be7e      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rbx
             40be82     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_handlers_block_matched 
             40be87      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40be8d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_selection_select_iter 
             40be9b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40be9e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40bea0     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40bea2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+            40be9e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40bea0     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40bea2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
             40bea7      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rbx
             40beab     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_handlers_unblock_matched 
             40beb0      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -8266,16 +8266,16 @@
             40bef7     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40befc      5 PTRIMMEDESP STACK 56 displ lea     rcx, [rsp+38h]
             40bf04     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            40bf0a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            40bf0c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
+            40bf0a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            40bf0c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
             40bf11      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40bf14     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             40bf19      5 PTRIMMEDESP STACK 56 displ mov     rcx, [rsp+38h]
             40bf1e     -1 INSTR LOCAL NoMetaUpdate test    rcx, rcx 
             40bf21     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40BF38 
             40bf29     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40bf2c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40bf31     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40bf2c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40bf31     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40bf33     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
             40bf40     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_path_free 
             40bf51     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40BE49 
@@ -8286,9 +8286,9 @@
             40bf81     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40bf87     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40C000 
             40bf89     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40bf8c     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40bf8e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40bf96     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+            40bf8c     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40bf8e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40bf96     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
             40bf9e      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rbx
             40bfa2     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_handlers_disconnect_matched 
             40bfab      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
@@ -8367,17 +8367,17 @@
             40c065     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 3 
             40c065      6 INSTR BELONGTO 40c020 
             40c065      6 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 ZZ mov     r8d, 3 
-            40c06b     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2BCh 
+            40c06b     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2BCh 
             40c06b      5 INSTR BELONGTO 40c020 
             40c06b      5 INSTR DEADREGS  EFLAGS RCX RDX RDI ZZ mov     ecx, 2BCh 
-            40c070     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40c070     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40c070      5 INSTR BELONGTO 40c020 
             40c070      5 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edx, 2 
             40c075      3 INSTR BELONGTO 40c020 
             40c075      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, [rax] 
             40c078      2 INSTR BELONGTO 40c020 
             40c078      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40c078     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c078     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c07a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_store_set 
             40c07a      5 INSTR BELONGTO 40c020 
             40c07a      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_tree_store_set 
@@ -8438,7 +8438,7 @@
             40c0be      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 ZZ mov     rax, [rdx+30h] 
             40c0c2      2 INSTR BELONGTO 40c0b0 
             40c0c2      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ xor     edx, edx 
-            40c0c2     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c0c2     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c0c4      5 INSTR BELONGTO 40c0b0 
             40c0c4      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ lea     rsi, [rsp+68h+var_58] 
             40c0c4      5 PTRIMMEDESP STACK 16 displ lea     rsi, [rsp+68h+var_58]
@@ -8471,10 +8471,10 @@
             40c0f4      3 INSTR DEADREGS  EFLAGS RCX RDX R8 R9 ZZ mov     rcx, rax 
             40c0f7      2 INSTR BELONGTO 40c0b0 
             40c0f7      2 INSTR DEADREGS  EFLAGS RAX RDX R8 R9 ZZ xor     edx, edx 
-            40c0f7     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c0f7     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c0f9      2 INSTR BELONGTO 40c0b0 
             40c0f9      2 INSTR DEADREGS  EFLAGS RAX R8 R9 ZZ xor     eax, eax 
-            40c0f9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c0f9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c0fb      3 INSTR BELONGTO 40c0b0 
             40c0fb      3 INSTR DEADREGS  EFLAGS R8 R9 ZZ mov     r9, r12 
             40c0fe     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
@@ -8504,20 +8504,20 @@
             40c121      5 PTRIMMEDESP STACK 48 displ lea     rsi, [rsp+68h+var_38]
             40c126      2 INSTR BELONGTO 40c0b0 
             40c126      2 INSTR DEADREGS  EFLAGS RCX RDI R12 ZZ xor     ecx, ecx 
-            40c126     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40c126     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40c128      3 INSTR BELONGTO 40c0b0 
             40c128      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, [rax] 
             40c12b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_store_insert 
             40c12b      5 INSTR BELONGTO 40c0b0 
             40c12b      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _gtk_tree_store_insert 
-            40c130     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40c130     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40c130      5 INSTR BELONGTO 40c0b0 
             40c130      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 5          ; category 
             40c135      5 INSTR BELONGTO 40c0b0 
             40c135      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aLoading___; "Loading..." 
             40c13a      2 INSTR BELONGTO 40c0b0 
             40c13a      2 INSTR DEADREGS  EFLAGS RDI R12 ZZ xor     edi, edi        ; domainname 
-            40c13a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40c13a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40c13c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40c13c      5 INSTR BELONGTO 40c0b0 
             40c13c      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _dcgettext 
@@ -8531,12 +8531,12 @@
             40c14d     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
             40c14d      6 INSTR BELONGTO 40c0b0 
             40c14d      6 INSTR DEADREGS  EFLAGS RAX RDX R8 R12 ZZ mov     r8d, 0FFFFFFFFh 
-            40c153     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40c153     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40c153      5 INSTR BELONGTO 40c0b0 
             40c153      5 INSTR DEADREGS  EFLAGS RAX RDX R12 ZZ mov     edx, 1 
             40c158      2 INSTR BELONGTO 40c0b0 
             40c158      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            40c158     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c158     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c15a      3 INSTR BELONGTO 40c0b0 
             40c15a      3 INSTR DEADREGS  EFLAGS R12 ZZ mov     rdi, [rdi] 
             40c15d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_store_set 
@@ -8552,7 +8552,7 @@
             40c16b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40c16b      3 INSTR BELONGTO 40c0b0 
             40c16b      3 INSTR DEADREGS  EFLAGS RDX RBX RSI R8 R12 ZZ xor     r8d, r8d 
-            40c16e     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40C020 
+            40c16e     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40C020 
             40c16e      5 INSTR BELONGTO 40c0b0 
             40c16e      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 ZZ mov     edx, offset sub_40C020 
             40c173      5 INSTR BELONGTO 40c0b0 
@@ -8582,14 +8582,14 @@
             40c1c9     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40C248 
             40c1cb      5 PTRIMMEDESP STACK 16 displ lea     rcx, [rsp+10h]
             40c1d0     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            40c1d6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40c1d6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40c1db      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
-            40c1e1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c1e1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c1e3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             40c1e8      5 PTRIMMEDESP STACK 24 displ lea     rcx, [rsp+18h]
             40c1ed     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            40c1f3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            40c1fe     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c1f3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40c1fe     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c200     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             40c205      5 PTRIMMEDESP STACK 24 displ mov     rsi, [rsp+18h]
             40c20a      5 PTRIMMEDESP STACK 16 displ mov     rdi, [rsp+10h]
@@ -8607,21 +8607,21 @@
             40c248     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 1 
             40c24b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40C270 
             40c24d     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40c255     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 172h 
+            40c255     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 172h 
             40c264     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message 
             40c270      5 PTRIMMEDESP STACK 32 displ lea     rcx, [rsp+20h]
-            40c275     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c275     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c277     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            40c27d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
+            40c27d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
             40c282      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40c288     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             40c28d      5 PTRIMMEDESP STACK 40 displ lea     rcx, [rsp+28h]
-            40c292     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c292     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c297     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
-            40c29d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
+            40c29d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
             40c2a5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             40c2aa      5 PTRIMMEDESP STACK 32 displ mov     rdi, [rsp+20h]
-            40c2af     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c2af     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c2b1     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             40c2b4     -1 INSTR LOCAL NoMetaUpdate jz      loc_40C230 
             40c2ba      5 PTRIMMEDESP STACK 40 displ mov     rsi, [rsp+28h]
@@ -8683,7 +8683,7 @@
             40c324      5 PTRIMMEDESP STACK 104 displ lea     rcx, [rsp+98h+var_30]
             40c329      2 INSTR BELONGTO 40c2e0 
             40c329      2 INSTR DEADREGS  EFLAGS RDX R8 ZZ xor     edx, edx 
-            40c329     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c329     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c32b     -1 INSTR LOCAL MetadataUnused mov     [rsp+98h+var_90], rax 
             40c32b      5 INSTR BELONGTO 40c2e0 
             40c330     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 3 
@@ -8691,7 +8691,7 @@
             40c330      6 INSTR DEADREGS  EFLAGS RAX R8 ZZ mov     r8d, 3 
             40c336      2 INSTR BELONGTO 40c2e0 
             40c336      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40c336     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c336     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c338     -1 INSTR LOCAL MetadataUnused mov     [rsp+98h+var_88], 0FFFFFFFFh 
             40c338      8 INSTR BELONGTO 40c2e0 
             40c340      7 INSTR BELONGTO 40c2e0 
@@ -8784,10 +8784,10 @@
             40c3d9      5 PTRIMMEDESP STACK 64 displ lea     rsi, [rsp+98h+var_58]
             40c3de      2 INSTR BELONGTO 40c2e0 
             40c3de      2 INSTR DEADREGS  EFLAGS RAX RDX R8 ZZ xor     edx, edx 
-            40c3de     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c3de     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c3e0      2 INSTR BELONGTO 40c2e0 
             40c3e0      2 INSTR DEADREGS  EFLAGS RAX R8 ZZ xor     eax, eax 
-            40c3e0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c3e0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c3e2     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
             40c3e2      6 INSTR BELONGTO 40c2e0 
             40c3e2      6 INSTR DEADREGS  EFLAGS R8 ZZ mov     r8d, 0FFFFFFFFh 
@@ -8879,13 +8879,13 @@
             40c477      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 ZZ mov     r8d, 0FFFFFFFFh 
             40c47d      2 INSTR BELONGTO 40c2e0 
             40c47d      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX ZZ xor     ecx, ecx 
-            40c47d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40c47f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            40c47d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40c47f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
             40c47f      5 INSTR BELONGTO 40c2e0 
             40c47f      5 INSTR DEADREGS  EFLAGS RAX RDX RBX ZZ mov     edx, 3 
             40c484      2 INSTR BELONGTO 40c2e0 
             40c484      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40c484     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c484     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c486     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_store_set 
             40c486      5 INSTR BELONGTO 40c2e0 
             40c486      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _gtk_tree_store_set 
@@ -8897,15 +8897,15 @@
             40c496      7 INSTR DEADREGS  EFLAGS RCX RDX RDI ZZ mov     dword ptr [rax+18h], 0 
             40c49d      2 INSTR BELONGTO 40c2e0 
             40c49d      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI ZZ xor     ecx, ecx 
-            40c49d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40c49d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40c49f      2 INSTR BELONGTO 40c2e0 
             40c49f      2 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ xor     edx, edx 
-            40c49f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c49f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c4a1      3 INSTR BELONGTO 40c2e0 
             40c4a1      3 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     rdi, rbx 
             40c4a4      2 INSTR BELONGTO 40c2e0 
             40c4a4      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40c4a4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c4a4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c4a6     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
             40c4a6      5 INSTR BELONGTO 40c2e0 
             40c4a6      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_signal_emit 
@@ -8921,12 +8921,12 @@
             40c4bb      3 INSTR DEADREGS  EFLAGS RAX RDX RDI R8 ZZ xor     r8d, r8d 
             40c4be      2 INSTR BELONGTO 40c2e0 
             40c4be      2 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ xor     edx, edx 
-            40c4be     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40c4be     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40c4c0      3 INSTR BELONGTO 40c2e0 
             40c4c0      3 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     rdi, rbx 
             40c4c3      2 INSTR BELONGTO 40c2e0 
             40c4c3      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40c4c3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c4c3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c4c5     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
             40c4c5      5 INSTR BELONGTO 40c2e0 
             40c4c5      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_signal_emit 
@@ -8990,10 +8990,10 @@
             40c524     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 38h 
             40c524      6 INSTR BELONGTO 40c4d0 
             40c524      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 38h 
-            40c52a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_40BC90 
+            40c52a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_40BC90 
             40c52a      5 INSTR BELONGTO 40c4d0 
             40c52a      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset sub_40BC90 
-            40c52f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 498h 
+            40c52f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 498h 
             40c52f      5 INSTR BELONGTO 40c4d0 
             40c52f      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 498h 
             40c534      7 INSTR BELONGTO 40c4d0 
@@ -9046,7 +9046,7 @@
             40c591      4 INSTR BELONGTO 40c550 
             40c595      8 INSTR BELONGTO 40c550 
             40c59d      7 INSTR BELONGTO 40c550 
-            40c5a4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40c5a4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40c5a4      5 INSTR BELONGTO 40c550 
             40c5a9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             40c5a9      5 INSTR BELONGTO 40c550 
@@ -9068,10 +9068,10 @@
             40c5f0     -1 INSTR LOCAL NoMetaUpdate call    sub_410040 
             40c5f5     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 44h 
             40c5fb     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 14h 
-            40c601     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 18h 
-            40c606     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40h 
-            40c60e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 5 
-            40c613     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c601     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 18h 
+            40c606     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40h 
+            40c60e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 5 
+            40c613     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c615     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_store_new 
             40c61d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get_type 
             40c628     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -9080,42 +9080,42 @@
             40c649     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_set_model 
             40c652      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40c65b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40c660     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40c660     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40c665     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_set_headers_visible 
             40c66a      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40c670     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40c678     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_selection 
-            40c67d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40c67d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40c688     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_selection_set_mode 
             40c68d     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40c690     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40c6a3     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             40c6a8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_cell_renderer_text_new 
             40c6b0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new 
-            40c6be     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40c6be     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40c6c3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_pack_start 
             40c6c8     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 3 
-            40c6d4     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40c6e4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c6d4     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40c6e4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c6e6      9 PTRIMMEDESP STACK 16 displ mov     qword ptr [rsp+10h], 0
             40c6ef      8 PTRIMMEDESP STACK 8 displ mov     dword ptr [rsp+8], 2
             40c6f7      8 PTRIMMEDESP STACK 0 displ mov     qword ptr [rsp], offset aWeight; "weight"
             40c6ff     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_set_attributes 
             40c704     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_sortable_get_type 
             40c716     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40c71b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40c720     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40c71b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40c720     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40c725     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_sortable_set_sort_column_id 
             40c734     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40c73c     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40c747     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40c747     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40c74c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_sortable_set_sort_func 
             40c751      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40c757     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40c762     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
             40c767      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40c76d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40c772     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
+            40c772     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
             40c77a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_set_search_column 
             40c783     -1 INSTR LOCAL NoMetaUpdate call    sub_40AAF0 
             40c78b     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
@@ -9150,7 +9150,7 @@
             40c82e      4 INSTR BELONGTO 40c820 
             40c832      2 INSTR BELONGTO 40c820 
             40c832      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            40c832     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c832     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c832      8 DEALLOC STACK esp - 8 xor     eax, eax
             40c834     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
             40c834      5 INSTR BELONGTO 40c820 
@@ -9204,7 +9204,7 @@
             40c87f      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 ZZ mov     r8d, offset aLogview_is_l_0; "LOGVIEW_IS_LOGLIST (loglist)" 
             40c885      5 INSTR BELONGTO 40c840 
             40c885      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     ecx, offset aLogview_loglis; "logview_loglist_update_lines" 
-            40c88a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1E8h 
+            40c88a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1E8h 
             40c88a      5 INSTR BELONGTO 40c840 
             40c88a      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 1E8h 
             40c88f      5 INSTR BELONGTO 40c840 
@@ -9248,7 +9248,7 @@
             40c8c7      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 ZZ mov     r8d, offset aLogview_is_log; "LOGVIEW_IS_LOG (log)" 
             40c8cd      5 INSTR BELONGTO 40c840 
             40c8cd      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     ecx, offset aLogview_loglis; "logview_loglist_update_lines" 
-            40c8d2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1E9h 
+            40c8d2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1E9h 
             40c8d2      5 INSTR BELONGTO 40c840 
             40c8d2      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 1E9h 
             40c8d7      5 INSTR BELONGTO 40c840 
@@ -9328,7 +9328,7 @@
             40c96f      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             40c973      2 INSTR BELONGTO 40c950 
             40c973      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            40c973     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c973     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c975     -1 INSTR LOCAL NoMetaUpdate call    _g_markup_printf_escaped 
             40c975      5 INSTR BELONGTO 40c950 
             40c975      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    _g_markup_printf_escaped 
@@ -9340,7 +9340,7 @@
             40c980      5 INSTR DEADREGS  EFLAGS RAX RDI R13 ZZ mov     edi, offset aSmallSSmall; "<small>%s</small>" 
             40c985      2 INSTR BELONGTO 40c950 
             40c985      2 INSTR DEADREGS  EFLAGS RAX R13 ZZ xor     eax, eax 
-            40c985     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40c985     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40c987     -1 INSTR LOCAL NoMetaUpdate call    _g_markup_printf_escaped 
             40c987      5 INSTR BELONGTO 40c950 
             40c987      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_markup_printf_escaped 
@@ -9447,11 +9447,11 @@
             40ca35      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R8 ZZ xor     r8d, r8d 
             40ca38      2 INSTR BELONGTO 40ca00 
             40ca38      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI ZZ xor     ecx, ecx 
-            40ca38     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ca38     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40ca3a      2 INSTR BELONGTO 40ca00 
             40ca3a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ xor     edx, edx 
-            40ca3a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40ca3c     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+            40ca3a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40ca3c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
             40ca3c      5 INSTR BELONGTO 40ca00 
             40ca3c      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 18h 
             40ca41      4 INSTR BELONGTO 40ca00 
@@ -9617,7 +9617,7 @@
             40cb36      5 INSTR BELONGTO 40cac0 
             40cb36      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ lea     rsi, [rsp+98h+var_88] 
             40cb36      5 PTRIMMEDESP STACK 16 displ lea     rsi, [rsp+98h+var_88]
-            40cb3b     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40cb3b     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40cb3b      5 INSTR BELONGTO 40cac0 
             40cb3b      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI R12 ZZ mov     ecx, 1 
             40cb40      3 INSTR BELONGTO 40cac0 
@@ -9894,18 +9894,18 @@
             40cd2b     -1 INSTR LOCAL NoMetaUpdate jmp     _g_return_if_fail_warning 
             40cd2b      5 INSTR BELONGTO 40cca0 
             40cd2b      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 ZZ jmp     _g_return_if_fail_warning 
-            40cd30     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40cd30     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40cd30      5 INSTR BELONGTO 40cca0 
             40cd30      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R13 R14 ZZ mov     edx, 5          ; category 
             40cd35      5 INSTR BELONGTO 40cca0 
             40cd35      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 R14 ZZ mov     esi, offset aYouShouldHaveR; "You should have received a copy of the "... 
             40cd3a      2 INSTR BELONGTO 40cca0 
             40cd3a      2 INSTR DEADREGS  EFLAGS RBX RDI R13 R14 ZZ xor     edi, edi        ; domainname 
-            40cd3a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40cd3a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40cd3c     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40cd3c      5 INSTR BELONGTO 40cca0 
             40cd3c      5 INSTR DEADREGS  EFLAGS RBX R13 R14 ZZ call    _dcgettext 
-            40cd41     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40cd41     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40cd41      5 INSTR BELONGTO 40cca0 
             40cd41      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R13 R14 ZZ mov     edx, 5          ; category 
             40cd46      5 INSTR BELONGTO 40cca0 
@@ -9917,7 +9917,7 @@
             40cd50     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40cd50      5 INSTR BELONGTO 40cca0 
             40cd50      5 INSTR DEADREGS  EFLAGS RBX R14 ZZ call    _dcgettext 
-            40cd55     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40cd55     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40cd55      5 INSTR BELONGTO 40cca0 
             40cd55      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R14 ZZ mov     edx, 5          ; category 
             40cd5a      3 INSTR BELONGTO 40cca0 
@@ -9942,24 +9942,24 @@
             40cd75      5 INSTR DEADREGS  EFLAGS RAX RBX RDI R13 R14 ZZ mov     edi, offset asc_41464A; "\n\n" 
             40cd7a      2 INSTR BELONGTO 40cca0 
             40cd7a      2 INSTR DEADREGS  EFLAGS RAX RBX R13 R14 ZZ xor     eax, eax 
-            40cd7a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cd7a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cd7c     -1 INSTR LOCAL NoMetaUpdate call    _g_strjoin 
             40cd7c      5 INSTR BELONGTO 40cca0 
             40cd7c      5 INSTR DEADREGS  EFLAGS RBX R13 R14 ZZ call    _g_strjoin 
-            40cd81     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40cd81     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40cd81      5 INSTR BELONGTO 40cca0 
             40cd81      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R13 R14 ZZ mov     edx, 5          ; category 
             40cd86      5 INSTR BELONGTO 40cca0 
             40cd86      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 R14 ZZ mov     esi, offset aASystemLogView; "A system log viewer for GNOME." 
             40cd8b      2 INSTR BELONGTO 40cca0 
             40cd8b      2 INSTR DEADREGS  EFLAGS RBX RDI R13 R14 ZZ xor     edi, edi        ; domainname 
-            40cd8b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40cd8b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40cd8d      3 INSTR BELONGTO 40cca0 
             40cd8d      3 INSTR DEADREGS  EFLAGS RBX R13 R14 ZZ mov     rbx, rax 
             40cd90     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40cd90      5 INSTR BELONGTO 40cca0 
             40cd90      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ call    _dcgettext 
-            40cd95     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40cd95     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40cd95      5 INSTR BELONGTO 40cca0 
             40cd95      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 ZZ mov     edx, 5          ; category 
             40cd9a      5 INSTR BELONGTO 40cca0 
@@ -9994,7 +9994,7 @@
             40cdce      5 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 ZZ mov     esi, offset aName; "name" 
             40cdd3      2 INSTR BELONGTO 40cca0 
             40cdd3      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            40cdd3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cdd3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cdd5     -1 INSTR LOCAL MetadataUnused mov     [rsp+0A8h+var_78], r14 
             40cdd5      5 INSTR BELONGTO 40cca0 
             40cdda      5 INSTR BELONGTO 40cca0 
@@ -10104,14 +10104,14 @@
             40cedd      2 INSTR BELONGTO 40cea0 
             40cedf      4 INSTR BELONGTO 40cea0 
             40cedf      4 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rbx, [rax+8] 
-            40cee3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40cee3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40cee3      5 INSTR BELONGTO 40cea0 
             40cee3      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 5          ; category 
             40cee8      5 INSTR BELONGTO 40cea0 
             40cee8      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aThereWasAnErro; "There was an error displaying help: %s" 
             40ceed      2 INSTR BELONGTO 40cea0 
             40ceed      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; domainname 
-            40ceed     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40ceed     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40ceef     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40ceef      5 INSTR BELONGTO 40cea0 
             40ceef      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
@@ -10121,12 +10121,12 @@
             40cef9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ mov     rdx, rax 
             40cefc      3 INSTR BELONGTO 40cea0 
             40cefc      3 INSTR DEADREGS  EFLAGS RAX RCX RSI ZZ mov     rcx, rbx 
-            40ceff     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40ceff     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             40ceff      5 INSTR BELONGTO 40cea0 
             40ceff      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 10h 
             40cf04      2 INSTR BELONGTO 40cea0 
             40cf04      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40cf04     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40cf04     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40cf06     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40cf06      5 INSTR BELONGTO 40cea0 
             40cf06      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
@@ -10172,7 +10172,7 @@
             40cf41     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40cf41      3 INSTR BELONGTO 40cf20 
             40cf41      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R12 ZZ xor     r8d, r8d 
-            40cf44     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40E2E0 
+            40cf44     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40E2E0 
             40cf44      5 INSTR BELONGTO 40cf20 
             40cf44      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, offset sub_40E2E0 
             40cf49      5 INSTR BELONGTO 40cf20 
@@ -10447,7 +10447,7 @@
             40d0e1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_view_get_buffer 
             40d0e1      5 INSTR BELONGTO 40d0c0 
             40d0e1      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_text_view_get_buffer 
-            40d0e6     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 45h 
+            40d0e6     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 45h 
             40d0e6      5 INSTR BELONGTO 40d0c0 
             40d0e6      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 45h 
             40d0eb      3 INSTR BELONGTO 40d0c0 
@@ -10548,10 +10548,10 @@
             40d18e      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_type_check_instance_cast 
             40d193      2 INSTR BELONGTO 40d130 
             40d193      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ xor     edi, edi        ; domainname 
-            40d193     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40d193     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40d195      3 INSTR BELONGTO 40d130 
             40d195      3 INSTR DEADREGS  EFLAGS RDX RSI R12 ZZ mov     r12, rax 
-            40d198     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40d198     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40d198      5 INSTR BELONGTO 40d130 
             40d198      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 5          ; category 
             40d19d      5 INSTR BELONGTO 40d130 
@@ -10561,7 +10561,7 @@
             40d1a2      5 INSTR DEADREGS  EFLAGS ZZ call    _dcgettext 
             40d1a7      2 INSTR BELONGTO 40d130 
             40d1a7      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 ZZ xor     edx, edx 
-            40d1a7     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40d1a7     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40d1a9      6 INSTR BELONGTO 40d130 
             40d1a9      6 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9d, offset aGtkOpen; "gtk-open" 
             40d1af     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFAh 
@@ -10575,7 +10575,7 @@
             40d1bd      3 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     rdi, rax 
             40d1c0      2 INSTR BELONGTO 40d130 
             40d1c0      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            40d1c0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40d1c0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40d1c2     -1 INSTR LOCAL MetadataUnused mov     [rsp+28h+var_20], 0 
             40d1c2      9 INSTR BELONGTO 40d130 
             40d1cb      7 INSTR BELONGTO 40d130 
@@ -10598,7 +10598,7 @@
             40d1ec     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40d1ec      5 INSTR BELONGTO 40d130 
             40d1ec      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_type_check_instance_cast 
-            40d1f1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFBh 
+            40d1f1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFBh 
             40d1f1      5 INSTR BELONGTO 40d130 
             40d1f1      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 0FFFFFFFBh 
             40d1f6      3 INSTR BELONGTO 40d130 
@@ -10613,7 +10613,7 @@
             40d208     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40d208      5 INSTR BELONGTO 40d130 
             40d208      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_type_check_instance_cast 
-            40d20d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40d20d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40d20d      5 INSTR BELONGTO 40d130 
             40d20d      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 1 
             40d212      3 INSTR BELONGTO 40d130 
@@ -10631,7 +10631,7 @@
             40d224      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R12 ZZ xor     r8d, r8d 
             40d227      3 INSTR BELONGTO 40d130 
             40d227      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 ZZ mov     rcx, rbp 
-            40d22a     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40DD40 
+            40d22a     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40DD40 
             40d22a      5 INSTR BELONGTO 40d130 
             40d22a      5 INSTR DEADREGS  EFLAGS RDX RSI R12 ZZ mov     edx, offset loc_40DD40 
             40d22f      5 INSTR BELONGTO 40d130 
@@ -10647,7 +10647,7 @@
             40d243      3 INSTR BELONGTO 40d130 
             40d246      5 INSTR BELONGTO 40d130 
             40d246      5 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 ZZ mov     ecx, offset qword_61A318 
-            40d24b     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset _gtk_widget_destroyed 
+            40d24b     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset _gtk_widget_destroyed 
             40d24b      5 INSTR BELONGTO 40d130 
             40d24b      5 INSTR DEADREGS  EFLAGS RDX RSI R12 ZZ mov     edx, offset _gtk_widget_destroyed 
             40d250      5 INSTR BELONGTO 40d130 
@@ -10798,7 +10798,7 @@
             40d35e     -1 INSTR LOCAL NoMetaUpdate call    _pango_context_get_font_description 
             40d35e      5 INSTR BELONGTO 40d330 
             40d35e      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _pango_context_get_font_description 
-            40d363     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, [rbx+7Ch] 
+            40d363     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, [rbx+7Ch] 
             40d363      3 INSTR BELONGTO 40d330 
             40d363      3 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     esi, [rbx+7Ch] 
             40d366      3 INSTR BELONGTO 40d330 
@@ -10863,7 +10863,7 @@
             40d3d0      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
             40d3d4     -1 INSTR LOCAL MetadataUnused mov     rdi, rsi 
             40d3d4      3 INSTR BELONGTO 40d3d0 
-            40d3d7     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 6 
+            40d3d7     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 6 
             40d3d7      5 INSTR BELONGTO 40d3d0 
             40d3d7      5 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ mov     eax, 6 
             40d3dc      3 INSTR BELONGTO 40d3d0 
@@ -10889,7 +10889,7 @@
             40d400      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
             40d404     -1 INSTR LOCAL MetadataUnused mov     rdi, rsi 
             40d404      3 INSTR BELONGTO 40d400 
-            40d407     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 18h 
+            40d407     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 18h 
             40d407      5 INSTR BELONGTO 40d400 
             40d407      5 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ mov     eax, 18h 
             40d40c      3 INSTR BELONGTO 40d400 
@@ -10956,7 +10956,7 @@
             40d476      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     edx, offset qword_4153E0 
             40d47b      2 INSTR BELONGTO 40d450 
             40d47b      2 INSTR DEADREGS  EFLAGS RCX RBX ZZ xor     ecx, ecx 
-            40d47b     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40d47b     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40d47d     -1 INSTR LOCAL NoMetaUpdate cmp     esi, [rdx] 
             40d47d      2 INSTR BELONGTO 40d450 
             40d47f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40D4A8 
@@ -10971,7 +10971,7 @@
             40d48b      2 INSTR BELONGTO 40d450 
             40d48d      2 INSTR BELONGTO 40d450 
             40d48d      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            40d48d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40d48d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40d48f      4 INSTR BELONGTO 40d450 
             40d48f      4 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ mov     rbx, [rsp+18h+var_18] 
             40d48f      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp+18h+var_18]
@@ -11008,7 +11008,7 @@
             40d4cc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_activate 
             40d4cc      5 INSTR BELONGTO 40d450 
             40d4cc      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _gtk_action_activate 
-            40d4d1     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40d4d1     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40d4d1      5 INSTR BELONGTO 40d450 
             40d4d1      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ mov     eax, 1 
             40d4d6     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40D48F 
@@ -11028,7 +11028,7 @@
             40d541     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
             40d551      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
             40d55d      4 PTRIMMEDESP STACK 8 displ mov     [rsp+8], eax
-            40d561     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40d561     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40d563     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             40d568      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40d56e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_tag_table_add 
@@ -11197,7 +11197,7 @@
             40d677      5 INSTR DEADREGS  EFLAGS ZZ call    sub_411B40 
             40d67c      2 INSTR BELONGTO 40d660 
             40d67c      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40d67c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40d67c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40d67e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             40d67e      4 INSTR BELONGTO 40d660 
             40d682      1 INSTR BELONGTO 40d660 
@@ -11284,12 +11284,12 @@
             40d72a      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
             40d730     -1 INSTR LOCAL NoMetaUpdate call    sub_40D690 
             40d738     -1 INSTR LOCAL NoMetaUpdate call    sub_4105A0 
-            40d73d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40d73d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40d73f     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
-            40d745     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40d745     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             40d74f     -1 INSTR LOCAL NoMetaUpdate jz      loc_40D8E0 
             40d755     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            40d765     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40d765     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40d767     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40d76f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             40d774      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -11314,7 +11314,7 @@
             40d7f7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_buffer_insert 
             40d7fc      3 PTRIMMEDESP STACK 0 displ mov     rdi, rsp
             40d7ff     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_iter_forward_to_end 
-            40d804     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40d804     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40d80e      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
             40d814     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_buffer_insert 
             40d819      3 PTRIMMEDESP STACK 0 displ mov     rdi, rsp
@@ -11322,7 +11322,7 @@
             40d825     -1 INSTR LOCAL NoMetaUpdate test    r14, r14 
             40d828     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40D7E0 
             40d82d     -1 INSTR LOCAL NoMetaUpdate call    sub_410790 
-            40d832     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40d832     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40d83d     -1 INSTR LOCAL NoMetaUpdate call    sub_40D5A0 
             40d845     -1 INSTR LOCAL NoMetaUpdate call    sub_4107F0 
             40d84a     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
@@ -11345,7 +11345,7 @@
             40d8c8      4 PTRIMMEDEBP STACK 56 displ mov     rax, [rbp+38h]
             40d8d7     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40D7A6 
             40d8e0     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            40d8e8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40d8e8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40d8ea     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40d8f2     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40D76F 
             40d900      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbx
@@ -11355,7 +11355,7 @@
             40d91f     -1 INSTR LOCAL NoMetaUpdate call    _g_source_remove 
             40d924      4 PTRIMMEDEBP STACK 56 displ mov     rbx, [rbp+38h]
             40d928      3 PTRIMMEDEBP STACK 0 displ mov     rdx, rbp
-            40d930     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 12Ch 
+            40d930     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 12Ch 
             40d935     -1 INSTR LOCAL NoMetaUpdate call    _g_timeout_add 
             40d93a      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             40d945      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
@@ -11545,7 +11545,7 @@
             40da66      5 INSTR BELONGTO 40d950 
             40da66      5 INSTR DEADREGS  RCX RDX RSI RDI ZZ lea     rcx, [rsp+198h+var_128] 
             40da66      5 PTRIMMEDESP STACK 112 displ lea     rcx, [rsp+198h+var_128]
-            40da6b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40da6b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40da6b      5 INSTR BELONGTO 40d950 
             40da6b      5 INSTR DEADREGS  RDX RSI RDI ZZ mov     edx, 1 
             40da70      3 INSTR BELONGTO 40d950 
@@ -11614,7 +11614,7 @@
             40dad7      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R15 ZZ call    _gtk_text_view_scroll_mark_onscreen 
             40dadc     -1 INSTR LOCAL NoMetaUpdate test    ebp, ebp 
             40dadc      2 INSTR BELONGTO 40d950 
-            40dade     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40dade     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40dade      5 INSTR BELONGTO 40d950 
             40dade      5 INSTR DEADREGS  RDX RBX RSI R12 R13 R15 ZZ mov     edx, 5          ; category 
             40dae3      5 INSTR BELONGTO 40d950 
@@ -11623,7 +11623,7 @@
             40dae8      6 INSTR BELONGTO 40d950 
             40daee      2 INSTR BELONGTO 40d950 
             40daee      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R15 ZZ xor     edi, edi        ; domainname 
-            40daee     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40daee     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40daf0     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40daf0      5 INSTR BELONGTO 40d950 
             40daf0      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R15 ZZ call    _dcgettext 
@@ -11704,7 +11704,7 @@
             40db84     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_buffer_move_mark_by_name 
             40db84      5 INSTR BELONGTO 40d950 
             40db84      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R15 ZZ call    _gtk_text_buffer_move_mark_by_name 
-            40db89     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40db89     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             40db89      5 INSTR BELONGTO 40d950 
             40db89      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R15 ZZ mov     edx, 5 
             40db8e      5 INSTR BELONGTO 40d950 
@@ -11718,7 +11718,7 @@
             40db9e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_buffer_get_start_iter 
             40db9e      5 INSTR BELONGTO 40d950 
             40db9e      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_text_buffer_get_start_iter 
-            40dba3     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40dba3     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40dba3      5 INSTR BELONGTO 40d950 
             40dba3      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, 1 
             40dba8      3 INSTR BELONGTO 40d950 
@@ -11730,7 +11730,7 @@
             40dbb3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_buffer_create_mark 
             40dbb3      5 INSTR BELONGTO 40d950 
             40dbb3      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_text_buffer_create_mark 
-            40dbb8     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40dbb8     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40dbb8      5 INSTR BELONGTO 40d950 
             40dbb8      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, 1 
             40dbbd      3 INSTR BELONGTO 40d950 
@@ -11770,20 +11770,20 @@
             40dc71     -1 INSTR LOCAL NoMetaUpdate call    sub_410C80 
             40dc76      4 PTRIMMEDEBP STACK 56 displ mov     rdx, [rbp+38h]
             40dc81     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40dc86     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40dc86     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40dc8b     -1 INSTR LOCAL NoMetaUpdate call    sub_411320 
             40dc90      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-            40dc93     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40dc93     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40dc98     -1 INSTR LOCAL NoMetaUpdate call    sub_40D950 
-            40dc9d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40dc9d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40dc9f      5 PTRIMMEDESP STACK 88 displ mov     rbx, [rsp+58h]
             40dca4      5 PTRIMMEDESP STACK 96 displ mov     rbp, [rsp+60h]
             40dca9      5 PTRIMMEDESP STACK 104 displ mov     r12, [rsp+68h]
             40dcae      5 PTRIMMEDESP STACK 112 displ mov     r13, [rsp+70h]
             40dcb3     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 78h 
-            40dcc3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40dcc3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40dcc8     -1 INSTR LOCAL NoMetaUpdate jmp     sub_40D950 
-            40dcd3     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40dcd3     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40dcd5     -1 INSTR LOCAL NoMetaUpdate jmp     sub_40D950 
             40dce0      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 -8 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             40dce0      0 FUNC MMSAFENESS SAFE
@@ -11885,7 +11885,7 @@
             40de18      5 PTRIMMEDESP STACK 32 displ mov     r13, [rsp+20h]
             40de1d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
             40de21     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_unref 
-            40de30     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40de30     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40de38     -1 INSTR LOCAL NoMetaUpdate call    sub_40AF80 
             40de3d     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40DE06 
             40de40      5 PTRIMMEDESP STACK -40 displ mov     [rsp-28h], rbx
@@ -11919,7 +11919,7 @@
             40df25     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_view_get_visible_rect 
             40df32     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_window 
             40df37      8 PTRIMMEDESP STACK 320 displ lea     rsi, [rsp+140h]
-            40df3f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40df3f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40df47     -1 INSTR LOCAL NoMetaUpdate call    _gdk_window_invalidate_rect 
             40df4c      8 PTRIMMEDESP STACK 336 displ mov     rbx, [rsp+150h]
             40df54      8 PTRIMMEDESP STACK 344 displ mov     rbp, [rsp+158h]
@@ -11986,10 +11986,10 @@
             40dfe4     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 40h 
             40dfe4      6 INSTR BELONGTO 40df90 
             40dfe4      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 40h 
-            40dfea     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_40CA60 
+            40dfea     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_40CA60 
             40dfea      5 INSTR BELONGTO 40df90 
             40dfea      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset sub_40CA60 
-            40dfef     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 430h 
+            40dfef     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 430h 
             40dfef      5 INSTR BELONGTO 40df90 
             40dfef      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 430h 
             40dff4      7 INSTR BELONGTO 40df90 
@@ -12025,7 +12025,7 @@
             40e02b     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             40e02b      5 INSTR BELONGTO 40e010 
             40e030      7 INSTR BELONGTO 40e010 
-            40e037     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40e037     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40e037      5 INSTR BELONGTO 40e010 
             40e03c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             40e03c      5 INSTR BELONGTO 40e010 
@@ -12149,14 +12149,14 @@
             40e0f4      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 ZZ xor     r8d, r8d 
             40e0f7      2 INSTR BELONGTO 40e050 
             40e0f7      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R9 ZZ xor     ecx, ecx 
-            40e0f7     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40e0f7     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40e0f9      2 INSTR BELONGTO 40e050 
             40e0f9      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R9 ZZ xor     edx, edx 
-            40e0f9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40e0f9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40e0fb     -2 INSTR LOCAL n R9 ZZ  NumericDEFs mov     r9d, offset loc_40EE10 
             40e0fb      6 INSTR BELONGTO 40e050 
             40e0fb      6 INSTR DEADREGS  EFLAGS RSI RDI R9 ZZ mov     r9d, offset loc_40EE10 
-            40e101     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
+            40e101     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 18h 
             40e101      5 INSTR BELONGTO 40e050 
             40e101      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 18h 
             40e106      3 INSTR BELONGTO 40e050 
@@ -12245,10 +12245,10 @@
             40e193      5 PTRIMMEDESP STACK 56 displ lea     rdx, [rsp+78h+var_40]
             40e198      2 INSTR BELONGTO 40e050 
             40e198      2 INSTR DEADREGS  EFLAGS RAX RCX RSI ZZ xor     ecx, ecx 
-            40e198     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40e198     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40e19a      2 INSTR BELONGTO 40e050 
             40e19a      2 INSTR DEADREGS  EFLAGS RAX RSI ZZ xor     eax, eax 
-            40e19a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40e19a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40e19c      5 INSTR BELONGTO 40e050 
             40e19c      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset aName; "name" 
             40e1a1     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
@@ -12259,10 +12259,10 @@
             40e1a6      5 PTRIMMEDESP STACK 56 displ mov     rdi, [rsp+78h+var_40]
             40e1ab      2 INSTR BELONGTO 40e050 
             40e1ab      2 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ xor     ecx, ecx 
-            40e1ab     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40e1ab     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40e1ad      2 INSTR BELONGTO 40e050 
             40e1ad      2 INSTR DEADREGS  EFLAGS RDX RSI ZZ xor     edx, edx 
-            40e1ad     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40e1ad     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40e1af      3 INSTR BELONGTO 40e050 
             40e1af      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, rdi 
             40e1b2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_action_new 
@@ -12293,7 +12293,7 @@
             40e1d7      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             40e1da      3 INSTR BELONGTO 40e050 
             40e1da      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, r14 
-            40e1dd     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_40EE10 
+            40e1dd     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_40EE10 
             40e1dd      5 INSTR BELONGTO 40e050 
             40e1dd      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset loc_40EE10 
             40e1e2      5 INSTR BELONGTO 40e050 
@@ -12484,8 +12484,8 @@
             40e389      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40e392     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e3a0     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_default_size 
-            40e3a5     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40e3a7     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40e3a5     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40e3a7     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40e3ac     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
             40e3b1      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], rax
             40e3b6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_get_type 
@@ -12494,16 +12494,16 @@
             40e3c9      5 PTRIMMEDESP STACK 24 displ mov     rsi, [rsp+18h]
             40e3d1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
             40e3db     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_new 
-            40e3e0     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40e3e0     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40e3e8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_set_translation_domain 
             40e3f0      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-            40e3f3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 11h 
+            40e3f3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 11h 
             40e3fd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_add_actions 
             40e402      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
-            40e408     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
+            40e408     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4 
             40e412     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_add_toggle_actions 
             40e425     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_new 
-            40e42a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40e42a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40e435     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_insert_action_group 
             40e43d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_get_accel_group 
             40e448      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -12521,35 +12521,35 @@
             40e4b1      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+18h]
             40e4bc     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e4c1     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40e4c4     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40e4c6     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40e4c4     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40e4c6     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40e4ce     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40e4d6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-            40e4db     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40e4db     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40e4dd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_paned_new 
             40e4e2      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+18h]
             40e4ed     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e4f2     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40e4f5     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40e4fa     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40e4f5     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40e4fa     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40e505     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40e511     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-            40e516     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40e518     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40e516     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40e518     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40e51d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
             40e529     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-            40e52e     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40e530     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40e52e     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40e530     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40e532     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_new 
             40e53a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_get_type 
             40e545      5 PTRIMMEDESP STACK 32 displ mov     [rsp+20h], rax
             40e54a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40e54f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            40e557     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40e54f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40e557     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40e55c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_set_policy 
             40e561      5 PTRIMMEDESP STACK 32 displ mov     rsi, [rsp+20h]
             40e569     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40e56e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            40e56e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             40e576     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_set_shadow_type 
             40e57b     -1 INSTR LOCAL NoMetaUpdate call    sub_40C820 
             40e58a      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
@@ -12558,16 +12558,16 @@
             40e59f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
             40e5ab     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e5b0     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40e5b3     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40e5b8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40e5b3     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40e5b8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40e5c3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40e5cc      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rax
             40e5d1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_paned_get_type 
             40e5dc      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
             40e5e1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e5e6      5 PTRIMMEDESP STACK 16 displ mov     rsi, [rsp+10h]
-            40e5eb     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40e5ed     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40e5eb     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40e5ed     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40e5f2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_paned_pack1 
             40e5fa     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40e603     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
@@ -12579,31 +12579,31 @@
             40e62b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40e62e      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
             40e63b     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            40e640     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40e642     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40e640     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40e642     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40e647     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
             40e64c      5 PTRIMMEDESP STACK 8 displ mov     r10, [rsp+8]
             40e654      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rax
             40e65c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e661      5 PTRIMMEDESP STACK 16 displ mov     rsi, [rsp+10h]
-            40e666     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40e66b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40e666     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40e66b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40e673     -1 INSTR LOCAL NoMetaUpdate call    _gtk_paned_pack2 
             40e678     -1 INSTR LOCAL NoMetaUpdate call    _gtk_info_bar_new 
-            40e67d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
-            40e682     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40e67d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            40e682     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40e688      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
             40e68d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
             40e695      5 PTRIMMEDESP STACK 40 displ mov     [rsp+28h], rax
             40e69a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-            40e69f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            40e69f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
             40e6a9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_image_new_from_stock 
             40e6b4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40e6b9      5 PTRIMMEDESP STACK 40 displ mov     rdi, [rsp+28h]
             40e6c1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e6c6     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40e6c9     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40e6cb     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40e6c9     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40e6cb     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40e6d3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40e6d8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_misc_get_type 
             40e6e3      5 PTRIMMEDESP STACK 56 displ mov     [rsp+38h], rax
@@ -12611,8 +12611,8 @@
             40e6ed     -1 INSTR LOCAL NoMetaUpdate xorps   xmm1, xmm1 
             40e6f3     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm0, cs:dword_41546C 
             40e6fb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_misc_set_alignment 
-            40e700     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
-            40e705     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            40e700     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 6 
+            40e705     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             40e70a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
             40e712      5 PTRIMMEDESP STACK 48 displ mov     [rsp+30h], rax
             40e717     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
@@ -12620,55 +12620,55 @@
             40e724     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e729      5 PTRIMMEDESP STACK 48 displ mov     rsi, [rsp+30h]
             40e72e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40e731     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40e736     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40e731     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40e736     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40e73e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
-            40e743     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40e743     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40e745     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
             40e750     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40e755      5 PTRIMMEDESP STACK 48 displ mov     rdi, [rsp+30h]
             40e75d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e762     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40e765     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40e76a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40e765     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40e76a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40e775     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40e77a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_get_type 
             40e788     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40e78d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40e78d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40e795     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_set_use_markup 
             40e7a0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40e7a5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40e7a5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40e7ad     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_set_line_wrap 
             40e7b2      5 PTRIMMEDESP STACK 56 displ mov     rsi, [rsp+38h]
             40e7ba     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e7bf     -1 INSTR LOCAL NoMetaUpdate xorps   xmm0, xmm0 
             40e7c5     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm1, cs:dword_41546C 
             40e7cd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_misc_set_alignment 
-            40e7d5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40e7d5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40e7da     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_can_focus 
             40e7e5     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40e7ea     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40e7ea     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40e7f2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_set_selectable 
             40e7f7      4 PTRIMMEDEBP STACK 56 displ mov     rax, [rbp+38h]
-            40e7fb     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40e7fb     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40e801     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
             40e80c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40e811      5 PTRIMMEDESP STACK 48 displ mov     rdi, [rsp+30h]
             40e819     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e81e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40e821     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40e826     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40e821     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40e826     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40e831     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
-            40e839     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40e839     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40e83e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_can_focus 
             40e849     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40e84e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40e84e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40e856     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_set_use_markup 
             40e861     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40e866     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40e866     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40e86e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_set_line_wrap 
             40e879     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40e87e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40e87e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40e886     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_set_selectable 
             40e88b      5 PTRIMMEDESP STACK 56 displ mov     rsi, [rsp+38h]
             40e893     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -12684,39 +12684,39 @@
             40e8de      5 PTRIMMEDESP STACK 40 displ mov     rsi, [rsp+28h]
             40e8e6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
             40e8f2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40e8f7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF9h 
+            40e8f7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF9h 
             40e904     -1 INSTR LOCAL NoMetaUpdate call    _gtk_info_bar_add_button 
             40e90d      5 PTRIMMEDESP STACK 16 displ mov     rdi, [rsp+10h]
             40e915     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e91a     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40e91d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40e91f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40e91d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40e91f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40e927     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
-            40e92c     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40e92e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40e92c     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40e92e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40e930     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_new 
             40e935      5 PTRIMMEDESP STACK 32 displ mov     rsi, [rsp+20h]
             40e940     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40e945     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            40e94d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40e945     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40e94d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40e952     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_set_policy 
             40e957      5 PTRIMMEDESP STACK 32 displ mov     rsi, [rsp+20h]
             40e95f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40e964     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40e964     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40e96c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_set_shadow_type 
             40e971      5 PTRIMMEDESP STACK 16 displ mov     rdi, [rsp+10h]
             40e979     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40e97e     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40e984     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40e989     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40e984     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40e989     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40e991     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40e999     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40e99e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_tag_table_new 
             40e9af     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_tag_new 
             40e9b4     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40e9ba     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-            40e9c5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2BCh 
-            40e9d2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40e9c5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2BCh 
+            40e9d2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40e9d4      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], r10
             40e9d9     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             40e9de      5 PTRIMMEDESP STACK 8 displ mov     r10, [rsp+8]
@@ -12724,8 +12724,8 @@
             40e9f3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_tag_new 
             40e9f8     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40e9fe     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-            40ea09     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            40ea16     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ea09     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40ea16     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ea18      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], r10
             40ea1d     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             40ea22      5 PTRIMMEDESP STACK 8 displ mov     r10, [rsp+8]
@@ -12733,16 +12733,16 @@
             40ea37     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_tag_new 
             40ea3c     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40ea3f     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-            40ea4d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            40ea5a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ea4d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40ea5a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ea5c      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], r10
             40ea61     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             40ea66      5 PTRIMMEDESP STACK 8 displ mov     r10, [rsp+8]
             40ea71     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_tag_table_add 
             40ea76     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_view_new 
-            40ea7b     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40ea7d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40ea8b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ea7b     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ea7d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40ea8b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ea8d     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             40ea9c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40eaa7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
@@ -12755,50 +12755,50 @@
             40eae3     -1 INSTR LOCAL NoMetaUpdate call    _pango_context_get_font_description 
             40eaeb     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_get_size 
             40eaf6     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
-            40eb02     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM sar     eax, 0Ah 
+            40eb02     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM sar     eax, 0Ah 
             40eb08     -1 INSTR LOCAL NoMetaUpdate call    sub_412180 
             40eb0d     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40eb12     -1 INSTR LOCAL NoMetaUpdate jle     loc_40EE00 
-            40eb18     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40eb18     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40eb1a      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40eb1d     -1 INSTR LOCAL NoMetaUpdate call    sub_40D330 
-            40eb22     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            40eb24     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40eb22     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            40eb24     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40eb26     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
             40eb35     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40eb3a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            40eb3a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             40eb42     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_set_border_width 
             40eb47     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_new 
             40eb4c     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40eb4f     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40eb52      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
             40eb66     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            40eb6b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40eb75     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40eb6b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40eb75     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40eb77     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40eb7f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
             40eb92     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40eb97     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40eb9a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40eb9c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40eb9a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40eb9c     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40eba4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_end 
             40ebb0     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40ebb5     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40ebb8     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40ebba     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ebb8     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ebba     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ebc2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_end 
             40ebcb      5 PTRIMMEDESP STACK 16 displ mov     rdi, [rsp+10h]
             40ebd3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40ebd8     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40ebdb     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40ebdd     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ebdb     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ebdd     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ebe5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_end 
             40ebea     -1 INSTR LOCAL NoMetaUpdate call    sub_411210 
             40ebef      5 PTRIMMEDESP STACK 16 displ mov     rdi, [rsp+10h]
             40ebfe     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40ec03     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40ec06     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40ec08     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ec06     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ec08     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ec10     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_end 
             40ec19     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             40ec1c      3 PTRIMMEDEBP STACK 0 displ mov     rcx, rbp
@@ -12847,12 +12847,12 @@
             40ed38      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+18h]
             40ed47     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40ed4c     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40ed52     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40ed57     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ed52     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ed57     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ed59     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             40ed62     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40ed6c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_action_group_new 
-            40ed78     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40ed78     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40ed80     -1 INSTR LOCAL NoMetaUpdate call    _gtk_ui_manager_insert_action_group 
             40ed85      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             40ed93     -1 INSTR LOCAL NoMetaUpdate call    sub_40E050 
@@ -12862,14 +12862,14 @@
             40eda7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
             40edac     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 58h 
             40edc0      5 PTRIMMEDESP STACK 64 displ mov     rax, [rsp+40h]
-            40edd1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
-            40eddf     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40edd1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 8 
+            40eddf     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ede1     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40ede6      5 PTRIMMEDESP STACK 64 displ mov     rdi, [rsp+40h]
             40edeb     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
             40edf0     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 58h 
             40ee00      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
-            40ee03     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40ee03     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40ee05     -1 INSTR LOCAL NoMetaUpdate call    sub_40D430 
             40ee0a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40EB22 
             40ee10      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], rbx
@@ -12906,7 +12906,7 @@
             40ef03     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 0C8h 
             40ef10     -1 INSTR LOCAL NoMetaUpdate call    sub_412500 
             40ef1f     -1 INSTR LOCAL NoMetaUpdate call    _g_list_append 
-            40ef24     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40ef24     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40ef30     -1 INSTR LOCAL NoMetaUpdate call    sub_40CAC0 
             40ef35     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40EEE3 
             40ef40      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -12921,12 +12921,12 @@
             40ef41      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ call    sub_40DF90 
             40ef46      2 INSTR BELONGTO 40ef40 
             40ef46      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     esi, esi 
-            40ef46     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40ef46     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40ef48      3 INSTR BELONGTO 40ef40 
             40ef48      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rax 
             40ef4b      2 INSTR BELONGTO 40ef40 
             40ef4b      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            40ef4b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ef4b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ef4d     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             40ef4d      5 INSTR BELONGTO 40ef40 
             40ef4d      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_object_new 
@@ -12952,7 +12952,7 @@
             40ef6b      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_type_check_instance_cast 
             40ef70      2 INSTR BELONGTO 40ef40 
             40ef70      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40ef70     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40ef70     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40ef72      1 INSTR BELONGTO 40ef40 
             40ef72      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40ef73      1 INSTR BELONGTO 40ef40 
@@ -13010,7 +13010,7 @@
             40efc7      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 ZZ mov     r8d, offset aLogview_is_win; "LOGVIEW_IS_WINDOW (window)" 
             40efcd      5 INSTR BELONGTO 40ef80 
             40efcd      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ mov     ecx, offset aLogview_window; "logview_window_add_error" 
-            40efd2     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5C7h 
+            40efd2     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5C7h 
             40efd2      5 INSTR BELONGTO 40ef80 
             40efd2      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     edx, 5C7h 
             40efd7      5 INSTR BELONGTO 40ef80 
@@ -13053,7 +13053,7 @@
             40f024      5 INSTR BELONGTO 40ef80 
             40f029     -1 INSTR LOCAL MetadataUnused xor     r8d, r8d 
             40f029      3 INSTR BELONGTO 40ef80 
-            40f02c     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40CA00 
+            40f02c     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40CA00 
             40f02c      5 INSTR BELONGTO 40ef80 
             40f02c      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ mov     edx, offset sub_40CA00 
             40f031     -1 INSTR LOCAL MetadataUnused mov     esi, offset aResponse; "response" 
@@ -13071,16 +13071,16 @@
             40f051     -3 INSTR LOCAL NoWarn push    rbp 
             40f052     -3 INSTR LOCAL NoWarn push    rbx 
             40f066      8 PTRIMMEDESP STACK 488 displ mov     [rsp+1E8h], rax
-            40f06e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40f06e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40f070     -1 INSTR LOCAL NoMetaUpdate test    rcx, rcx 
             40f073      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rdx
             40f078     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40F0E8 
             40f07a     -1 INSTR LOCAL NoMetaUpdate call    sub_4105A0 
-            40f07f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40f08c     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f07f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40f08c     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f08e     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40f093      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
-            40f099     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40f099     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40f09b     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40f0ad     -1 INSTR LOCAL NoMetaUpdate call    sub_40EF80 
             40f0b2      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -13116,7 +13116,7 @@
             40f184      8 PTRIMMEDESP STACK 208 displ mov     rsi, [rsp+0D0h]
             40f18c      8 PTRIMMEDESP STACK 208 displ lea     rcx, [rsp+0D0h]
             40f194     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40f197     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40f197     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40f199     -1 INSTR LOCAL NoMetaUpdate call    _g_locale_to_utf8 
             40f19e      7 PTRIMMEDESP STACK 208 displ mov     ecx, [rsp+0D0h]
             40f1b1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_buffer_insert 
@@ -13124,7 +13124,7 @@
             40f1c1      3 PTRIMMEDEBP STACK 0 displ mov     r12, rbp
             40f1c4     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbp, 8 
             40f1c8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_iter_forward_to_end 
-            40f1cd     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40f1cd     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
             40f1dd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_buffer_insert 
             40f1e5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_iter_forward_char 
             40f1ea      4 PTRIMMEDEBP STACK -8 displ mov     rcx, [rbp-8]
@@ -13133,7 +13133,7 @@
             40f1f6      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rcx
             40f1fa     -1 INSTR LOCAL NoMetaUpdate call    _strlen 
             40f1ff      4 PTRIMMEDESP STACK 0 displ mov     rcx, [rsp]
-            40f203     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40f203     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40f208      8 PTRIMMEDESP STACK 208 displ mov     [rsp+0D0h], rax
             40f213     -1 INSTR LOCAL NoMetaUpdate call    _g_utf8_validate 
             40f218     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
@@ -13142,8 +13142,8 @@
             40f237     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_buffer_insert 
             40f23c     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40F1BE 
             40f240     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_buffer_get_end_iter 
-            40f245     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            40f24d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40f245     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            40f24d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40f252     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_buffer_create_mark 
             40f257      8 PTRIMMEDESP STACK 36 displ mov     dword ptr [rsp+24h], 1
             40f25f      5 PTRIMMEDESP STACK 40 displ mov     [rsp+28h], rax
@@ -13167,36 +13167,36 @@
             40f2d6      8 PTRIMMEDESP STACK 216 displ mov     [rsp+0D8h], rax
             40f2de     -1 INSTR LOCAL NoMetaUpdate call    _localtime 
             40f2e3      8 PTRIMMEDESP STACK 224 displ lea     rdi, [rsp+0E0h]
-            40f2f3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFh 
+            40f2f3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFh 
             40f2f8     -1 INSTR LOCAL NoMetaUpdate call    _strftime 
             40f2fd      8 PTRIMMEDESP STACK 224 displ lea     rdi, [rsp+0E0h]
             40f305     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40f308     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40f30a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40f308     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40f30a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40f30c     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     rsi, 0FFFFFFFFFFFFFFFFh 
             40f313     -1 INSTR LOCAL NoMetaUpdate call    _g_locale_to_utf8 
-            40f318     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40f325     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f318     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40f325     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f327     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40f32c      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
-            40f332     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40f332     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40f334     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40f33f     -1 INSTR LOCAL NoMetaUpdate call    sub_410660 
             40f347     -1 INSTR LOCAL NoMetaUpdate call    _g_format_size 
             40f352     -1 INSTR LOCAL NoMetaUpdate call    sub_4106C0 
-            40f357     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40f364     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f357     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40f364     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f366     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
-            40f377     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40f377     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40f379     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             40f381     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_get_type 
             40f394      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rdx
             40f398     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40f39d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40f39d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40f3a2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_pop 
             40f3ab      4 PTRIMMEDESP STACK 0 displ mov     rdx, [rsp]
             40f3b6     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40f3be     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40f3be     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40f3c3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_push 
             40f3cb     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             40f3d0      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -13222,14 +13222,14 @@
             40f480      5 PTRIMMEDESP STACK 24 displ mov     rsi, [rsp+18h]
             40f489     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40f48e     -1 INSTR LOCAL NoMetaUpdate xorpd   xmm2, xmm2 
-            40f492     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40f492     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40f49a     -1 INSTR LOCAL NUMViaFPRegDest movapd  xmm1, xmm2 
             40f49e     -1 INSTR LOCAL NUMViaFPRegDest movapd  xmm0, xmm2 
             40f4a2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_view_scroll_to_iter 
             40f4a7     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40F29A 
             40f4ac     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_get_type 
             40f4bc     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40f4c1     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40f4c1     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40f4c6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_statusbar_pop 
             40f4cb     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40F3E8 
             40f4d0     -1 INSTR LOCAL NoMetaUpdate call    ___stack_chk_fail 
@@ -13295,7 +13295,7 @@
             40f51b      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 R14 R15 ZZ mov     r8d, offset aLogview_is_win; "LOGVIEW_IS_WINDOW (window)" 
             40f521      5 INSTR BELONGTO 40f4e0 
             40f521      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 ZZ mov     ecx, offset aLogview_wind_0; "logview_window_add_errors" 
-            40f526     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5DCh 
+            40f526     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5DCh 
             40f526      5 INSTR BELONGTO 40f4e0 
             40f526      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 ZZ mov     edx, 5DCh 
             40f52b      5 INSTR BELONGTO 40f4e0 
@@ -13310,14 +13310,14 @@
             40f540      4 INSTR BELONGTO 40f4e0 
             40f544     -1 INSTR LOCAL NoMetaUpdate jbe     loc_40F638 
             40f544      6 INSTR BELONGTO 40f4e0 
-            40f54a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            40f54a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40f54a      5 INSTR BELONGTO 40f4e0 
             40f54a      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 ZZ mov     edx, 5          ; category 
             40f54f      5 INSTR BELONGTO 40f4e0 
             40f54f      5 INSTR DEADREGS  EFLAGS RSI RDI R13 R14 R15 ZZ mov     esi, offset aCouldNotOpenTh; "Could not open the following files:" 
             40f554      2 INSTR BELONGTO 40f4e0 
             40f554      2 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 ZZ xor     edi, edi        ; domainname 
-            40f554     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            40f554     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             40f556     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40f556      5 INSTR BELONGTO 40f4e0 
             40f556      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _dcgettext 
@@ -13328,7 +13328,7 @@
             40f55e      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_strdup 
             40f563      2 INSTR BELONGTO 40f4e0 
             40f563      2 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 ZZ xor     edi, edi 
-            40f563     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f563     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f565      3 INSTR BELONGTO 40f4e0 
             40f565      3 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ mov     rbp, rax 
             40f568     -1 INSTR LOCAL NoMetaUpdate call    _g_string_new 
@@ -13397,7 +13397,7 @@
             40f5d0      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R14 R15 ZZ mov     rdi, r13 
             40f5d3      2 INSTR BELONGTO 40f4e0 
             40f5d3      2 INSTR DEADREGS  EFLAGS RBX RSI R13 R14 R15 ZZ xor     esi, esi 
-            40f5d3     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40f5d3     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40f5d5     -1 INSTR LOCAL NoMetaUpdate call    _g_string_free 
             40f5d5      5 INSTR BELONGTO 40f4e0 
             40f5d5      5 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ call    _g_string_free 
@@ -13429,7 +13429,7 @@
             40f604     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40f604      3 INSTR BELONGTO 40f4e0 
             40f604      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R12 R13 R14 R15 ZZ xor     r8d, r8d 
-            40f607     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_40CA00 
+            40f607     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_40CA00 
             40f607      5 INSTR BELONGTO 40f4e0 
             40f607      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 ZZ mov     edx, offset sub_40CA00 
             40f60c      5 INSTR BELONGTO 40f4e0 
@@ -13468,7 +13468,7 @@
             40f638      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 R13 R14 R15 ZZ mov     r8d, offset aErrorsLen1; "errors->len > 1" 
             40f63e      5 INSTR BELONGTO 40f4e0 
             40f63e      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     ecx, offset aLogview_wind_0; "logview_window_add_errors" 
-            40f643     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5DDh 
+            40f643     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5DDh 
             40f643      5 INSTR BELONGTO 40f4e0 
             40f643      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     edx, 5DDh 
             40f648      5 INSTR BELONGTO 40f4e0 
@@ -13500,7 +13500,7 @@
             40f66d      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rbp, rsi 
             40f670     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
             40f670      5 INSTR BELONGTO 40f660 
-            40f675     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 20h 
+            40f675     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 20h 
             40f675      5 INSTR BELONGTO 40f660 
             40f675      5 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     edi, 20h 
             40f67a     24 DATAREF STACK 1184 esp + 0 PARENT LocalFrame LOCALFRAME
@@ -13524,14 +13524,14 @@
             40f694      5 INSTR BELONGTO 40f660 
             40f699      2 INSTR BELONGTO 40f660 
             40f699      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     ecx, ecx 
-            40f699     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40f699     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40f69b     -1 INSTR LOCAL MetadataUnused mov     rbx, [rsp+18h+var_18] 
             40f69b      4 INSTR BELONGTO 40f660 
             40f69f     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+18h+var_8] 
             40f69f      5 INSTR BELONGTO 40f660 
             40f6a4      2 INSTR BELONGTO 40f660 
             40f6a4      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     edx, edx 
-            40f6a4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40f6a4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40f6a6      8 INSTR BELONGTO 40f660 
             40f6a6      8 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ mov     qword ptr [rax+8], 0 
             40f6ae     -1 INSTR LOCAL MetadataUnused mov     rsi, rax 
@@ -13563,12 +13563,12 @@
             40f6cd      4 INSTR DEADREGS  EFLAGS RDX RSI R8 ZZ mov     r8, [rdi+28h] 
             40f6d1      2 INSTR BELONGTO 40f6c0 
             40f6d1      2 INSTR DEADREGS  EFLAGS RDX RSI ZZ xor     edx, edx 
-            40f6d1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40f6d1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40f6d3      3 INSTR BELONGTO 40f6c0 
             40f6d3      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     rdi, [rdi] 
             40f6d6      2 INSTR BELONGTO 40f6c0 
             40f6d6      2 INSTR DEADREGS  EFLAGS RSI ZZ xor     esi, esi 
-            40f6d6     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40f6d6     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40f6d8     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [rbx+20h] 
             40f6d8      3 INSTR BELONGTO 40f6c0 
             40f6db      4 INSTR BELONGTO 40f6c0 
@@ -13580,8 +13580,8 @@
             40f6e4      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, [rbx+18h] 
             40f6e8      2 INSTR BELONGTO 40f6c0 
             40f6e8      2 INSTR DEADREGS  EFLAGS RDX RSI ZZ xor     edx, edx 
-            40f6e8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40f6ea     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_40B590 
+            40f6e8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40f6ea     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_40B590 
             40f6ea      5 INSTR BELONGTO 40f6c0 
             40f6ea      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset sub_40B590 
             40f6ef     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_foreach 
@@ -13599,7 +13599,7 @@
             40f700      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_unref 
             40f705      3 INSTR BELONGTO 40f6c0 
             40f705      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rbx 
-            40f708     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 30h 
+            40f708     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 30h 
             40f708      5 INSTR BELONGTO 40f6c0 
             40f708      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 30h 
             40f70d     -1 INSTR LOCAL NoMetaUpdate call    _g_slice_free1 
@@ -13607,7 +13607,7 @@
             40f70d      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_slice_free1 
             40f712      2 INSTR BELONGTO 40f6c0 
             40f712      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40f712     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40f712     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40f714      1 INSTR BELONGTO 40f6c0 
             40f714      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40f715      1 INSTR BELONGTO 40f6c0 
@@ -13618,7 +13618,7 @@
             40f724      4 INSTR DEADREGS  EFLAGS RCX RSI R8 ZZ mov     rsi, [rdi+10h] 
             40f728      2 INSTR BELONGTO 40f6c0 
             40f728      2 INSTR DEADREGS  EFLAGS RCX R8 ZZ xor     ecx, ecx 
-            40f728     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40f728     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40f72a      4 INSTR BELONGTO 40f6c0 
             40f72a      4 INSTR DEADREGS  EFLAGS R8 ZZ mov     r8, [rdi+28h] 
             40f72e      3 INSTR BELONGTO 40f6c0 
@@ -13633,35 +13633,35 @@
             40f756     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rdi+8], 0 
             40f75b     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40F7A0 
             40f760     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
-            40f765     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40f765     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40f76f     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [rbx+10h] 
             40f776     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
-            40f77e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 20h 
+            40f77e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 20h 
             40f783     -1 INSTR LOCAL NoMetaUpdate call    _g_slice_free1 
-            40f788     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40f788     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40f78a      5 PTRIMMEDESP STACK 16 displ mov     rbx, [rsp+10h]
             40f78f      5 PTRIMMEDESP STACK 24 displ mov     rbp, [rsp+18h]
             40f794      5 PTRIMMEDESP STACK 32 displ mov     r12, [rsp+20h]
             40f799     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
-            40f7a4     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40f7a4     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40f7a9     -1 INSTR LOCAL NoMetaUpdate call    qword ptr [rbx+10h] 
             40f7af      5 PTRIMMEDESP STACK 8 displ lea     rcx, [rsp+8]
-            40f7b4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40f7b6     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40f7b4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40f7b6     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40f7b8      9 PTRIMMEDESP STACK 8 displ mov     qword ptr [rsp+8], 0
             40f7c1      4 PTRIMMEDEBP STACK 24 displ mov     r12, [rbp+18h]
             40f7c9     -1 INSTR LOCAL NoMetaUpdate call    _g_file_monitor 
             40f7ce     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rsp+8], 0 
             40f7ce      6 PTRIMMEDESP STACK 8 displ cmp     qword ptr [rsp+8], 0
             40f7d9     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40F800 
-            40f7e0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            40f7ea     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40f7e0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            40f7ea     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40f7ec     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             40f7f1      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
             40f7f6     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
             40f7fb     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40F77B 
             40f800      4 PTRIMMEDEBP STACK 24 displ mov     rax, [rbp+18h]
-            40f804     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3E8h 
+            40f804     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3E8h 
             40f80d     -1 INSTR LOCAL NoMetaUpdate call    _g_file_monitor_set_rate_limit 
             40f812      4 PTRIMMEDEBP STACK 24 displ mov     rax, [rbp+18h]
             40f816     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
@@ -13688,7 +13688,7 @@
             40f848      5 INSTR DEADREGS  EFLAGS ZZ call    _g_type_class_peek_parent 
             40f84d      3 INSTR BELONGTO 40f840 
             40f84d      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
-            40f850     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            40f850     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             40f850      5 INSTR BELONGTO 40f840 
             40f850      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 50h 
             40f855      7 INSTR BELONGTO 40f840 
@@ -13717,15 +13717,15 @@
             40f88d     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40f88d      3 INSTR BELONGTO 40f840 
             40f88d      3 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 ZZ xor     r8d, r8d 
-            40f890     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
+            40f890     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
             40f890      5 INSTR BELONGTO 40f840 
             40f890      5 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ mov     ecx, 88h 
-            40f895     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40f895     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40f895      5 INSTR BELONGTO 40f840 
             40f895      5 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     edx, 2 
             40f89a      2 INSTR BELONGTO 40f840 
             40f89a      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40f89a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40f89a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40f89c     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             40f89c      5 INSTR BELONGTO 40f840 
             40f89c      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_new 
@@ -13745,30 +13745,30 @@
             40f8b4      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_type_class_add_private 
             40f8c0     -1 INSTR LOCAL NoMetaUpdate test    ecx, ecx 
             40f8c2     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40F8D0 
-            40f8da     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40f8dc     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40f8e8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40f8da     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40f8dc     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40f8e8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40f8ea     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
             40f8f0      5 PTRIMMEDESP STACK -48 displ mov     [rsp-30h], rbx
             40f8f5      5 PTRIMMEDESP STACK -40 displ mov     [rsp-28h], rbp
-            40f8fa     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40f8fa     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40f8fc      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], r12
             40f901      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], r13
             40f909      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r14
             40f90e      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r15
             40f91d      5 PTRIMMEDESP STACK 72 displ lea     r8, [rsp+48h]
-            40f922     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40f922     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40f92d      5 PTRIMMEDESP STACK 120 displ mov     [rsp+78h], rax
-            40f932     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40f932     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40f93c      4 PTRIMMEDEBP STACK 24 displ mov     rax, [rbp+18h]
             40f943      9 PTRIMMEDESP STACK 72 displ mov     qword ptr [rsp+48h], 0
             40f94f     -1 INSTR LOCAL NoMetaUpdate call    _g_file_query_info 
             40f957      5 PTRIMMEDESP STACK 72 displ mov     rax, [rsp+48h]
             40f95c     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40f95f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40F9C8 
-            40f965     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40f965     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40f972     -1 INSTR LOCAL NoMetaUpdate call    _g_io_scheduler_job_send_to_mainloop_async 
-            40f977     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40f977     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40f979      5 PTRIMMEDESP STACK 120 displ mov     rdx, [rsp+78h]
             40f97e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     rdx, fs:28h 
             40f987     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40FB72 
@@ -13789,12 +13789,12 @@
             40f9fd     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rsp+10h], 1 
             40f9fd      5 PTRIMMEDESP STACK 16 displ cmp     dword ptr [rsp+10h], 1
             40fa02     -1 INSTR LOCAL NoMetaUpdate jz      loc_40FA94 
-            40fa08     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40fa12     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40fa08     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40fa12     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40fa14     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40fa21     -1 INSTR LOCAL NoMetaUpdate call    _g_quark_from_static_string 
             40fa26      3 PTRIMMEDEBP STACK 0 displ mov     rdx, rbp
-            40fa2b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
+            40fa2b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 4 
             40fa30     -1 INSTR LOCAL NoMetaUpdate call    _g_error_new_literal 
             40fa38      5 PTRIMMEDESP STACK 72 displ mov     [rsp+48h], rax
             40fa3d     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
@@ -13802,12 +13802,12 @@
             40fa47     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40fa4a     -1 INSTR LOCAL NoMetaUpdate jz      loc_40F965 
             40fa50     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40F961 
-            40fa58     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            40fa62     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40fa58     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            40fa62     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40fa64     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             40fa71     -1 INSTR LOCAL NoMetaUpdate call    _g_quark_from_static_string 
             40fa76      3 PTRIMMEDEBP STACK 0 displ mov     rdx, rbp
-            40fa7b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40fa7b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40fa80     -1 INSTR LOCAL NoMetaUpdate call    _g_error_new_literal 
             40fa88      5 PTRIMMEDESP STACK 72 displ mov     [rsp+48h], rax
             40fa8d     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
@@ -13831,7 +13831,7 @@
             40fafa     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             40faff     -1 INSTR LOCAL NoMetaUpdate call    _g_input_stream_get_type 
             40fb04      5 PTRIMMEDESP STACK 72 displ lea     rdx, [rsp+48h]
-            40fb09     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40fb09     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40fb11     -1 INSTR LOCAL NoMetaUpdate call    _g_file_read 
             40fb1c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40fb24      5 PTRIMMEDESP STACK 72 displ mov     rax, [rsp+48h]
@@ -13842,8 +13842,8 @@
             40fb38     -1 INSTR LOCAL NoMetaUpdate jz      loc_40FD19 
             40fb3e      5 PTRIMMEDESP STACK 96 displ lea     rsi, [rsp+60h]
             40fb43     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40fb46     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40fb48     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0Ah 
+            40fb46     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40fb48     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0Ah 
             40fb50     -1 INSTR LOCAL NoMetaUpdate call    _g_input_stream_read 
             40fb55     -1 INSTR LOCAL NoMetaUpdate cmp     rax, 0Ah 
             40fb59     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40FB77 
@@ -13877,29 +13877,29 @@
             40fbbe     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40FFA1 
             40fbc4      5 PTRIMMEDESP STACK 101 displ movzx   eax, byte ptr [rsp+65h]
             40fbc9      5 PTRIMMEDESP STACK 102 displ movzx   edx, byte ptr [rsp+66h]
-            40fbce     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 90h 
+            40fbce     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 90h 
             40fbd3      4 PTRIMMEDEBP STACK 24 displ mov     rcx, [rbp+18h]
-            40fbd7     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM shl     edx, 10h 
-            40fbda     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM shl     eax, 8 
+            40fbd7     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM shl     edx, 10h 
+            40fbda     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM shl     eax, 8 
             40fbdf      5 PTRIMMEDESP STACK 100 displ movzx   edx, byte ptr [rsp+64h]
             40fbe6      5 PTRIMMEDESP STACK 103 displ movzx   edx, byte ptr [rsp+67h]
-            40fbeb     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM shl     edx, 18h 
+            40fbeb     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM shl     edx, 18h 
             40fbf0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cdqe 
             40fbf6     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc 
             40fc01     -1 INSTR LOCAL NoMetaUpdate call    _g_object_ref 
             40fc0c     -1 INSTR LOCAL NoMetaUpdate call    _g_object_ref 
-            40fc11     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40fc11     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40fc37     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
-            40fc3c     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 4000h 
+            40fc3c     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 4000h 
             40fc41     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc 
-            40fc5a     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 70h 
-            40fc64     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFF1h 
+            40fc5a     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 70h 
+            40fc64     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFF1h 
             40fc6c      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], rax
             40fc71     -1 INSTR LOCAL NoMetaUpdate call    _inflateInit2_ 
             40fc76     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             40fc78     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40FE80 
             40fc8e     -1 INSTR LOCAL NoMetaUpdate call    _g_memory_input_stream_new 
-            40fc96     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 400h 
+            40fc96     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 400h 
             40fc9b     -1 INSTR LOCAL NoMetaUpdate call    _g_malloc 
             40fca0      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rax
             40fca9     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
@@ -13913,7 +13913,7 @@
             40fcd3     -1 INSTR LOCAL NoMetaUpdate call    _g_memory_input_stream_get_type 
             40fcde     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40fce3      5 PTRIMMEDESP STACK 16 displ mov     rsi, [rsp+10h]
-            40fce8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40fce8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40fcf2     -1 INSTR LOCAL NoMetaUpdate call    _g_memory_input_stream_add_data 
             40fcf7      5 PTRIMMEDESP STACK 8 displ mov     r8d, [rsp+8]
             40fcfc     -1 INSTR LOCAL NoMetaUpdate cmp     r8d, 1 
@@ -13929,7 +13929,7 @@
             40fd4d      4 PTRIMMEDEBP STACK 24 displ mov     rax, [rbp+18h]
             40fd58     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40fd5d      5 PTRIMMEDESP STACK 72 displ lea     rcx, [rsp+48h]
-            40fd62     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40fd62     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40fd6a     -1 INSTR LOCAL NoMetaUpdate call    _g_buffered_input_stream_fill 
             40fd6f     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rsp+48h], 0 
             40fd6f      6 PTRIMMEDESP STACK 72 displ cmp     qword ptr [rsp+48h], 0
@@ -13950,7 +13950,7 @@
             40fddb     -1 INSTR LOCAL NoMetaUpdate test    edi, edi 
             40fddd     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40FE06 
             40fddf      5 PTRIMMEDESP STACK 24 displ mov     rdi, [rsp+18h]
-            40fde4     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40fde4     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40fde6     -1 INSTR LOCAL NoMetaUpdate call    _inflate 
             40fdeb     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 1 
             40fdee     -1 INSTR LOCAL NoMetaUpdate jz      loc_40FE9F 
@@ -13960,8 +13960,8 @@
             40fdfe     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40FDBF 
             40fe04     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40FDCF 
             40fe0d     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40fe10     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40fe12     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4000h 
+            40fe10     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40fe12     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 4000h 
             40fe17     -1 INSTR LOCAL NoMetaUpdate call    _g_input_stream_read 
             40fe1c     -1 INSTR LOCAL NoMetaUpdate cmp     rax, 0FFFFFFFFFFFFFFFFh 
             40fe20     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40FE69 
@@ -13969,7 +13969,7 @@
             40fe30     -1 INSTR LOCAL NoMetaUpdate call    _g_memory_input_stream_get_type 
             40fe3b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40fe40      5 PTRIMMEDESP STACK 16 displ mov     rsi, [rsp+10h]
-            40fe4a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40fe4a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40fe4f     -1 INSTR LOCAL NoMetaUpdate call    _g_memory_input_stream_add_data 
             40fe57     -1 INSTR LOCAL NoMetaUpdate call    sub_409B6F 
             40fe5f     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
@@ -13996,13 +13996,13 @@
             40fef6     -1 INSTR LOCAL NoMetaUpdate call    _g_memory_input_stream_get_type 
             40ff01     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40ff06      5 PTRIMMEDESP STACK 16 displ mov     rsi, [rsp+10h]
-            40ff10     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ff10     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ff15     -1 INSTR LOCAL NoMetaUpdate call    _g_memory_input_stream_add_data 
             40ff1a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40FD06 
             40ff26     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            40ff2b     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40ff2b     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40ff30     -1 INSTR LOCAL NoMetaUpdate call    _g_buffered_input_stream_peek_buffer 
-            40ff35     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            40ff35     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             40ff37      5 PTRIMMEDESP STACK 32 displ mov     [rsp+20h], rax
             40ff3c      9 PTRIMMEDESP STACK 40 displ mov     qword ptr [rsp+28h], 0
             40ff45     -1 INSTR LOCAL NoMetaUpdate call    _time 
@@ -14011,7 +14011,7 @@
             40ff5a      4 PTRIMMEDEBP STACK 24 displ mov     rax, [rbp+18h]
             40ff5e     -1 INSTR LOCAL NoMetaUpdate test    r12, r12 
             40ff61     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40FF95 
-            40ff6d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40ff6d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40ff74     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_foreach 
             40ff7c     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_free 
             40ff81     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40FD90 
@@ -14019,9 +14019,9 @@
             40ff89     -1 INSTR LOCAL NoMetaUpdate jz      loc_40FE54 
             40ff90     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40FD06 
             40ff9c     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40FD90 
-            40ffa1     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40ffa3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            40ffa5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            40ffa1     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40ffa3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            40ffa5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             40ffad     -1 INSTR LOCAL NoMetaUpdate call    _g_input_stream_skip 
             40ffb2     -1 INSTR LOCAL NoMetaUpdate cmp     rax, 2 
             40ffb6     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40FB5B 
@@ -14036,14 +14036,14 @@
             40ffe6     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40FB5B 
             40ffeb      5 PTRIMMEDESP STACK 80 displ lea     rsi, [rsp+50h]
             40fff0     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40fff3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40fff5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            40fff3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40fff5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             40fffd     -1 INSTR LOCAL NoMetaUpdate call    _g_input_stream_read 
             410002     -1 INSTR LOCAL NoMetaUpdate cmp     rax, 2 
             410006     -1 INSTR LOCAL NoMetaUpdate jnz     loc_40FB5B 
             41000c      5 PTRIMMEDESP STACK 80 displ movzx   eax, byte ptr [rsp+50h]
-            410011     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            410013     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            410011     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            410013     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             41001b     -2 INSTR LOCAL n R14 ZZ  AlwaysNUM shl     r14d, 8 
             410022     -2 INSTR LOCAL n R14 ZZ  AlwaysNUM movsxd  r14, r14d 
             410028     -1 INSTR LOCAL NoMetaUpdate call    _g_input_stream_skip 
@@ -14093,15 +14093,15 @@
             41007e     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h 
             41007e      6 INSTR BELONGTO 410040 
             41007e      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 20h 
-            410084     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_40F840 
+            410084     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_40F840 
             410084      5 INSTR BELONGTO 410040 
             410084      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset sub_40F840 
-            410089     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 90h 
+            410089     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 90h 
             410089      5 INSTR BELONGTO 410040 
             410089      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 90h 
             41008e      3 INSTR BELONGTO 410040 
             41008e      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-            410091     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+            410091     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
             410091      5 INSTR BELONGTO 410040 
             410091      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
             410096      7 INSTR BELONGTO 410040 
@@ -14136,7 +14136,7 @@
             4100fd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_is_a 
             410102     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             410104     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_410128 
-            410111     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 117h 
+            410111     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 117h 
             410120     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
             41012c     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [r14+48h], 0 
             410131     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4101A8 
@@ -14150,21 +14150,21 @@
             410153      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             410156     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_add 
             41015f      5 PTRIMMEDESP STACK 40 displ lea     rcx, [rsp+28h]
-            410164     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            410166     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            410164     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            410166     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             41016c     -1 INSTR LOCAL NoMetaUpdate call    _g_data_input_stream_read_line 
             410171     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             410174     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_410150 
             410176      5 PTRIMMEDESP STACK 40 displ mov     rax, [rsp+28h]
             41017b     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             41017e     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4101C7 
-            41018b     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            41018b     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             410192     -1 INSTR LOCAL NoMetaUpdate call    _g_io_scheduler_job_send_to_mainloop_async 
             410197     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 38h 
-            41019b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            4101b3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 118h 
+            41019b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            4101b3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 118h 
             4101c2     -1 INSTR LOCAL NoMetaUpdate call    _g_assertion_message_expr 
-            4101c7     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4101c7     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4101c9      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4101cc     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_add 
             4101d5      4 PTRIMMEDEBP STACK 0 displ mov     r8, [rbp+0]
@@ -14198,7 +14198,7 @@
             4102a1     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     edx, 1 
             4102a7     -1 INSTR LOCAL NoMetaUpdate jmp     loc_410185 
             4102ac     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_new 
-            4102b9     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4102b9     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4102bf     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_add 
             4102cc     -1 INSTR LOCAL NoMetaUpdate jmp     loc_410140 
             4102e0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -16 0 4 0 0 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -14254,7 +14254,7 @@
             410353     -1 INSTR LOCAL NoMetaUpdate jz      short loc_41037A 
             410353      2 INSTR BELONGTO 4102e0 
             410355      2 INSTR BELONGTO 4102e0 
-            410355     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            410355     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             410357      5 INSTR BELONGTO 4102e0 
             41035c     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_foreach 
             41035c      5 INSTR BELONGTO 4102e0 
@@ -14270,7 +14270,7 @@
             410381     -1 INSTR LOCAL NoMetaUpdate jz      short loc_41039E 
             410381      2 INSTR BELONGTO 4102e0 
             410383      2 INSTR BELONGTO 4102e0 
-            410383     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            410383     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             410385     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_free 
             410385      5 INSTR BELONGTO 4102e0 
             41038a      3 INSTR BELONGTO 4102e0 
@@ -14279,7 +14279,7 @@
             410392      4 INSTR BELONGTO 4102e0 
             410396      8 INSTR BELONGTO 4102e0 
             41039e      7 INSTR BELONGTO 4102e0 
-            4103a5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4103a5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4103a5      5 INSTR BELONGTO 4102e0 
             4103aa     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             4103aa      5 INSTR BELONGTO 4102e0 
@@ -14352,7 +14352,7 @@
             41042a      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             41042e      3 INSTR BELONGTO 410410 
             41042e      3 INSTR DEADREGS  EFLAGS RBX RDI R13 ZZ mov     r13, rdx 
-            410431     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 30h 
+            410431     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 30h 
             410431      5 INSTR BELONGTO 410410 
             410431      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 30h 
             410436     -1 INSTR LOCAL NoMetaUpdate call    _g_slice_alloc0 
@@ -14387,14 +14387,14 @@
             410474      5 INSTR BELONGTO 410410 
             410479      2 INSTR BELONGTO 410410 
             410479      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ xor     ecx, ecx 
-            410479     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            410479     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             41047b     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+28h+var_10] 
             41047b      5 INSTR BELONGTO 410410 
             410480     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+28h+var_8] 
             410480      5 INSTR BELONGTO 410410 
             410485      2 INSTR BELONGTO 410410 
             410485      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ xor     edx, edx 
-            410485     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            410485     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             410487     -1 INSTR LOCAL MetadataUnused mov     edi, offset loc_4100C0 
             410487      5 INSTR BELONGTO 410410 
             41048c     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
@@ -14409,8 +14409,8 @@
             4104b2      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r13
             4104ba      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r14
             4104c6     -1 INSTR LOCAL NoMetaUpdate call    sub_410040 
-            4104cb     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            4104d0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4104cb     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            4104d0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4104d2     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             4104e1     -1 INSTR LOCAL NoMetaUpdate call    _g_file_new_for_path 
             4104e9      3 PTRIMMEDEBP STACK 0 displ mov     rsi, rbp
@@ -14449,12 +14449,12 @@
             410546      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R14 ZZ call    sub_410040 
             41054b      2 INSTR BELONGTO 410520 
             41054b      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R14 ZZ xor     esi, esi 
-            41054b     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            41054b     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             41054d      3 INSTR BELONGTO 410520 
             41054d      3 INSTR DEADREGS  EFLAGS RBX RDI R14 ZZ mov     rdi, rax 
             410550      2 INSTR BELONGTO 410520 
             410550      2 INSTR DEADREGS  EFLAGS RAX RBX R14 ZZ xor     eax, eax 
-            410550     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410550     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410552     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             410552      5 INSTR BELONGTO 410520 
             410552      5 INSTR DEADREGS  EFLAGS RBX R14 ZZ call    _g_object_new 
@@ -14532,7 +14532,7 @@
             4105ca      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_log; "LOGVIEW_IS_LOG (log)" 
             4105d0      5 INSTR BELONGTO 4105a0 
             4105d0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_log__1; "logview_log_get_display_name" 
-            4105d5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 34Eh 
+            4105d5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 34Eh 
             4105d5      5 INSTR BELONGTO 4105a0 
             4105d5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 34Eh 
             4105da      5 INSTR BELONGTO 4105a0 
@@ -14592,7 +14592,7 @@
             41062a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_log; "LOGVIEW_IS_LOG (log)" 
             410630      5 INSTR BELONGTO 410600 
             410630      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_log__5; "logview_log_get_timestamp" 
-            410635     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 356h 
+            410635     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 356h 
             410635      5 INSTR BELONGTO 410600 
             410635      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 356h 
             41063a      5 INSTR BELONGTO 410600 
@@ -14652,7 +14652,7 @@
             41068a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_log; "LOGVIEW_IS_LOG (log)" 
             410690      5 INSTR BELONGTO 410660 
             410690      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_log__6; "logview_log_get_file_size" 
-            410695     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 35Eh 
+            410695     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 35Eh 
             410695      5 INSTR BELONGTO 410660 
             410695      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 35Eh 
             41069a      5 INSTR BELONGTO 410660 
@@ -14712,7 +14712,7 @@
             4106ea      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_log; "LOGVIEW_IS_LOG (log)" 
             4106f0      5 INSTR BELONGTO 4106c0 
             4106f0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_log__7; "logview_log_get_cached_lines_number" 
-            4106f5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 366h 
+            4106f5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 366h 
             4106f5      5 INSTR BELONGTO 4106c0 
             4106f5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 366h 
             4106fa      5 INSTR BELONGTO 4106c0 
@@ -14772,7 +14772,7 @@
             41074a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_log; "LOGVIEW_IS_LOG (log)" 
             410750      5 INSTR BELONGTO 410720 
             410750      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_log__4; "logview_log_get_cached_lines" 
-            410755     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 370h 
+            410755     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 370h 
             410755      5 INSTR BELONGTO 410720 
             410755      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 370h 
             41075a      5 INSTR BELONGTO 410720 
@@ -14799,7 +14799,7 @@
             410781      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
             410782      2 INSTR BELONGTO 410720 
             410782      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            410782     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410782     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410784      1 INSTR BELONGTO 410720 
             410784      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             410785      1 INSTR BELONGTO 410720 
@@ -14845,7 +14845,7 @@
             4107ba      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_log; "LOGVIEW_IS_LOG (log)" 
             4107c0      5 INSTR BELONGTO 410790 
             4107c0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_log__3; "logview_log_get_days_for_cached_lines" 
-            4107c5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 37Ch 
+            4107c5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 37Ch 
             4107c5      5 INSTR BELONGTO 410790 
             4107c5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 37Ch 
             4107ca      5 INSTR BELONGTO 410790 
@@ -14905,7 +14905,7 @@
             41081a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_log; "LOGVIEW_IS_LOG (log)" 
             410820      5 INSTR BELONGTO 4107f0 
             410820      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_log_ha; "logview_log_has_new_lines" 
-            410825     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 384h 
+            410825     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 384h 
             410825      5 INSTR BELONGTO 4107f0 
             410825      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 384h 
             41082a      5 INSTR BELONGTO 4107f0 
@@ -14965,7 +14965,7 @@
             41087a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_log; "LOGVIEW_IS_LOG (log)" 
             410880      5 INSTR BELONGTO 410850 
             410880      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_log__0; "logview_log_get_uri" 
-            410885     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 38Ch 
+            410885     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 38Ch 
             410885      5 INSTR BELONGTO 410850 
             410885      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 38Ch 
             41088a      5 INSTR BELONGTO 410850 
@@ -15026,7 +15026,7 @@
             4108da      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_log; "LOGVIEW_IS_LOG (log)" 
             4108e0      5 INSTR BELONGTO 4108b0 
             4108e0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_log_ge; "logview_log_get_gfile" 
-            4108e5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 394h 
+            4108e5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 394h 
             4108e5      5 INSTR BELONGTO 4108b0 
             4108e5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 394h 
             4108ea      5 INSTR BELONGTO 4108b0 
@@ -15087,7 +15087,7 @@
             41093a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_log; "LOGVIEW_IS_LOG (log)" 
             410940      5 INSTR BELONGTO 410910 
             410940      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_log__2; "logview_log_get_has_days" 
-            410945     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 39Ch 
+            410945     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 39Ch 
             410945      5 INSTR BELONGTO 410910 
             410945      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 39Ch 
             41094a      5 INSTR BELONGTO 410910 
@@ -15115,7 +15115,7 @@
             41099c     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_free 
             4109a5      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             4109aa      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
-            4109b6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4109b6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4109b8     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             4109c0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -16 0 4 0 0 5 -8 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             4109c0      0 FUNC MMSAFENESS SAFE
@@ -15139,7 +15139,7 @@
             4109c9      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_class_peek_parent 
             4109ce      3 INSTR BELONGTO 4109c0 
             4109ce      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
-            4109d1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4109d1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4109d1      5 INSTR BELONGTO 4109c0 
             4109d1      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             4109d6      7 INSTR BELONGTO 4109c0 
@@ -15180,17 +15180,17 @@
             410a1f      8 PTRIMMEDESP STACK 0 displ mov     [rsp+38h+var_38], offset _g_cclosure_marshal_VOID__VOID
             410a27      3 INSTR BELONGTO 4109c0 
             410a27      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rsi, [rbx] 
-            410a2a     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 408h 
+            410a2a     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 408h 
             410a2a      5 INSTR BELONGTO 4109c0 
             410a2a      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI ZZ mov     ecx, 408h 
-            410a2f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            410a2f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             410a2f      5 INSTR BELONGTO 4109c0 
             410a2f      5 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ mov     edx, 2 
             410a34      5 INSTR BELONGTO 4109c0 
             410a34      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aPrevious; "previous" 
             410a39      2 INSTR BELONGTO 4109c0 
             410a39      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            410a39     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410a39     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410a3b     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             410a3b      5 INSTR BELONGTO 4109c0 
             410a3b      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_new 
@@ -15208,17 +15208,17 @@
             410a5f      3 INSTR BELONGTO 4109c0 
             410a62      6 INSTR BELONGTO 4109c0 
             410a62      6 INSTR DEADREGS  EFLAGS RCX RDX RDI ZZ mov     cs:dword_61A350, eax 
-            410a68     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 410h 
+            410a68     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 410h 
             410a68      5 INSTR BELONGTO 4109c0 
             410a68      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI ZZ mov     ecx, 410h 
-            410a6d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            410a6d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             410a6d      5 INSTR BELONGTO 4109c0 
             410a6d      5 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ mov     edx, 2 
             410a72      5 INSTR BELONGTO 4109c0 
             410a72      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aNext; "next" 
             410a77      2 INSTR BELONGTO 4109c0 
             410a77      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            410a77     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410a77     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410a79     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             410a79      5 INSTR BELONGTO 4109c0 
             410a79      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_new 
@@ -15236,17 +15236,17 @@
             410a9d      3 INSTR BELONGTO 4109c0 
             410aa0      6 INSTR BELONGTO 4109c0 
             410aa0      6 INSTR DEADREGS  EFLAGS RCX RDX RDI ZZ mov     cs:dword_61A354, eax 
-            410aa6     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 418h 
+            410aa6     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 418h 
             410aa6      5 INSTR BELONGTO 4109c0 
             410aa6      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI ZZ mov     ecx, 418h 
-            410aab     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            410aab     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             410aab      5 INSTR BELONGTO 4109c0 
             410aab      5 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ mov     edx, 2 
             410ab0      5 INSTR BELONGTO 4109c0 
             410ab0      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aClose; "close" 
             410ab5      2 INSTR BELONGTO 4109c0 
             410ab5      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            410ab5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410ab5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410ab7     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             410ab7      5 INSTR BELONGTO 4109c0 
             410ab7      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_new 
@@ -15266,15 +15266,15 @@
             410ae0      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     cs:dword_61A358, eax 
             410ae6     -1 INSTR LOCAL MetadataRedundant xor     r8d, r8d 
             410ae6      3 INSTR BELONGTO 4109c0 
-            410ae9     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 420h 
+            410ae9     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 420h 
             410ae9      5 INSTR BELONGTO 4109c0 
             410ae9      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX ZZ mov     ecx, 420h 
-            410aee     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            410aee     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             410aee      5 INSTR BELONGTO 4109c0 
             410aee      5 INSTR DEADREGS  EFLAGS RAX RDX RBX ZZ mov     edx, 2 
             410af3      2 INSTR BELONGTO 4109c0 
             410af3      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            410af3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410af3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410af5     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             410af5      5 INSTR BELONGTO 4109c0 
             410af5      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_signal_new 
@@ -15304,18 +15304,18 @@
             410b23      6 INSTR BELONGTO 410b20 
             410b29      2 INSTR BELONGTO 410b20 
             410b29      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     edx, edx 
-            410b29     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            410b29     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             410b2b      2 INSTR BELONGTO 410b20 
             410b2b      2 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ xor     eax, eax 
-            410b2b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410b2b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410b2d     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
             410b2d      5 INSTR BELONGTO 410b20 
             410b2d      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ jmp     _g_signal_emit 
-            410b49     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            410b4b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410b49     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            410b4b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410b4d     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
-            410b69     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            410b6b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410b69     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            410b6b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410b6d     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
             410b80      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbx
             410b85      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
@@ -15340,9 +15340,9 @@
             410c08     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
             410c16      5 PTRIMMEDESP STACK 8 displ mov     rbp, [rsp+8]
             410c20      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
-            410c24     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            410c24     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             410c26      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+10h]
-            410c2b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410c2b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410c2d     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             410c31     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
             410c40      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 4 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -15354,7 +15354,7 @@
             410c40      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             410c44      2 INSTR BELONGTO 410c40 
             410c44      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ xor     eax, eax 
-            410c44     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            410c44     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             410c46     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rsi+1Ch], 0FF1Bh 
             410c46      7 INSTR BELONGTO 410c40 
             410c4d      3 INSTR BELONGTO 410c40 
@@ -15369,11 +15369,11 @@
             410c60      6 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     esi, cs:dword_61A358 
             410c66      2 INSTR BELONGTO 410c40 
             410c66      2 INSTR DEADREGS  EFLAGS RDX ZZ xor     edx, edx 
-            410c66     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            410c66     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             410c68     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
             410c68      5 INSTR BELONGTO 410c40 
             410c68      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_emit 
-            410c6d     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            410c6d     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             410c6d      5 INSTR BELONGTO 410c40 
             410c6d      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, 1 
             410c72     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
@@ -15439,10 +15439,10 @@
             410cd4     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 38h 
             410cd4      6 INSTR BELONGTO 410c80 
             410cd4      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 38h 
-            410cda     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_4109C0 
+            410cda     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_4109C0 
             410cda      5 INSTR BELONGTO 410c80 
             410cda      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset sub_4109C0 
-            410cdf     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 428h 
+            410cdf     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 428h 
             410cdf      5 INSTR BELONGTO 410c80 
             410cdf      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 428h 
             410ce4      7 INSTR BELONGTO 410c80 
@@ -15506,7 +15506,7 @@
             410d4c     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             410d4c      5 INSTR BELONGTO 410d30 
             410d51      7 INSTR BELONGTO 410d30 
-            410d58     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            410d58     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             410d58      5 INSTR BELONGTO 410d30 
             410d5d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             410d5d      5 INSTR BELONGTO 410d30 
@@ -15528,7 +15528,7 @@
             410d98     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toolbar_get_type 
             410d9d      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             410da3     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            410da8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            410da8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             410db3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toolbar_set_style 
             410db8     -1 INSTR LOCAL NUMViaFPRegDest movss   xmm3, cs:dword_41594C 
             410dc7     -1 INSTR LOCAL NoMetaUpdate xorps   xmm0, xmm0 
@@ -15538,18 +15538,18 @@
             410ddd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_alignment_get_type 
             410de8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410ded     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 2 
-            410df3     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
-            410df8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            410dfa     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            410df3     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            410df8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            410dfa     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             410dff     -1 INSTR LOCAL NoMetaUpdate call    _gtk_alignment_set_padding 
-            410e04     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            410e06     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            410e04     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            410e06     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             410e0b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_new 
             410e13     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_get_type 
             410e21     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410e2c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
-            410e31     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            410e3b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            410e31     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            410e3b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             410e3d     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             410e45     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new_with_mnemonic 
             410e4a      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rax
@@ -15558,15 +15558,15 @@
             410e5e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410e63      5 PTRIMMEDESP STACK 16 displ mov     rsi, [rsp+10h]
             410e68     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            410e6b     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            410e6d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            410e6b     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            410e6d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             410e72     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             410e77     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_new 
             410e7f      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
             410e84     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_get_type 
             410e89      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
             410e91     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            410e96     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
+            410e96     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 20h 
             410e9e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_set_width_chars 
             410ea6      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], rax
             410eab     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_get_type 
@@ -15580,70 +15580,70 @@
             410ee1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410ee6      5 PTRIMMEDESP STACK 16 displ mov     rsi, [rsp+10h]
             410eeb     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            410eee     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            410ef3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            410eee     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            410ef3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             410efb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             410f00     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tool_item_new 
             410f0e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410f19     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
-            410f1e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            410f1e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             410f29     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toolbar_insert 
             410f2e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
             410f3c     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410f44     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show_all 
-            410f49     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            410f4b     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            410f49     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            410f4b     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             410f50     -1 INSTR LOCAL NoMetaUpdate call    _gtk_arrow_new 
-            410f55     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            410f5d     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            410f55     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            410f5d     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             410f64     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             410f6f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tool_button_new 
-            410f74     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            410f74     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             410f80     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tool_item_set_is_important 
-            410f85     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            410f8a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            410f85     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            410f8a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             410f91     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             410f9d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tool_item_set_tooltip_text 
-            410fa6     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            410fa6     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             410fae     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toolbar_insert 
             410fba     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             410fc2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show_all 
-            410fc7     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            410fc9     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
+            410fc7     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            410fc9     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
             410fce     -1 INSTR LOCAL NoMetaUpdate call    _gtk_arrow_new 
-            410fd3     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            410fdb     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            410fd3     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            410fdb     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             410fe2     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             410fed     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tool_button_new 
-            410ff2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            410ff2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             410ffe     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tool_item_set_is_important 
-            411003     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            411008     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            411003     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            411008     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             41100f     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             41101b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tool_item_set_tooltip_text 
-            411024     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            411024     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             41102c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toolbar_insert 
             411038     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             411040     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show_all 
             41104a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tool_button_new_from_stock 
-            41104f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            411054     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            41104f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            411054     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             41105f     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             41106b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tool_item_set_tooltip_text 
-            411074     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            411074     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             41107c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toolbar_insert 
             411088     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             411090     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show_all 
             411095     -1 INSTR LOCAL NoMetaUpdate call    _gtk_separator_tool_item_new 
-            41109a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            41109a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             4110a9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toolbar_insert 
             4110ae     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tool_item_new 
-            4110b3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4110b3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4110bf     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tool_item_set_expand 
             4110c9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
             4110ce      5 PTRIMMEDESP STACK 8 displ mov     r9, [rsp+8]
             4110dd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            4110e2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4110e2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4110ea     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_set_use_markup 
             4110ef     -1 INSTR LOCAL NoMetaUpdate call    _gtk_misc_get_type 
             4110fb     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -15653,7 +15653,7 @@
             41111e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             411129     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_add 
             411132     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_show 
-            41113e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
+            41113e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFFFh 
             411143     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toolbar_insert 
             41114c     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             41114f     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -15698,7 +15698,7 @@
             41121e      4 INSTR BELONGTO 411210 
             411222      2 INSTR BELONGTO 411210 
             411222      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            411222     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            411222     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             411222      8 DEALLOC STACK esp - 8 xor     eax, eax
             411224     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
             411224      5 INSTR BELONGTO 411210 
@@ -15751,7 +15751,7 @@
             41125f      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_fin; "LOGVIEW_IS_FINDBAR (findbar)" 
             411265      5 INSTR BELONGTO 411230 
             411265      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_findba; "logview_findbar_open" 
-            41126a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 13Dh 
+            41126a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 13Dh 
             41126a      5 INSTR BELONGTO 411230 
             41126a      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 13Dh 
             41126f      5 INSTR BELONGTO 411230 
@@ -15840,7 +15840,7 @@
             4112ea      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_fin; "LOGVIEW_IS_FINDBAR (findbar)" 
             4112f0      5 INSTR BELONGTO 4112c0 
             4112f0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_find_1; "logview_findbar_get_text" 
-            4112f5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 146h 
+            4112f5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 146h 
             4112f5      5 INSTR BELONGTO 4112c0 
             4112f5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 146h 
             4112fa      5 INSTR BELONGTO 4112c0 
@@ -15909,7 +15909,7 @@
             411350      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 ZZ mov     r8d, offset aLogview_is_fin; "LOGVIEW_IS_FINDBAR (findbar)" 
             411356      5 INSTR BELONGTO 411320 
             411356      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     ecx, offset aLogview_find_0; "logview_findbar_set_message" 
-            41135b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 151h 
+            41135b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 151h 
             41135b      5 INSTR BELONGTO 411320 
             41135b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 151h 
             411360      5 INSTR BELONGTO 411320 
@@ -15929,7 +15929,7 @@
             41137b     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_new 
             41137b      5 INSTR BELONGTO 411320 
             41137b      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _pango_font_description_new 
-            411380     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2BCh 
+            411380     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2BCh 
             411380      5 INSTR BELONGTO 411320 
             411380      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 2BCh 
             411385      3 INSTR BELONGTO 411320 
@@ -15957,10 +15957,10 @@
             4113a8      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     r12, [rbx+30h] 
             4113ac      3 INSTR BELONGTO 411320 
             4113ac      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, rbx 
-            4113af     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset loc_410970 
+            4113af     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset loc_410970 
             4113af      5 INSTR BELONGTO 411320 
             4113af      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset loc_410970 
-            4113b4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 258h 
+            4113b4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 258h 
             4113b4      5 INSTR BELONGTO 411320 
             4113b4      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 258h 
             4113b9     -1 INSTR LOCAL NoMetaUpdate call    _g_timeout_add 
@@ -15996,22 +15996,22 @@
             4113ea      3 INSTR BELONGTO 411320 
             4113ed      5 INSTR BELONGTO 411320 
             4113ed      5 INSTR DEADREGS  RCX RDX RSI RDI R12 ZZ mov     esi, offset aVisible; "visible" 
-            4113f2     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM setnz   bpl 
+            4113f2     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM setnz   bpl 
             4113f2      4 INSTR BELONGTO 411320 
             4113f2      4 INSTR DEADREGS  RCX RDX RDI R12 ZZ setnz   bpl 
             4113f6      2 INSTR BELONGTO 411320 
             4113f6      2 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 ZZ xor     ecx, ecx 
-            4113f6     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4113f6     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4113f8     -1 INSTR LOCAL MetadataRedundant movzx   ebp, bpl 
             4113f8      4 INSTR BELONGTO 411320 
             4113fc      4 INSTR BELONGTO 411320 
             4113fc      4 INSTR DEADREGS  EFLAGS RDX RDI R12 ZZ mov     rdi, [rax+30h] 
             411400      2 INSTR BELONGTO 411320 
             411400      2 INSTR DEADREGS  EFLAGS RAX RDX R12 ZZ mov     edx, ebp 
-            411400     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, ebp 
+            411400     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, ebp 
             411402      2 INSTR BELONGTO 411320 
             411402      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            411402     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            411402     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             411404     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             411404      5 INSTR BELONGTO 411320 
             411404      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_object_set 
@@ -16019,10 +16019,10 @@
             411409      4 INSTR BELONGTO 411320 
             41140d      2 INSTR BELONGTO 411320 
             41140d      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 ZZ mov     edx, ebp 
-            41140d     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, ebp 
+            41140d     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, ebp 
             41140f      2 INSTR BELONGTO 411320 
             41140f      2 INSTR DEADREGS  EFLAGS RCX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     ecx, ecx 
-            41140f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            41140f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             411411      1 INSTR BELONGTO 411320 
             411411      1 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ pop     rbx 
             411412      1 INSTR BELONGTO 411320 
@@ -16035,7 +16035,7 @@
             411419      5 INSTR BELONGTO 411320 
             41141e      2 INSTR BELONGTO 411320 
             41141e      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            41141e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            41141e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             411420     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_set 
             411420      5 INSTR BELONGTO 411320 
             411420      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ jmp     _g_object_set 
@@ -16050,7 +16050,7 @@
             411431      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rbx, rsi 
             411434      2 INSTR BELONGTO 411430 
             411434      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            411434     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            411434     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             411436      3 INSTR BELONGTO 411430 
             411436      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rbx 
             411439     -1 INSTR LOCAL NoMetaUpdate call    sub_411320 
@@ -16100,7 +16100,7 @@
             41146e      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     rbx, rax 
             411471      4 INSTR BELONGTO 411460 
             411471      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rax, [rbp+18h] 
-            411475     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_4114C0 
+            411475     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_4114C0 
             411475      5 INSTR BELONGTO 411460 
             411475      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     esi, offset sub_4114C0 
             41147a      3 INSTR BELONGTO 411460 
@@ -16114,7 +16114,7 @@
             411486      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
             411489      2 INSTR BELONGTO 411460 
             411489      2 INSTR DEADREGS  EFLAGS RSI ZZ xor     esi, esi 
-            411489     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            411489     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             41148b     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_add 
             41148b      5 INSTR BELONGTO 411460 
             41148b      5 INSTR DEADREGS  EFLAGS ZZ call    _g_ptr_array_add 
@@ -16211,7 +16211,7 @@
             411506      3 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI R9 ZZ xor     r9d, r9d 
             411509      2 INSTR BELONGTO 4114c0 
             411509      2 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ xor     eax, eax 
-            411509     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            411509     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             41150b      5 INSTR BELONGTO 4114c0 
             41150b      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ mov     ecx, offset aTexttag; "texttag" 
             411510      5 INSTR BELONGTO 4114c0 
@@ -16265,7 +16265,7 @@
             411570      4 PTRIMMEDESP STACK 0 displ mov     [rsp+78h+var_78], rax
             411574      2 INSTR BELONGTO 4114c0 
             411574      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            411574     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            411574     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             411576     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             411576      5 INSTR BELONGTO 4114c0 
             411576      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_get 
@@ -16355,7 +16355,7 @@
             411605      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, rbx 
             411608      2 INSTR BELONGTO 4114c0 
             411608      2 INSTR DEADREGS  EFLAGS RBX RSI ZZ xor     esi, esi 
-            411608     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            411608     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             41160a     -1 INSTR LOCAL NoMetaUpdate call    _g_string_free 
             41160a      5 INSTR BELONGTO 4114c0 
             41160a      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_string_free 
@@ -16459,7 +16459,7 @@
             4116c9      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_class_peek_parent 
             4116ce      3 INSTR BELONGTO 4116c0 
             4116ce      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
-            4116d1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4116d1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4116d1      5 INSTR BELONGTO 4116c0 
             4116d1      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             4116d6      7 INSTR BELONGTO 4116c0 
@@ -16490,17 +16490,17 @@
             411715     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             411715      3 INSTR BELONGTO 4116c0 
             411715      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 ZZ xor     r8d, r8d 
-            411718     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
+            411718     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 88h 
             411718      5 INSTR BELONGTO 4116c0 
             411718      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI ZZ mov     ecx, 88h 
-            41171d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            41171d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             41171d      5 INSTR BELONGTO 4116c0 
             41171d      5 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ mov     edx, 2 
             411722      5 INSTR BELONGTO 4116c0 
             411722      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset aSystemFontChan; "system-font-changed" 
             411727      2 INSTR BELONGTO 4116c0 
             411727      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            411727     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            411727     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             411729     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             411729      5 INSTR BELONGTO 4116c0 
             411729      5 INSTR DEADREGS  EFLAGS ZZ call    _g_signal_new 
@@ -16522,15 +16522,15 @@
             41175b      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     cs:dword_61A370, eax 
             411761     -1 INSTR LOCAL MetadataRedundant xor     r8d, r8d 
             411761      3 INSTR BELONGTO 4116c0 
-            411764     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 90h 
+            411764     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 90h 
             411764      5 INSTR BELONGTO 4116c0 
             411764      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX ZZ mov     ecx, 90h 
-            411769     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            411769     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             411769      5 INSTR BELONGTO 4116c0 
             411769      5 INSTR DEADREGS  EFLAGS RAX RDX RBX ZZ mov     edx, 2 
             41176e      2 INSTR BELONGTO 4116c0 
             41176e      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            41176e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            41176e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             411770     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_new 
             411770      5 INSTR BELONGTO 4116c0 
             411770      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_signal_new 
@@ -16574,10 +16574,10 @@
             4117a5      3 INSTR BELONGTO 411790 
             4117a8      2 INSTR BELONGTO 411790 
             4117a8      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R10 R11 ZZ xor     edx, edx 
-            4117a8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4117a8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4117aa      2 INSTR BELONGTO 411790 
             4117aa      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            4117aa     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4117aa     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4117ac     -1 INSTR LOCAL NoMetaUpdate jmp     _g_signal_emit 
             4117ac      5 INSTR BELONGTO 411790 
             4117ac      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _g_signal_emit 
@@ -16586,8 +16586,8 @@
             4117d1     -1 INSTR LOCAL NoMetaUpdate call    _g_settings_get_string 
             4117df      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             4117e5     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4117e8     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            4117ea     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4117e8     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            4117ea     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4117ec     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_emit 
             4117f4      5 PTRIMMEDESP STACK 16 displ mov     rbp, [rsp+10h]
             4117f9      5 PTRIMMEDESP STACK 8 displ mov     rbx, [rsp+8]
@@ -16636,15 +16636,15 @@
             41184e     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h 
             41184e      6 INSTR BELONGTO 411810 
             41184e      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 20h 
-            411854     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_4116C0 
+            411854     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_4116C0 
             411854      5 INSTR BELONGTO 411810 
             411854      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset sub_4116C0 
-            411859     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
+            411859     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0A0h 
             411859      5 INSTR BELONGTO 411810 
             411859      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 0A0h 
             41185e      3 INSTR BELONGTO 411810 
             41185e      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-            411861     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+            411861     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
             411861      5 INSTR BELONGTO 411810 
             411861      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
             411866      7 INSTR BELONGTO 411810 
@@ -16694,7 +16694,7 @@
             4118cd     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             4118cd      5 INSTR BELONGTO 411890 
             4118d2      7 INSTR BELONGTO 411890 
-            4118d9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4118d9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4118d9      5 INSTR BELONGTO 411890 
             4118de     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             4118de      5 INSTR BELONGTO 411890 
@@ -16730,9 +16730,9 @@
             4119be     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_411A24 
             4119c4     -1 INSTR LOCAL NoMetaUpdate cmp     byte ptr [rdi], 0 
             4119c7     -1 INSTR LOCAL NoMetaUpdate jnz     loc_411AB3 
-            4119cd     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4119cd     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4119cf      3 PTRIMMEDEBP STACK 0 displ mov     rdx, rbp
-            4119d7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4119d7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4119dc     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     r14, 8 
             4119e0     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             4119e8     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup 
@@ -16743,14 +16743,14 @@
             411a13     -1 INSTR LOCAL NoMetaUpdate call    _g_strfreev 
             411a1b     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             411a1e     -1 INSTR LOCAL NoMetaUpdate jz      loc_411AE0 
-            411a24     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            411a24     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             411a2e     -1 INSTR LOCAL NoMetaUpdate call    _g_strsplit 
             411a3d     -1 INSTR LOCAL NoMetaUpdate call    sub_4129A0 
             411a48     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_tag_new 
             411a59     -1 INSTR LOCAL NoMetaUpdate call    _g_str_equal 
-            411a5e     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            411a5e     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             411a62      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-            411a65     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            411a65     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             411a6c     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             411a75     -1 INSTR LOCAL NoMetaUpdate cmp     byte ptr [rdi], 0 
             411a78     -1 INSTR LOCAL NoMetaUpdate jz      loc_4119C0 
@@ -16758,7 +16758,7 @@
             411a81     -1 INSTR LOCAL NoMetaUpdate call    _gdk_color_parse 
             411a86     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             411a89      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-            411a8c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            411a8c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             411a8e     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
             411a99      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp
             411aa1     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
@@ -16770,7 +16770,7 @@
             411abe     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
             411ac9      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp
             411ad1      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
-            411ad4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            411ad4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             411ad6     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             411adb     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4119CD 
             411ae3     -1 INSTR LOCAL NoMetaUpdate call    _g_strfreev 
@@ -16797,12 +16797,12 @@
             411b18      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_411810 
             411b1d      2 INSTR BELONGTO 411b00 
             411b1d      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ xor     esi, esi 
-            411b1d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            411b1d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             411b1f      3 INSTR BELONGTO 411b00 
             411b1f      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rax 
             411b22      2 INSTR BELONGTO 411b00 
             411b22      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            411b22     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            411b22     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             411b24     -1 INSTR LOCAL NoMetaUpdate call    _g_object_new 
             411b24      5 INSTR BELONGTO 411b00 
             411b24      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_new 
@@ -16864,7 +16864,7 @@
             411b81      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_pre; "LOGVIEW_IS_PREFS (prefs)" 
             411b87      5 INSTR BELONGTO 411b40 
             411b87      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_pref_7; "logview_prefs_store_window_size" 
-            411b8c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 14Eh 
+            411b8c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 14Eh 
             411b8c      5 INSTR BELONGTO 411b40 
             411b8c      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 14Eh 
             411b91      5 INSTR BELONGTO 411b40 
@@ -16958,7 +16958,7 @@
             411c22      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_pre; "LOGVIEW_IS_PREFS (prefs)" 
             411c28      5 INSTR BELONGTO 411be0 
             411c28      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_pref_8; "logview_prefs_get_stored_window_size" 
-            411c2d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 15Ah 
+            411c2d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 15Ah 
             411c2d      5 INSTR BELONGTO 411be0 
             411c2d      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 15Ah 
             411c32      5 INSTR BELONGTO 411be0 
@@ -16995,12 +16995,12 @@
             411c71      3 INSTR DEADREGS  EFLAGS RDX RBX RSI R8 R9 R10 R11 ZZ mov     esi, [rbp+0] 
             411c74     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             411c74      2 INSTR BELONGTO 411be0 
-            411c76     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setz    dl 
+            411c76     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setz    dl 
             411c76      3 INSTR BELONGTO 411be0 
             411c76      3 INSTR DEADREGS  RAX RDX RBX R8 R9 R10 R11 ZZ setz    dl 
             411c79     -1 INSTR LOCAL NoMetaUpdate test    esi, esi 
             411c79      2 INSTR BELONGTO 411be0 
-            411c7b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setz    al 
+            411c7b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setz    al 
             411c7b      3 INSTR BELONGTO 411be0 
             411c7b      3 INSTR DEADREGS  RAX RBX R8 R9 R10 R11 ZZ setz    al 
             411c7e     -1 INSTR LOCAL NoMetaUpdate cmp     dl, al 
@@ -17065,7 +17065,7 @@
             411cda      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_pre; "LOGVIEW_IS_PREFS (prefs)" 
             411ce0      5 INSTR BELONGTO 411cb0 
             411ce0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_pref_9; "logview_prefs_get_monospace_font_name" 
-            411ce5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 16Bh 
+            411ce5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 16Bh 
             411ce5      5 INSTR BELONGTO 411cb0 
             411ce5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 16Bh 
             411cea      5 INSTR BELONGTO 411cb0 
@@ -17128,7 +17128,7 @@
             411d4a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_pre; "LOGVIEW_IS_PREFS (prefs)" 
             411d50      5 INSTR BELONGTO 411d20 
             411d50      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_pre_10; "logview_prefs_get_have_tearoff" 
-            411d55     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 173h 
+            411d55     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 173h 
             411d55      5 INSTR BELONGTO 411d20 
             411d55      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 173h 
             411d5a      5 INSTR BELONGTO 411d20 
@@ -17191,7 +17191,7 @@
             411dba      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_pre; "LOGVIEW_IS_PREFS (prefs)" 
             411dc0      5 INSTR BELONGTO 411d90 
             411dc0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_prefs_; "logview_prefs_get_stored_logfiles" 
-            411dc5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 17Dh 
+            411dc5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 17Dh 
             411dc5      5 INSTR BELONGTO 411d90 
             411dc5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 17Dh 
             411dca      5 INSTR BELONGTO 411d90 
@@ -17268,7 +17268,7 @@
             411e34      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 ZZ mov     r8d, offset aLogview_is_pre; "LOGVIEW_IS_PREFS (prefs)" 
             411e3a      5 INSTR BELONGTO 411e00 
             411e3a      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     ecx, offset aLogview_pref_2; "logview_prefs_store_log" 
-            411e3f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 18Bh 
+            411e3f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 18Bh 
             411e3f      5 INSTR BELONGTO 411e00 
             411e3f      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 18Bh 
             411e44      5 INSTR BELONGTO 411e00 
@@ -17311,7 +17311,7 @@
             411e7f      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 ZZ mov     r8d, offset aG_is_fileFile; "G_IS_FILE (file)" 
             411e85      5 INSTR BELONGTO 411e00 
             411e85      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     ecx, offset aLogview_pref_2; "logview_prefs_store_log" 
-            411e8a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 18Ch 
+            411e8a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 18Ch 
             411e8a      5 INSTR BELONGTO 411e00 
             411e8a      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 18Ch 
             411e8f      5 INSTR BELONGTO 411e00 
@@ -17375,10 +17375,10 @@
             411eef      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _g_strv_length 
             411ef4      2 INSTR BELONGTO 411e00 
             411ef4      2 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     ebp, eax 
-            411ef4     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, eax 
+            411ef4     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     ebp, eax 
             411ef6      3 INSTR BELONGTO 411e00 
             411ef6      3 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     rdi, rbx 
-            411ef9     -2 INSTR LOCAL n ESI ZZ  NumericDEFs lea     esi, [rbp+2] 
+            411ef9     -2 INSTR LOCAL n RSI ZZ  NumericDEFs lea     esi, [rbp+2] 
             411ef9      3 INSTR BELONGTO 411e00 
             411ef9      3 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ lea     esi, [rbp+2] 
             411efc     -1 INSTR LOCAL MetadataRedundant movsxd  rbp, ebp 
@@ -17509,7 +17509,7 @@
             411faa      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 R14 ZZ mov     r8d, offset aLogview_is_pre; "LOGVIEW_IS_PREFS (prefs)" 
             411fb0      5 INSTR BELONGTO 411f70 
             411fb0      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R14 ZZ mov     ecx, offset aLogview_pref_3; "logview_prefs_remove_stored_log" 
-            411fb5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1B3h 
+            411fb5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1B3h 
             411fb5      5 INSTR BELONGTO 411f70 
             411fb5      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R14 ZZ mov     edx, 1B3h 
             411fba      5 INSTR BELONGTO 411f70 
@@ -17552,7 +17552,7 @@
             411ff7      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R12 R14 ZZ mov     r8d, offset aG_is_fileTarge; "G_IS_FILE (target)" 
             411ffd      5 INSTR BELONGTO 411f70 
             411ffd      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R14 ZZ mov     ecx, offset aLogview_pref_3; "logview_prefs_remove_stored_log" 
-            412002     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1B4h 
+            412002     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1B4h 
             412002      5 INSTR BELONGTO 411f70 
             412002      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R14 ZZ mov     edx, 1B4h 
             412007      5 INSTR BELONGTO 411f70 
@@ -17640,7 +17640,7 @@
             412093      2 INSTR BELONGTO 411f70 
             412098      2 INSTR BELONGTO 411f70 
             412098      2 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ xor     esi, esi 
-            412098     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            412098     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             41209a      3 INSTR BELONGTO 411f70 
             41209a      3 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     rdi, r14 
             41209d     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_add 
@@ -17656,7 +17656,7 @@
             4120ac      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     rdi, r14 
             4120af      2 INSTR BELONGTO 411f70 
             4120af      2 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 R14 ZZ xor     esi, esi 
-            4120af     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4120af     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4120b1     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_free 
             4120b1      5 INSTR BELONGTO 411f70 
             4120b1      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ call    _g_ptr_array_free 
@@ -17743,7 +17743,7 @@
             412121      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_pre; "LOGVIEW_IS_PREFS (prefs)" 
             412127      5 INSTR BELONGTO 4120f0 
             412127      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_pref_5; "logview_prefs_store_fontsize" 
-            41212c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1D1h 
+            41212c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1D1h 
             41212c      5 INSTR BELONGTO 4120f0 
             41212c      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 1D1h 
             412131      5 INSTR BELONGTO 4120f0 
@@ -17779,7 +17779,7 @@
             412160      6 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 ZZ mov     r8d, offset aFontsize0; "fontsize > 0" 
             412166      5 INSTR BELONGTO 4120f0 
             412166      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     ecx, offset aLogview_pref_5; "logview_prefs_store_fontsize" 
-            41216b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1D2h 
+            41216b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1D2h 
             41216b      5 INSTR BELONGTO 4120f0 
             41216b      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 1D2h 
             412170      5 INSTR BELONGTO 4120f0 
@@ -17831,7 +17831,7 @@
             4121aa      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_pre; "LOGVIEW_IS_PREFS (prefs)" 
             4121b0      5 INSTR BELONGTO 412180 
             4121b0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_pref_6; "logview_prefs_get_stored_fontsize" 
-            4121b5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1DAh 
+            4121b5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1DAh 
             4121b5      5 INSTR BELONGTO 412180 
             4121b5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 1DAh 
             4121ba      5 INSTR BELONGTO 412180 
@@ -17900,7 +17900,7 @@
             41222a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_pre; "LOGVIEW_IS_PREFS (prefs)" 
             412230      5 INSTR BELONGTO 4121f0 
             412230      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_pref_0; "logview_prefs_store_active_logfile" 
-            412235     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1E3h 
+            412235     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1E3h 
             412235      5 INSTR BELONGTO 4121f0 
             412235      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 1E3h 
             41223a      5 INSTR BELONGTO 4121f0 
@@ -17970,7 +17970,7 @@
             4122aa      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_pre; "LOGVIEW_IS_PREFS (prefs)" 
             4122b0      5 INSTR BELONGTO 412280 
             4122b0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_pref_1; "logview_prefs_get_active_logfile" 
-            4122b5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1ECh 
+            4122b5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1ECh 
             4122b5      5 INSTR BELONGTO 412280 
             4122b5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 1ECh 
             4122ba      5 INSTR BELONGTO 412280 
@@ -18040,7 +18040,7 @@
             412327      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_pre; "LOGVIEW_IS_PREFS (prefs)" 
             41232d      5 INSTR BELONGTO 4122f0 
             41232d      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_pref_4; "logview_prefs_get_filters" 
-            412332     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1F7h 
+            412332     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1F7h 
             412332      5 INSTR BELONGTO 4122f0 
             412332      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 1F7h 
             412337      5 INSTR BELONGTO 4122f0 
@@ -18056,7 +18056,7 @@
             412354      5 INSTR BELONGTO 4122f0 
             412354      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ lea     rdx, [rsp+18h+var_10] 
             412354      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+18h+var_10]
-            412359     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset loc_4116A0 
+            412359     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset loc_4116A0 
             412359      5 INSTR BELONGTO 4122f0 
             412359      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset loc_4116A0 
             41235e      4 INSTR BELONGTO 4122f0 
@@ -18122,7 +18122,7 @@
             4123ba      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_pre; "LOGVIEW_IS_PREFS (prefs)" 
             4123c0      5 INSTR BELONGTO 412380 
             4123c0      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_pre_12; "logview_prefs_remove_filter" 
-            4123c5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 204h 
+            4123c5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 204h 
             4123c5      5 INSTR BELONGTO 412380 
             4123c5      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 204h 
             4123ca      5 INSTR BELONGTO 412380 
@@ -18204,7 +18204,7 @@
             412442      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_pre; "LOGVIEW_IS_PREFS (prefs)" 
             412448      5 INSTR BELONGTO 412410 
             412448      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_pre_13; "logview_prefs_add_filter" 
-            41244d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 212h 
+            41244d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 212h 
             41244d      5 INSTR BELONGTO 412410 
             41244d      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 212h 
             412452      5 INSTR BELONGTO 412410 
@@ -18247,7 +18247,7 @@
             41248f      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_fil; "LOGVIEW_IS_FILTER (filter)" 
             412495      5 INSTR BELONGTO 412410 
             412495      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_pre_13; "logview_prefs_add_filter" 
-            41249a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 213h 
+            41249a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 213h 
             41249a      5 INSTR BELONGTO 412410 
             41249a      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 213h 
             41249f      5 INSTR BELONGTO 412410 
@@ -18264,14 +18264,14 @@
             4124b0      5 PTRIMMEDESP STACK 8 displ lea     rdx, [rsp+28h+var_20]
             4124b5      2 INSTR BELONGTO 412410 
             4124b5      2 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ xor     ecx, ecx 
-            4124b5     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4124b5     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4124b7      5 INSTR BELONGTO 412410 
             4124b7      5 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     esi, offset aName; "name" 
             4124bc      3 INSTR BELONGTO 412410 
             4124bc      3 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     rdi, rbp 
             4124bf      2 INSTR BELONGTO 412410 
             4124bf      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4124bf     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4124bf     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4124c1     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             4124c1      5 INSTR BELONGTO 412410 
             4124c1      5 INSTR DEADREGS  EFLAGS ZZ call    _g_object_get 
@@ -18353,7 +18353,7 @@
             41253a      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, offset aLogview_is_pre; "LOGVIEW_IS_PREFS (prefs)" 
             412540      5 INSTR BELONGTO 412500 
             412540      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset aLogview_pre_11; "logview_prefs_get_filter" 
-            412545     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 21Fh 
+            412545     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 21Fh 
             412545      5 INSTR BELONGTO 412500 
             412545      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 21Fh 
             41254a      5 INSTR BELONGTO 412500 
@@ -18401,7 +18401,7 @@
             412589      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_type_class_peek_parent 
             41258e      3 INSTR BELONGTO 412580 
             41258e      3 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     rdi, rbp 
-            412591     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            412591     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             412591      5 INSTR BELONGTO 412580 
             412591      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 50h 
             412596      7 INSTR BELONGTO 412580 
@@ -18435,7 +18435,7 @@
             4125da      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
             4125dd      3 INSTR BELONGTO 412580 
             4125dd      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-            4125e0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4125e0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4125e0      5 INSTR BELONGTO 412580 
             4125e0      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
             4125e5     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -18459,7 +18459,7 @@
             412605      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
             412608      3 INSTR BELONGTO 412580 
             412608      3 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     rdx, rax 
-            41260b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            41260b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             41260b      5 INSTR BELONGTO 412580 
             41260b      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 2 
             412610     -1 INSTR LOCAL NoMetaUpdate call    _g_object_class_install_property 
@@ -18484,7 +18484,7 @@
             412630      5 INSTR DEADREGS  EFLAGS ZZ call    _g_param_spec_object 
             412635      3 INSTR BELONGTO 412580 
             412635      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdi, rbx 
-            412638     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            412638     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             412638      5 INSTR BELONGTO 412580 
             412638      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     esi, 3 
             41263d      3 INSTR BELONGTO 412580 
@@ -18549,15 +18549,15 @@
             41269e     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h 
             41269e      6 INSTR BELONGTO 412660 
             41269e      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 20h 
-            4126a4     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_412580 
+            4126a4     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_412580 
             4126a4      5 INSTR BELONGTO 412660 
             4126a4      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, offset sub_412580 
-            4126a9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 88h 
+            4126a9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 88h 
             4126a9      5 INSTR BELONGTO 412660 
             4126a9      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 88h 
             4126ae      3 INSTR BELONGTO 412660 
             4126ae      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax 
-            4126b1     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
+            4126b1     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 50h 
             4126b1      5 INSTR BELONGTO 412660 
             4126b1      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 50h 
             4126b6      7 INSTR BELONGTO 412660 
@@ -18621,10 +18621,10 @@
             4127ea     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             4127f8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_name 
             4127fd      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
-            412819     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            412819     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             412823      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rbp
             412828      4 PTRIMMEDESP STACK 0 displ mov     [rsp], rax
-            41282c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            41282c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             41282e     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             412833      5 PTRIMMEDESP STACK 48 displ mov     rbx, [rsp+30h]
             412838      5 PTRIMMEDESP STACK 56 displ mov     rbp, [rsp+38h]
@@ -18635,16 +18635,16 @@
             41285b      9 PTRIMMEDESP STACK 40 displ mov     qword ptr [rsp+28h], 0
             412864     -1 INSTR LOCAL NoMetaUpdate call    _g_value_get_string 
             412869      5 PTRIMMEDESP STACK 40 displ lea     rcx, [rsp+28h]
-            41286e     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            412870     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            41286e     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            412870     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             412875     -1 INSTR LOCAL NoMetaUpdate call    _g_regex_new 
             41287a     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rsp+28h], 0 
             41287a      6 PTRIMMEDESP STACK 40 displ cmp     qword ptr [rsp+28h], 0
             412884     -1 INSTR LOCAL NoMetaUpdate jz      short loc_412833 
             412889     -1 INSTR LOCAL NoMetaUpdate call    _g_regex_unref 
             41288e      5 PTRIMMEDESP STACK 40 displ mov     rax, [rsp+28h]
-            4128a0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
-            4128ae     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4128a0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            4128ae     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4128b0     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             4128b5      5 PTRIMMEDESP STACK 40 displ mov     rdi, [rsp+28h]
             4128ba     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
@@ -18689,7 +18689,7 @@
             412948     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             412948      5 INSTR BELONGTO 412910 
             41294d      7 INSTR BELONGTO 412910 
-            412954     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            412954     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             412954      5 INSTR BELONGTO 412910 
             412959     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             412959      5 INSTR BELONGTO 412910 
@@ -18765,7 +18765,7 @@
             4129d4      5 INSTR BELONGTO 4129a0 
             4129d9      2 INSTR BELONGTO 4129a0 
             4129d9      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            4129d9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4129d9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4129db     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             4129db      4 INSTR BELONGTO 4129a0 
             4129df     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
@@ -18829,12 +18829,12 @@
             412a32      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             412a37      2 INSTR BELONGTO 4129f0 
             412a37      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     ebx, ebx 
-            412a37     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            412a37     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             412a39     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             412a39      4 INSTR BELONGTO 4129f0 
             412a3d      2 INSTR BELONGTO 4129f0 
             412a3d      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, ebx 
-            412a3d     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            412a3d     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             412a3f      1 INSTR BELONGTO 4129f0 
             412a3f      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             412a40      1 INSTR BELONGTO 4129f0 
@@ -18854,7 +18854,7 @@
             412a56      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rsi, rbx 
             412a59      2 INSTR BELONGTO 4129f0 
             412a59      2 INSTR DEADREGS  EFLAGS RDX RBX RDI ZZ xor     edx, edx 
-            412a59     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            412a59     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             412a5b      3 INSTR BELONGTO 4129f0 
             412a5b      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, [rax] 
             412a5e     -1 INSTR LOCAL NoMetaUpdate call    _g_regex_match 
@@ -18895,13 +18895,13 @@
             412a97      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             412a9c      2 INSTR BELONGTO 4129f0 
             412a9c      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     ebx, ebx 
-            412a9c     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            412a9c     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             412a9e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
             412a9e      4 INSTR BELONGTO 4129f0 
             412aa2     24 DEALLOC STACK esp - 24 mov     eax, ebx
             412aa2      2 INSTR BELONGTO 4129f0 
             412aa2      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, ebx 
-            412aa2     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            412aa2     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             412aa4      1 INSTR BELONGTO 4129f0 
             412aa4      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             412aa5      1 INSTR BELONGTO 4129f0 
@@ -18956,7 +18956,7 @@
             412ae9      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_return_if_fail_warning 
             412aee      2 INSTR BELONGTO 412ab0 
             412aee      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            412aee     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            412aee     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             412af0      1 INSTR BELONGTO 412ab0 
             412af0      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             412af1      1 INSTR BELONGTO 412ab0 
@@ -18973,11 +18973,11 @@
             412b15      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], rbp
             412b1d      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r12
             412b26     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
-            412b2e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            412b2e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             412b3a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             412b42     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_type 
             412b4d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
-            412b58     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 38h 
+            412b58     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 38h 
             412b5d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_add_private 
             412b62      8 PTRIMMEDEBP STACK 40 displ mov     qword ptr [rbp+28h], offset sub_413A20
             412b6a      4 PTRIMMEDESP STACK 0 displ mov     rbx, [rsp]
@@ -19082,10 +19082,10 @@
             412c03      5 PTRIMMEDESP STACK 56 displ lea     rdx, [rsp+78h+var_40]
             412c08      2 INSTR BELONGTO 412bb0 
             412c08      2 INSTR DEADREGS  EFLAGS RAX RCX RSI R13 R15 ZZ xor     ecx, ecx 
-            412c08     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            412c08     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             412c0a      2 INSTR BELONGTO 412bb0 
             412c0a      2 INSTR DEADREGS  EFLAGS RAX RSI R13 R15 ZZ xor     eax, eax 
-            412c0a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            412c0a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             412c0c      5 INSTR BELONGTO 412bb0 
             412c0c      5 INSTR DEADREGS  EFLAGS RSI R13 R15 ZZ mov     esi, offset aName; "name" 
             412c11     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
@@ -19127,14 +19127,14 @@
             412c4b      5 PTRIMMEDESP STACK 16 displ lea     rsi, [rsp+78h+var_68]
             412c50      2 INSTR BELONGTO 412bb0 
             412c50      2 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 R9 ZZ xor     edx, edx 
-            412c50     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            412c50     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             412c52      3 INSTR BELONGTO 412bb0 
             412c52      3 INSTR DEADREGS  EFLAGS RCX RDI R8 R9 ZZ mov     rdi, rax 
             412c55      3 INSTR BELONGTO 412bb0 
             412c55      3 INSTR DEADREGS  EFLAGS RAX RCX R8 R9 ZZ mov     r9, r15 
             412c58      2 INSTR BELONGTO 412bb0 
             412c58      2 INSTR DEADREGS  EFLAGS RAX RCX R8 R15 ZZ xor     eax, eax 
-            412c58     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            412c58     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             412c5a     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
             412c5a      6 INSTR BELONGTO 412bb0 
             412c5a      6 INSTR DEADREGS  EFLAGS RCX R8 R15 ZZ mov     r8d, 1 
@@ -19196,10 +19196,10 @@
             412cad      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             412cb1      2 INSTR BELONGTO 412ca0 
             412cb1      2 INSTR DEADREGS  EFLAGS RDX RSI ZZ xor     edx, edx 
-            412cb1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            412cb1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             412cb3      2 INSTR BELONGTO 412ca0 
             412cb3      2 INSTR DEADREGS  EFLAGS RSI ZZ xor     esi, esi 
-            412cb3     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            412cb3     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             412cb5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_selection_get_selected 
             412cb5      5 INSTR BELONGTO 412ca0 
             412cb5      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_tree_selection_get_selected 
@@ -19282,13 +19282,13 @@
             412d2e      6 INSTR DEADREGS  EFLAGS RAX RDX RSI R8 ZZ mov     r8d, 0FFFFFFFFh 
             412d34      2 INSTR BELONGTO 412cf0 
             412d34      2 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ xor     edx, edx 
-            412d34     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            412d34     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             412d36      3 INSTR BELONGTO 412cf0 
             412d36      3 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     rsi, rsp 
             412d36      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
             412d39      2 INSTR BELONGTO 412cf0 
             412d39      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            412d39     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            412d39     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             412d3b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             412d3b      5 INSTR BELONGTO 412cf0 
             412d3b      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_tree_model_get 
@@ -19406,12 +19406,12 @@
             412de1      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 R14 R15 ZZ mov     edi, offset domainname; "gnome-system-log" 
             412de6      5 INSTR BELONGTO 412d90 
             412de6      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 R13 R14 R15 ZZ mov     edx, offset aCouldNotLoadFi; "Could not load filter ui: %s" 
-            412deb     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
+            412deb     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 10h 
             412deb      5 INSTR BELONGTO 412d90 
             412deb      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 R14 R15 ZZ mov     esi, 10h 
             412df0      2 INSTR BELONGTO 412d90 
             412df0      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 R14 R15 ZZ xor     eax, eax 
-            412df0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            412df0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             412df2     -1 INSTR LOCAL NoMetaUpdate call    _g_log 
             412df2      5 INSTR BELONGTO 412d90 
             412df2      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_log 
@@ -19441,7 +19441,7 @@
             412e12      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 ZZ retn 
             412e18     -1 INSTR LOCAL NoMetaUpdate test    r13, r13 
             412e18      3 INSTR BELONGTO 412d90 
-            412e1b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
+            412e1b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             412e1b      5 INSTR BELONGTO 412d90 
             412e1b      5 INSTR DEADREGS  RDX RSI RDI R12 R14 R15 ZZ mov     edx, 5          ; category 
             412e20     -1 INSTR LOCAL NoMetaUpdate jz      loc_413350 
@@ -19450,7 +19450,7 @@
             412e26      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 ZZ mov     esi, offset aEditFilter; "Edit filter" 
             412e2b      2 INSTR BELONGTO 412d90 
             412e2b      2 INSTR DEADREGS  EFLAGS RDI R12 R14 R15 ZZ xor     edi, edi        ; domainname 
-            412e2b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            412e2b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             412e2d     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             412e2d      5 INSTR BELONGTO 412d90 
             412e2d      5 INSTR DEADREGS  EFLAGS R12 R14 R15 ZZ call    _dcgettext 
@@ -19684,7 +19684,7 @@
             412fad     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             412fad      3 INSTR BELONGTO 412d90 
             412fad      3 INSTR DEADREGS  EFLAGS RDX RSI R8 ZZ xor     r8d, r8d 
-            412fb0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_412D70 
+            412fb0     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_412D70 
             412fb0      5 INSTR BELONGTO 412d90 
             412fb0      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, offset sub_412D70 
             412fb5      5 INSTR BELONGTO 412d90 
@@ -19705,7 +19705,7 @@
             412fce      3 INSTR BELONGTO 412d90 
             412fd1     -1 INSTR LOCAL MetadataRedundant xor     r8d, r8d 
             412fd1      3 INSTR BELONGTO 412d90 
-            412fd4     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_412D70 
+            412fd4     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_412D70 
             412fd4      5 INSTR BELONGTO 412d90 
             412fd4      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, offset sub_412D70 
             412fd9      5 INSTR BELONGTO 412d90 
@@ -19777,7 +19777,7 @@
             413043      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R8 ZZ xor     r8d, r8d 
             413046      3 INSTR BELONGTO 412d90 
             413046      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI ZZ mov     rcx, rax 
-            413049     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset sub_412D70 
+            413049     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset sub_412D70 
             413049      5 INSTR BELONGTO 412d90 
             413049      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, offset sub_412D70 
             41304e      5 INSTR BELONGTO 412d90 
@@ -19829,7 +19829,7 @@
             4130a2      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R13 ZZ mov     esi, offset aName; "name" 
             4130a7      2 INSTR BELONGTO 412d90 
             4130a7      2 INSTR DEADREGS  EFLAGS RAX RBX R13 ZZ xor     eax, eax 
-            4130a7     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4130a7     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4130a9      9 INSTR BELONGTO 412d90 
             4130a9      9 INSTR DEADREGS  EFLAGS RBX R13 ZZ mov     [rsp+0D8h+var_D0], 0 
             4130a9      9 PTRIMMEDESP STACK 8 displ mov     [rsp+0D8h+var_D0], 0
@@ -19859,7 +19859,7 @@
             4130e7      4 PTRIMMEDESP STACK 0 displ mov     [rsp+0D8h+var_D8], rax
             4130eb      2 INSTR BELONGTO 412d90 
             4130eb      2 INSTR DEADREGS  EFLAGS RAX RBX R13 ZZ xor     eax, eax 
-            4130eb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4130eb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4130ed     -1 INSTR LOCAL MetadataRedundant mov     [rsp+0D8h+var_D0], 0 
             4130ed      9 INSTR BELONGTO 412d90 
             4130f6     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
@@ -19951,13 +19951,13 @@
             413190      5 PTRIMMEDESP STACK 112 displ mov     rbx, [rsp+0D8h+var_68]
             413195      3 INSTR BELONGTO 412d90 
             413195      3 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     rdi, rbp 
-            413198     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            413198     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             413198      5 INSTR BELONGTO 412d90 
             413198      5 INSTR DEADREGS  EFLAGS RSI R13 ZZ mov     esi, 50h 
             41319d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             41319d      5 INSTR BELONGTO 412d90 
             41319d      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_type_check_instance_cast 
-            4131a2     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset _g_free 
+            4131a2     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset _g_free 
             4131a2      5 INSTR BELONGTO 412d90 
             4131a2      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 ZZ mov     ecx, offset _g_free 
             4131a7      3 INSTR BELONGTO 412d90 
@@ -19972,7 +19972,7 @@
             4131b2      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _g_object_set_data_full 
             4131b7      3 INSTR BELONGTO 412d90 
             4131b7      3 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 ZZ mov     rdi, r14 
-            4131ba     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4131ba     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4131ba      5 INSTR BELONGTO 412d90 
             4131ba      5 INSTR DEADREGS  EFLAGS RBX RSI R13 ZZ mov     esi, 50h 
             4131bf     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -19986,7 +19986,7 @@
             4131c7      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R8 R13 ZZ xor     r8d, r8d 
             4131ca      3 INSTR BELONGTO 412d90 
             4131ca      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R13 ZZ mov     rcx, rbp 
-            4131cd     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_413420 
+            4131cd     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_413420 
             4131cd      5 INSTR BELONGTO 412d90 
             4131cd      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R13 ZZ mov     edx, offset loc_413420 
             4131d2      5 INSTR BELONGTO 412d90 
@@ -20026,7 +20026,7 @@
             413209     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             413209      5 INSTR BELONGTO 412d90 
             413209      5 INSTR DEADREGS  EFLAGS RBX R13 R15 ZZ call    _g_type_check_instance_cast 
-            41320e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            41320e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             41320e      5 INSTR BELONGTO 412d90 
             41320e      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 R15 ZZ mov     esi, 1 
             413213      3 INSTR BELONGTO 412d90 
@@ -20056,12 +20056,12 @@
             413240      8 PTRIMMEDESP STACK 136 displ lea     rdx, [rsp+0D8h+var_50]
             413248      2 INSTR BELONGTO 412d90 
             413248      2 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI R13 ZZ xor     ecx, ecx 
-            413248     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            413248     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             41324a      5 INSTR BELONGTO 412d90 
             41324a      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R13 ZZ mov     esi, offset aParagraphBackg; "paragraph-background-gdk" 
             41324f      2 INSTR BELONGTO 412d90 
             41324f      2 INSTR DEADREGS  EFLAGS RAX RBX R13 ZZ xor     eax, eax 
-            41324f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            41324f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             413251     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             413251      5 INSTR BELONGTO 412d90 
             413251      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _g_object_get 
@@ -20095,7 +20095,7 @@
             413285     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             413285      5 INSTR BELONGTO 412d90 
             413285      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _g_type_check_instance_cast 
-            41328a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            41328a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             41328a      5 INSTR BELONGTO 412d90 
             41328a      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 ZZ mov     esi, 1 
             41328f      3 INSTR BELONGTO 412d90 
@@ -20125,7 +20125,7 @@
             4132bd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4132bd      5 INSTR BELONGTO 412d90 
             4132bd      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _g_type_check_instance_cast 
-            4132c2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4132c2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4132c2      5 INSTR BELONGTO 412d90 
             4132c2      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 ZZ mov     esi, 1 
             4132c7      3 INSTR BELONGTO 412d90 
@@ -20143,12 +20143,12 @@
             4132e0      8 PTRIMMEDESP STACK 136 displ lea     rdx, [rsp+0D8h+var_50]
             4132e8      2 INSTR BELONGTO 412d90 
             4132e8      2 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI R13 ZZ xor     ecx, ecx 
-            4132e8     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4132e8     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4132ea      5 INSTR BELONGTO 412d90 
             4132ea      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R13 ZZ mov     esi, offset aForegroundGdk; "foreground-gdk" 
             4132ef      2 INSTR BELONGTO 412d90 
             4132ef      2 INSTR DEADREGS  EFLAGS RAX RBX R13 ZZ xor     eax, eax 
-            4132ef     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4132ef     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4132f1     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get 
             4132f1      5 INSTR BELONGTO 412d90 
             4132f1      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _g_object_get 
@@ -20182,7 +20182,7 @@
             413325     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             413325      5 INSTR BELONGTO 412d90 
             413325      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _g_type_check_instance_cast 
-            41332a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            41332a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             41332a      5 INSTR BELONGTO 412d90 
             41332a      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 ZZ mov     esi, 1 
             41332f      3 INSTR BELONGTO 412d90 
@@ -20202,7 +20202,7 @@
             413350      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R14 R15 ZZ mov     esi, offset aAddNewFilter; "Add new filter" 
             413355      2 INSTR BELONGTO 412d90 
             413355      2 INSTR DEADREGS  EFLAGS RDI R12 R14 R15 ZZ xor     edi, edi        ; domainname 
-            413355     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
+            413355     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; domainname 
             413357     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             413357      5 INSTR BELONGTO 412d90 
             413357      5 INSTR DEADREGS  EFLAGS R12 R14 R15 ZZ call    _dcgettext 
@@ -20220,7 +20220,7 @@
             41337a     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             41337a      5 INSTR BELONGTO 412d90 
             41337a      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _g_type_check_instance_cast 
-            41337f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            41337f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             41337f      5 INSTR BELONGTO 412d90 
             41337f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R13 ZZ mov     esi, 1 
             413384      3 INSTR BELONGTO 412d90 
@@ -20280,7 +20280,7 @@
             4133de     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 0FFFFFFFFh 
             4133de      6 INSTR BELONGTO 4133a0 
             4133de      6 INSTR DEADREGS  EFLAGS RAX RDX RSI R8 ZZ mov     r8d, 0FFFFFFFFh 
-            4133e4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4133e4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4133e4      5 INSTR BELONGTO 4133a0 
             4133e4      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, 1 
             4133e9      3 INSTR BELONGTO 4133a0 
@@ -20288,7 +20288,7 @@
             4133e9      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
             4133ec      2 INSTR BELONGTO 4133a0 
             4133ec      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4133ec     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4133ec     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4133ee     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get 
             4133ee      5 INSTR BELONGTO 4133a0 
             4133ee      5 INSTR DEADREGS  EFLAGS ZZ call    _gtk_tree_model_get 
@@ -20313,7 +20313,7 @@
             41340e     48 DEALLOC STACK esp - 48 pop     rbx
             41340f      1 INSTR BELONGTO 4133a0 
             41340f      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-            413413     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            413413     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             413415     -1 INSTR LOCAL NoMetaUpdate jmp     sub_412D90 
             413420      5 PTRIMMEDESP STACK -48 displ mov     [rsp-30h], rbx
             413425      5 PTRIMMEDESP STACK -40 displ mov     [rsp-28h], rbp
@@ -20321,7 +20321,7 @@
             413435      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], r13
             41343a      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r14
             41343f      5 PTRIMMEDESP STACK -8 displ mov     [rsp-8], r15
-            41344e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            41344e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             413456     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             413463     -1 INSTR LOCAL NoMetaUpdate call    _g_object_get_data 
             413468      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], rax
@@ -20372,24 +20372,24 @@
             4135b1     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4135b9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_get_text 
             4135c1      4 PTRIMMEDESP STACK 0 displ mov     rax, [rsp]
-            4135c5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4135c5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             4135cf     -1 INSTR LOCAL NoMetaUpdate cmp     byte ptr [rax], 0 
             4135d2     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4135F1 
             4135d4      4 PTRIMMEDESP STACK 0 displ mov     rdi, [rsp]
-            4135d8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3Ah 
+            4135d8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3Ah 
             4135dd     -1 INSTR LOCAL NoMetaUpdate call    _strchr 
             4135e2     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             4135e5     -1 INSTR LOCAL NoMetaUpdate jz      short loc_413658 
-            4135e7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            4135f1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4135e7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            4135f1     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4135f3     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4135fb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             413606     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             41360b      3 PTRIMMEDEBP STACK 0 displ mov     r9, rbp
-            413614     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
-            413619     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
-            413621     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
-            413626     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            413614     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            413619     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            413621     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            413626     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             413628     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             413630     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_type 
             41363b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -20400,22 +20400,22 @@
             413661     -1 INSTR LOCAL NoMetaUpdate cmp     byte ptr [r15], 0 
             413665     -1 INSTR LOCAL NoMetaUpdate jz      loc_413708 
             41366b      5 PTRIMMEDESP STACK 72 displ lea     rcx, [rsp+48h]
-            413670     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            413672     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            413670     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            413672     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             413677     -1 INSTR LOCAL NoMetaUpdate call    _g_regex_new 
             41367c      5 PTRIMMEDESP STACK 72 displ mov     rdx, [rsp+48h]
             413681     -1 INSTR LOCAL NoMetaUpdate test    rdx, rdx 
             413684     -1 INSTR LOCAL NoMetaUpdate jz      loc_413720 
-            41368e     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            413690     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            41368e     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
+            413690     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             41369a     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             4136a2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             4136ad     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4136b5      3 PTRIMMEDEBP STACK 0 displ mov     r8, rbp
-            4136b8     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
-            4136bd     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
-            4136c5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
-            4136ca     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4136b8     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            4136bd     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            4136c5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4136ca     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4136cc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             4136d4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_type 
             4136df     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -20424,7 +20424,7 @@
             4136f4      5 PTRIMMEDESP STACK 72 displ mov     rdi, [rsp+48h]
             4136f9     -1 INSTR LOCAL NoMetaUpdate call    _g_error_free 
             4136fe     -1 INSTR LOCAL NoMetaUpdate jmp     loc_41355B 
-            413708     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            413708     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
             413712     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4135F1 
             413723     -1 INSTR LOCAL NoMetaUpdate call    _g_regex_unref 
             413728      4 PTRIMMEDESP STACK 0 displ mov     rdi, [rsp]
@@ -20464,11 +20464,11 @@
             4137d8     -1 INSTR LOCAL NoMetaUpdate call    _g_str_equal 
             4137dd     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             4137df     -1 INSTR LOCAL NoMetaUpdate jz      short loc_413850 
-            4137e4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            4137e4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             4137e9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4137ee      5 PTRIMMEDESP STACK 8 displ mov     rdx, [rsp+8]
-            4137f3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            4137fd     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4137f3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            4137fd     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4137ff     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             413804      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
             413809     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
@@ -20477,9 +20477,9 @@
             413829     -1 INSTR LOCAL NoMetaUpdate call    sub_412BB0 
             41382e     -1 INSTR LOCAL NoMetaUpdate jmp     loc_413553 
             413833      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
-            413838     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            41383a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            413844     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            413838     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            41383a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            413844     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             413846     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             41384b     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4137C7 
             413854      5 PTRIMMEDESP STACK 24 displ mov     rsi, [rsp+18h]
@@ -20491,16 +20491,16 @@
             413879     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_get_active 
             41387e     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             413880     -1 INSTR LOCAL NoMetaUpdate jnz     loc_4137C7 
-            413886     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            41388b     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            413886     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            41388b     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             413892     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             41389a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             4138a5     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             4138aa      3 PTRIMMEDEBP STACK 0 displ mov     r9, rbp
-            4138b3     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
-            4138b8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
-            4138c0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
-            4138c5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4138b3     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            4138b8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3 
+            4138c0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4138c5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4138c7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_message_dialog_new 
             4138cf     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_type 
             4138da     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -20518,7 +20518,7 @@
             413928      5 PTRIMMEDESP STACK 48 displ lea     rdx, [rsp+30h]
             41392d     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             413930     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-            413940     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            413940     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             413942     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             413947     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4137A8 
             41394c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_color_button_get_type 
@@ -20526,12 +20526,12 @@
             41395c      5 PTRIMMEDESP STACK 48 displ lea     rsi, [rsp+30h]
             413964     -1 INSTR LOCAL NoMetaUpdate call    _gtk_color_button_get_color 
             413969      5 PTRIMMEDESP STACK 8 displ mov     rdi, [rsp+8]
-            41396e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            41396e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             413973     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             413978      5 PTRIMMEDESP STACK 48 displ lea     rdx, [rsp+30h]
             413980     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             413983     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-            413993     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            413993     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             413995     -1 INSTR LOCAL NoMetaUpdate call    _g_object_set 
             41399a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_413789 
             4139a0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
@@ -20592,10 +20592,10 @@
             4139f4     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 48h 
             4139f4      6 INSTR BELONGTO 4139a0 
             4139f4      6 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 ZZ mov     r8d, 48h 
-            4139fa     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset loc_412B10 
+            4139fa     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset loc_412B10 
             4139fa      5 INSTR BELONGTO 4139a0 
             4139fa      5 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     ecx, offset loc_412B10 
-            4139ff     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 460h 
+            4139ff     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 460h 
             4139ff      5 INSTR BELONGTO 4139a0 
             4139ff      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 460h 
             413a04      7 INSTR BELONGTO 4139a0 
@@ -20631,7 +20631,7 @@
             413a3c     -1 INSTR LOCAL NoMetaUpdate call    _g_object_unref 
             413a3c      5 INSTR BELONGTO 413a20 
             413a41      7 INSTR BELONGTO 413a20 
-            413a48     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
+            413a48     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h 
             413a48      5 INSTR BELONGTO 413a20 
             413a4d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             413a4d      5 INSTR BELONGTO 413a20 
@@ -20657,19 +20657,19 @@
             413aa7      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             413aad      5 PTRIMMEDESP STACK 8 displ mov     [rsp+8], rax
             413ab2     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            413ab7     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF9h 
+            413ab7     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0FFFFFFF9h 
             413ac4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_add_button 
             413ac9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             413ace      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
             413ad4      5 PTRIMMEDESP STACK 16 displ mov     [rsp+10h], rax
             413ad9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            413ade     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            413ade     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             413ae6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_set_modal 
             413aeb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get_type 
-            413af0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 50h 
-            413af8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
-            413afd     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
-            413b02     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            413af0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 50h 
+            413af8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 40h 
+            413afd     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            413b02     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             413b04     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_new 
             413b0f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             413b14      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -20677,26 +20677,26 @@
             413b20     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grid_new 
             413b28     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_get_type 
             413b36     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            413b3b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
+            413b3b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 5 
             413b43     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_set_border_width 
-            413b48     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
-            413b4a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            413b48     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
+            413b4a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             413b4c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_new 
             413b54     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_get_type 
             413b62     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            413b67     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            413b6f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            413b67     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            413b6f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             413b74     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_set_policy 
             413b7f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            413b84     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            413b84     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             413b8c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_scrolled_window_set_shadow_type 
             413b95     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_new_with_model 
-            413b9a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0C8h 
-            413ba2     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 96h 
+            413b9a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0C8h 
+            413ba2     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 96h 
             413baa     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_size_request 
             413baf     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_type 
             413bbd     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            413bc2     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            413bc2     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             413bc7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_set_headers_visible 
             413bd5      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], rax
             413bda     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
@@ -20706,20 +20706,20 @@
             413bf1      5 PTRIMMEDESP STACK 24 displ mov     [rsp+18h], rax
             413bf6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_new 
             413bfb      5 PTRIMMEDESP STACK 24 displ mov     rsi, [rsp+18h]
-            413c03     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            413c03     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             413c0b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_pack_start 
             413c10      5 PTRIMMEDESP STACK 24 displ mov     rsi, [rsp+18h]
             413c15     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            413c18     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            413c22     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            413c18     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            413c22     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             413c24     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_column_set_attributes 
             413c2f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             413c3a     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_append_column 
             413c44     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_new_from_stock 
             413c52     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_new_from_stock 
             413c60     -1 INSTR LOCAL NoMetaUpdate call    _gtk_button_new_from_stock 
-            413c65     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
-            413c6a     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            413c65     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5 
+            413c6a     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             413c75     -1 INSTR LOCAL NoMetaUpdate call    _dcgettext 
             413c7a      5 PTRIMMEDESP STACK 16 displ mov     r9, [rsp+10h]
             413c82      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -20737,9 +20737,9 @@
             413cd7     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM xor     r9d, r9d 
             413cda     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             413ce7     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
-            413cf0     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            413cf0     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             413cf2     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
-            413cfb     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            413cfb     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             413cfd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_sensitive 
             413d08     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             413d10     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_selection 
@@ -20749,42 +20749,42 @@
             413d2b     -1 INSTR LOCAL NoMetaUpdate call    _g_signal_connect_data 
             413d30     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grid_get_type 
             413d3e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            413d43     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
+            413d43     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
             413d4b     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grid_set_column_spacing 
             413d56     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            413d5b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
+            413d5b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ah 
             413d63     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grid_set_row_spacing 
-            413d6b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            413d6b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             413d70     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_hexpand 
-            413d78     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            413d78     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             413d7d     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_vexpand 
             413d88     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            413d8d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            413d8f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            413d8d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            413d8f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             413d91     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 3 
             413d97     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
             413da3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grid_attach 
-            413dac     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            413dac     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             413db1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_valign 
-            413dba     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            413dba     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             413dbf     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_valign 
-            413dc8     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
+            413dc8     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 3 
             413dcd     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_set_valign 
             413ddc     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
-            413de1     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            413de1     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             413de3     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 1 
             413de9     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-            413def     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            413def     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             413dfa     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grid_attach 
             413e0d     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             413e15     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 1 
             413e1b     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-            413e21     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
+            413e21     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
             413e2c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grid_attach_next_to 
             413e3f     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             413e44     -2 INSTR LOCAL n R9 ZZ  NUMVia2ndSrcIMMEDNUM mov     r9d, 1 
             413e4d     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1 
-            413e53     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
+            413e53     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
             413e5e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_grid_attach_next_to 
             413e63     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_get_type 
             413e68      5 PTRIMMEDESP STACK 8 displ mov     r10, [rsp+8]
@@ -20793,8 +20793,8 @@
             413e7e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_get_content_area 
             413e89     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             413e91     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 5 
-            413e97     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
-            413e9c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            413e97     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1 
+            413e9c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             413ea4     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_pack_start 
             413ea9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
             413eae      3 PTRIMMEDEBP STACK 0 displ mov     rdi, rbp
@@ -20819,7 +20819,7 @@
             413ede      4 INSTR BELONGTO 413ed0 
             413ee2      2 INSTR BELONGTO 413ed0 
             413ee2      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            413ee2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            413ee2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             413ee2      8 DEALLOC STACK esp - 8 xor     eax, eax
             413ee4     -1 INSTR LOCAL NoMetaUpdate jmp     _g_object_new 
             413ee4      5 INSTR BELONGTO 413ed0 
@@ -20901,7 +20901,7 @@
             413ff8      2 INSTR BELONGTO 413fb0 
             413ffa      2 INSTR BELONGTO 413fb0 
             413ffa      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            413ffa     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            413ffa     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             413ffc      4 INSTR BELONGTO 413fb0 
             414000      3 INSTR BELONGTO 413fb0 
             414000      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 d689fdee..750e5aaa 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 @@
-58568eb7e010487bbbaffffc492a5f3034fbd7e9
\ No newline at end of file
+49f46e70b725844e589d3080d22ca3ed2948e0ab
\ 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 863bcc17..2d55fc22 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 @@
-c8e987f9a5bd37cbbcebab7c8aa2b8898337b624
\ No newline at end of file
+ad96d40eb1eada26c273ae363e8d13db76d34c34
\ 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 59e5a6dd..c2eba9a7 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 @@
-ce60bf4b088a3108cddc09987a744ffc6ae40cc0
\ No newline at end of file
+aa9f6fafd06c489074e3ff91a83f5d07c0b28a49
\ 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 5492b76b..c5113d3c 100644
--- a/tests/commit/trimmed-sorted-save-gnome-thumbnail-font.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-thumbnail-font.psexe.annot
@@ -783,8 +783,8 @@
             4017c0     -3 INSTR LOCAL NoWarn push    r15 
             4017c2      2 INSTR BELONGTO 4017c0 
             4017c2      2 INSTR DEADREGS  EFLAGS RAX RCX R15 ZZ xor     eax, eax 
-            4017c2     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            4017c4     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 18h 
+            4017c2     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            4017c4     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 18h 
             4017c4      5 INSTR BELONGTO 4017c0 
             4017c4      5 INSTR DEADREGS  EFLAGS RCX R15 ZZ mov     ecx, 18h 
             4017c9      2 INSTR BELONGTO 4017c0 
@@ -911,7 +911,7 @@
             4018e4      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _textdomain 
             4018e9      5 INSTR BELONGTO 4017c0 
             4018e9      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 ZZ mov     esi, (offset aCouldNotCreate+18h); locale 
-            4018ee     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
+            4018ee     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6          ; category 
             4018ee      5 INSTR BELONGTO 4017c0 
             4018ee      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ mov     edi, 6          ; category 
             4018f3     -1 INSTR LOCAL NoMetaUpdate call    _setlocale 
@@ -922,7 +922,7 @@
             4018f8      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_type_init 
             4018fd      2 INSTR BELONGTO 4017c0 
             4018fd      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 R15 ZZ xor     edi, edi 
-            4018fd     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4018fd     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4018ff     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_new 
             4018ff      5 INSTR BELONGTO 4017c0 
             4018ff      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _g_option_context_new 
@@ -973,10 +973,10 @@
             40194c      6 INSTR BELONGTO 4017c0 
             401952      2 INSTR BELONGTO 4017c0 
             401952      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 R14 R15 XMM0 ZZ xor     edx, edx 
-            401952     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401952     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             401954      3 INSTR BELONGTO 4017c0 
             401954      3 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 XMM0 ZZ mov     rdi, rbx 
-            401957     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            401957     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             401957      5 INSTR BELONGTO 4017c0 
             401957      5 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 R15 XMM0 ZZ mov     esi, 1 
             40195c     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_get_help 
@@ -988,18 +988,18 @@
             401966      3 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 R15 XMM0 ZZ mov     rsi, rax 
             401969      2 INSTR BELONGTO 4017c0 
             401969      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 XMM0 ZZ xor     eax, eax 
-            401969     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401969     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40196b     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             40196b      5 INSTR BELONGTO 4017c0 
             40196b      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ call    _g_printerr 
-            401970     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            401970     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
             401970      5 INSTR BELONGTO 4017c0 
             401970      5 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 XMM0 ZZ mov     ebp, 1 
             401975      3 INSTR BELONGTO 4017c0 
             401975      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 XMM0 ZZ mov     rdi, rbx 
             401978      2 INSTR BELONGTO 4017c0 
             401978      2 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM0 ZZ xor     ebx, ebx 
-            401978     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            401978     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40197a     -1 INSTR LOCAL NoMetaUpdate call    _g_option_context_free 
             40197a      5 INSTR BELONGTO 4017c0 
             40197a      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ call    _g_option_context_free 
@@ -1027,7 +1027,7 @@
             4019a8    296 DEALLOC STACK esp - 296 mov     eax, ebp
             4019a8      2 INSTR BELONGTO 4017c0 
             4019a8      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ mov     eax, ebp 
-            4019a8     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebp 
+            4019a8     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebp 
             4019aa      1 INSTR BELONGTO 4017c0 
             4019aa      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 R13 R14 R15 XMM0 ZZ pop     rbx 
             4019ab      1 INSTR BELONGTO 4017c0 
@@ -1046,14 +1046,14 @@
             4019b5      8 INSTR BELONGTO 4017c0 
             4019bd      5 INSTR BELONGTO 4017c0 
             4019bd      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 XMM0 ZZ mov     edi, offset aErrorParsingAr; "Error parsing arguments: %s\n" 
-            4019c2     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            4019c2     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
             4019c2      5 INSTR BELONGTO 4017c0 
             4019c2      5 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 R15 XMM0 ZZ mov     ebp, 1 
             4019c7      4 INSTR BELONGTO 4017c0 
             4019c7      4 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 R15 XMM0 ZZ mov     rsi, [rax+8] 
             4019cb      2 INSTR BELONGTO 4017c0 
             4019cb      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 XMM0 ZZ xor     eax, eax 
-            4019cb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4019cb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4019cd     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             4019cd      5 INSTR BELONGTO 4017c0 
             4019cd      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ call    _g_printerr 
@@ -1085,7 +1085,7 @@
             4019fc      6 INSTR BELONGTO 4017c0 
             401a02      2 INSTR BELONGTO 4017c0 
             401a02      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R12 R13 R14 R15 ZZ xor     eax, eax 
-            401a02     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401a02     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401a04      3 INSTR BELONGTO 4017c0 
             401a04      3 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R8 R12 R13 R14 R15 ZZ mov     rdi, r9 
             401a07     12 INSTR BELONGTO 4017c0 
@@ -1099,7 +1099,7 @@
             401a17      8 PTRIMMEDESP STACK 264 displ lea     r8, [rsp+158h+var_50]
             401a1f      2 INSTR BELONGTO 4017c0 
             401a1f      2 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 R14 R15 ZZ xor     edx, edx 
-            401a1f     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401a1f     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             401a21     -1 INSTR LOCAL NoMetaUpdate repne scasb 
             401a21      2 INSTR BELONGTO 4017c0 
             401a23      3 INSTR BELONGTO 4017c0 
@@ -1131,8 +1131,8 @@
             401a4e      5 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 XMM0 ZZ mov     edi, offset aFailedToConver; "Failed to convert: %s\n" 
             401a53      2 INSTR BELONGTO 4017c0 
             401a53      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 XMM0 ZZ xor     eax, eax 
-            401a53     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            401a55     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            401a53     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            401a55     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
             401a55      5 INSTR BELONGTO 4017c0 
             401a55      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ mov     ebp, 1 
             401a5a     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
@@ -1173,8 +1173,8 @@
             401a9b      5 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 XMM0 ZZ mov     edi, offset aCouldNotInitia; "Could not initialise freetype: %s\n" 
             401aa0      2 INSTR BELONGTO 4017c0 
             401aa0      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 XMM0 ZZ xor     eax, eax 
-            401aa0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            401aa2     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            401aa0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            401aa2     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
             401aa2      5 INSTR BELONGTO 4017c0 
             401aa2      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ mov     ebp, 1 
             401aa7     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
@@ -1186,12 +1186,12 @@
             401ab1      6 INSTR BELONGTO 4017c0 
             401ab7      2 INSTR BELONGTO 4017c0 
             401ab7      2 INSTR DEADREGS  EFLAGS RBX RDI R13 R14 R15 ZZ xor     ebx, ebx 
-            401ab7     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            401ab7     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             401ab9     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_401A74 
             401ab9      2 INSTR BELONGTO 4017c0 
             401abb     -1 INSTR LOCAL MetadataUnused mov     rax, [rsp+158h+var_58] 
             401abb      8 INSTR BELONGTO 4017c0 
-            401ac3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1C9C380h 
+            401ac3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1C9C380h 
             401ac3      5 INSTR BELONGTO 4017c0 
             401ac3      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 R10 R11 R13 R14 R15 ZZ mov     esi, 1C9C380h 
             401ac8      3 INSTR BELONGTO 4017c0 
@@ -1230,7 +1230,7 @@
             401afe      8 PTRIMMEDESP STACK 232 displ lea     rcx, [rsp+158h+var_70]
             401b06      2 INSTR BELONGTO 4017c0 
             401b06      2 INSTR DEADREGS  EFLAGS RDX RSI R13 R14 R15 ZZ xor     edx, edx 
-            401b06     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401b06     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             401b08      3 INSTR BELONGTO 4017c0 
             401b08      3 INSTR DEADREGS  EFLAGS RSI R13 R14 R15 ZZ mov     rsi, rbp 
             401b0b     -1 INSTR LOCAL NoMetaUpdate call    sub_402290 
@@ -1256,13 +1256,13 @@
             401b2d      5 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 XMM0 ZZ mov     edi, offset aCouldNotLoadFa; "Could not load face '%s': %s\n" 
             401b32      2 INSTR BELONGTO 4017c0 
             401b32      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 XMM0 ZZ xor     eax, eax 
-            401b32     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401b32     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401b34     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
             401b34      5 INSTR BELONGTO 4017c0 
             401b34      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ call    _g_printerr 
             401b39      3 INSTR BELONGTO 4017c0 
             401b39      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 XMM0 ZZ mov     rdi, rbp 
-            401b3c     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            401b3c     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
             401b3c      5 INSTR BELONGTO 4017c0 
             401b3c      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ mov     ebp, 1 
             401b41     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
@@ -1275,7 +1275,7 @@
             401b4e     -1 INSTR LOCAL NoMetaUpdate call    _g_free 
             401b4e      5 INSTR BELONGTO 4017c0 
             401b4e      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _g_free 
-            401b53     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, [rsp+158h+var_3C] 
+            401b53     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, [rsp+158h+var_3C] 
             401b53      7 INSTR BELONGTO 4017c0 
             401b53      7 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 ZZ mov     edx, [rsp+158h+var_3C] 
             401b53      7 PTRIMMEDESP STACK 284 displ mov     edx, [rsp+158h+var_3C]
@@ -1284,7 +1284,7 @@
             401b5a      8 PTRIMMEDESP STACK 232 displ mov     rdi, [rsp+158h+var_70]
             401b62      2 INSTR BELONGTO 4017c0 
             401b62      2 INSTR DEADREGS  EFLAGS RSI R13 R14 R15 ZZ xor     esi, esi 
-            401b62     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            401b62     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             401b64     -1 INSTR LOCAL NoMetaUpdate call    _FT_Set_Pixel_Sizes 
             401b64      5 INSTR BELONGTO 4017c0 
             401b64      5 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ call    _FT_Set_Pixel_Sizes 
@@ -1297,10 +1297,10 @@
             401b71      8 PTRIMMEDESP STACK 232 displ mov     rdi, [rsp+158h+var_70]
             401b79      2 INSTR BELONGTO 4017c0 
             401b79      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R13 R14 R15 ZZ xor     edx, edx 
-            401b79     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401b79     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             401b7b      2 INSTR BELONGTO 4017c0 
             401b7b      2 INSTR DEADREGS  EFLAGS RAX RCX RSI R8 R13 R14 R15 ZZ xor     ecx, ecx 
-            401b7b     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            401b7b     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             401b7d      4 INSTR BELONGTO 4017c0 
             401b7d      4 INSTR DEADREGS  EFLAGS RAX RSI R8 R13 R14 R15 ZZ mov     r8d, [rdi+48h] 
             401b81     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_401BB6 
@@ -1331,19 +1331,19 @@
             401bb6      3 INSTR BELONGTO 4017c0 
             401bb9     -1 INSTR LOCAL NoMetaUpdate jl      short loc_401B83 
             401bb9      2 INSTR BELONGTO 4017c0 
-            401bbb     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rsp+158h+var_3C] 
+            401bbb     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rsp+158h+var_3C] 
             401bbb      7 INSTR BELONGTO 4017c0 
             401bbb      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R13 R14 R15 ZZ mov     eax, [rsp+158h+var_3C] 
             401bbb      7 PTRIMMEDESP STACK 284 displ mov     eax, [rsp+158h+var_3C]
-            401bc2     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            401bc2     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             401bc2      5 INSTR BELONGTO 4017c0 
             401bc2      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R13 R14 R15 ZZ mov     ecx, 2 
             401bc7      2 INSTR BELONGTO 4017c0 
             401bc7      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 R14 R15 ZZ xor     esi, esi 
-            401bc7     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            401bc7     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             401bc9      2 INSTR BELONGTO 4017c0 
             401bc9      2 INSTR DEADREGS  EFLAGS RDX RDI R13 R14 R15 ZZ xor     edi, edi 
-            401bc9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401bc9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401bcb     -1 INSTR LOCAL NoMetaUpdate cvtsi2sd xmm0, eax 
             401bcb      4 INSTR BELONGTO 4017c0 
             401bcf     -1 INSTR LOCAL MetadataRedundant lea     eax, [rax+rax*2] 
@@ -1409,19 +1409,19 @@
             401c3c      3 INSTR BELONGTO 4017c0 
             401c3f     -1 INSTR LOCAL NoMetaUpdate jg      short loc_401C32 
             401c3f      2 INSTR BELONGTO 4017c0 
-            401c41     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, [rsp+158h+var_3C] 
+            401c41     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, [rsp+158h+var_3C] 
             401c41      7 INSTR BELONGTO 4017c0 
             401c41      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R13 R14 R15 XMM0 ZZ mov     ecx, [rsp+158h+var_3C] 
             401c41      7 PTRIMMEDESP STACK 284 displ mov     ecx, [rsp+158h+var_3C]
-            401c48     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            401c48     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             401c48      5 INSTR BELONGTO 4017c0 
             401c48      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R13 R14 R15 XMM0 ZZ mov     esi, 2 
             401c4d      2 INSTR BELONGTO 4017c0 
             401c4d      2 INSTR DEADREGS  EFLAGS RAX RDX RDI R13 R14 R15 XMM0 ZZ mov     edx, ecx 
-            401c4d     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, ecx 
+            401c4d     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, ecx 
             401c4f      2 INSTR BELONGTO 4017c0 
             401c4f      2 INSTR DEADREGS  EFLAGS RAX RDI R13 R14 R15 XMM0 ZZ mov     eax, ecx 
-            401c4f     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ecx 
+            401c4f     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ecx 
             401c51      7 INSTR BELONGTO 4017c0 
             401c51      7 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 XMM0 ZZ mov     [rsp+158h+var_40], ecx 
             401c51      7 PTRIMMEDESP STACK 280 displ mov     [rsp+158h+var_40], ecx
@@ -1439,7 +1439,7 @@
             401c6d      8 INSTR BELONGTO 4017c0 
             401c6d      8 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 XMM0 ZZ mov     rdi, [rsp+158h+var_70] 
             401c6d      8 PTRIMMEDESP STACK 232 displ mov     rdi, [rsp+158h+var_70]
-            401c75     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 41h 
+            401c75     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 41h 
             401c75      5 INSTR BELONGTO 4017c0 
             401c75      5 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 R15 XMM0 ZZ mov     esi, 41h 
             401c7a     -1 INSTR LOCAL NoMetaUpdate call    _FT_Get_Char_Index 
@@ -1560,7 +1560,7 @@
             401d4e      3 INSTR BELONGTO 4017c0 
             401d51      2 INSTR BELONGTO 4017c0 
             401d51      2 INSTR DEADREGS  EFLAGS RCX RSI R8 R9 R10 XMM0 ZZ xor     esi, esi 
-            401d51     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            401d51     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             401d53     -2 INSTR LOCAL n R9 ZZ  AlwaysNUM movsxd  r9, eax 
             401d53      3 INSTR BELONGTO 4017c0 
             401d53      3 INSTR DEADREGS  EFLAGS RCX R8 R9 R10 XMM0 ZZ movsxd  r9, eax 
@@ -1592,14 +1592,14 @@
             401d7e      3 INSTR DEADREGS  RCX RDX R8 R10 XMM0 ZZ cmovle  eax, esi 
             401d81      2 INSTR BELONGTO 4017c0 
             401d81      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R10 XMM0 ZZ xor     esi, esi 
-            401d81     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            401d81     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             401d83      3 INSTR BELONGTO 4017c0 
             401d83      3 INSTR DEADREGS  EFLAGS RCX RDX R8 R10 XMM0 ZZ lea     edx, [rax-4] 
             401d86     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 5 
             401d86      3 INSTR BELONGTO 4017c0 
             401d89      4 INSTR BELONGTO 4017c0 
             401d89      4 INSTR DEADREGS  RAX RCX R8 R10 XMM0 ZZ lea     eax, [r13-1] 
-            401d8d     -2 INSTR LOCAL n ECX ZZ  NumericDEFs lea     ecx, [rax+rax*2] 
+            401d8d     -2 INSTR LOCAL n RCX ZZ  NumericDEFs lea     ecx, [rax+rax*2] 
             401d8d      3 INSTR BELONGTO 4017c0 
             401d8d      3 INSTR DEADREGS  RCX R8 R10 XMM0 ZZ lea     ecx, [rax+rax*2] 
             401d90      3 INSTR BELONGTO 4017c0 
@@ -1669,7 +1669,7 @@
             401df5      4 INSTR DEADREGS  RCX RDX RDI XMM0 ZZ cmovg   r8d, r12d 
             401df9      2 INSTR BELONGTO 4017c0 
             401df9      2 INSTR DEADREGS  EFLAGS RCX RDX RDI XMM0 ZZ xor     edx, edx 
-            401df9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401df9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             401dfb      4 INSTR BELONGTO 4017c0 
             401dfb      4 INSTR DEADREGS  EFLAGS RCX RDI XMM0 ZZ lea     ecx, [r8-4] 
             401dff     -1 INSTR LOCAL NoMetaUpdate cmp     r8d, 5 
@@ -1742,7 +1742,7 @@
             401e67      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 R12 R13 R14 R15 XMM0 ZZ xor     r8d, r8d 
             401e6a      2 INSTR BELONGTO 4017c0 
             401e6a      2 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 R13 R14 R15 XMM0 ZZ xor     ecx, ecx 
-            401e6a     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            401e6a     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             401e6c      5 INSTR BELONGTO 4017c0 
             401e6c      5 INSTR DEADREGS  EFLAGS RDX RDI R12 R13 R14 R15 XMM0 ZZ mov     edx, offset aPng; "png" 
             401e71      3 INSTR BELONGTO 4017c0 
@@ -1751,7 +1751,7 @@
             401e74      3 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ mov     r12, rax 
             401e77      2 INSTR BELONGTO 4017c0 
             401e77      2 INSTR DEADREGS  EFLAGS RAX R13 R14 R15 XMM0 ZZ xor     eax, eax 
-            401e77     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401e77     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401e79     -1 INSTR LOCAL NoMetaUpdate call    _gdk_pixbuf_save 
             401e79      5 INSTR BELONGTO 4017c0 
             401e79      5 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM0 ZZ call    _gdk_pixbuf_save 
@@ -1792,8 +1792,8 @@
             401ebe      5 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 XMM0 ZZ mov     edi, offset aCouldNotUnload; "Could not unload face: %s\n" 
             401ec3      2 INSTR BELONGTO 4017c0 
             401ec3      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 XMM0 ZZ xor     eax, eax 
-            401ec3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            401ec5     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            401ec3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            401ec5     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
             401ec5      5 INSTR BELONGTO 4017c0 
             401ec5      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ mov     ebp, 1 
             401eca     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
@@ -1895,8 +1895,8 @@
             401fa6      5 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 XMM0 ZZ mov     edi, offset aCouldNotSetPix; "Could not set pixel size: %s\n" 
             401fab      2 INSTR BELONGTO 4017c0 
             401fab      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 XMM0 ZZ xor     eax, eax 
-            401fab     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            401fad     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            401fab     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            401fad     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
             401fad      5 INSTR BELONGTO 4017c0 
             401fad      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ mov     ebp, 1 
             401fb2     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
@@ -1925,8 +1925,8 @@
             401fdf      5 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 XMM0 ZZ mov     edi, offset aCouldNotSetCha; "Could not set charmap: %s\n" 
             401fe4      2 INSTR BELONGTO 4017c0 
             401fe4      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 XMM0 ZZ xor     eax, eax 
-            401fe4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            401fe6     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            401fe4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            401fe6     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
             401fe6      5 INSTR BELONGTO 4017c0 
             401fe6      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ mov     ebp, 1 
             401feb     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
@@ -1937,7 +1937,7 @@
             401ff5      8 INSTR BELONGTO 4017c0 
             401ff5      8 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 R14 R15 XMM0 ZZ mov     rdi, [rsp+158h+var_70] 
             401ff5      8 PTRIMMEDESP STACK 232 displ mov     rdi, [rsp+158h+var_70]
-            401ffd     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 756E6963h 
+            401ffd     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 756E6963h 
             401ffd      5 INSTR BELONGTO 4017c0 
             401ffd      5 INSTR DEADREGS  EFLAGS RSI R12 R13 R14 R15 XMM0 ZZ mov     esi, 756E6963h 
             402002     -1 INSTR LOCAL MetadataUnused xor     r12d, r12d 
@@ -1985,7 +1985,7 @@
             402052      8 PTRIMMEDESP STACK 224 displ mov     rdi, [rsp+158h+var_78]
             40205a      2 INSTR BELONGTO 4017c0 
             40205a      2 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ xor     ebp, ebp 
-            40205a     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40205a     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40205c     -1 INSTR LOCAL NoMetaUpdate call    _FT_Done_FreeType 
             40205c      5 INSTR BELONGTO 4017c0 
             40205c      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ call    _FT_Done_FreeType 
@@ -2007,8 +2007,8 @@
             40207f      5 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 XMM0 ZZ mov     edi, offset aCouldNotFinali; "Could not finalize freetype library: %s"... 
             402084      2 INSTR BELONGTO 4017c0 
             402084      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 XMM0 ZZ xor     eax, eax 
-            402084     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            402086     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            402084     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            402086     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
             402086      5 INSTR BELONGTO 4017c0 
             402086      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ mov     ebp, 1 
             40208b     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
@@ -2020,8 +2020,8 @@
             402095      5 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 XMM0 ZZ mov     edi, offset aCouldNotCreate; "Could not create pixbuf\n" 
             40209a      2 INSTR BELONGTO 4017c0 
             40209a      2 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 XMM0 ZZ xor     eax, eax 
-            40209a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            40209c     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     bpl, 1 
+            40209a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            40209c     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     bpl, 1 
             40209c      3 INSTR BELONGTO 4017c0 
             40209c      3 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ mov     bpl, 1 
             40209f     -1 INSTR LOCAL NoMetaUpdate call    _g_printerr 
@@ -2155,7 +2155,7 @@
             402169      3 INSTR BELONGTO 402160 
             40216c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_402180 
             40216c      2 INSTR BELONGTO 402160 
-            40216e     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            40216e     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             40216e      5 INSTR BELONGTO 402160 
             402173     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             402173      3 INSTR BELONGTO 402160 
@@ -2203,17 +2203,17 @@
             4021e3     -1 INSTR LOCAL NoMetaUpdate test    rcx, rcx 
             4021ed     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4021FA 
             4021ef     -1 INSTR LOCAL NoMetaUpdate cmp     [rdi+8], rsi 
-            4021f3     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
+            4021f3     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 1 
             4021f8     -1 INSTR LOCAL NoMetaUpdate jb      short loc_40222A 
             4021fa     -1 INSTR LOCAL NoMetaUpdate call    _g_seekable_get_type 
             402205     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             40220a     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            40220d     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
-            40220f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40220d     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
+            40220f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40221a     -1 INSTR LOCAL NoMetaUpdate call    _g_seekable_seek 
             40221f     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             402221     -1 INSTR LOCAL NoMetaUpdate jz      short loc_402250 
-            402223     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            402223     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             402225     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
             402228     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_402260 
             40222a      3 PTRIMMEDEBP STACK 0 displ mov     rax, rbp
@@ -2223,14 +2223,14 @@
             40223b      5 PTRIMMEDESP STACK 24 displ mov     r13, [rsp+18h]
             402240      5 PTRIMMEDESP STACK 32 displ mov     r14, [rsp+20h]
             402245     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
-            402250     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            402250     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             402252     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
-            402255     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM setz    bpl 
+            402255     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM setz    bpl 
             402259     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40222A 
             402260     -1 INSTR LOCAL NoMetaUpdate call    _g_input_stream_get_type 
             40226b     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             402270     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            402273     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            402273     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40227e     -1 INSTR LOCAL NoMetaUpdate call    _g_input_stream_read 
             402283     -1 INSTR LOCAL NoMetaUpdate cmp     rax, 0FFFFFFFFFFFFFFFFh 
             40228b     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40222A 
@@ -2251,7 +2251,7 @@
             4022a2      5 INSTR BELONGTO 402290 
             4022a2      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     [rsp+var_10], r14 
             4022a2      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], r14
-            4022a7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h        ; size 
+            4022a7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 50h        ; size 
             4022a7      5 INSTR BELONGTO 402290 
             4022a7      5 INSTR DEADREGS  EFLAGS RBX RSI R12 R14 ZZ mov     esi, 50h        ; size 
             4022ac      5 INSTR BELONGTO 402290 
@@ -2266,7 +2266,7 @@
             4022b9      7 INSTR BELONGTO 402290 
             4022b9      7 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 ZZ sub     rsp, 88h 
             4022b9      8 MEMORYHOLE STACK esp + 136 ReturnAddress 
-            4022c0     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; nmemb 
+            4022c0     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; nmemb 
             4022c0      5 INSTR BELONGTO 402290 
             4022c0      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 ZZ mov     edi, 1          ; nmemb 
             4022c5     -2 INSTR LOCAL n R14 ZZ  NumericDEFs mov     r14, rdx 
@@ -2279,7 +2279,7 @@
             4022cb      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _calloc 
             4022d0      3 INSTR BELONGTO 402290 
             4022d0      3 INSTR DEADREGS  EFLAGS RBX R13 ZZ mov     rbx, rax 
-            4022d3     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 40h 
+            4022d3     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 40h 
             4022d3      5 INSTR BELONGTO 402290 
             4022d3      5 INSTR DEADREGS  EFLAGS RAX R13 ZZ mov     eax, 40h 
             4022d8     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -2293,10 +2293,10 @@
             4022e4      5 INSTR DEADREGS  EFLAGS R13 ZZ call    _g_file_new_for_uri 
             4022e9      2 INSTR BELONGTO 402290 
             4022e9      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ xor     edx, edx 
-            4022e9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4022e9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4022eb      2 INSTR BELONGTO 402290 
             4022eb      2 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ xor     esi, esi 
-            4022eb     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4022eb     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4022ed      3 INSTR BELONGTO 402290 
             4022ed      3 INSTR DEADREGS  EFLAGS RDI R13 ZZ mov     rdi, rax 
             4022f0      3 INSTR BELONGTO 402290 
@@ -2315,10 +2315,10 @@
             402304      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ xor     r8d, r8d 
             402307      2 INSTR BELONGTO 402290 
             402307      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ xor     ecx, ecx 
-            402307     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            402307     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             402309      2 INSTR BELONGTO 402290 
             402309      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            402309     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            402309     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40230b      5 INSTR BELONGTO 402290 
             40230b      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aStandardSize; "standard::size" 
             402310      3 INSTR BELONGTO 402290 
@@ -2449,7 +2449,7 @@
             40240b     -1 INSTR LOCAL NoMetaUpdate call    _free 
             40240b      5 INSTR BELONGTO 402290 
             40240b      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ call    _free 
-            402410     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            402410     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             402410      5 INSTR BELONGTO 402290 
             402410      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     eax, 1 
             402415     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4023B8 
@@ -2471,7 +2471,7 @@
             402431      5 INSTR BELONGTO 402420 
             402436      2 INSTR BELONGTO 402420 
             402436      2 INSTR DEADREGS  EFLAGS RDX R12 R13 ZZ xor     edx, edx 
-            402436     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            402436     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             402438     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_10], r14 
             402438      5 INSTR BELONGTO 402420 
             40243d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
@@ -2519,7 +2519,7 @@
             402486      5 INSTR BELONGTO 402420 
             40248b      2 INSTR BELONGTO 402420 
             40248b      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ xor     eax, eax 
-            40248b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40248b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40248d     -1 INSTR LOCAL MetadataUnused mov     r12, [rsp+58h+var_20] 
             40248d      5 INSTR BELONGTO 402420 
             402492     -1 INSTR LOCAL MetadataUnused mov     r13, [rsp+58h+var_18] 
@@ -2535,7 +2535,7 @@
             4024a5      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ jmp     _g_printerr 
             4024b0      2 INSTR BELONGTO 402420 
             4024b0      2 INSTR DEADREGS  EFLAGS RSI RDI R15 ZZ xor     esi, esi 
-            4024b0     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4024b0     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4024b2      3 INSTR BELONGTO 402420 
             4024b2      3 INSTR DEADREGS  EFLAGS RDI R15 ZZ mov     rdi, r13 
             4024b5     -1 INSTR LOCAL NoMetaUpdate call    _FT_Render_Glyph 
@@ -2613,16 +2613,16 @@
             402541     -2 INSTR LOCAL n R11 ZZ  AlwaysNUM movsxd  r11, eax 
             402541      3 INSTR BELONGTO 402420 
             402541      3 INSTR DEADREGS  EFLAGS RDX R8 R10 R11 ZZ movsxd  r11, eax 
-            402544     -2 INSTR LOCAL n EDX ZZ  NumericDEFs lea     edx, [r15+r15*2] 
+            402544     -2 INSTR LOCAL n RDX ZZ  NumericDEFs lea     edx, [r15+r15*2] 
             402544      4 INSTR BELONGTO 402420 
             402544      4 INSTR DEADREGS  EFLAGS RDX R8 R10 ZZ lea     edx, [r15+r15*2] 
             402548     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             402548      3 INSTR BELONGTO 402420 
             402548      3 INSTR DEADREGS  EFLAGS R8 R10 ZZ xor     r8d, r8d 
-            40254b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM imul    eax, r9d 
+            40254b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM imul    eax, r9d 
             40254b      4 INSTR BELONGTO 402420 
             40254b      4 INSTR DEADREGS  EFLAGS R10 ZZ imul    eax, r9d 
-            40254f     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 7 
+            40254f     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 7 
             40254f      5 INSTR BELONGTO 402420 
             40254f      5 INSTR DEADREGS  EFLAGS R10 ZZ mov     ebp, 7 
             402554     -1 INSTR LOCAL MetadataRedundant movsxd  rdx, edx 
@@ -2662,7 +2662,7 @@
             402590      3 INSTR DEADREGS  EFLAGS RSI RDI R10 ZZ mov     rdi, rax 
             402593      2 INSTR BELONGTO 402420 
             402593      2 INSTR DEADREGS  EFLAGS RSI R10 ZZ xor     esi, esi 
-            402593     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            402593     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             402595     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4025DD 
             402595      2 INSTR BELONGTO 402420 
             4025a0     -1 INSTR LOCAL NoMetaUpdate cmp     cl, 2 
@@ -2672,7 +2672,7 @@
             4025a3      6 INSTR DEADREGS  R10 ZZ mov     r10d, 0FFFFFFFFh 
             4025a9     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4025C3 
             4025a9      2 INSTR BELONGTO 402420 
-            4025ab     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, [rbx+8] 
+            4025ab     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, [rbx+8] 
             4025ab      3 INSTR BELONGTO 402420 
             4025ab      3 INSTR DEADREGS  EFLAGS RCX R10 ZZ mov     ecx, [rbx+8] 
             4025ae     -1 INSTR LOCAL MetadataUnused mov     r10, [rbx+10h] 
@@ -2712,7 +2712,7 @@
             4025e1      3 INSTR BELONGTO 402420 
             4025e4     -1 INSTR LOCAL NoMetaUpdate jle     short loc_4025CE 
             4025e4      2 INSTR BELONGTO 402420 
-            4025e6     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movzx   ecx, byte ptr [rbx+1Ah] 
+            4025e6     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movzx   ecx, byte ptr [rbx+1Ah] 
             4025e6      4 INSTR BELONGTO 402420 
             4025e6      4 INSTR DEADREGS  EFLAGS RCX R10 ZZ movzx   ecx, byte ptr [rbx+1Ah] 
             4025ea     -1 INSTR LOCAL NoMetaUpdate cmp     cl, 1 
@@ -2745,7 +2745,7 @@
             402610      4 PTRIMMEDESP STACK 28 displ mov     [rsp+58h+var_3C], ecx
             402614      2 INSTR BELONGTO 402420 
             402614      2 INSTR DEADREGS  EFLAGS RCX ZZ mov     ecx, ebp 
-            402614     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, ebp 
+            402614     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, ebp 
             402616     -1 INSTR LOCAL MetadataRedundant sub     ecx, [rsp+58h+var_3C] 
             402616      4 INSTR BELONGTO 402420 
             40261a     -1 INSTR LOCAL MetadataRedundant sar     r10d, cl 
@@ -2831,19 +2831,19 @@
             4026ab      3 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     rdx, rbx 
             4026ae      2 INSTR BELONGTO 402680 
             4026ae      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            4026ae     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4026ae     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4026b0     -1 INSTR LOCAL NoMetaUpdate call    _g_print 
             4026b0      5 INSTR BELONGTO 402680 
             4026b0      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_print 
             4026b5      2 INSTR BELONGTO 402680 
             4026b5      2 INSTR DEADREGS  EFLAGS RBX RDI ZZ xor     edi, edi        ; status 
-            4026b5     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; status 
+            4026b5     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; status 
             4026b7     -1 INSTR LOCAL NoMetaUpdate call    _exit 
             4026b7      5 INSTR BELONGTO 402680 
             4026b7      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _exit 
             4026bc      2 INSTR BELONGTO 402680 
             4026bc      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
-            4026bc     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4026bc     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4026be     -1 INSTR LOCAL NoMetaUpdate call    _g_thread_exit 
             4026be      5 INSTR BELONGTO 402680 
             4026be      5 INSTR DEADREGS  EFLAGS ZZ call    _g_thread_exit 
@@ -2888,7 +2888,7 @@
             40270e      3 INSTR BELONGTO 4026e0 
             40270e      3 INSTR DEADREGS  EFLAGS RDX RDI R13 ZZ mov     rdx, rsp        ; stat_buf 
             40270e      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp        ; stat_buf
-            402711     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            402711     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             402711      5 INSTR BELONGTO 4026e0 
             402711      5 INSTR DEADREGS  EFLAGS RDI R13 ZZ mov     edi, 1          ; ver 
             402716     -1 INSTR LOCAL NoMetaUpdate call    ___xstat 
@@ -2905,7 +2905,7 @@
             40272f      8 INSTR BELONGTO 4026e0 
             40272f      8 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ lea     rsi, [rsp+0C8h+rlimits]; rlimits 
             40272f      8 PTRIMMEDESP STACK 144 displ lea     rsi, [rsp+0C8h+rlimits]; rlimits
-            402737     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2          ; resource 
+            402737     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2          ; resource 
             402737      5 INSTR BELONGTO 4026e0 
             402737      5 INSTR DEADREGS  EFLAGS RDI R13 ZZ mov     edi, 2          ; resource 
             40273c     -1 INSTR LOCAL MetadataUnused mov     [rsp+0C8h+rlimits.rlim_cur], rbp 
@@ -2937,7 +2937,7 @@
             402780      7 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     cs:dword_6041E8, r12d 
             402787      3 INSTR BELONGTO 4026e0 
             402787      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     rdx, rbx 
-            40278a     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_402680 
+            40278a     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_402680 
             40278a      5 INSTR BELONGTO 4026e0 
             40278a      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, offset sub_402680 
             40278f      5 INSTR BELONGTO 4026e0 
@@ -2975,10 +2975,10 @@
             4027df      6 INSTR BELONGTO 4026e0 
             4027e5      2 INSTR BELONGTO 4026e0 
             4027e5      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ xor     edx, edx 
-            4027e5     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4027e5     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4027e7      2 INSTR BELONGTO 4026e0 
             4027e7      2 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ xor     esi, esi 
-            4027e7     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4027e7     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4027e9      3 INSTR BELONGTO 4026e0 
             4027e9      3 INSTR DEADREGS  EFLAGS RDI R13 ZZ mov     rdi, rbx 
             4027ec     -1 INSTR LOCAL NoMetaUpdate call    _g_filename_from_uri 
@@ -2995,7 +2995,7 @@
             4027f9      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp        ; stat_buf
             4027fc      3 INSTR BELONGTO 4026e0 
             4027fc      3 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, rax        ; filename 
-            4027ff     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            4027ff     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             4027ff      5 INSTR BELONGTO 4026e0 
             4027ff      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 1          ; ver 
             402804     -1 INSTR LOCAL NoMetaUpdate call    ___xstat 
@@ -3073,7 +3073,7 @@
             402888      2 INSTR BELONGTO 402840 
             40288a      2 INSTR BELONGTO 402840 
             40288a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            40288a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40288a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40288c      4 INSTR BELONGTO 402840 
             402890      3 INSTR BELONGTO 402840 
             402890      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 d84cb7df..680c2abb 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 @@
-0900c7a4294e2c7bb7e37b7ac0a81c5f45949012
\ No newline at end of file
+79f17aa2383d9322ac7cecc33d456bd3d0be3a1d
\ 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 4e6a6037..467cf8e4 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 @@
-b1bc989488ad9fe7bf38336e5588c9a1d25de49c
\ No newline at end of file
+1e25021cd38d9d41c1a7d116b0df0b822999e8e9
\ 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 f9dc25d2..f5104265 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 @@
-2eacea97888d361d75cc2a03ad3e965a3e3f0ec9
\ No newline at end of file
+939982e16244197438b57be806fceb5ced72090a
\ 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 1c656334..fdee03ff 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 @@
-270d6492524baa55451720a0bde1b943895789f3
\ No newline at end of file
+74a8509b7e5a55e1b11f02db2e3b6ae66fbc6885
\ 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 545360af..594dd71e 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 @@
-00e31d280569163226f5de2bf327e29e8d3c463c
\ No newline at end of file
+0c97aeacbf303a9778fbe379fe4e8205acfa6cb7
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-nginx.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-nginx.psexe.annot.REMOVED.git-id
index 0bffc4cb..a667d8c3 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 @@
-078579aa4fa967aa930b58ee149416271636ec78
\ No newline at end of file
+871af1cc2b6a60b2d15b16c8ec0eef69923836b2
\ 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 360f6501..1520a40a 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 @@
-e087b1c61ebc9e3fe4a4341f89031337da9d9eae
\ No newline at end of file
+f92cfe627252ec46d434716e1568e17702e01880
\ 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 644bdd09..71805e6f 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 @@
-8a78822454ea4696aa37a9fd853429ef39321280
\ No newline at end of file
+0be8f380ac953c404041e8933eb64fb20408792f
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-xcalc.psexe.annot b/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
index 2f555151..b06aa666 100644
--- a/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
@@ -852,7 +852,7 @@
             401810     -3 INSTR LOCAL NoWarn push    r12 
             401812      2 INSTR BELONGTO 401810 
             401812      2 INSTR DEADREGS  EFLAGS RDX R12 ZZ xor     edx, edx 
-            401812     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401812     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             401814      1 INSTR BELONGTO 401810 
             401814      1 INSTR DEADREGS  EFLAGS R12 ZZ push    rbp 
             401814     -3 INSTR LOCAL NoWarn push    rbp 
@@ -863,7 +863,7 @@
             401816      3 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     rbx, rsi 
             401819      2 INSTR BELONGTO 401810 
             401819      2 INSTR DEADREGS  EFLAGS RSI R12 ZZ xor     esi, esi 
-            401819     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            401819     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40181b     20 DATAREF STACK 492 esp + 0 CHILDOF 491 OFFSET 0 OutArgsRegion OUTARGS
             40181b     24 MEMORYHOLE STACK esp + 96 CalleeSavedRegs 
             40181b      4 INSTR BELONGTO 401810 
@@ -874,7 +874,7 @@
             40181f      4 INSTR BELONGTO 401810 
             401823      2 INSTR BELONGTO 401810 
             401823      2 INSTR DEADREGS  EFLAGS RDI R12 ZZ xor     edi, edi 
-            401823     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401823     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401825     -1 INSTR LOCAL NoMetaUpdate call    _XtSetLanguageProc 
             401825      5 INSTR BELONGTO 401810 
             401825      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _XtSetLanguageProc 
@@ -883,7 +883,7 @@
             40182a      5 PTRIMMEDESP STACK 44 displ lea     r8, [rsp+78h+var_4C]
             40182f      3 INSTR BELONGTO 401810 
             40182f      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R9 R12 ZZ mov     r9, rbx 
-            401832     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            401832     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             401832      5 INSTR BELONGTO 401810 
             401832      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     ecx, 2 
             401837      5 INSTR BELONGTO 401810 
@@ -917,7 +917,7 @@
             401878      5 PTRIMMEDESP STACK 48 displ lea     rsi, [rsp+78h+var_48]
             40187d      3 INSTR BELONGTO 401810 
             40187d      3 INSTR DEADREGS  EFLAGS RDX RBX RDI R12 ZZ mov     rdi, rax 
-            401880     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            401880     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             401880      5 INSTR BELONGTO 401810 
             401880      5 INSTR DEADREGS  EFLAGS RDX RBX R12 ZZ mov     edx, 1 
             401885     -1 INSTR LOCAL MetadataUnused mov     [rsp+78h+var_48], offset byte_607781 
@@ -935,7 +935,7 @@
             4018a6     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             4018a6      3 INSTR BELONGTO 401810 
             4018a6      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R8 R12 ZZ xor     r8d, r8d 
-            4018a9     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
+            4018a9     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 3 
             4018a9      5 INSTR BELONGTO 401810 
             4018a9      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R12 ZZ mov     ecx, 3 
             4018ae      5 INSTR BELONGTO 401810 
@@ -945,7 +945,7 @@
             4018b8     -1 INSTR LOCAL NoMetaUpdate call    _XtGetApplicationResources 
             4018b8      5 INSTR BELONGTO 401810 
             4018b8      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _XtGetApplicationResources 
-            4018bd     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movsx   eax, cs:byte_608840 
+            4018bd     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movsx   eax, cs:byte_608840 
             4018bd      7 INSTR BELONGTO 401810 
             4018bd      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R12 ZZ movsx   eax, cs:byte_608840 
             4018c4      7 INSTR BELONGTO 401810 
@@ -966,7 +966,7 @@
             4018e8      3 INSTR BELONGTO 401810 
             4018eb      2 INSTR BELONGTO 401810 
             4018eb      2 INSTR DEADREGS  EFLAGS RCX RBX R12 ZZ xor     ecx, ecx 
-            4018eb     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4018eb     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4018ed     -1 INSTR LOCAL NoMetaUpdate call    _XtCreateManagedWidget 
             4018ed      5 INSTR BELONGTO 401810 
             4018ed      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _XtCreateManagedWidget 
@@ -976,7 +976,7 @@
             4018f9      3 INSTR BELONGTO 401810 
             4018fc      2 INSTR BELONGTO 401810 
             4018fc      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI R12 ZZ xor     ecx, ecx 
-            4018fc     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4018fc     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4018fe      3 INSTR BELONGTO 401810 
             4018fe      3 INSTR DEADREGS  EFLAGS RDX RBX RDI R12 ZZ mov     rdx, rax 
             401901      5 INSTR BELONGTO 401810 
@@ -992,7 +992,7 @@
             401919      3 INSTR BELONGTO 401810 
             40191c      2 INSTR BELONGTO 401810 
             40191c      2 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI R12 ZZ xor     ecx, ecx 
-            40191c     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            40191c     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40191e      3 INSTR BELONGTO 401810 
             40191e      3 INSTR DEADREGS  EFLAGS RDX RBX RDI R12 ZZ mov     rdx, rax 
             401921      5 INSTR BELONGTO 401810 
@@ -1129,7 +1129,7 @@
             401a5f      3 INSTR DEADREGS  EFLAGS RCX RDX R8 ZZ xor     r8d, r8d 
             401a62      2 INSTR BELONGTO 401810 
             401a62      2 INSTR DEADREGS  EFLAGS RCX RDX ZZ xor     ecx, ecx 
-            401a62     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            401a62     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             401a64      3 INSTR BELONGTO 401810 
             401a64      3 INSTR DEADREGS  EFLAGS RDX ZZ mov     rdx, r12 
             401a67     -1 INSTR LOCAL MetadataUnused add     rbx, 1 
@@ -1181,7 +1181,7 @@
             401aca      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _XtDisplay 
             401acf      2 INSTR BELONGTO 401810 
             401acf      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ xor     edx, edx        ; int 
-            401acf     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx        ; int 
+            401acf     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx        ; int 
             401ad1      5 INSTR BELONGTO 401810 
             401ad1      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset aWm_delete_wind; "WM_DELETE_WINDOW" 
             401ad6      3 INSTR BELONGTO 401810 
@@ -1200,7 +1200,7 @@
             401af3      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _XtWindow 
             401af8      7 INSTR BELONGTO 401810 
             401af8      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     rdi, cs:qword_608850; Display * 
-            401aff     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1          ; int 
+            401aff     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1          ; int 
             401aff      5 INSTR BELONGTO 401810 
             401aff      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R12 ZZ mov     ecx, 1          ; int 
             401b04      5 INSTR BELONGTO 401810 
@@ -1268,7 +1268,7 @@
             401b8b     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 10h        ; unsigned int 
             401b8b      6 INSTR BELONGTO 401810 
             401b8b      6 INSTR DEADREGS  EFLAGS RCX RBX R8 ZZ mov     r8d, 10h        ; unsigned int 
-            401b91     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h        ; unsigned int 
+            401b91     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 10h        ; unsigned int 
             401b91      5 INSTR BELONGTO 401810 
             401b91      5 INSTR DEADREGS  EFLAGS RCX RBX ZZ mov     ecx, 10h        ; unsigned int 
             401b96      5 INSTR BELONGTO 401810 
@@ -1285,7 +1285,7 @@
             401bab      5 INSTR BELONGTO 401810 
             401bab      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 ZZ lea     rsi, [rsp+78h+var_48] 
             401bab      5 PTRIMMEDESP STACK 48 displ lea     rsi, [rsp+78h+var_48]
-            401bb0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            401bb0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             401bb0      5 INSTR BELONGTO 401810 
             401bb0      5 INSTR DEADREGS  EFLAGS RDX RBX R12 ZZ mov     edx, 1 
             401bb5     -1 INSTR LOCAL MetadataUnused mov     [rsp+78h+var_48], offset byte_607BBF 
@@ -1295,10 +1295,10 @@
             401bc3     -1 INSTR LOCAL NoMetaUpdate call    _XtSetValues 
             401bc3      5 INSTR BELONGTO 401810 
             401bc3      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _XtSetValues 
-            401bc8     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset handler; handler 
+            401bc8     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset handler; handler 
             401bc8      5 INSTR BELONGTO 401810 
             401bc8      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset handler; handler 
-            401bcd     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 8          ; sig 
+            401bcd     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 8          ; sig 
             401bcd      5 INSTR BELONGTO 401810 
             401bcd      5 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     edi, 8          ; sig 
             401bd2     -1 INSTR LOCAL NoMetaUpdate call    _signal 
@@ -1323,7 +1323,7 @@
             401bf7      4 INSTR BELONGTO 401810 
             401bfb      2 INSTR BELONGTO 401810 
             401bfb      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            401bfb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401bfb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401bfb     96 DEALLOC STACK esp - 96 xor     eax, eax
             401bfd      1 INSTR BELONGTO 401810 
             401bfd      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
@@ -1339,12 +1339,12 @@
             401c05      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R12 ZZ mov     rdi, cs:stderr 
             401c0c      5 INSTR BELONGTO 401810 
             401c0c      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 ZZ mov     edx, offset aSUnknownOption; "%s: unknown options:" 
-            401c11     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            401c11     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             401c11      5 INSTR BELONGTO 401810 
             401c11      5 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ mov     esi, 1 
             401c16      2 INSTR BELONGTO 401810 
             401c16      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            401c16     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401c16     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401c18     -1 INSTR LOCAL MetadataUnused xor     r12d, r12d 
             401c18      3 INSTR BELONGTO 401810 
             401c1b     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -1358,12 +1358,12 @@
             401c26      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rdi, cs:stderr 
             401c2d      5 INSTR BELONGTO 401810 
             401c2d      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, (offset aUsageS+7); " %s" 
-            401c32     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            401c32     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             401c32      5 INSTR BELONGTO 401810 
             401c32      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             401c37      2 INSTR BELONGTO 401810 
             401c37      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            401c37     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401c37     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401c39     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             401c39      5 INSTR BELONGTO 401810 
             401c39      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -1375,10 +1375,10 @@
             401c45      2 INSTR BELONGTO 401810 
             401c47      7 INSTR BELONGTO 401810 
             401c47      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; s 
-            401c4e     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2          ; n 
+            401c4e     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2          ; n 
             401c4e      5 INSTR BELONGTO 401810 
             401c4e      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 2          ; n 
-            401c53     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            401c53     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             401c53      5 INSTR BELONGTO 401810 
             401c53      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 1          ; size 
             401c58      5 INSTR BELONGTO 401810 
@@ -1396,7 +1396,7 @@
             401c71      5 INSTR BELONGTO 401810 
             401c76      2 INSTR BELONGTO 401810 
             401c76      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            401c76     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401c76     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401c78     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             401c78      5 INSTR BELONGTO 401810 
             401c78      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    ___fprintf_chk 
@@ -1410,7 +1410,7 @@
             401c90      5 INSTR BELONGTO 401810 
             401c95      2 INSTR BELONGTO 401810 
             401c95      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            401c95     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401c95     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401c97     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             401c97      5 INSTR BELONGTO 401810 
             401c97      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    ___fprintf_chk 
@@ -1424,13 +1424,13 @@
             401caf      5 INSTR BELONGTO 401810 
             401cb4      2 INSTR BELONGTO 401810 
             401cb4      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            401cb4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401cb4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401cb6     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             401cb6      5 INSTR BELONGTO 401810 
             401cb6      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    ___fprintf_chk 
             401cbb      7 INSTR BELONGTO 401810 
             401cbb      7 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     rsi, cs:stderr  ; stream 
-            401cc2     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ah        ; c 
+            401cc2     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ah        ; c 
             401cc2      5 INSTR BELONGTO 401810 
             401cc2      5 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     edi, 0Ah        ; c 
             401cc7     -1 INSTR LOCAL NoMetaUpdate call    _fputc 
@@ -1441,7 +1441,7 @@
             401cd3     -1 INSTR LOCAL NoMetaUpdate call    _XtDestroyApplicationContext 
             401cd3      5 INSTR BELONGTO 401810 
             401cd3      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _XtDestroyApplicationContext 
-            401cd8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
+            401cd8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
             401cd8      5 INSTR BELONGTO 401810 
             401cd8      5 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     edi, 1          ; status 
             401cdd     -1 INSTR LOCAL NoMetaUpdate call    _exit 
@@ -1573,7 +1573,7 @@
             401da9      3 INSTR BELONGTO 401da0 
             401dac     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401DC0 
             401dac      2 INSTR BELONGTO 401da0 
-            401dae     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            401dae     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             401dae      5 INSTR BELONGTO 401da0 
             401db3     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             401db3      3 INSTR BELONGTO 401da0 
@@ -1592,7 +1592,7 @@
             401dd0     82 FUNC GLOBAL sub_401DD0 FUNC_UNSAFE NOFP RET             401e21 
             401dd0      8 DATAREF STACK 495 esp + 0 PARENT LocalFrame LOCALFRAME
             401dd0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            401dd4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 29h 
+            401dd4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 29h 
             401dd4      5 INSTR BELONGTO 401dd0 
             401dd4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 29h 
             401dd9     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -1615,7 +1615,7 @@
             401dfa      2 INSTR BELONGTO 401dd0 
             401dfc     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401E18 
             401dfc      2 INSTR BELONGTO 401dd0 
-            401dfe     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 29h 
+            401dfe     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 29h 
             401dfe      5 INSTR BELONGTO 401dd0 
             401dfe      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 29h 
             401e03     -1 INSTR LOCAL NoMetaUpdate call    sub_403C30 
@@ -1643,7 +1643,7 @@
             401e30     82 FUNC GLOBAL sub_401E30 FUNC_UNSAFE NOFP RET             401e81 
             401e30      8 DATAREF STACK 496 esp + 0 PARENT LocalFrame LOCALFRAME
             401e30      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            401e34     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Bh 
+            401e34     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Bh 
             401e34      5 INSTR BELONGTO 401e30 
             401e34      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 2Bh 
             401e39     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -1666,7 +1666,7 @@
             401e5a      2 INSTR BELONGTO 401e30 
             401e5c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401E78 
             401e5c      2 INSTR BELONGTO 401e30 
-            401e5e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Bh 
+            401e5e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Bh 
             401e5e      5 INSTR BELONGTO 401e30 
             401e5e      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 2Bh 
             401e63     -1 INSTR LOCAL NoMetaUpdate call    sub_404510 
@@ -1694,7 +1694,7 @@
             401e90     82 FUNC GLOBAL sub_401E90 FUNC_UNSAFE NOFP RET             401ee1 
             401e90      8 DATAREF STACK 497 esp + 0 PARENT LocalFrame LOCALFRAME
             401e90      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            401e94     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 8 
+            401e94     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 8 
             401e94      5 INSTR BELONGTO 401e90 
             401e94      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 8 
             401e99     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -1717,7 +1717,7 @@
             401eba      2 INSTR BELONGTO 401e90 
             401ebc     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401ED8 
             401ebc      2 INSTR BELONGTO 401e90 
-            401ebe     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 8 
+            401ebe     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 8 
             401ebe      5 INSTR BELONGTO 401e90 
             401ebe      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 8 
             401ec3     -1 INSTR LOCAL NoMetaUpdate call    sub_404510 
@@ -1745,7 +1745,7 @@
             401ef0     82 FUNC GLOBAL sub_401EF0 FUNC_UNSAFE NOFP RET             401f41 
             401ef0      8 DATAREF STACK 498 esp + 0 PARENT LocalFrame LOCALFRAME
             401ef0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            401ef4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            401ef4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             401ef4      5 INSTR BELONGTO 401ef0 
             401ef4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 2 
             401ef9     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -1768,7 +1768,7 @@
             401f1a      2 INSTR BELONGTO 401ef0 
             401f1c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401F38 
             401f1c      2 INSTR BELONGTO 401ef0 
-            401f1e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            401f1e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             401f1e      5 INSTR BELONGTO 401ef0 
             401f1e      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 2 
             401f23     -1 INSTR LOCAL NoMetaUpdate call    sub_404510 
@@ -1796,7 +1796,7 @@
             401f50     82 FUNC GLOBAL sub_401F50 FUNC_UNSAFE NOFP RET             401fa1 
             401f50      8 DATAREF STACK 499 esp + 0 PARENT LocalFrame LOCALFRAME
             401f50      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            401f54     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            401f54     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             401f54      5 INSTR BELONGTO 401f50 
             401f54      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1 
             401f59     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -1819,7 +1819,7 @@
             401f7a      2 INSTR BELONGTO 401f50 
             401f7c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401F98 
             401f7c      2 INSTR BELONGTO 401f50 
-            401f7e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            401f7e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             401f7e      5 INSTR BELONGTO 401f50 
             401f7e      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1 
             401f83     -1 INSTR LOCAL NoMetaUpdate call    sub_404510 
@@ -1847,7 +1847,7 @@
             401fb0     82 FUNC GLOBAL sub_401FB0 FUNC_UNSAFE NOFP RET             402001 
             401fb0      8 DATAREF STACK 500 esp + 0 PARENT LocalFrame LOCALFRAME
             401fb0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            401fb4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6 
+            401fb4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6 
             401fb4      5 INSTR BELONGTO 401fb0 
             401fb4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 6 
             401fb9     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -1870,7 +1870,7 @@
             401fda      2 INSTR BELONGTO 401fb0 
             401fdc     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401FF8 
             401fdc      2 INSTR BELONGTO 401fb0 
-            401fde     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6 
+            401fde     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6 
             401fde      5 INSTR BELONGTO 401fb0 
             401fde      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 6 
             401fe3     -1 INSTR LOCAL NoMetaUpdate call    sub_404510 
@@ -1900,7 +1900,7 @@
             402010      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402014      2 INSTR BELONGTO 402010 
             402014      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ xor     edi, edi 
-            402014     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            402014     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             402016     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
             402016      5 INSTR BELONGTO 402010 
             402016      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_403150 
@@ -1923,7 +1923,7 @@
             402034      2 INSTR BELONGTO 402010 
             402036      2 INSTR BELONGTO 402010 
             402036      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ xor     edi, edi 
-            402036     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            402036     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             402038     -1 INSTR LOCAL NoMetaUpdate call    sub_404510 
             402038      5 INSTR BELONGTO 402010 
             402038      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_404510 
@@ -1949,7 +1949,7 @@
             402060     82 FUNC GLOBAL sub_402060 FUNC_UNSAFE NOFP RET             4020b1 
             402060      8 DATAREF STACK 502 esp + 0 PARENT LocalFrame LOCALFRAME
             402060      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402064     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Fh 
+            402064     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Fh 
             402064      5 INSTR BELONGTO 402060 
             402064      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 0Fh 
             402069     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -1972,7 +1972,7 @@
             40208a      2 INSTR BELONGTO 402060 
             40208c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4020A8 
             40208c      2 INSTR BELONGTO 402060 
-            40208e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Fh 
+            40208e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Fh 
             40208e      5 INSTR BELONGTO 402060 
             40208e      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 0Fh 
             402093     -1 INSTR LOCAL NoMetaUpdate call    sub_404510 
@@ -2000,7 +2000,7 @@
             4020c0     82 FUNC GLOBAL sub_4020C0 FUNC_UNSAFE NOFP RET             402111 
             4020c0      8 DATAREF STACK 503 esp + 0 PARENT LocalFrame LOCALFRAME
             4020c0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            4020c4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Dh 
+            4020c4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Dh 
             4020c4      5 INSTR BELONGTO 4020c0 
             4020c4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 0Dh 
             4020c9     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2023,7 +2023,7 @@
             4020ea      2 INSTR BELONGTO 4020c0 
             4020ec     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_402108 
             4020ec      2 INSTR BELONGTO 4020c0 
-            4020ee     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Dh 
+            4020ee     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Dh 
             4020ee      5 INSTR BELONGTO 4020c0 
             4020ee      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 0Dh 
             4020f3     -1 INSTR LOCAL NoMetaUpdate call    sub_404510 
@@ -2051,7 +2051,7 @@
             402120     82 FUNC GLOBAL sub_402120 FUNC_UNSAFE NOFP RET             402171 
             402120      8 DATAREF STACK 504 esp + 0 PARENT LocalFrame LOCALFRAME
             402120      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402124     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ch 
+            402124     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ch 
             402124      5 INSTR BELONGTO 402120 
             402124      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 0Ch 
             402129     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2074,7 +2074,7 @@
             40214a      2 INSTR BELONGTO 402120 
             40214c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_402168 
             40214c      2 INSTR BELONGTO 402120 
-            40214e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ch 
+            40214e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ch 
             40214e      5 INSTR BELONGTO 402120 
             40214e      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 0Ch 
             402153     -1 INSTR LOCAL NoMetaUpdate call    sub_404510 
@@ -2102,7 +2102,7 @@
             402180     82 FUNC GLOBAL sub_402180 FUNC_UNSAFE NOFP RET             4021d1 
             402180      8 DATAREF STACK 505 esp + 0 PARENT LocalFrame LOCALFRAME
             402180      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402184     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
+            402184     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
             402184      5 INSTR BELONGTO 402180 
             402184      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 10h 
             402189     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2125,7 +2125,7 @@
             4021aa      2 INSTR BELONGTO 402180 
             4021ac     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4021C8 
             4021ac      2 INSTR BELONGTO 402180 
-            4021ae     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
+            4021ae     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
             4021ae      5 INSTR BELONGTO 402180 
             4021ae      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 10h 
             4021b3     -1 INSTR LOCAL NoMetaUpdate call    sub_404510 
@@ -2153,7 +2153,7 @@
             4021e0     82 FUNC GLOBAL sub_4021E0 FUNC_UNSAFE NOFP RET             402231 
             4021e0      8 DATAREF STACK 506 esp + 0 PARENT LocalFrame LOCALFRAME
             4021e0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            4021e4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 23h 
+            4021e4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 23h 
             4021e4      5 INSTR BELONGTO 4021e0 
             4021e4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 23h 
             4021e9     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2176,7 +2176,7 @@
             40220a      2 INSTR BELONGTO 4021e0 
             40220c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_402228 
             40220c      2 INSTR BELONGTO 4021e0 
-            40220e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 23h 
+            40220e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 23h 
             40220e      5 INSTR BELONGTO 4021e0 
             40220e      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 23h 
             402213     -1 INSTR LOCAL NoMetaUpdate call    sub_404510 
@@ -2204,7 +2204,7 @@
             402240     82 FUNC GLOBAL sub_402240 FUNC_UNSAFE NOFP RET             402291 
             402240      8 DATAREF STACK 507 esp + 0 PARENT LocalFrame LOCALFRAME
             402240      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402244     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Ah 
+            402244     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Ah 
             402244      5 INSTR BELONGTO 402240 
             402244      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 2Ah 
             402249     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2227,7 +2227,7 @@
             40226a      2 INSTR BELONGTO 402240 
             40226c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_402288 
             40226c      2 INSTR BELONGTO 402240 
-            40226e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Ah 
+            40226e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Ah 
             40226e      5 INSTR BELONGTO 402240 
             40226e      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 2Ah 
             402273     -1 INSTR LOCAL NoMetaUpdate call    sub_404510 
@@ -2255,7 +2255,7 @@
             4022a0     82 FUNC GLOBAL sub_4022A0 FUNC_UNSAFE NOFP RET             4022f1 
             4022a0      8 DATAREF STACK 508 esp + 0 PARENT LocalFrame LOCALFRAME
             4022a0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            4022a4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ah 
+            4022a4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ah 
             4022a4      5 INSTR BELONGTO 4022a0 
             4022a4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 0Ah 
             4022a9     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2278,7 +2278,7 @@
             4022ca      2 INSTR BELONGTO 4022a0 
             4022cc     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_4022E8 
             4022cc      2 INSTR BELONGTO 4022a0 
-            4022ce     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ah 
+            4022ce     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ah 
             4022ce      5 INSTR BELONGTO 4022a0 
             4022ce      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 0Ah 
             4022d3     -1 INSTR LOCAL NoMetaUpdate call    sub_404510 
@@ -2306,7 +2306,7 @@
             402300     82 FUNC GLOBAL sub_402300 FUNC_UNSAFE NOFP RET             402351 
             402300      8 DATAREF STACK 509 esp + 0 PARENT LocalFrame LOCALFRAME
             402300      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402304     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 7 
+            402304     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 7 
             402304      5 INSTR BELONGTO 402300 
             402304      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 7 
             402309     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2329,7 +2329,7 @@
             40232a      2 INSTR BELONGTO 402300 
             40232c     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_402348 
             40232c      2 INSTR BELONGTO 402300 
-            40232e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 7 
+            40232e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 7 
             40232e      5 INSTR BELONGTO 402300 
             40232e      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 7 
             402333     -1 INSTR LOCAL NoMetaUpdate call    sub_404510 
@@ -2357,7 +2357,7 @@
             402360      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             402360      8 DATAREF STACK 510 esp + 0 PARENT LocalFrame LOCALFRAME
             402360      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402364     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Eh 
+            402364     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Eh 
             402364      5 INSTR BELONGTO 402360 
             402364      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1Eh 
             402369     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2382,7 +2382,7 @@
             40238c      2 INSTR BELONGTO 402360 
             40238e     -1 INSTR LOCAL MetadataUnused mov     eax, cs:dword_608820 
             40238e      6 INSTR BELONGTO 402360 
-            402394     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Eh 
+            402394     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Eh 
             402394      5 INSTR BELONGTO 402360 
             402394      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 1Eh 
             402399     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
@@ -2417,7 +2417,7 @@
             4023d0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             4023d0      8 DATAREF STACK 511 esp + 0 PARENT LocalFrame LOCALFRAME
             4023d0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            4023d4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 14h 
+            4023d4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 14h 
             4023d4      5 INSTR BELONGTO 4023d0 
             4023d4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 14h 
             4023d9     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2442,7 +2442,7 @@
             4023fc      2 INSTR BELONGTO 4023d0 
             4023fe     -1 INSTR LOCAL MetadataUnused mov     edx, cs:dword_608820 
             4023fe      6 INSTR BELONGTO 4023d0 
-            402404     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 14h 
+            402404     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 14h 
             402404      5 INSTR BELONGTO 4023d0 
             402404      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 14h 
             402409     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
@@ -2477,7 +2477,7 @@
             402440      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             402440      8 DATAREF STACK 512 esp + 0 PARENT LocalFrame LOCALFRAME
             402440      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402444     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 19h 
+            402444     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 19h 
             402444      5 INSTR BELONGTO 402440 
             402444      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 19h 
             402449     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2502,7 +2502,7 @@
             40246c      2 INSTR BELONGTO 402440 
             40246e     -1 INSTR LOCAL MetadataUnused mov     ecx, cs:dword_608820 
             40246e      6 INSTR BELONGTO 402440 
-            402474     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 19h 
+            402474     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 19h 
             402474      5 INSTR BELONGTO 402440 
             402474      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 19h 
             402479     -1 INSTR LOCAL NoMetaUpdate test    ecx, ecx 
@@ -2537,7 +2537,7 @@
             4024b0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             4024b0      8 DATAREF STACK 513 esp + 0 PARENT LocalFrame LOCALFRAME
             4024b0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            4024b4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Dh 
+            4024b4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Dh 
             4024b4      5 INSTR BELONGTO 4024b0 
             4024b4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1Dh 
             4024b9     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2562,7 +2562,7 @@
             4024dc      2 INSTR BELONGTO 4024b0 
             4024de     -1 INSTR LOCAL MetadataUnused mov     esi, cs:dword_608820 
             4024de      6 INSTR BELONGTO 4024b0 
-            4024e4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Dh 
+            4024e4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Dh 
             4024e4      5 INSTR BELONGTO 4024b0 
             4024e4      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 1Dh 
             4024e9     -1 INSTR LOCAL NoMetaUpdate test    esi, esi 
@@ -2597,7 +2597,7 @@
             402520      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             402520      8 DATAREF STACK 514 esp + 0 PARENT LocalFrame LOCALFRAME
             402520      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402524     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Eh 
+            402524     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Eh 
             402524      5 INSTR BELONGTO 402520 
             402524      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 0Eh 
             402529     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2622,7 +2622,7 @@
             40254c      2 INSTR BELONGTO 402520 
             40254e     -1 INSTR LOCAL MetadataUnused mov     r8d, cs:dword_608820 
             40254e      7 INSTR BELONGTO 402520 
-            402555     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Eh 
+            402555     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Eh 
             402555      5 INSTR BELONGTO 402520 
             402555      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 0Eh 
             40255a     -1 INSTR LOCAL NoMetaUpdate test    r8d, r8d 
@@ -2657,7 +2657,7 @@
             402590      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             402590      8 DATAREF STACK 515 esp + 0 PARENT LocalFrame LOCALFRAME
             402590      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402594     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
+            402594     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
             402594      5 INSTR BELONGTO 402590 
             402594      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 18h 
             402599     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2682,7 +2682,7 @@
             4025bc      2 INSTR BELONGTO 402590 
             4025be     -1 INSTR LOCAL MetadataUnused mov     r9d, cs:dword_608820 
             4025be      7 INSTR BELONGTO 402590 
-            4025c5     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
+            4025c5     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
             4025c5      5 INSTR BELONGTO 402590 
             4025c5      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 18h 
             4025ca     -1 INSTR LOCAL NoMetaUpdate test    r9d, r9d 
@@ -2717,7 +2717,7 @@
             402600      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             402600      8 DATAREF STACK 516 esp + 0 PARENT LocalFrame LOCALFRAME
             402600      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402604     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 13h 
+            402604     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 13h 
             402604      5 INSTR BELONGTO 402600 
             402604      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 13h 
             402609     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2742,7 +2742,7 @@
             40262c      2 INSTR BELONGTO 402600 
             40262e     -1 INSTR LOCAL MetadataUnused mov     r10d, cs:dword_608820 
             40262e      7 INSTR BELONGTO 402600 
-            402635     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 13h 
+            402635     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 13h 
             402635      5 INSTR BELONGTO 402600 
             402635      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 13h 
             40263a     -1 INSTR LOCAL NoMetaUpdate test    r10d, r10d 
@@ -2777,7 +2777,7 @@
             402670      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             402670      8 DATAREF STACK 517 esp + 0 PARENT LocalFrame LOCALFRAME
             402670      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402674     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 22h 
+            402674     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 22h 
             402674      5 INSTR BELONGTO 402670 
             402674      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 22h 
             402679     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2802,7 +2802,7 @@
             40269c      2 INSTR BELONGTO 402670 
             40269e     -1 INSTR LOCAL MetadataUnused mov     r11d, cs:dword_608820 
             40269e      7 INSTR BELONGTO 402670 
-            4026a5     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 22h 
+            4026a5     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 22h 
             4026a5      5 INSTR BELONGTO 402670 
             4026a5      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 22h 
             4026aa     -1 INSTR LOCAL NoMetaUpdate test    r11d, r11d 
@@ -2846,7 +2846,7 @@
             4026f0     74 FUNC GLOBAL sub_4026F0 FUNC_UNSAFE NOFP RET             402739 
             4026f0      8 DATAREF STACK 518 esp + 0 PARENT LocalFrame LOCALFRAME
             4026f0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            4026f4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Bh 
+            4026f4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Bh 
             4026f4      5 INSTR BELONGTO 4026f0 
             4026f4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 0Bh 
             4026f9     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2894,7 +2894,7 @@
             402740     74 FUNC GLOBAL sub_402740 FUNC_UNSAFE NOFP RET             402789 
             402740      8 DATAREF STACK 519 esp + 0 PARENT LocalFrame LOCALFRAME
             402740      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402744     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Ch 
+            402744     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Ch 
             402744      5 INSTR BELONGTO 402740 
             402744      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 2Ch 
             402749     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -2942,7 +2942,7 @@
             402790     74 FUNC GLOBAL sub_402790 FUNC_UNSAFE NOFP RET             4027d9 
             402790      8 DATAREF STACK 520 esp + 0 PARENT LocalFrame LOCALFRAME
             402790      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402794     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 12h 
+            402794     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 12h 
             402794      5 INSTR BELONGTO 402790 
             402794      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 12h 
             402799     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3024,7 +3024,7 @@
             402830     74 FUNC GLOBAL sub_402830 FUNC_UNSAFE NOFP RET             402879 
             402830      8 DATAREF STACK 521 esp + 0 PARENT LocalFrame LOCALFRAME
             402830      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402834     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 4 
+            402834     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 4 
             402834      5 INSTR BELONGTO 402830 
             402834      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 4 
             402839     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3072,7 +3072,7 @@
             402880     74 FUNC GLOBAL sub_402880 FUNC_UNSAFE NOFP RET             4028c9 
             402880      8 DATAREF STACK 522 esp + 0 PARENT LocalFrame LOCALFRAME
             402880      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402884     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 26h 
+            402884     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 26h 
             402884      5 INSTR BELONGTO 402880 
             402884      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 26h 
             402889     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3120,7 +3120,7 @@
             4028d0     74 FUNC GLOBAL sub_4028D0 FUNC_UNSAFE NOFP RET             402919 
             4028d0      8 DATAREF STACK 523 esp + 0 PARENT LocalFrame LOCALFRAME
             4028d0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            4028d4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 11h 
+            4028d4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 11h 
             4028d4      5 INSTR BELONGTO 4028d0 
             4028d4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 11h 
             4028d9     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3168,7 +3168,7 @@
             402920     74 FUNC GLOBAL sub_402920 FUNC_UNSAFE NOFP RET             402969 
             402920      8 DATAREF STACK 524 esp + 0 PARENT LocalFrame LOCALFRAME
             402920      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402924     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 5 
+            402924     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 5 
             402924      5 INSTR BELONGTO 402920 
             402924      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 5 
             402929     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3216,7 +3216,7 @@
             402970     74 FUNC GLOBAL sub_402970 FUNC_UNSAFE NOFP RET             4029b9 
             402970      8 DATAREF STACK 525 esp + 0 PARENT LocalFrame LOCALFRAME
             402970      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402974     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 27h 
+            402974     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 27h 
             402974      5 INSTR BELONGTO 402970 
             402974      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 27h 
             402979     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3264,7 +3264,7 @@
             4029c0     74 FUNC GLOBAL sub_4029C0 FUNC_UNSAFE NOFP RET             402a09 
             4029c0      8 DATAREF STACK 526 esp + 0 PARENT LocalFrame LOCALFRAME
             4029c0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            4029c4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
+            4029c4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
             4029c4      5 INSTR BELONGTO 4029c0 
             4029c4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 28h 
             4029c9     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3314,7 +3314,7 @@
             402a10      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402a14     -1 INSTR LOCAL MetadataUnused mov     rax, [rdx] 
             402a14      3 INSTR BELONGTO 402a10 
-            402a17     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rax] 
+            402a17     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rax] 
             402a17      3 INSTR BELONGTO 402a10 
             402a17      3 INSTR DEADREGS  EFLAGS ZZ movzx   eax, byte ptr [rax] 
             402a1a     -1 INSTR LOCAL MetadataRedundant sub     eax, 30h 
@@ -3335,7 +3335,7 @@
             402a33     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_404EC8[rax*8]; switch jump 
             402a33      7 INSTR BELONGTO 402a10 
             402a33      7 INSTR DEADREGS  EFLAGS RDI ZZ jmp     ds:off_404EC8[rax*8]; switch jump 
-            402a40     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 16h        ; jumptable 0000000000402A33 case 8 
+            402a40     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 16h        ; jumptable 0000000000402A33 case 8 
             402a40      5 INSTR BELONGTO 402a10 
             402a40      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 16h        ; jumptable 0000000000402A33 case 8 
             402a45     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3354,7 +3354,7 @@
             402a58      2 INSTR BELONGTO 402a10 
             402a5a     -1 INSTR LOCAL NoMetaUpdate jnz     loc_402C50 
             402a5a      6 INSTR BELONGTO 402a10 
-            402a60     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 16h 
+            402a60     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 16h 
             402a60      5 INSTR BELONGTO 402a10 
             402a60      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 16h 
             402a65     -1 INSTR LOCAL NoMetaUpdate call    sub_4032B0 
@@ -3362,7 +3362,7 @@
             402a65      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_4032B0 
             402a6a     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_402A21; jumptable 0000000000402A33 default case 
             402a6a      2 INSTR BELONGTO 402a10 
-            402a70     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 17h        ; jumptable 0000000000402A33 case 9 
+            402a70     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 17h        ; jumptable 0000000000402A33 case 9 
             402a70      5 INSTR BELONGTO 402a10 
             402a70      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 17h        ; jumptable 0000000000402A33 case 9 
             402a75     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3381,7 +3381,7 @@
             402a88      2 INSTR BELONGTO 402a10 
             402a8a     -1 INSTR LOCAL NoMetaUpdate jnz     loc_402C50 
             402a8a      6 INSTR BELONGTO 402a10 
-            402a90     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 17h 
+            402a90     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 17h 
             402a90      5 INSTR BELONGTO 402a10 
             402a90      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 17h 
             402a95     -1 INSTR LOCAL NoMetaUpdate call    sub_4032B0 
@@ -3389,7 +3389,7 @@
             402a95      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_4032B0 
             402a9a     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_402A21; jumptable 0000000000402A33 default case 
             402a9a      2 INSTR BELONGTO 402a10 
-            402aa0     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 24h        ; jumptable 0000000000402A33 case 0 
+            402aa0     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 24h        ; jumptable 0000000000402A33 case 0 
             402aa0      5 INSTR BELONGTO 402a10 
             402aa0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 24h        ; jumptable 0000000000402A33 case 0 
             402aa5     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3408,7 +3408,7 @@
             402abc      2 INSTR BELONGTO 402a10 
             402abe     -1 INSTR LOCAL NoMetaUpdate jnz     loc_402C50 
             402abe      6 INSTR BELONGTO 402a10 
-            402ac4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 24h 
+            402ac4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 24h 
             402ac4      5 INSTR BELONGTO 402a10 
             402ac4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 24h 
             402ac9     -1 INSTR LOCAL NoMetaUpdate call    sub_4032B0 
@@ -3416,7 +3416,7 @@
             402ac9      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_4032B0 
             402ace     -1 INSTR LOCAL NoMetaUpdate jmp     loc_402A21      ; jumptable 0000000000402A33 default case 
             402ace      5 INSTR BELONGTO 402a10 
-            402ad8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Fh        ; jumptable 0000000000402A33 case 1 
+            402ad8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Fh        ; jumptable 0000000000402A33 case 1 
             402ad8      5 INSTR BELONGTO 402a10 
             402ad8      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1Fh        ; jumptable 0000000000402A33 case 1 
             402add     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3435,7 +3435,7 @@
             402af4      2 INSTR BELONGTO 402a10 
             402af6     -1 INSTR LOCAL NoMetaUpdate jnz     loc_402C50 
             402af6      6 INSTR BELONGTO 402a10 
-            402afc     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Fh 
+            402afc     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Fh 
             402afc      5 INSTR BELONGTO 402a10 
             402afc      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1Fh 
             402b01     -1 INSTR LOCAL NoMetaUpdate call    sub_4032B0 
@@ -3443,7 +3443,7 @@
             402b01      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_4032B0 
             402b06     -1 INSTR LOCAL NoMetaUpdate jmp     loc_402A21      ; jumptable 0000000000402A33 default case 
             402b06      5 INSTR BELONGTO 402a10 
-            402b10     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 20h        ; jumptable 0000000000402A33 case 2 
+            402b10     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 20h        ; jumptable 0000000000402A33 case 2 
             402b10      5 INSTR BELONGTO 402a10 
             402b10      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 20h        ; jumptable 0000000000402A33 case 2 
             402b15     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3462,7 +3462,7 @@
             402b2c      2 INSTR BELONGTO 402a10 
             402b2e     -1 INSTR LOCAL NoMetaUpdate jnz     loc_402C50 
             402b2e      6 INSTR BELONGTO 402a10 
-            402b34     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 20h 
+            402b34     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 20h 
             402b34      5 INSTR BELONGTO 402a10 
             402b34      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 20h 
             402b39     -1 INSTR LOCAL NoMetaUpdate call    sub_4032B0 
@@ -3470,7 +3470,7 @@
             402b39      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_4032B0 
             402b3e     -1 INSTR LOCAL NoMetaUpdate jmp     loc_402A21      ; jumptable 0000000000402A33 default case 
             402b3e      5 INSTR BELONGTO 402a10 
-            402b48     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 21h        ; jumptable 0000000000402A33 case 3 
+            402b48     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 21h        ; jumptable 0000000000402A33 case 3 
             402b48      5 INSTR BELONGTO 402a10 
             402b48      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 21h        ; jumptable 0000000000402A33 case 3 
             402b4d     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3489,7 +3489,7 @@
             402b64      2 INSTR BELONGTO 402a10 
             402b66     -1 INSTR LOCAL NoMetaUpdate jnz     loc_402C50 
             402b66      6 INSTR BELONGTO 402a10 
-            402b6c     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 21h 
+            402b6c     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 21h 
             402b6c      5 INSTR BELONGTO 402a10 
             402b6c      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 21h 
             402b71     -1 INSTR LOCAL NoMetaUpdate call    sub_4032B0 
@@ -3497,7 +3497,7 @@
             402b71      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_4032B0 
             402b76     -1 INSTR LOCAL NoMetaUpdate jmp     loc_402A21      ; jumptable 0000000000402A33 default case 
             402b76      5 INSTR BELONGTO 402a10 
-            402b80     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Ah        ; jumptable 0000000000402A33 case 4 
+            402b80     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Ah        ; jumptable 0000000000402A33 case 4 
             402b80      5 INSTR BELONGTO 402a10 
             402b80      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1Ah        ; jumptable 0000000000402A33 case 4 
             402b85     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3516,7 +3516,7 @@
             402b9c      2 INSTR BELONGTO 402a10 
             402b9e     -1 INSTR LOCAL NoMetaUpdate jnz     loc_402C50 
             402b9e      6 INSTR BELONGTO 402a10 
-            402ba4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Ah 
+            402ba4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Ah 
             402ba4      5 INSTR BELONGTO 402a10 
             402ba4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1Ah 
             402ba9     -1 INSTR LOCAL NoMetaUpdate call    sub_4032B0 
@@ -3524,7 +3524,7 @@
             402ba9      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_4032B0 
             402bae     -1 INSTR LOCAL NoMetaUpdate jmp     loc_402A21      ; jumptable 0000000000402A33 default case 
             402bae      5 INSTR BELONGTO 402a10 
-            402bb8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Bh        ; jumptable 0000000000402A33 case 5 
+            402bb8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Bh        ; jumptable 0000000000402A33 case 5 
             402bb8      5 INSTR BELONGTO 402a10 
             402bb8      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1Bh        ; jumptable 0000000000402A33 case 5 
             402bbd     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3543,7 +3543,7 @@
             402bd4      2 INSTR BELONGTO 402a10 
             402bd6     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_402C50 
             402bd6      2 INSTR BELONGTO 402a10 
-            402bd8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Bh 
+            402bd8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Bh 
             402bd8      5 INSTR BELONGTO 402a10 
             402bd8      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1Bh 
             402bdd     -1 INSTR LOCAL NoMetaUpdate call    sub_4032B0 
@@ -3551,7 +3551,7 @@
             402bdd      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_4032B0 
             402be2     -1 INSTR LOCAL NoMetaUpdate jmp     loc_402A21      ; jumptable 0000000000402A33 default case 
             402be2      5 INSTR BELONGTO 402a10 
-            402bf0     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Ch        ; jumptable 0000000000402A33 case 6 
+            402bf0     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Ch        ; jumptable 0000000000402A33 case 6 
             402bf0      5 INSTR BELONGTO 402a10 
             402bf0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1Ch        ; jumptable 0000000000402A33 case 6 
             402bf5     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3570,7 +3570,7 @@
             402c0c      2 INSTR BELONGTO 402a10 
             402c0e     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_402C50 
             402c0e      2 INSTR BELONGTO 402a10 
-            402c10     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Ch 
+            402c10     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Ch 
             402c10      5 INSTR BELONGTO 402a10 
             402c10      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1Ch 
             402c15     -1 INSTR LOCAL NoMetaUpdate call    sub_4032B0 
@@ -3578,7 +3578,7 @@
             402c15      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_4032B0 
             402c1a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_402A21      ; jumptable 0000000000402A33 default case 
             402c1a      5 INSTR BELONGTO 402a10 
-            402c20     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 15h        ; jumptable 0000000000402A33 case 7 
+            402c20     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 15h        ; jumptable 0000000000402A33 case 7 
             402c20      5 INSTR BELONGTO 402a10 
             402c20      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 15h        ; jumptable 0000000000402A33 case 7 
             402c25     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3597,7 +3597,7 @@
             402c3c      2 INSTR BELONGTO 402a10 
             402c3e     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_402C50 
             402c3e      2 INSTR BELONGTO 402a10 
-            402c40     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 15h 
+            402c40     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 15h 
             402c40      5 INSTR BELONGTO 402a10 
             402c40      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 15h 
             402c45     -1 INSTR LOCAL NoMetaUpdate call    sub_4032B0 
@@ -3620,7 +3620,7 @@
             402c60     74 FUNC GLOBAL sub_402C60 FUNC_UNSAFE NOFP RET             402ca9 
             402c60      8 DATAREF STACK 528 esp + 0 PARENT LocalFrame LOCALFRAME
             402c60      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402c64     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 9 
+            402c64     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 9 
             402c64      5 INSTR BELONGTO 402c60 
             402c64      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 9 
             402c69     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3668,7 +3668,7 @@
             402cb0     74 FUNC GLOBAL sub_402CB0 FUNC_UNSAFE NOFP RET             402cf9 
             402cb0      8 DATAREF STACK 529 esp + 0 PARENT LocalFrame LOCALFRAME
             402cb0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402cb4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 25h 
+            402cb4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 25h 
             402cb4      5 INSTR BELONGTO 402cb0 
             402cb4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 25h 
             402cb9     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3716,7 +3716,7 @@
             402d00     74 FUNC GLOBAL sub_402D00 FUNC_UNSAFE NOFP RET             402d49 
             402d00      8 DATAREF STACK 530 esp + 0 PARENT LocalFrame LOCALFRAME
             402d00      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402d04     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
+            402d04     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
             402d04      5 INSTR BELONGTO 402d00 
             402d04      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 3 
             402d09     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3764,7 +3764,7 @@
             402d50     74 FUNC GLOBAL sub_402D50 FUNC_UNSAFE NOFP RET             402d99 
             402d50      8 DATAREF STACK 531 esp + 0 PARENT LocalFrame LOCALFRAME
             402d50      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402d54     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Eh 
+            402d54     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Eh 
             402d54      5 INSTR BELONGTO 402d50 
             402d54      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 2Eh 
             402d59     -1 INSTR LOCAL NoMetaUpdate call    sub_403150 
@@ -3836,7 +3836,7 @@
             402dc0      3 INSTR BELONGTO 402da0 
             402dc3     -1 INSTR LOCAL NoMetaUpdate jle     short loc_402E32 
             402dc3      2 INSTR BELONGTO 402da0 
-            402dc5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 65h        ; c 
+            402dc5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 65h        ; c 
             402dc5      5 INSTR BELONGTO 402da0 
             402dc5      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 65h        ; c 
             402dca      5 INSTR BELONGTO 402da0 
@@ -3863,10 +3863,10 @@
             402df1      5 INSTR DEADREGS  RAX RCX RDX RSI RDI ZZ mov     ecx, offset a_8s; "%.8s" 
             402df6     -1 INSTR LOCAL NoMetaUpdate jg      loc_402ED0 
             402df6      6 INSTR BELONGTO 402da0 
-            402dfc     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
+            402dfc     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
             402dfc      5 INSTR BELONGTO 402da0 
             402dfc      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edx, 20h 
-            402e01     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402e01     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402e01      5 INSTR BELONGTO 402da0 
             402e01      5 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     esi, 1 
             402e06      3 INSTR BELONGTO 402da0 
@@ -3874,11 +3874,11 @@
             402e06      3 PTRIMMEDESP STACK 0 displ mov     rdi, rsp
             402e09      2 INSTR BELONGTO 402da0 
             402e09      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            402e09     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402e09     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402e0b     -1 INSTR LOCAL NoMetaUpdate call    ___sprintf_chk 
             402e0b      5 INSTR BELONGTO 402da0 
             402e0b      5 INSTR DEADREGS  EFLAGS ZZ call    ___sprintf_chk 
-            402e10     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
+            402e10     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
             402e10      5 INSTR BELONGTO 402da0 
             402e10      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 20h 
             402e15      3 INSTR BELONGTO 402da0 
@@ -3889,7 +3889,7 @@
             402e1b     -1 INSTR LOCAL NoMetaUpdate call    ___strcat_chk 
             402e1b      5 INSTR BELONGTO 402da0 
             402e1b      5 INSTR DEADREGS  EFLAGS RBX ZZ call    ___strcat_chk 
-            402e20     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
+            402e20     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
             402e20      5 INSTR BELONGTO 402da0 
             402e20      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 20h 
             402e25      3 INSTR BELONGTO 402da0 
@@ -3905,12 +3905,12 @@
             402e37     -1 INSTR LOCAL NoMetaUpdate call    sub_404C70 
             402e37      5 INSTR BELONGTO 402da0 
             402e37      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ call    sub_404C70 
-            402e3c     -2 INSTR LOCAL n ESI ZZ  NumericDEFs movsx   esi, byte ptr cs:dword_608608 
+            402e3c     -2 INSTR LOCAL n RSI ZZ  NumericDEFs movsx   esi, byte ptr cs:dword_608608 
             402e3c      7 INSTR BELONGTO 402da0 
             402e3c      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ movsx   esi, byte ptr cs:dword_608608 
             402e43      2 INSTR BELONGTO 402da0 
             402e43      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 ZZ xor     edi, edi 
-            402e43     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            402e43     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             402e45     -1 INSTR LOCAL NoMetaUpdate call    sub_404CA0 
             402e45      5 INSTR BELONGTO 402da0 
             402e45      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ call    sub_404CA0 
@@ -3998,18 +3998,18 @@
             402f00     39 FUNC GLOBAL sub_402F00 FUNC_UNSAFE NOFP NORET             402f26 
             402f00      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
             402f00      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402f01     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_402F00; handler 
+            402f01     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_402F00; handler 
             402f01      5 INSTR BELONGTO 402f00 
             402f01      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, offset sub_402F00; handler 
             402f06      2 INSTR BELONGTO 402f00 
             402f06      2 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, edi 
-            402f08     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 4          ; sig 
+            402f08     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 4          ; sig 
             402f08      5 INSTR BELONGTO 402f00 
             402f08      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 4          ; sig 
             402f0d     -1 INSTR LOCAL NoMetaUpdate call    _signal 
             402f0d      5 INSTR BELONGTO 402f00 
             402f0d      5 INSTR DEADREGS  EFLAGS ZZ call    _signal 
-            402f12     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402f12     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402f12      5 INSTR BELONGTO 402f00 
             402f12      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 1 
             402f17      5 INSTR BELONGTO 402f00 
@@ -4026,18 +4026,18 @@
             402f30     39 FUNC GLOBAL handler FUNC_UNSAFE NOFP NORET             402f56 
             402f30      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
             402f30      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
-            402f31     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset handler; handler 
+            402f31     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset handler; handler 
             402f31      5 INSTR BELONGTO 402f30 
             402f31      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, offset handler; handler 
             402f36      2 INSTR BELONGTO 402f30 
             402f36      2 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, edi 
-            402f38     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 8          ; sig 
+            402f38     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 8          ; sig 
             402f38      5 INSTR BELONGTO 402f30 
             402f38      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 8          ; sig 
             402f3d     -1 INSTR LOCAL NoMetaUpdate call    _signal 
             402f3d      5 INSTR BELONGTO 402f30 
             402f3d      5 INSTR DEADREGS  EFLAGS ZZ call    _signal 
-            402f42     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402f42     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402f42      5 INSTR BELONGTO 402f30 
             402f42      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 1 
             402f47      5 INSTR BELONGTO 402f30 
@@ -4113,7 +4113,7 @@
             402fee      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     cs:s, rcx 
             402ff5      2 INSTR BELONGTO 402fb0 
             402ff5      2 INSTR DEADREGS  EFLAGS RAX ZZ mov     al, 2Dh 
-            402ff5     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     al, 2Dh 
+            402ff5     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     al, 2Dh 
             402ff7      1 INSTR BELONGTO 402fb0 
             402ff7      1 INSTR DEADREGS  EFLAGS ZZ retn 
             402ff7     -4 INSTR LOCAL SafeReturn retn
@@ -4250,7 +4250,7 @@
             403132      5 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     edi, offset s 
             403137      2 INSTR BELONGTO 403110 
             403137      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            403137     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403137     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403139     -1 INSTR LOCAL NoMetaUpdate call    ___isoc99_sscanf 
             403139      5 INSTR BELONGTO 403110 
             403139      5 INSTR DEADREGS  EFLAGS ZZ call    ___isoc99_sscanf 
@@ -4272,7 +4272,7 @@
             403150    116 FUNC GLOBAL sub_403150 FUNC_UNSAFE NOFP RET             4031c3 
             403150      2 INSTR BELONGTO 403150 
             403150      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            403150     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403150     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403152     -1 INSTR LOCAL NoMetaUpdate cmp     edi, 0FFFFFFFFh 
             403152      3 INSTR BELONGTO 403150 
             403155      1 INSTR BELONGTO 403150 
@@ -4280,7 +4280,7 @@
             403155      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             403156      2 INSTR BELONGTO 403150 
             403156      2 INSTR DEADREGS  RBX ZZ mov     ebx, edi 
-            403156     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, edi 
+            403156     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     ebx, edi 
             403158     -1 INSTR LOCAL NoMetaUpdate jz      short loc_403181 
             403158      2 INSTR BELONGTO 403150 
             40315a     -1 INSTR LOCAL NoMetaUpdate call    ___errno_location 
@@ -4294,7 +4294,7 @@
             40316c      2 INSTR BELONGTO 403150 
             40316e      2 INSTR BELONGTO 403150 
             40316e      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40316e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40316e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403170     -1 INSTR LOCAL NoMetaUpdate cmp     ebx, 3 
             403170      3 INSTR BELONGTO 403150 
             403173     -1 INSTR LOCAL NoMetaUpdate jz      short loc_403181 
@@ -4303,12 +4303,12 @@
             403175     10 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     cs:dword_608604, 0 
             40317f      2 INSTR BELONGTO 403150 
             40317f      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40317f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40317f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403181      1 INSTR BELONGTO 403150 
             403181      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             403182      1 INSTR BELONGTO 403150 
             403182      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-            403188     -2 INSTR LOCAL n EAX ZZ  NumericDEFs lea     eax, [rbx-3] 
+            403188     -2 INSTR LOCAL n RAX ZZ  NumericDEFs lea     eax, [rbx-3] 
             403188      3 INSTR BELONGTO 403150 
             403188      3 INSTR DEADREGS  EFLAGS RAX R10 ZZ lea     eax, [rbx-3] 
             40318b     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 1 
@@ -4327,13 +4327,13 @@
             4031a3     10 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     cs:dword_608604, 0 
             4031ad      2 INSTR BELONGTO 403150 
             4031ad      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            4031ad     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4031ad     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4031af     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_403181 
             4031af      2 INSTR BELONGTO 403150 
             4031b8     -1 INSTR LOCAL NoMetaUpdate call    sub_404D20 
             4031b8      5 INSTR BELONGTO 403150 
             4031b8      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ call    sub_404D20 
-            4031bd     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4031bd     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4031bd      5 INSTR BELONGTO 403150 
             4031bd      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
             4031c2      1 INSTR BELONGTO 403150 
@@ -4435,7 +4435,7 @@
             4032b1     -3 INSTR LOCAL NoWarn push    rbx 
             4032b2      2 INSTR BELONGTO 4032b0 
             4032b2      2 INSTR DEADREGS  EFLAGS RAX RDX RBX ZZ mov     ebx, edi 
-            4032b2     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, edi 
+            4032b2     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     ebx, edi 
             4032b4     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
             4032b4     24 DATAREF STACK 534 esp + 0 PARENT LocalFrame LOCALFRAME
             4032b4      2 DATAREF STACK 535 esp + 0 CHILDOF 534 OFFSET 0 OutArgsRegion OUTARGS
@@ -4460,7 +4460,7 @@
             4032d7      3 INSTR BELONGTO 4032b0 
             4032da      2 INSTR BELONGTO 4032b0 
             4032da      2 INSTR DEADREGS  EFLAGS ZZ xor     ebp, ebp 
-            4032da     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            4032da     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             4032dc     -1 INSTR LOCAL NoMetaUpdate cmp     ebx, 0Ch 
             4032dc      3 INSTR BELONGTO 4032b0 
             4032df     -1 INSTR LOCAL NoMetaUpdate jbe     loc_403400 
@@ -4533,7 +4533,7 @@
             403385      3 INSTR BELONGTO 4032b0 
             403388     -1 INSTR LOCAL NoMetaUpdate jg      short loc_403338 
             403388      2 INSTR BELONGTO 4032b0 
-            40338a     -2 INSTR LOCAL n EAX ZZ  NumericDEFs lea     eax, [rbx-15h] 
+            40338a     -2 INSTR LOCAL n RAX ZZ  NumericDEFs lea     eax, [rbx-15h] 
             40338a      3 INSTR BELONGTO 4032b0 
             40338a      3 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI XMM0 ZZ lea     eax, [rbx-15h] 
             40338d     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 0Fh        ; switch 16 cases  
@@ -4547,7 +4547,7 @@
             4033a0      4 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 ZZ mov     [rsp+28h+var_28], 31h; jumptable 0000000000403392 case 10 
             4033a0      4 PTRIMMEDESP STACK 0 displ mov     [rsp+28h+var_28], 31h; jumptable 0000000000403392 case 10
             4033a4      4 INSTR BELONGTO 4032b0 
-            4033a8     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h        ; jumptable 0000000000403392 default case 
+            4033a8     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h        ; jumptable 0000000000403392 default case 
             4033a8      5 INSTR BELONGTO 4032b0 
             4033a8      5 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 ZZ mov     edx, 20h        ; jumptable 0000000000403392 default case 
             4033ad      3 INSTR BELONGTO 4032b0 
@@ -4591,7 +4591,7 @@
             4033fc      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 XMM0 ZZ pop     rbp 
             4033fd      1 INSTR BELONGTO 4032b0 
             4033fd      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 XMM0 ZZ retn 
-            403400     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, ds:dword_405520[rbx*4] 
+            403400     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     ebp, ds:dword_405520[rbx*4] 
             403400      7 INSTR BELONGTO 4032b0 
             403400      7 INSTR DEADREGS  EFLAGS ZZ mov     ebp, ds:dword_405520[rbx*4] 
             403407     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4032E5 
@@ -4634,12 +4634,12 @@
             403481      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI ZZ mov     ecx, offset a_8g; "%.8g" 
             403486     -1 INSTR LOCAL MetadataRedundant mov     edx, 20h 
             403486      5 INSTR BELONGTO 4032b0 
-            40348b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40348b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40348b      5 INSTR BELONGTO 4032b0 
             40348b      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     esi, 1 
             403490      5 INSTR BELONGTO 4032b0 
             403490      5 INSTR DEADREGS  EFLAGS RAX RBX RDI ZZ mov     edi, offset s 
-            403495     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            403495     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             403495      5 INSTR BELONGTO 4032b0 
             403495      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     eax, 1 
             40349a      8 INSTR BELONGTO 4032b0 
@@ -4655,7 +4655,7 @@
             4034bb      7 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ add     cs:dword_607494, 1 
             4034c2     -1 INSTR LOCAL NoMetaUpdate jmp     loc_403329 
             4034c2      5 INSTR BELONGTO 4032b0 
-            4034d0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h        ; jumptable 0000000000403392 case 15 
+            4034d0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h        ; jumptable 0000000000403392 case 15 
             4034d0      5 INSTR BELONGTO 4032b0 
             4034d0      5 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 ZZ mov     edx, 20h        ; jumptable 0000000000403392 case 15 
             4034d5      3 INSTR BELONGTO 4032b0 
@@ -4751,7 +4751,7 @@
             4035b7      5 INSTR DEADREGS  EFLAGS XMM0 ZZ call    _localeconv 
             4035bc      3 INSTR BELONGTO 403580 
             4035bc      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 ZZ mov     rsi, [rax] 
-            4035bf     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
+            4035bf     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
             4035bf      5 INSTR BELONGTO 403580 
             4035bf      5 INSTR DEADREGS  EFLAGS RDX RDI XMM0 ZZ mov     edx, 20h 
             4035c4      5 INSTR BELONGTO 403580 
@@ -4809,7 +4809,7 @@
             40363d      2 INSTR BELONGTO 403620 
             40363f     -1 INSTR LOCAL MetadataUnused mov     ebx, (offset aButton10+7); "0" 
             40363f      5 INSTR BELONGTO 403620 
-            403644     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, word ptr [rbx] 
+            403644     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, word ptr [rbx] 
             403644      3 INSTR BELONGTO 403620 
             403644      3 INSTR DEADREGS  EFLAGS RAX R9 XMM0 ZZ movzx   eax, word ptr [rbx] 
             403647      7 INSTR BELONGTO 403620 
@@ -4820,7 +4820,7 @@
             403655      3 INSTR BELONGTO 403620 
             403658     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_403686 
             403658      2 INSTR BELONGTO 403620 
-            40365a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
+            40365a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
             40365a      5 INSTR BELONGTO 403620 
             40365a      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI XMM0 ZZ mov     edx, 20h 
             40365f      5 INSTR BELONGTO 403620 
@@ -5043,7 +5043,7 @@
             40386b     10 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ mov     cs:dword_60860C, 0 
             403875     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_403819 
             403875      2 INSTR BELONGTO 403760 
-            403880     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
+            403880     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
             403880      5 INSTR BELONGTO 403760 
             403880      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 20h 
             403885      5 INSTR BELONGTO 403760 
@@ -5086,7 +5086,7 @@
             4038d7      5 PTRIMMEDESP STACK 40 displ mov     [rsp+38h+var_10], rax
             4038dc     -1 INSTR LOCAL MetadataUnused xor     eax, eax 
             4038dc      2 INSTR BELONGTO 4038c0 
-            4038de     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, cs:dword_608678 
+            4038de     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, cs:dword_608678 
             4038de      6 INSTR BELONGTO 4038c0 
             4038de      6 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, cs:dword_608678 
             4038e4     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
@@ -5098,7 +5098,7 @@
             4038e8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cdqe 
             4038ea     -1 INSTR LOCAL NoMetaUpdate cmp     byte ptr ds:s[rax], 2Dh 
             4038ea      7 INSTR BELONGTO 4038c0 
-            4038f1     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setnz   dl 
+            4038f1     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setnz   dl 
             4038f1      3 INSTR BELONGTO 4038c0 
             4038f1      3 INSTR DEADREGS  RDX RDI XMM0 XMM1 ZZ setnz   dl 
             4038f4     -1 INSTR LOCAL MetadataRedundant lea     edx, [rdx+rdx+2Bh] 
@@ -5121,7 +5121,7 @@
             40391b      1 INSTR BELONGTO 4038c0 
             40391b      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 XMM0 XMM1 ZZ retn 
             40391b     56 DEALLOC STACK esp - 56 retn
-            403920     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr cs:s 
+            403920     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr cs:s 
             403920      7 INSTR BELONGTO 4038c0 
             403920      7 INSTR DEADREGS  EFLAGS RAX ZZ movzx   eax, byte ptr cs:s 
             403927     -1 INSTR LOCAL NoMetaUpdate cmp     al, 30h 
@@ -5132,10 +5132,10 @@
             40392b      7 INSTR BELONGTO 4038c0 
             403932     -1 INSTR LOCAL NoMetaUpdate jz      short loc_403903 
             403932      2 INSTR BELONGTO 4038c0 
-            403934     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
+            403934     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
             403934      5 INSTR BELONGTO 4038c0 
             403934      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 ZZ mov     edx, 20h 
-            403939     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403939     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403939      5 INSTR BELONGTO 4038c0 
             403939      5 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI R8 ZZ mov     esi, 1 
             40393e      3 INSTR BELONGTO 4038c0 
@@ -5147,11 +5147,11 @@
             403947      5 INSTR DEADREGS  EFLAGS RAX RCX ZZ mov     ecx, offset aS_0; "-%s" 
             40394c      2 INSTR BELONGTO 4038c0 
             40394c      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40394c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40394c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40394e     -1 INSTR LOCAL NoMetaUpdate call    ___sprintf_chk 
             40394e      5 INSTR BELONGTO 4038c0 
             40394e      5 INSTR DEADREGS  EFLAGS ZZ call    ___sprintf_chk 
-            403953     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
+            403953     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
             403953      5 INSTR BELONGTO 4038c0 
             403953      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 20h 
             403958      3 INSTR BELONGTO 4038c0 
@@ -5175,7 +5175,7 @@
             403978      2 INSTR BELONGTO 4038c0 
             40397a     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_403934 
             40397a      2 INSTR BELONGTO 4038c0 
-            40397c     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
+            40397c     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
             40397c      5 INSTR BELONGTO 4038c0 
             40397c      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 20h 
             403981      5 INSTR BELONGTO 4038c0 
@@ -5272,7 +5272,7 @@
             403a4a      3 INSTR BELONGTO 4039c0 
             403a4d      2 INSTR BELONGTO 4039c0 
             403a4d      2 INSTR DEADREGS  XMM2 ZZ mov     ebp, eax 
-            403a4d     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, eax 
+            403a4d     -2 INSTR LOCAL n RBP ZZ  NumericDEFs mov     ebp, eax 
             403a4f      6 INSTR BELONGTO 4039c0 
             403a4f      6 INSTR DEADREGS  XMM2 ZZ mov     cs:dword_60749C, eax 
             403a55     -1 INSTR LOCAL NoMetaUpdate jz      short loc_403AA0 
@@ -5281,12 +5281,12 @@
             403a57      3 INSTR BELONGTO 4039c0 
             403a5a      2 INSTR BELONGTO 4039c0 
             403a5a      2 INSTR DEADREGS  EFLAGS RCX RDX XMM2 ZZ xor     edx, edx 
-            403a5a     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            403a5a     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             403a5c     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 14h 
             403a5c      3 INSTR BELONGTO 4039c0 
             403a5f     -1 INSTR LOCAL NoMetaUpdate jbe     loc_403B00 
             403a5f      6 INSTR BELONGTO 4039c0 
-            403a65     -2 INSTR LOCAL n ECX ZZ  NumericDEFs lea     ecx, [rbp-0Eh] 
+            403a65     -2 INSTR LOCAL n RCX ZZ  NumericDEFs lea     ecx, [rbp-0Eh] 
             403a65      3 INSTR BELONGTO 4039c0 
             403a65      3 INSTR DEADREGS  EFLAGS RAX RCX XMM2 ZZ lea     ecx, [rbp-0Eh] 
             403a68     -1 INSTR LOCAL MetadataUnused xor     eax, eax 
@@ -5357,7 +5357,7 @@
             403af5     -1 INSTR LOCAL NoMetaUpdate jmp     sub_402F60 
             403af5      5 INSTR BELONGTO 4039c0 
             403af5      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 XMM0 XMM1 XMM2 ZZ jmp     sub_402F60 
-            403b00     -2 INSTR LOCAL n ECX ZZ  NumericDEFs lea     ecx, [rbp-0Eh] 
+            403b00     -2 INSTR LOCAL n RCX ZZ  NumericDEFs lea     ecx, [rbp-0Eh] 
             403b00      3 INSTR BELONGTO 4039c0 
             403b00      3 INSTR DEADREGS  EFLAGS RCX RDX XMM2 ZZ lea     ecx, [rbp-0Eh] 
             403b03      7 INSTR BELONGTO 4039c0 
@@ -5413,14 +5413,14 @@
             403b7a      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI XMM0 XMM1 ZZ mov     ecx, offset a_8g; "%.8g" 
             403b7f     -1 INSTR LOCAL MetadataRedundant mov     edx, 20h 
             403b7f      5 INSTR BELONGTO 4039c0 
-            403b84     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403b84     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403b84      5 INSTR BELONGTO 4039c0 
             403b84      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI XMM0 XMM1 ZZ mov     esi, 1 
             403b89      5 INSTR BELONGTO 4039c0 
             403b89      5 INSTR DEADREGS  EFLAGS RAX RBX RDI XMM0 XMM1 ZZ mov     edi, offset s 
             403b8e     -1 INSTR LOCAL MetadataUnused movapd  xmm0, xmm2 
             403b8e      4 INSTR BELONGTO 4039c0 
-            403b92     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            403b92     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             403b92      5 INSTR BELONGTO 4039c0 
             403b92      5 INSTR DEADREGS  EFLAGS RAX RBX XMM0 XMM1 XMM2 ZZ mov     eax, 1 
             403b97     -1 INSTR LOCAL NoMetaUpdate call    ___sprintf_chk 
@@ -5516,15 +5516,15 @@
             403c77      4 INSTR BELONGTO 403c30 
             403c7b      5 INSTR BELONGTO 403c30 
             403c7b      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI XMM0 XMM1 XMM2 ZZ mov     ecx, offset a_8g; "%.8g" 
-            403c80     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
+            403c80     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
             403c80      5 INSTR BELONGTO 403c30 
             403c80      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI XMM0 XMM1 XMM2 ZZ mov     edx, 20h 
-            403c85     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403c85     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403c85      5 INSTR BELONGTO 403c30 
             403c85      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI XMM0 XMM1 XMM2 ZZ mov     esi, 1 
             403c8a      5 INSTR BELONGTO 403c30 
             403c8a      5 INSTR DEADREGS  EFLAGS RAX RBX RDI XMM0 XMM1 XMM2 ZZ mov     edi, offset s 
-            403c8f     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            403c8f     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             403c8f      5 INSTR BELONGTO 403c30 
             403c8f      5 INSTR DEADREGS  EFLAGS RAX RBX XMM0 XMM1 XMM2 ZZ mov     eax, 1 
             403c94     -1 INSTR LOCAL NoMetaUpdate call    ___sprintf_chk 
@@ -5753,15 +5753,15 @@
             403f1d      8 INSTR BELONGTO 403e40 
             403f25      5 INSTR BELONGTO 403e40 
             403f25      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI XMM0 XMM1 XMM2 ZZ mov     ecx, offset a_8g; "%.8g" 
-            403f2a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
+            403f2a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
             403f2a      5 INSTR BELONGTO 403e40 
             403f2a      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI XMM0 XMM1 XMM2 ZZ mov     edx, 20h 
-            403f2f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403f2f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403f2f      5 INSTR BELONGTO 403e40 
             403f2f      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI XMM0 XMM1 XMM2 ZZ mov     esi, 1 
             403f34      5 INSTR BELONGTO 403e40 
             403f34      5 INSTR DEADREGS  EFLAGS RAX RBX RDI XMM0 XMM1 XMM2 ZZ mov     edi, offset s 
-            403f39     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            403f39     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             403f39      5 INSTR BELONGTO 403e40 
             403f39      5 INSTR DEADREGS  EFLAGS RAX RBX XMM0 XMM1 XMM2 ZZ mov     eax, 1 
             403f3e     -1 INSTR LOCAL NoMetaUpdate call    ___sprintf_chk 
@@ -5900,15 +5900,15 @@
             4040a8      8 INSTR BELONGTO 404030 
             4040b0      5 INSTR BELONGTO 404030 
             4040b0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI XMM0 ZZ mov     ecx, offset a_8g; "%.8g" 
-            4040b5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
+            4040b5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
             4040b5      5 INSTR BELONGTO 404030 
             4040b5      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI XMM0 ZZ mov     edx, 20h 
-            4040ba     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4040ba     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4040ba      5 INSTR BELONGTO 404030 
             4040ba      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI XMM0 ZZ mov     esi, 1 
             4040bf      5 INSTR BELONGTO 404030 
             4040bf      5 INSTR DEADREGS  EFLAGS RAX RBX RDI XMM0 ZZ mov     edi, offset s 
-            4040c4     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4040c4     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4040c4      5 INSTR BELONGTO 404030 
             4040c4      5 INSTR DEADREGS  EFLAGS RAX RBX XMM0 ZZ mov     eax, 1 
             4040c9     10 INSTR BELONGTO 404030 
@@ -6048,10 +6048,10 @@
             40422c      8 INSTR BELONGTO 404140 
             404234      5 INSTR BELONGTO 404140 
             404234      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI XMM0 XMM1 ZZ mov     ecx, offset a_8g; "%.8g" 
-            404239     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
+            404239     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
             404239      5 INSTR BELONGTO 404140 
             404239      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI XMM0 XMM1 ZZ mov     edx, 20h 
-            40423e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40423e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40423e      5 INSTR BELONGTO 404140 
             40423e      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI XMM0 XMM1 ZZ mov     esi, 1 
             404243      5 INSTR BELONGTO 404140 
@@ -6145,15 +6145,15 @@
             40434b      8 INSTR BELONGTO 4042f0 
             404353      5 INSTR BELONGTO 4042f0 
             404353      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI XMM0 ZZ mov     ecx, offset a_8g; "%.8g" 
-            404358     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
+            404358     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
             404358      5 INSTR BELONGTO 4042f0 
             404358      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI XMM0 ZZ mov     edx, 20h 
-            40435d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40435d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40435d      5 INSTR BELONGTO 4042f0 
             40435d      5 INSTR DEADREGS  EFLAGS RAX RSI RDI XMM0 ZZ mov     esi, 1 
             404362      5 INSTR BELONGTO 4042f0 
             404362      5 INSTR DEADREGS  EFLAGS RAX RDI XMM0 ZZ mov     edi, offset s 
-            404367     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            404367     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             404367      5 INSTR BELONGTO 4042f0 
             404367      5 INSTR DEADREGS  EFLAGS RAX XMM0 ZZ mov     eax, 1 
             40436c     10 INSTR BELONGTO 4042f0 
@@ -6167,7 +6167,7 @@
             40438a      5 INSTR DEADREGS  EFLAGS XMM0 ZZ call    ___sprintf_chk 
             40438f      6 INSTR BELONGTO 4042f0 
             40438f      6 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 XMM0 ZZ mov     ecx, cs:dword_608610 
-            404395     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 55555556h 
+            404395     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 55555556h 
             404395      5 INSTR BELONGTO 4042f0 
             404395      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R8 R9 R10 R11 XMM0 ZZ mov     edx, 55555556h 
             40439a     10 INSTR BELONGTO 4042f0 
@@ -6176,7 +6176,7 @@
             4043a4      3 INSTR BELONGTO 4042f0 
             4043a7      2 INSTR BELONGTO 4042f0 
             4043a7      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 XMM0 ZZ mov     eax, ecx 
-            4043a7     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ecx 
+            4043a7     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ecx 
             4043a9     -1 INSTR LOCAL MetadataRedundant imul    edx 
             4043a9      2 INSTR BELONGTO 4042f0 
             4043ab     -1 INSTR LOCAL MetadataRedundant mov     eax, ecx 
@@ -6319,7 +6319,7 @@
             404510     -3 INSTR LOCAL NoWarn push    rbx 
             404511      2 INSTR BELONGTO 404510 
             404511      2 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, edi 
-            404511     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, edi 
+            404511     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     ebx, edi 
             404513     32 DATAREF STACK 547 esp + 0 PARENT LocalFrame LOCALFRAME
             404513      4 INSTR BELONGTO 404510 
             404513      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 20h 
@@ -6337,7 +6337,7 @@
             404531      2 INSTR BELONGTO 404510 
             404533      2 INSTR BELONGTO 404510 
             404533      2 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, ebx 
-            404533     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            404533     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             404535     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_4053B8[rax*8]; switch jump 
             404535      7 INSTR BELONGTO 404510 
             404535      7 INSTR DEADREGS  EFLAGS ZZ jmp     ds:off_4053B8[rax*8]; switch jump 
@@ -6347,7 +6347,7 @@
             404547      2 INSTR BELONGTO 404510 
             404549     -1 INSTR LOCAL NoMetaUpdate test    r10d, r10d 
             404549      3 INSTR BELONGTO 404510 
-            40454c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setz    al 
+            40454c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setz    al 
             40454c      3 INSTR BELONGTO 404510 
             40454c      3 INSTR DEADREGS  RAX XMM2 ZZ setz    al 
             40454f      6 INSTR BELONGTO 404510 
@@ -6370,15 +6370,15 @@
             404580      8 INSTR BELONGTO 404510 
             404588      5 INSTR BELONGTO 404510 
             404588      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     ecx, offset a_8g; "%.8g" 
-            40458d     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
+            40458d     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 20h 
             40458d      5 INSTR BELONGTO 404510 
             40458d      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI XMM0 XMM1 XMM2 ZZ mov     edx, 20h 
-            404592     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            404592     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             404592      5 INSTR BELONGTO 404510 
             404592      5 INSTR DEADREGS  EFLAGS RAX RSI RDI XMM0 XMM1 XMM2 ZZ mov     esi, 1 
             404597      5 INSTR BELONGTO 404510 
             404597      5 INSTR DEADREGS  EFLAGS RAX RDI XMM0 XMM1 XMM2 ZZ mov     edi, offset s 
-            40459c     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40459c     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40459c      5 INSTR BELONGTO 404510 
             40459c      5 INSTR DEADREGS  EFLAGS RAX XMM0 XMM1 XMM2 ZZ mov     eax, 1 
             4045a1      6 INSTR BELONGTO 404510 
@@ -6561,7 +6561,7 @@
             40479f      2 INSTR BELONGTO 404510 
             4047a1     -1 INSTR LOCAL NoMetaUpdate test    r11d, r11d 
             4047a1      3 INSTR BELONGTO 404510 
-            4047a4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setz    al 
+            4047a4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setz    al 
             4047a4      3 INSTR BELONGTO 404510 
             4047a4      3 INSTR DEADREGS  RAX XMM1 XMM2 ZZ setz    al 
             4047a7      6 INSTR BELONGTO 404510 
@@ -6592,7 +6592,7 @@
             4047dc      4 INSTR BELONGTO 404510 
             4047e0     -1 INSTR LOCAL NoMetaUpdate xorpd   xmm1, xmm1 
             4047e0      4 INSTR BELONGTO 404510 
-            4047e4     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0 
+            4047e4     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0 
             4047e4      5 INSTR BELONGTO 404510 
             4047e4      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI XMM2 ZZ mov     edx, 0 
             4047e9     -1 INSTR LOCAL SafeIfNoIndexing movsd   xmm0, cs:qword_608620 
@@ -6601,7 +6601,7 @@
             4047f1      4 INSTR BELONGTO 404510 
             4047f5      8 INSTR BELONGTO 404510 
             4047f5      8 INSTR DEADREGS  RCX RSI RDI XMM1 XMM2 ZZ movsd   cs:qword_608618, xmm0 
-            4047fd     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM setnp   cl 
+            4047fd     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM setnp   cl 
             4047fd      3 INSTR BELONGTO 404510 
             4047fd      3 INSTR DEADREGS  RCX RSI RDI XMM1 XMM2 ZZ setnp   cl 
             404800     -1 INSTR LOCAL MetadataRedundant cmovz   edx, ecx 
@@ -6620,14 +6620,14 @@
             404820      8 INSTR BELONGTO 404510 
             404828     -1 INSTR LOCAL NoMetaUpdate xorpd   xmm1, xmm1 
             404828      4 INSTR BELONGTO 404510 
-            40482c     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            40482c     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             40482c      5 INSTR BELONGTO 404510 
             40482c      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI XMM2 ZZ mov     eax, 0 
             404831      8 INSTR BELONGTO 404510 
             404831      8 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI XMM2 ZZ movsd   cs:qword_608620, xmm0 
             404839     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm0, xmm1 
             404839      4 INSTR BELONGTO 404510 
-            40483d     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setnp   dl 
+            40483d     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setnp   dl 
             40483d      3 INSTR BELONGTO 404510 
             40483d      3 INSTR DEADREGS  RCX RDX RSI RDI XMM1 XMM2 ZZ setnp   dl 
             404840     -1 INSTR LOCAL MetadataRedundant cmovz   eax, edx 
@@ -6654,7 +6654,7 @@
             404877      2 INSTR BELONGTO 404510 
             404879     -1 INSTR LOCAL NoMetaUpdate test    r9d, r9d 
             404879      3 INSTR BELONGTO 404510 
-            40487c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setz    al 
+            40487c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setz    al 
             40487c      3 INSTR BELONGTO 404510 
             40487c      3 INSTR DEADREGS  RAX XMM1 XMM2 ZZ setz    al 
             40487f      6 INSTR BELONGTO 404510 
@@ -6702,7 +6702,7 @@
             4048f0      6 INSTR BELONGTO 404510 
             4048f6     -1 INSTR LOCAL MetadataUnused mov     [rsp+28h+var_20], rax 
             4048f6      5 INSTR BELONGTO 404510 
-            4048fb     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            4048fb     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             4048fb      5 INSTR BELONGTO 404510 
             4048fb      5 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI XMM2 ZZ mov     eax, 1 
             404900     -1 INSTR LOCAL SafeIfNoIndexing movsd   xmm0, [rsp+28h+var_20] 
@@ -6808,10 +6808,10 @@
             404a40      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             404a44      2 INSTR BELONGTO 404a40 
             404a44      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ xor     esi, esi 
-            404a44     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            404a44     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             404a46      2 INSTR BELONGTO 404a40 
             404a46      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ xor     edi, edi 
-            404a46     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            404a46     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             404a48     10 INSTR BELONGTO 404a40 
             404a48     10 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 ZZ mov     cs:dword_608614, 0 
             404a52     10 INSTR BELONGTO 404a40 
@@ -6972,7 +6972,7 @@
             404bd0      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             404bd4      2 INSTR BELONGTO 404bd0 
             404bd4      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            404bd4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404bd4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404bd6     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rdx], 1Fh 
             404bd6      4 INSTR BELONGTO 404bd0 
             404bda     -1 INSTR LOCAL NoMetaUpdate jz      short loc_404BE8 
@@ -6994,7 +6994,7 @@
             404bfa      6 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ lea     eax, [rcx-1010101h] 
             404c00      2 INSTR BELONGTO 404bd0 
             404c00      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ not     ecx 
-            404c00     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM not     ecx 
+            404c00     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM not     ecx 
             404c02      2 INSTR BELONGTO 404bd0 
             404c02      2 INSTR DEADREGS  EFLAGS RSI RDI ZZ and     eax, ecx 
             404c04      5 INSTR BELONGTO 404bd0 
@@ -7003,7 +7003,7 @@
             404c09      2 INSTR BELONGTO 404bd0 
             404c0b      2 INSTR BELONGTO 404bd0 
             404c0b      2 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ mov     ecx, eax 
-            404c0b     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, eax 
+            404c0b     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, eax 
             404c0d      5 INSTR BELONGTO 404bd0 
             404c0d      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset s 
             404c12      5 INSTR BELONGTO 404bd0 
@@ -7020,7 +7020,7 @@
             404c2b      4 INSTR BELONGTO 404bd0 
             404c2f      2 INSTR BELONGTO 404bd0 
             404c2f      2 INSTR DEADREGS  EFLAGS RCX ZZ add     al, al 
-            404c31     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 20h 
+            404c31     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 20h 
             404c31      5 INSTR BELONGTO 404bd0 
             404c31      5 INSTR DEADREGS  RCX ZZ mov     ecx, 20h 
             404c36     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sbb     rdx, 3 
@@ -7045,7 +7045,7 @@
             404c56      7 INSTR DEADREGS  EFLAGS R9 R10 R11 ZZ mov     qword ptr [r8], offset byte_6088C0 
             404c5d      6 INSTR BELONGTO 404bd0 
             404c5d      6 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ mov     dword ptr [rax], 8 
-            404c63     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            404c63     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             404c63      5 INSTR BELONGTO 404bd0 
             404c63      5 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, 1 
             404c68     -1 INSTR LOCAL NoMetaUpdate jmp     loc_404BDC 
@@ -7058,7 +7058,7 @@
             404c70      4 INSTR BELONGTO 404c70 
             404c70      4 INSTR DEADREGS  EFLAGS RDX RSI ZZ sub     rsp, 18h 
             404c70      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
-            404c74     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            404c74     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             404c74      5 INSTR BELONGTO 404c70 
             404c74      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, 1 
             404c79      5 INSTR BELONGTO 404c70 
@@ -7171,7 +7171,7 @@
             404d3b      5 INSTR DEADREGS  EFLAGS ZZ call    _XtDestroyApplicationContext 
             404d40      2 INSTR BELONGTO 404d30 
             404d40      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; status 
-            404d40     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; status 
+            404d40     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; status 
             404d42     -1 INSTR LOCAL NoMetaUpdate call    _exit 
             404d42      5 INSTR BELONGTO 404d30 
             404d42      5 INSTR DEADREGS  EFLAGS ZZ call    _exit 
@@ -7179,7 +7179,7 @@
             404d50      1 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ push    rbx 
             404d51      3 INSTR BELONGTO 4026e0 
             404d51      3 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     rbx, rdi 
-            404d54     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            404d54     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             404d54      5 INSTR BELONGTO 4026e0 
             404d54      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edx, 1 
             404d59      4 INSTR BELONGTO 4026e0 
@@ -7224,10 +7224,10 @@
             404da8     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8d, offset sub_404BC0 
             404da8      6 INSTR BELONGTO 4026e0 
             404da8      6 INSTR DEADREGS  EFLAGS RCX RBX RSI R8 ZZ mov     r8d, offset sub_404BC0 
-            404dae     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, offset sub_404BD0 
+            404dae     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, offset sub_404BD0 
             404dae      5 INSTR BELONGTO 4026e0 
             404dae      5 INSTR DEADREGS  EFLAGS RCX RBX RSI ZZ mov     ecx, offset sub_404BD0 
-            404db3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            404db3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             404db3      5 INSTR BELONGTO 4026e0 
             404db3      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             404db8     -1 INSTR LOCAL NoMetaUpdate call    _XtOwnSelection 
@@ -7288,7 +7288,7 @@
             404e18      2 INSTR BELONGTO 404dd0 
             404e1a      2 INSTR BELONGTO 404dd0 
             404e1a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            404e1a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            404e1a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             404e1c      4 INSTR BELONGTO 404dd0 
             404e20      3 INSTR BELONGTO 404dd0 
             404e20      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
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 e1a6abdc..bf34ab5e 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 @@
-b0571ec4d7c4f67f634f4b1fa064fa6014f7b11e
\ No newline at end of file
+c9d7626b2f940434f19eafefecb39f89b4fa1863
\ 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 9e7ad7b3..26c96a6f 100644
--- a/tests/commit/trimmed-sorted-save-xeyes.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-xeyes.psexe.annot
@@ -547,7 +547,7 @@
             401700    466 FUNC GLOBAL main FUNC_UNSAFE NOFP RET             4018d1 
             401702      2 INSTR BELONGTO 401700 
             401702      2 INSTR DEADREGS  EFLAGS RDX R12 ZZ xor     edx, edx 
-            401702     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401702     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             401704      1 INSTR BELONGTO 401700 
             401704      1 INSTR DEADREGS  EFLAGS R12 ZZ push    rbp 
             401704     -3 INSTR LOCAL NoWarn push    rbp 
@@ -555,7 +555,7 @@
             401705      3 INSTR DEADREGS  EFLAGS R12 ZZ mov     rbp, rsi 
             401708      2 INSTR BELONGTO 401700 
             401708      2 INSTR DEADREGS  EFLAGS RSI R12 ZZ xor     esi, esi 
-            401708     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            401708     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40170a      1 INSTR BELONGTO 401700 
             40170a      1 INSTR DEADREGS  EFLAGS R12 ZZ push    rbx 
             40170a     -3 INSTR LOCAL NoWarn push    rbx 
@@ -569,7 +569,7 @@
             40170f      4 INSTR BELONGTO 401700 
             401713      2 INSTR BELONGTO 401700 
             401713      2 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ xor     edi, edi 
-            401713     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            401713     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             401715      5 INSTR BELONGTO 401700 
             401715      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ lea     rbx, [rsp+78h+var_48] 
             401715      5 PTRIMMEDESP STACK 48 displ lea     rbx, [rsp+78h+var_48]
@@ -584,7 +584,7 @@
             401724      5 PTRIMMEDESP STACK 88 displ lea     rdi, [rsp+78h+var_20]
             401729      3 INSTR BELONGTO 401700 
             401729      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R9 R12 ZZ mov     r9, rbp 
-            40172c     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 8 
+            40172c     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 8 
             40172c      5 INSTR BELONGTO 401700 
             40172c      5 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 ZZ mov     ecx, 8 
             401731      5 INSTR BELONGTO 401700 
@@ -617,7 +617,7 @@
             401766      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _XtDisplay 
             40176b      2 INSTR BELONGTO 401700 
             40176b      2 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ xor     edx, edx        ; int 
-            40176b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx        ; int 
+            40176b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx        ; int 
             40176d      5 INSTR BELONGTO 401700 
             40176d      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset aWm_delete_wind; "WM_DELETE_WINDOW" 
             401772      3 INSTR BELONGTO 401700 
@@ -628,7 +628,7 @@
             40177a      5 INSTR BELONGTO 401700 
             40177a      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     rdi, [rsp+78h+var_20] 
             40177a      5 PTRIMMEDESP STACK 88 displ mov     rdi, [rsp+78h+var_20]
-            40177f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40177f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40177f      5 INSTR BELONGTO 401700 
             40177f      5 INSTR DEADREGS  EFLAGS RDX RSI R12 ZZ mov     edx, 1 
             401784      5 INSTR BELONGTO 401700 
@@ -667,7 +667,7 @@
             4017c7     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h        ; unsigned int 
             4017c7      6 INSTR BELONGTO 401700 
             4017c7      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 20h        ; unsigned int 
-            4017cd     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 30h        ; unsigned int 
+            4017cd     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 30h        ; unsigned int 
             4017cd      5 INSTR BELONGTO 401700 
             4017cd      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, 30h        ; unsigned int 
             4017d2      5 INSTR BELONGTO 401700 
@@ -698,7 +698,7 @@
             401804     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 20h        ; unsigned int 
             401804      6 INSTR BELONGTO 401700 
             401804      6 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ mov     r8d, 20h        ; unsigned int 
-            40180a     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 30h        ; unsigned int 
+            40180a     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 30h        ; unsigned int 
             40180a      5 INSTR BELONGTO 401700 
             40180a      5 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     ecx, 30h        ; unsigned int 
             40180f      5 INSTR BELONGTO 401700 
@@ -714,7 +714,7 @@
             40181f      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     rsi, rbx 
             401822      3 INSTR BELONGTO 401700 
             401822      3 INSTR DEADREGS  EFLAGS RDX RBX RDI R12 ZZ mov     rdi, rbp 
-            401825     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
+            401825     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2 
             401825      5 INSTR BELONGTO 401700 
             401825      5 INSTR DEADREGS  EFLAGS RDX RBX R12 ZZ mov     edx, 2 
             40182a     -1 INSTR LOCAL MetadataUnused mov     [rsp+78h+var_30], rax 
@@ -731,7 +731,7 @@
             40183e      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI R12 ZZ mov     rdx, rbp 
             401841      2 INSTR BELONGTO 401700 
             401841      2 INSTR DEADREGS  EFLAGS RCX RBX RDI R12 ZZ xor     ecx, ecx 
-            401841     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            401841     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             401843      5 INSTR BELONGTO 401700 
             401843      5 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     edi, offset aEyes; "eyes" 
             401848     -1 INSTR LOCAL NoMetaUpdate call    _XtCreateManagedWidget 
@@ -756,7 +756,7 @@
             401863      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _XtDisplay 
             401868      3 INSTR BELONGTO 401700 
             401868      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     rsi, rbx        ; Window 
-            40186b     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1          ; int 
+            40186b     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1          ; int 
             40186b      5 INSTR BELONGTO 401700 
             40186b      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RDI R12 ZZ mov     ecx, 1          ; int 
             401870      5 INSTR BELONGTO 401700 
@@ -776,7 +776,7 @@
             401887      4 INSTR BELONGTO 401700 
             40188b      2 INSTR BELONGTO 401700 
             40188b      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 R12 ZZ xor     eax, eax 
-            40188b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40188b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40188b     96 DEALLOC STACK esp - 96 xor     eax, eax
             40188d      1 INSTR BELONGTO 401700 
             40188d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 R12 ZZ pop     rbx 
@@ -788,10 +788,10 @@
             401891      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ retn 
             401892      7 INSTR BELONGTO 401700 
             401892      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; s 
-            401899     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 11Bh       ; n 
+            401899     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 11Bh       ; n 
             401899      5 INSTR BELONGTO 401700 
             401899      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 11Bh       ; n 
-            40189e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            40189e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             40189e      5 INSTR BELONGTO 401700 
             40189e      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 1          ; size 
             4018a3      5 INSTR BELONGTO 401700 
@@ -803,7 +803,7 @@
             4018ad      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; s 
             4018b4      5 INSTR BELONGTO 401700 
             4018b4      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edi, offset aRenderRender; "       [-render | +render]\n" 
-            4018b9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1Bh        ; n 
+            4018b9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1Bh        ; n 
             4018b9      5 INSTR BELONGTO 401700 
             4018b9      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 ZZ mov     edx, 1Bh        ; n 
             4018be     -1 INSTR LOCAL MetadataRedundant mov     esi, 1          ; size 
@@ -811,7 +811,7 @@
             4018c3     -1 INSTR LOCAL NoMetaUpdate call    _fwrite 
             4018c3      5 INSTR BELONGTO 401700 
             4018c3      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _fwrite 
-            4018c8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
+            4018c8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
             4018c8      5 INSTR BELONGTO 401700 
             4018c8      5 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     edi, 1          ; status 
             4018cd     -1 INSTR LOCAL NoMetaUpdate call    _exit 
@@ -943,7 +943,7 @@
             401999      3 INSTR BELONGTO 401990 
             40199c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4019B0 
             40199c      2 INSTR BELONGTO 401990 
-            40199e     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            40199e     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             40199e      5 INSTR BELONGTO 401990 
             4019a3     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             4019a3      3 INSTR BELONGTO 401990 
@@ -955,7 +955,7 @@
             4019ae      2 INSTR BELONGTO 401990 
             4019b0      1 INSTR BELONGTO 401990 
             4019b1      1 INSTR BELONGTO 401990 
-            4019c0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4019c0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4019d0      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 -32 0 4 0 8 5 -24 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 -16 0 13 -8 0 14 0 0 15 0 0 ZZ
             4019d0      0 FUNC MMSAFENESS SAFE
             4019d0   1339 FUNC GLOBAL sub_4019D0 FUNC_UNSAFE NOFP RET             401f0a 
@@ -1067,7 +1067,7 @@
             401abd      6 INSTR BELONGTO 4019d0 
             401ac3     -1 INSTR LOCAL MetadataUnused movapd  xmm3, xmm2 
             401ac3      4 INSTR BELONGTO 4019d0 
-            401ac7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
+            401ac7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
             401ac7      5 INSTR BELONGTO 4019d0 
             401ac7      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R13 XMM0 XMM2 XMM3 XMM4 XMM7 XMM8 XMM9 XMM10 ZZ mov     esi, 0FFFFFFFFh 
             401acc     -1 INSTR LOCAL SafeIfNoIndexing movsd   xmm1, [rsp+128h+var_80] 
@@ -1319,7 +1319,7 @@
             401d37      4 INSTR BELONGTO 4019d0 
             401d3b      2 INSTR BELONGTO 4019d0 
             401d3b      2 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM1 XMM3 XMM4 ZZ xor     edx, edx 
-            401d3b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            401d3b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             401d3d     -1 INSTR LOCAL NoMetaUpdate xorpd   xmm0, xmm0 
             401d3d      4 INSTR BELONGTO 4019d0 
             401d41     10 INSTR BELONGTO 4019d0 
@@ -1384,7 +1384,7 @@
             401dc9      6 INSTR BELONGTO 4019d0 
             401dcf     -1 INSTR LOCAL MetadataUnused movapd  xmm3, xmm2 
             401dcf      4 INSTR BELONGTO 4019d0 
-            401dd3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
+            401dd3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0FFFFFFFFh 
             401dd3      5 INSTR BELONGTO 4019d0 
             401dd3      5 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM2 XMM3 XMM4 XMM5 XMM7 XMM8 XMM9 XMM10 ZZ mov     esi, 0FFFFFFFFh 
             401dd8     -1 INSTR LOCAL MetadataUnused movsd   xmm1, [rsp+128h+var_80] 
@@ -1398,7 +1398,7 @@
             401de8      5 INSTR DEADREGS  EFLAGS RDX XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 XMM9 XMM10 ZZ call    sub_4019D0 
             401ded      7 INSTR BELONGTO 4019d0 
             401ded      7 INSTR DEADREGS  EFLAGS RAX RSI RDI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 XMM9 XMM10 ZZ mov     rax, [rbp+98h] 
-            401df4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
+            401df4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 2 
             401df4      5 INSTR BELONGTO 4019d0 
             401df4      5 INSTR DEADREGS  EFLAGS RSI RDI XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 XMM9 XMM10 ZZ mov     esi, 2 
             401df9     -1 INSTR LOCAL MetadataUnused movsxd  r12, r12d 
@@ -1499,12 +1499,12 @@
             401ed9      5 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 XMM9 XMM10 ZZ call    _XFillRectangle 
             401ede     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401B6E 
             401ede      5 INSTR BELONGTO 4019d0 
-            401ee8     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 40h 
+            401ee8     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 40h 
             401ee8      5 INSTR BELONGTO 4019d0 
             401ee8      5 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R13 XMM0 XMM7 ZZ mov     ebx, 40h 
             401eed     -1 INSTR LOCAL MetadataUnused mov     r13d, 4 
             401eed      6 INSTR BELONGTO 4019d0 
-            401ef3     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 2 
+            401ef3     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 2 
             401ef3      5 INSTR BELONGTO 4019d0 
             401ef3      5 INSTR DEADREGS  EFLAGS RAX RSI RDI XMM0 XMM7 ZZ mov     eax, 2 
             401ef8     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401C58 
@@ -1692,7 +1692,7 @@
             4020dd      6 INSTR BELONGTO 401f10 
             4020e3     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm8, xmm6 
             4020e3      5 INSTR BELONGTO 401f10 
-            4020e8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setnb   al 
+            4020e8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setnb   al 
             4020e8      3 INSTR BELONGTO 401f10 
             4020e8      3 INSTR DEADREGS  RAX RBX XMM1 ZZ setnb   al 
             4020eb     -1 INSTR LOCAL NoMetaUpdate test    al, al 
@@ -1795,7 +1795,7 @@
             4021d5      6 INSTR BELONGTO 401f10 
             4021db     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm8, xmm6 
             4021db      5 INSTR BELONGTO 401f10 
-            4021e0     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setnb   al 
+            4021e0     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setnb   al 
             4021e0      3 INSTR BELONGTO 401f10 
             4021e0      3 INSTR DEADREGS  RAX RBX XMM1 ZZ setnb   al 
             4021e3     -1 INSTR LOCAL NoMetaUpdate test    al, al 
@@ -1820,7 +1820,7 @@
             402209      2 INSTR BELONGTO 401f10 
             40220b     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm0, xmm6 
             40220b      4 INSTR BELONGTO 401f10 
-            40220f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setnb   al 
+            40220f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setnb   al 
             40220f      3 INSTR BELONGTO 401f10 
             40220f      3 INSTR DEADREGS  RAX RBX XMM1 XMM8 XMM10 ZZ setnb   al 
             402212     -1 INSTR LOCAL NoMetaUpdate test    al, al 
@@ -1844,7 +1844,7 @@
             40223d      2 INSTR BELONGTO 401f10 
             40223f     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm10, xmm6 
             40223f      5 INSTR BELONGTO 401f10 
-            402244     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setnb   al 
+            402244     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setnb   al 
             402244      3 INSTR BELONGTO 401f10 
             402244      3 INSTR DEADREGS  RAX RBX XMM1 XMM8 ZZ setnb   al 
             402247     -1 INSTR LOCAL NoMetaUpdate test    al, al 
@@ -1872,7 +1872,7 @@
             40227b      2 INSTR BELONGTO 401f10 
             40227d     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm9, xmm6 
             40227d      5 INSTR BELONGTO 401f10 
-            402282     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setnb   al 
+            402282     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setnb   al 
             402282      3 INSTR BELONGTO 401f10 
             402282      3 INSTR DEADREGS  RAX RBX XMM1 XMM6 XMM8 XMM9 XMM10 ZZ setnb   al 
             402285     -1 INSTR LOCAL NoMetaUpdate test    al, al 
@@ -1948,7 +1948,7 @@
             40231d      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R8 R12 ZZ xor     r8d, r8d        ; int 
             402320      2 INSTR BELONGTO 4022e0 
             402320      2 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 ZZ xor     ecx, ecx        ; int 
-            402320     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx        ; int 
+            402320     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx        ; int 
             402322      5 INSTR BELONGTO 4022e0 
             402322      5 INSTR DEADREGS  EFLAGS RDX RDI R12 ZZ lea     r12, [rsp+78h+var_48] 
             402322      5 PTRIMMEDESP STACK 48 displ lea     r12, [rsp+78h+var_48]
@@ -2021,7 +2021,7 @@
             4023bd      6 INSTR BELONGTO 4022e0 
             4023c3      2 INSTR BELONGTO 4022e0 
             4023c3      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 XMM2 ZZ xor     edi, edi 
-            4023c3     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            4023c3     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             4023c5     -1 INSTR LOCAL NoMetaUpdate call    sub_401F10 
             4023c5      5 INSTR BELONGTO 4022e0 
             4023c5      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 XMM2 ZZ call    sub_401F10 
@@ -2109,7 +2109,7 @@
             40245b      5 INSTR BELONGTO 402430 
             40245b      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     [rsp+0C8h+var_B8], rdx 
             40245b      5 PTRIMMEDESP STACK 16 displ mov     [rsp+0C8h+var_B8], rdx
-            402460     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
+            402460     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0Ch 
             402460      5 INSTR BELONGTO 402430 
             402460      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     esi, 0Ch 
             402465      3 INSTR BELONGTO 402430 
@@ -2205,7 +2205,7 @@
             40256c      6 INSTR BELONGTO 402430 
             402572      2 INSTR BELONGTO 402430 
             402572      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R13 ZZ xor     ebp, ebp 
-            402572     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            402572     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             402574     -2 INSTR LOCAL n R13 ZZ  AlwaysNUM movsxd  r13, ebp 
             402574      3 INSTR BELONGTO 402430 
             402574      3 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R13 ZZ movsxd  r13, ebp 
@@ -2333,7 +2333,7 @@
             4026ca     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40245B 
             4026ca      5 INSTR BELONGTO 402430 
             4026d0     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
-            4026d3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4026d3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4026e4     -1 INSTR LOCAL NoMetaUpdate jmp     _XtAddConverter 
             4026f0      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 -8 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             4026f0      0 FUNC MMSAFENESS SAFE
@@ -2361,7 +2361,7 @@
             402705      8 INSTR BELONGTO 4026f0 
             40270d      2 INSTR BELONGTO 4026f0 
             40270d      2 INSTR DEADREGS  EFLAGS RDX RSI XMM0 XMM2 XMM3 ZZ xor     esi, esi 
-            40270d     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            40270d     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             40270f     -1 INSTR LOCAL NoMetaUpdate xorpd   xmm1, xmm1 
             40270f      4 INSTR BELONGTO 4026f0 
             402713     -1 INSTR LOCAL MetadataUnused movsd   [rsp+28h+var_18], xmm5 
@@ -2469,17 +2469,17 @@
             4027da      5 INSTR DEADREGS  EFLAGS XMM2 ZZ call    _XClearWindow 
             4027df     -1 INSTR LOCAL MetadataUnused movsd   xmm0, cs:qword_403208 
             4027df      8 INSTR BELONGTO 4027a0 
-            4027e7     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movzx   ecx, word ptr [rbx+36h] 
+            4027e7     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movzx   ecx, word ptr [rbx+36h] 
             4027e7      4 INSTR BELONGTO 4027a0 
             4027e7      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 XMM2 ZZ movzx   ecx, word ptr [rbx+36h] 
-            4027eb     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, word ptr [rbx+34h] 
+            4027eb     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, word ptr [rbx+34h] 
             4027eb      4 INSTR BELONGTO 4027a0 
             4027eb      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 XMM2 ZZ movzx   edx, word ptr [rbx+34h] 
             4027ef      7 INSTR BELONGTO 4027a0 
             4027ef      7 INSTR DEADREGS  EFLAGS RSI RDI R8 XMM2 ZZ lea     rdi, [rbx+148h] 
             4027f6      2 INSTR BELONGTO 4027a0 
             4027f6      2 INSTR DEADREGS  EFLAGS RSI R8 XMM2 ZZ xor     esi, esi 
-            4027f6     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4027f6     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4027f8     -1 INSTR LOCAL MetadataUnused movsd   xmm3, cs:qword_403200 
             4027f8      8 INSTR BELONGTO 4027a0 
             402800     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -2528,7 +2528,7 @@
             402861      3 INSTR DEADREGS  EFLAGS RCX RDX RDI XMM0 XMM1 XMM3 ZZ mov     rdi, rbp 
             402864      2 INSTR BELONGTO 4027a0 
             402864      2 INSTR DEADREGS  EFLAGS RCX RDX XMM0 XMM1 XMM3 ZZ xor     ecx, ecx 
-            402864     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            402864     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             402866      3 INSTR BELONGTO 4027a0 
             402866      3 INSTR DEADREGS  EFLAGS RDX XMM0 XMM1 XMM3 ZZ mov     rdx, rax 
             402869     -1 INSTR LOCAL NoMetaUpdate call    _XRenderCreatePicture 
@@ -2545,10 +2545,10 @@
             40287d      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 XMM0 XMM1 XMM3 ZZ pop     rbp 
             40287e      1 INSTR BELONGTO 4027a0 
             40287e      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 XMM0 XMM1 XMM3 ZZ retn 
-            402880     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movzx   ecx, word ptr [rbx+36h]; unsigned int 
+            402880     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movzx   ecx, word ptr [rbx+36h]; unsigned int 
             402880      4 INSTR BELONGTO 4027a0 
             402880      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 XMM0 XMM1 XMM3 ZZ movzx   ecx, word ptr [rbx+36h]; unsigned int 
-            402884     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, word ptr [rbx+34h]; unsigned int 
+            402884     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, word ptr [rbx+34h]; unsigned int 
             402884      4 INSTR BELONGTO 4027a0 
             402884      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 XMM0 XMM1 XMM3 ZZ movzx   edx, word ptr [rbx+34h]; unsigned int 
             402888     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 1          ; unsigned int 
@@ -2571,7 +2571,7 @@
             4028ae      6 INSTR BELONGTO 4027a0 
             4028b4      2 INSTR BELONGTO 4027a0 
             4028b4      2 INSTR DEADREGS  EFLAGS RDX RDI XMM0 XMM1 XMM3 ZZ xor     edx, edx        ; unsigned __int64 
-            4028b4     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx        ; unsigned __int64 
+            4028b4     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx        ; unsigned __int64 
             4028b6      3 INSTR BELONGTO 4027a0 
             4028b6      3 INSTR DEADREGS  EFLAGS RDI XMM0 XMM1 XMM3 ZZ mov     rdi, rbp        ; Display * 
             4028b9     -1 INSTR LOCAL NoMetaUpdate call    _XSetForeground 
@@ -2580,12 +2580,12 @@
             4028be     -2 INSTR LOCAL n R9 ZZ  NumericDEFs movzx   r9d, word ptr [rbx+34h]; unsigned int 
             4028be      5 INSTR BELONGTO 4027a0 
             4028be      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 XMM0 XMM1 XMM3 ZZ movzx   r9d, word ptr [rbx+34h]; unsigned int 
-            4028c3     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, word ptr [rbx+36h] 
+            4028c3     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, word ptr [rbx+36h] 
             4028c3      4 INSTR BELONGTO 4027a0 
             4028c3      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 XMM0 XMM1 XMM3 ZZ movzx   eax, word ptr [rbx+36h] 
             4028c7      2 INSTR BELONGTO 4027a0 
             4028c7      2 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 XMM0 XMM1 XMM3 ZZ xor     ecx, ecx        ; int 
-            4028c7     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx        ; int 
+            4028c7     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx        ; int 
             4028c9      7 INSTR BELONGTO 4027a0 
             4028c9      7 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 XMM0 XMM1 XMM3 ZZ mov     rdx, [rbx+100h] ; GC 
             4028d0      7 INSTR BELONGTO 4027a0 
@@ -2603,7 +2603,7 @@
             4028e0      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 XMM3 ZZ call    _XFillRectangle 
             4028e5      7 INSTR BELONGTO 4027a0 
             4028e5      7 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM3 ZZ mov     rsi, [rbx+100h] ; GC 
-            4028ec     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1          ; unsigned __int64 
+            4028ec     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1          ; unsigned __int64 
             4028ec      5 INSTR BELONGTO 4027a0 
             4028ec      5 INSTR DEADREGS  EFLAGS RDX RDI XMM0 XMM1 XMM3 ZZ mov     edx, 1          ; unsigned __int64 
             4028f1      3 INSTR BELONGTO 4027a0 
@@ -2613,16 +2613,16 @@
             4028f4      5 INSTR DEADREGS  EFLAGS XMM0 XMM1 XMM3 ZZ call    _XSetForeground 
             4028f9      2 INSTR BELONGTO 4027a0 
             4028f9      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 XMM0 XMM1 XMM3 ZZ xor     edx, edx 
-            4028f9     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            4028f9     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             4028fb      2 INSTR BELONGTO 4027a0 
             4028fb      2 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI R8 R9 R10 R11 XMM0 XMM1 XMM3 ZZ xor     esi, esi 
-            4028fb     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            4028fb     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             4028fd      3 INSTR BELONGTO 4027a0 
             4028fd      3 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 XMM0 XMM1 XMM3 ZZ mov     rdi, rbx 
             402900     -1 INSTR LOCAL NoMetaUpdate call    sub_4026F0 
             402900      5 INSTR BELONGTO 4027a0 
             402900      5 INSTR DEADREGS  EFLAGS RAX RCX R8 R9 R10 R11 XMM0 XMM1 XMM3 ZZ call    sub_4026F0 
-            402905     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            402905     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             402905      5 INSTR BELONGTO 4027a0 
             402905      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 XMM0 XMM1 XMM3 ZZ mov     edx, 1 
             40290a     -1 INSTR LOCAL MetadataRedundant xor     esi, esi 
@@ -2636,7 +2636,7 @@
             402914      4 INSTR BELONGTO 4027a0 
             402918      2 INSTR BELONGTO 4027a0 
             402918      2 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI R8 R9 XMM0 XMM1 XMM3 ZZ xor     ecx, ecx 
-            402918     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            402918     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             40291a     -1 INSTR LOCAL MetadataUnused mov     rax, rbx 
             40291a      3 INSTR BELONGTO 4027a0 
             40291d     -1 INSTR LOCAL NoMetaUpdate test    rdx, rdx 
@@ -2649,13 +2649,13 @@
             402930      3 INSTR BELONGTO 4027a0 
             402933     -1 INSTR LOCAL MetadataUnused mov     rdx, rsi 
             402933      3 INSTR BELONGTO 4027a0 
-            402936     -2 INSTR LOCAL n ESI ZZ  NumericDEFs movzx   esi, word ptr [rax+38h] 
+            402936     -2 INSTR LOCAL n RSI ZZ  NumericDEFs movzx   esi, word ptr [rax+38h] 
             402936      4 INSTR BELONGTO 4027a0 
             402936      4 INSTR DEADREGS  EFLAGS RSI RDI R8 R9 XMM0 XMM1 XMM3 ZZ movzx   esi, word ptr [rax+38h] 
-            40293a     -2 INSTR LOCAL n EDI ZZ  NumericDEFs movsx   edi, word ptr [rax+30h] 
+            40293a     -2 INSTR LOCAL n RDI ZZ  NumericDEFs movsx   edi, word ptr [rax+30h] 
             40293a      4 INSTR BELONGTO 4027a0 
             40293a      4 INSTR DEADREGS  EFLAGS RDI R8 R9 XMM0 XMM1 XMM3 ZZ movsx   edi, word ptr [rax+30h] 
-            40293e     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movsx   eax, word ptr [rax+32h] 
+            40293e     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movsx   eax, word ptr [rax+32h] 
             40293e      4 INSTR BELONGTO 4027a0 
             40293e      4 INSTR DEADREGS  EFLAGS R8 R9 XMM0 XMM1 XMM3 ZZ movsx   eax, word ptr [rax+32h] 
             402942     -1 INSTR LOCAL MetadataRedundant add     edi, esi 
@@ -2683,7 +2683,7 @@
             402964      7 INSTR DEADREGS  EFLAGS RDX RDI R9 XMM0 XMM1 XMM3 ZZ mov     r9, [rbx+190h] 
             40296b      2 INSTR BELONGTO 4027a0 
             40296b      2 INSTR DEADREGS  EFLAGS RDX RDI XMM0 XMM1 XMM3 ZZ xor     edx, edx 
-            40296b     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            40296b     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             40296d      4 INSTR BELONGTO 4027a0 
             40296d      4 INSTR DEADREGS  EFLAGS RDI XMM0 XMM1 XMM3 ZZ mov     rdi, [rax+8] 
             402971      7 INSTR BELONGTO 4027a0 
@@ -2714,7 +2714,7 @@
             4029b0      3 INSTR BELONGTO 4027a0 
             4029b3      2 INSTR BELONGTO 4027a0 
             4029b3      2 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI R8 R9 XMM0 XMM1 XMM3 ZZ xor     ecx, ecx 
-            4029b3     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
+            4029b3     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM xor     ecx, ecx 
             4029b5     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_402953 
             4029b5      2 INSTR BELONGTO 4027a0 
             4029b7      5 INSTR BELONGTO 4027a0 
@@ -2724,7 +2724,7 @@
             4029bc      3 INSTR DEADREGS  EFLAGS RDX RSI RDI XMM0 XMM1 XMM3 ZZ mov     rsi, rax        ; Drawable 
             4029bf      2 INSTR BELONGTO 4027a0 
             4029bf      2 INSTR DEADREGS  EFLAGS RDX RDI XMM0 XMM1 XMM3 ZZ xor     edx, edx        ; unsigned __int64 
-            4029bf     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx        ; unsigned __int64 
+            4029bf     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx        ; unsigned __int64 
             4029c1      3 INSTR BELONGTO 4027a0 
             4029c1      3 INSTR DEADREGS  EFLAGS RDI XMM0 XMM1 XMM3 ZZ mov     rdi, rbp        ; Display * 
             4029c4     -1 INSTR LOCAL NoMetaUpdate call    _XCreateGC 
@@ -2770,8 +2770,8 @@
             402a01      3 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     [rsi], rcx 
             402a04      2 INSTR BELONGTO 4029e0 
             402a04      2 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ xor     edx, edx 
-            402a04     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            402a06     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402a04     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            402a06     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402a06      5 INSTR BELONGTO 4029e0 
             402a06      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 1 
             402a0b      3 INSTR BELONGTO 4029e0 
@@ -2797,7 +2797,7 @@
             402a2d      5 INSTR DEADREGS  EFLAGS ZZ call    _XtWidgetToApplicationContext 
             402a32      3 INSTR BELONGTO 4029e0 
             402a32      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, rbx 
-            402a35     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, offset loc_402C00 
+            402a35     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, offset loc_402C00 
             402a35      5 INSTR BELONGTO 4029e0 
             402a35      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset loc_402C00 
             402a3a      3 INSTR BELONGTO 4029e0 
@@ -2893,20 +2893,20 @@
             402b8b     -1 INSTR LOCAL NoMetaUpdate call    _XtWindowOfObject 
             402b90     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             402b93     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_402BA0 
-            402ba3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            402ba5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402ba3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            402ba5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402baa     -1 INSTR LOCAL NoMetaUpdate call    sub_4026F0 
-            402baf     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            402bb7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402baf     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            402bb7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402bbc     -1 INSTR LOCAL NoMetaUpdate call    sub_4026F0 
             402bc8     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm0, qword ptr [rbx+118h] 
             402bd0     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm1, qword ptr [rbx+120h] 
             402bdb     -1 INSTR LOCAL NoMetaUpdate call    sub_4022E0 
-            402be3     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
-            402be5     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            402be3     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
+            402be5     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             402be7     -1 INSTR LOCAL NoMetaUpdate call    sub_402AF0 
-            402bef     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
-            402bf4     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            402bef     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            402bf4     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             402bf7     -1 INSTR LOCAL NoMetaUpdate jmp     sub_402AF0 
             402c00      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], rbx
             402c05      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbp
@@ -2979,7 +2979,7 @@
             402dc0     -1 INSTR LOCAL NUMViaFPRegDest movsd   xmm9, qword ptr [rbx+160h] 
             402dc9     -1 INSTR LOCAL NoMetaUpdate jz      loc_402E88 
             402dcf     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm1, xmm4 
-            402dd3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setnp   al 
+            402dd3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setnp   al 
             402dda     -1 INSTR LOCAL NoMetaUpdate test    al, al 
             402ddc     -1 INSTR LOCAL NoMetaUpdate jnz     loc_402F18 
             402de2      7 PTRIMMEDEBP STACK 296 displ mov     rax, [rbp+128h]
@@ -3003,7 +3003,7 @@
             402e50     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rbp, 10h 
             402e54     -1 INSTR LOCAL NoMetaUpdate cmp     r12d, 2 
             402e58     -1 INSTR LOCAL NoMetaUpdate jnz     loc_402D73 
-            402e70     -2 INSTR LOCAL n EBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 32h 
+            402e70     -2 INSTR LOCAL n RBP ZZ  NUMVia2ndSrcIMMEDNUM mov     ebp, 32h 
             402e7d     -1 INSTR LOCAL NoMetaUpdate jmp     loc_402C36 
             402e88     -1 INSTR LOCAL NoMetaUpdate mulsd   xmm1, xmm0 
             402e8c     -1 INSTR LOCAL NoMetaUpdate mulsd   xmm0, xmm4 
@@ -3011,8 +3011,8 @@
             402e94     -1 INSTR LOCAL NoMetaUpdate addsd   xmm0, xmm6 
             402e98     -1 INSTR LOCAL NoMetaUpdate addsd   xmm1, xmm7 
             402e9c     -1 INSTR LOCAL NoMetaUpdate addsd   xmm0, xmm7 
-            402ea0     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM cvttsd2si ecx, xmm1 
-            402ea4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM cvttsd2si eax, xmm0 
+            402ea0     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM cvttsd2si ecx, xmm1 
+            402ea4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cvttsd2si eax, xmm0 
             402ea8     -1 INSTR LOCAL NoMetaUpdate cmp     cx, ax 
             402eab     -1 INSTR LOCAL NoMetaUpdate jnz     loc_402DE2 
             402eb1     -1 INSTR LOCAL NoMetaUpdate mulsd   xmm8, xmm10 
@@ -3021,10 +3021,10 @@
             402ec0     -1 INSTR LOCAL NoMetaUpdate addsd   xmm10, xmm9 
             402ec5     -1 INSTR LOCAL NoMetaUpdate addsd   xmm8, xmm7 
             402eca     -1 INSTR LOCAL NoMetaUpdate addsd   xmm10, xmm7 
-            402ecf     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM cvttsd2si ecx, xmm8 
-            402ed4     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM cvttsd2si eax, xmm10 
+            402ecf     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM cvttsd2si ecx, xmm8 
+            402ed4     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM cvttsd2si eax, xmm10 
             402ed9     -1 INSTR LOCAL NoMetaUpdate cmp     cx, ax 
-            402edc     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setnz   al 
+            402edc     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setnz   al 
             402edf     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_402F27 
             402ee8     -1 INSTR LOCAL NoMetaUpdate jnz     loc_402D29 
             402ef7     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM movsxd  rcx, eax 
@@ -3033,8 +3033,8 @@
             402f05     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM movsxd  rdx, edx 
             402f0f     -1 INSTR LOCAL NoMetaUpdate jmp     loc_402C36 
             402f18     -1 INSTR LOCAL NoMetaUpdate ucomisd xmm5, xmm8 
-            402f1d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM setnp   al 
-            402f24     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, 1 
+            402f1d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM setnp   al 
+            402f24     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, 1 
             402f27     -1 INSTR LOCAL NoMetaUpdate test    al, al 
             402f29     -1 INSTR LOCAL NoMetaUpdate jz      loc_402E4C 
             402f2f     -1 INSTR LOCAL NoMetaUpdate jmp     loc_402DE2 
@@ -3184,7 +3184,7 @@
             403061      5 INSTR DEADREGS  EFLAGS ZZ call    _XtDestroyApplicationContext 
             403066      2 INSTR BELONGTO 403030 
             403066      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi        ; status 
-            403066     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; status 
+            403066     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; status 
             403068     -1 INSTR LOCAL NoMetaUpdate call    _exit 
             403068      5 INSTR BELONGTO 403030 
             403068      5 INSTR DEADREGS  EFLAGS ZZ call    _exit 
@@ -3236,7 +3236,7 @@
             4030b8      2 INSTR BELONGTO 403070 
             4030ba      2 INSTR BELONGTO 403070 
             4030ba      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            4030ba     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            4030ba     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             4030bc      4 INSTR BELONGTO 403070 
             4030c0      3 INSTR BELONGTO 403070 
             4030c0      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
diff --git a/tests/quick/save-bzip2.psexe.infoannot b/tests/quick/save-bzip2.psexe.infoannot
index a1a8f0d9..8318aaca 100644
--- a/tests/quick/save-bzip2.psexe.infoannot
+++ b/tests/quick/save-bzip2.psexe.infoannot
@@ -122,7 +122,7 @@
             402090     61 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4020d0    432 FUNC RETURNTYPE RAX 0
             4020d0    432 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-            4021b3      2 INSTR CHECK UNDERFLOW SIGNED 32  EDX ZZ sub     edx, eax 
+            4021b3      2 INSTR CHECK UNDERFLOW SIGNED 32  RDX ZZ sub     edx, eax 
             402280     45 FUNC RETURNTYPE RAX 0
             402280     45 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             4022b0     40 FUNC RETURNTYPE RAX 1
diff --git a/tests/quick/trimmed-sorted-save-bzip2.psexe.annot b/tests/quick/trimmed-sorted-save-bzip2.psexe.annot
index 1eaa48c4..ab1ed1d4 100644
--- a/tests/quick/trimmed-sorted-save-bzip2.psexe.annot
+++ b/tests/quick/trimmed-sorted-save-bzip2.psexe.annot
@@ -586,7 +586,7 @@
             4013a2     -3 INSTR LOCAL NoWarn push    r12 
             4013a4     -1 INSTR LOCAL MetadataUnused mov     r12, rsi 
             4013a4      3 INSTR BELONGTO 4013a0 
-            4013a7     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset handler; handler 
+            4013a7     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset handler; handler 
             4013a7      5 INSTR BELONGTO 4013a0 
             4013a7      5 INSTR DEADREGS  EFLAGS RSI R13 ZZ mov     esi, offset handler; handler 
             4013ac      1 INSTR BELONGTO 4013a0 
@@ -594,7 +594,7 @@
             4013ac     -3 INSTR LOCAL NoWarn push    rbp 
             4013ad     -1 INSTR LOCAL MetadataUnused mov     ebp, edi 
             4013ad      2 INSTR BELONGTO 4013a0 
-            4013af     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Bh        ; sig 
+            4013af     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Bh        ; sig 
             4013af      5 INSTR BELONGTO 4013a0 
             4013af      5 INSTR DEADREGS  EFLAGS RDI R13 ZZ mov     edi, 0Bh        ; sig 
             4013b4      1 INSTR BELONGTO 4013a0 
@@ -664,7 +664,7 @@
             40146c     -1 INSTR LOCAL NoMetaUpdate call    sub_403080 
             40146c      5 INSTR BELONGTO 4013a0 
             40146c      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    sub_403080 
-            401471     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, cs:byte_6072C0 
+            401471     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, cs:byte_6072C0 
             401471      7 INSTR BELONGTO 4013a0 
             401471      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R13 ZZ movzx   eax, cs:byte_6072C0 
             401478      5 INSTR BELONGTO 4013a0 
@@ -679,7 +679,7 @@
             40148d      2 INSTR BELONGTO 4013a0 
             40148f     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4014C1 
             40148f      2 INSTR BELONGTO 4013a0 
-            401498     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rdx+1] 
+            401498     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rdx+1] 
             401498      4 INSTR BELONGTO 4013a0 
             401498      4 INSTR DEADREGS  EFLAGS RAX RBX RDI R13 ZZ movzx   eax, byte ptr [rdx+1] 
             40149c     -1 INSTR LOCAL NoMetaUpdate test    al, al 
@@ -694,7 +694,7 @@
             4014a5      4 INSTR DEADREGS  RAX RCX RBX RDI R13 ZZ lea     rcx, [rdx+1] 
             4014a9     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_401498 
             4014a9      2 INSTR BELONGTO 4013a0 
-            4014ab     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rdx+1] 
+            4014ab     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rdx+1] 
             4014ab      4 INSTR BELONGTO 4013a0 
             4014ab      4 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI RDI R13 ZZ movzx   eax, byte ptr [rdx+1] 
             4014af      4 INSTR BELONGTO 4013a0 
@@ -794,7 +794,7 @@
             40156e      2 INSTR BELONGTO 4013a0 
             401570      3 INSTR BELONGTO 4013a0 
             401570      3 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     rdi, [rbx]      ; s 
-            401573     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
+            401573     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
             401573      3 INSTR BELONGTO 4013a0 
             401573      3 INSTR DEADREGS  EFLAGS RAX ZZ movzx   eax, byte ptr [rdi] 
             401576     -1 INSTR LOCAL NoMetaUpdate cmp     al, 2Dh 
@@ -894,7 +894,7 @@
             401643      5 INSTR BELONGTO 4013a0 
             401648     -1 INSTR LOCAL NoMetaUpdate jz      loc_4016D5 
             401648      6 INSTR BELONGTO 4013a0 
-            40164e     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [r8+1] 
+            40164e     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [r8+1] 
             40164e      5 INSTR BELONGTO 4013a0 
             40164e      5 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ movzx   eax, byte ptr [r8+1] 
             401653     -1 INSTR LOCAL NoMetaUpdate cmp     al, 2Dh 
@@ -905,7 +905,7 @@
             401657      2 INSTR BELONGTO 4013a0 
             401659     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4016C8 
             401659      2 INSTR BELONGTO 4013a0 
-            40165b     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
+            40165b     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 2 
             40165b      5 INSTR BELONGTO 4013a0 
             40165b      5 INSTR DEADREGS  EFLAGS RCX RBX R12 R13 ZZ mov     ecx, 2 
             401660     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     eax, 31h 
@@ -920,12 +920,12 @@
             401672      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 ZZ mov     rdi, cs:stderr 
             401679      5 INSTR BELONGTO 4013a0 
             401679      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 R13 ZZ mov     edx, offset aSBadFlagS; "%s: Bad flag `%s'\n" 
-            40167e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40167e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40167e      5 INSTR BELONGTO 4013a0 
             40167e      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 ZZ mov     esi, 1 
             401683      2 INSTR BELONGTO 4013a0 
             401683      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-            401683     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401683     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401685     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             401685      5 INSTR BELONGTO 4013a0 
             401685      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    ___fprintf_chk 
@@ -934,7 +934,7 @@
             401691     -1 INSTR LOCAL NoMetaUpdate call    sub_4022E0 
             401691      5 INSTR BELONGTO 4013a0 
             401691      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    sub_4022E0 
-            401696     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
+            401696     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
             401696      5 INSTR BELONGTO 4013a0 
             401696      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     edi, 1          ; status 
             40169b     -1 INSTR LOCAL NoMetaUpdate call    _exit 
@@ -947,7 +947,7 @@
             4016ab     10 INSTR BELONGTO 4013a0 
             4016ab     10 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ mov     cs:dword_608350, 1; jumptable 0000000000401753 case 73 
             4016b5      3 INSTR BELONGTO 4013a0 
-            4016b8     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [r8+rcx] 
+            4016b8     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [r8+rcx] 
             4016b8      5 INSTR BELONGTO 4013a0 
             4016b8      5 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ movzx   eax, byte ptr [r8+rcx] 
             4016bd     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rcx, 1 
@@ -1007,7 +1007,7 @@
             40172d      2 INSTR BELONGTO 4013a0 
             40172f      5 INSTR BELONGTO 4013a0 
             40172f      5 INSTR DEADREGS  RCX RSI RDI R13 ZZ mov     edi, offset aDecompress; "--decompress" 
-            401734     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Dh 
+            401734     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Dh 
             401734      5 INSTR BELONGTO 4013a0 
             401734      5 INSTR DEADREGS  RCX RSI R13 ZZ mov     ecx, 0Dh 
             401739      3 INSTR BELONGTO 4013a0 
@@ -1020,7 +1020,7 @@
             401744     10 INSTR DEADREGS  EFLAGS RBX R13 ZZ mov     cs:dword_608350, 2 
             40174e     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4016FA 
             40174e      2 INSTR BELONGTO 4013a0 
-            401750     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, al 
+            401750     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, al 
             401750      3 INSTR BELONGTO 4013a0 
             401750      3 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ movzx   eax, al 
             401753     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_406088[rax*8]; switch jump 
@@ -1065,7 +1065,7 @@
             4017bb      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    sub_4022E0 
             4017c0      2 INSTR BELONGTO 4013a0 
             4017c0      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ xor     edi, edi        ; status 
-            4017c0     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; status 
+            4017c0     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; status 
             4017c2     -1 INSTR LOCAL NoMetaUpdate call    _exit 
             4017c2      5 INSTR BELONGTO 4013a0 
             4017c2      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _exit 
@@ -1088,7 +1088,7 @@
             4017f4      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    sub_4022B0      ; jumptable 0000000000401753 cases 27,37 
             4017f9      2 INSTR BELONGTO 4013a0 
             4017f9      2 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ xor     edi, edi        ; status 
-            4017f9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; status 
+            4017f9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; status 
             4017fb     -1 INSTR LOCAL NoMetaUpdate call    _exit 
             4017fb      5 INSTR BELONGTO 4013a0 
             4017fb      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _exit 
@@ -1130,7 +1130,7 @@
             401882      5 INSTR BELONGTO 4013a0 
             401890      5 INSTR BELONGTO 4013a0 
             401890      5 INSTR DEADREGS  RCX RSI RDI R13 ZZ mov     edi, offset aCompress; "--compress" 
-            401895     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Bh 
+            401895     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 0Bh 
             401895      5 INSTR BELONGTO 4013a0 
             401895      5 INSTR DEADREGS  RCX RSI R13 ZZ mov     ecx, 0Bh 
             40189a      3 INSTR BELONGTO 4013a0 
@@ -1245,7 +1245,7 @@
             401995      2 INSTR BELONGTO 4013a0 
             401997      3 INSTR BELONGTO 4013a0 
             401997      3 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 ZZ mov     rdi, [rbx]      ; src 
-            40199a     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
+            40199a     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
             40199a      3 INSTR BELONGTO 4013a0 
             40199a      3 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ movzx   eax, byte ptr [rdi] 
             40199d     -1 INSTR LOCAL NoMetaUpdate cmp     al, 2Dh 
@@ -1266,7 +1266,7 @@
             4019b7      2 INSTR BELONGTO 4013a0 
             4019b9      2 INSTR BELONGTO 4013a0 
             4019b9      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ xor     edi, edi        ; src 
-            4019b9     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; src 
+            4019b9     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; src 
             4019bb     -1 INSTR LOCAL NoMetaUpdate call    sub_403C00 
             4019bb      5 INSTR BELONGTO 4013a0 
             4019bb      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 R13 ZZ call    sub_403C00 
@@ -1460,7 +1460,7 @@
             401b2f      6 INSTR BELONGTO 4013a0 
             401b35      3 INSTR BELONGTO 4013a0 
             401b35      3 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 ZZ mov     rdi, [rbx]      ; src 
-            401b38     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
+            401b38     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
             401b38      3 INSTR BELONGTO 4013a0 
             401b38      3 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ movzx   eax, byte ptr [rdi] 
             401b3b     -1 INSTR LOCAL NoMetaUpdate cmp     al, 2Dh 
@@ -1489,16 +1489,16 @@
             401b67      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R12 R13 ZZ mov     rcx, cs:s 
             401b6e      5 INSTR BELONGTO 4013a0 
             401b6e      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 R13 ZZ mov     edx, offset aSCAndTCannotBe; "%s: -c and -t cannot be used together.\"... 
-            401b73     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            401b73     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             401b73      5 INSTR BELONGTO 4013a0 
             401b73      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 ZZ mov     esi, 1 
             401b78      2 INSTR BELONGTO 4013a0 
             401b78      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-            401b78     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            401b78     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             401b7a     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             401b7a      5 INSTR BELONGTO 4013a0 
             401b7a      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    ___fprintf_chk 
-            401b7f     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
+            401b7f     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; status 
             401b7f      5 INSTR BELONGTO 4013a0 
             401b7f      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     edi, 1          ; status 
             401b84     -1 INSTR LOCAL NoMetaUpdate call    _exit 
@@ -1522,7 +1522,7 @@
             401bb9      5 INSTR BELONGTO 4013a0 
             401bbe      2 INSTR BELONGTO 4013a0 
             401bbe      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ xor     edi, edi        ; src 
-            401bbe     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; src 
+            401bbe     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; src 
             401bc0     -1 INSTR LOCAL NoMetaUpdate call    sub_403EF0 
             401bc0      5 INSTR BELONGTO 4013a0 
             401bc0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 R13 ZZ call    sub_403EF0 
@@ -1565,7 +1565,7 @@
             401c0c      2 INSTR BELONGTO 4013a0 
             401c0e      3 INSTR BELONGTO 4013a0 
             401c0e      3 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 ZZ mov     rdi, [rbx]      ; src 
-            401c11     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
+            401c11     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rdi] 
             401c11      3 INSTR BELONGTO 4013a0 
             401c11      3 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ movzx   eax, byte ptr [rdi] 
             401c14     -1 INSTR LOCAL NoMetaUpdate cmp     al, 2Dh 
@@ -1593,7 +1593,7 @@
             401c34      2 INSTR BELONGTO 4013a0 
             401c36      2 INSTR BELONGTO 4013a0 
             401c36      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ xor     edi, edi        ; src 
-            401c36     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi        ; src 
+            401c36     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi        ; src 
             401c38     -1 INSTR LOCAL NoMetaUpdate call    sub_403480 
             401c38      5 INSTR BELONGTO 4013a0 
             401c38      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 R13 ZZ call    sub_403480 
@@ -1612,10 +1612,10 @@
             401c63     -1 INSTR LOCAL NoMetaUpdate call    _exit 
             401c63      5 INSTR BELONGTO 4013a0 
             401c63      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _exit 
-            401c68     -2 INSTR LOCAL n ESI ZZ  NumericDEFs mov     esi, offset sub_402280; handler 
+            401c68     -2 INSTR LOCAL n RSI ZZ  NumericDEFs mov     esi, offset sub_402280; handler 
             401c68      5 INSTR BELONGTO 4013a0 
             401c68      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, offset sub_402280; handler 
-            401c6d     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2          ; sig 
+            401c6d     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2          ; sig 
             401c6d      5 INSTR BELONGTO 4013a0 
             401c6d      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     edi, 2          ; sig 
             401c72     -1 INSTR LOCAL NoMetaUpdate call    _signal 
@@ -1761,7 +1761,7 @@
             401d83      2 INSTR BELONGTO 4013a0 
             401d85     -1 INSTR LOCAL NoMetaUpdate jz      loc_4017B4      ; jumptable 0000000000401753 case 55 
             401d85      6 INSTR BELONGTO 4013a0 
-            401d8b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2          ; n 
+            401d8b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2          ; n 
             401d8b      5 INSTR BELONGTO 4013a0 
             401d8b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R13 ZZ mov     edx, 2          ; n 
             401d90      5 INSTR BELONGTO 4013a0 
@@ -1781,7 +1781,7 @@
             401da8      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R13 ZZ mov     rcx, cs:s 
             401daf      5 INSTR BELONGTO 4013a0 
             401daf      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 ZZ mov     edx, offset aSBadFlagS; "%s: Bad flag `%s'\n" 
-            401db4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            401db4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             401db4      5 INSTR BELONGTO 4013a0 
             401db4      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, 1 
             401db9      7 INSTR BELONGTO 4013a0 
@@ -1794,10 +1794,10 @@
             401dcc      6 INSTR BELONGTO 4013a0 
             401dd2      7 INSTR BELONGTO 4013a0 
             401dd2      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R13 ZZ mov     rcx, cs:stderr  ; s 
-            401dd9     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 70h        ; n 
+            401dd9     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 70h        ; n 
             401dd9      5 INSTR BELONGTO 4013a0 
             401dd9      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 ZZ mov     edx, 70h        ; n 
-            401dde     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            401dde     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             401dde      5 INSTR BELONGTO 4013a0 
             401dde      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     esi, 1          ; size 
             401de3      5 INSTR BELONGTO 4013a0 
@@ -1933,7 +1933,7 @@
             401eb9      3 INSTR BELONGTO 401eb0 
             401ebc     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401ED0 
             401ebc      2 INSTR BELONGTO 401eb0 
-            401ebe     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+            401ebe     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
             401ebe      5 INSTR BELONGTO 401eb0 
             401ec3     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             401ec3      3 INSTR BELONGTO 401eb0 
@@ -1982,19 +1982,19 @@
             401f10      5 PTRIMMEDESP STACK 39 displ lea     rcx, [rsp+38h+var_18+7]
             401f15      2 INSTR BELONGTO 401ee0 
             401f15      2 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ xor     esi, esi 
-            401f15     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
+            401f15     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM xor     esi, esi 
             401f17      9 INSTR BELONGTO 401ee0 
-            401f20     -2 INSTR LOCAL n EAX ZZ  NumericDEFs movzx   eax, byte ptr [rcx] 
+            401f20     -2 INSTR LOCAL n RAX ZZ  NumericDEFs movzx   eax, byte ptr [rcx] 
             401f20      3 INSTR BELONGTO 401ee0 
             401f20      3 INSTR DEADREGS  EFLAGS RAX RDX ZZ movzx   eax, byte ptr [rcx] 
-            401f23     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM shl     esi, 8 
+            401f23     -2 INSTR LOCAL n RSI ZZ  AlwaysNUM shl     esi, 8 
             401f23      3 INSTR BELONGTO 401ee0 
             401f23      3 INSTR DEADREGS  EFLAGS RDX ZZ shl     esi, 8 
             401f26     -1 INSTR LOCAL MetadataRedundant add     esi, eax 
             401f26      2 INSTR BELONGTO 401ee0 
             401f28     -1 INSTR LOCAL MetadataRedundant mov     eax, esi 
             401f28      2 INSTR BELONGTO 401ee0 
-            401f2a     -2 INSTR LOCAL n EAX EDX ZZ  AlwaysNUM mul     r8d 
+            401f2a     -2 INSTR LOCAL n RAX RDX ZZ  AlwaysNUM mul     r8d 
             401f2a      3 INSTR BELONGTO 401ee0 
             401f2a      3 INSTR DEADREGS  EFLAGS RDX ZZ mul     r8d 
             401f2d     -1 INSTR LOCAL MetadataRedundant shr     edx, 3 
@@ -2046,7 +2046,7 @@
             401f72      3 INSTR BELONGTO 401ee0 
             401f75     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM sub     edx, 1 
             401f75      3 INSTR BELONGTO 401ee0 
-            401f78     -2 INSTR LOCAL n ESI ZZ  NumericDEFs movzx   esi, [rsp+rsi+38h+var_38] 
+            401f78     -2 INSTR LOCAL n RSI ZZ  NumericDEFs movzx   esi, [rsp+rsi+38h+var_38] 
             401f78      4 INSTR BELONGTO 401ee0 
             401f78      4 INSTR DEADREGS  EFLAGS ZZ movzx   esi, [rsp+rsi+38h+var_38] 
             401f78      4 PTRIMMEDESP STACK 0 displ movzx   esi, [rsp+rsi+38h+var_38]
@@ -2110,7 +2110,7 @@
             401fd4      5 INSTR DEADREGS  EFLAGS ZZ call    _strlen 
             401fd9      2 INSTR BELONGTO 401fb0 
             401fd9      2 INSTR DEADREGS  EFLAGS RDX ZZ mov     edx, eax 
-            401fd9     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, eax 
+            401fd9     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, eax 
             401fdb     -1 INSTR LOCAL MetadataRedundant xor     eax, eax 
             401fdb      2 INSTR BELONGTO 401fb0 
             401fdd     -1 INSTR LOCAL NoMetaUpdate cmp     r12d, edx 
@@ -2163,7 +2163,7 @@
             402016      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _fopen64 
             40201b     -1 INSTR LOCAL NoMetaUpdate test    rax, rax 
             40201b      3 INSTR BELONGTO 402010 
-            40201e     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM setnz   bl 
+            40201e     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM setnz   bl 
             40201e      3 INSTR BELONGTO 402010 
             40201e      3 INSTR DEADREGS  RBX ZZ setnz   bl 
             402021     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40202B 
@@ -2175,7 +2175,7 @@
             402026      5 INSTR DEADREGS  EFLAGS ZZ call    _fclose 
             40202b      2 INSTR BELONGTO 402010 
             40202b      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, ebx 
-            40202b     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            40202b     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             40202d      1 INSTR BELONGTO 402010 
             40202d      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             40202e      1 INSTR BELONGTO 402010 
@@ -2194,7 +2194,7 @@
             402034      5 INSTR DEADREGS  EFLAGS ZZ call    _fgetc 
             402039      2 INSTR BELONGTO 402030 
             402039      2 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, eax        ; c 
-            40203b     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
+            40203b     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 1 
             40203b      5 INSTR BELONGTO 402030 
             40203b      5 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, 1 
             402040     -1 INSTR LOCAL NoMetaUpdate cmp     edi, 0FFFFFFFFh 
@@ -2208,7 +2208,7 @@
             402048      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _ungetc 
             40204d      2 INSTR BELONGTO 402030 
             40204d      2 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ xor     eax, eax 
-            40204d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40204d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40204f      1 INSTR BELONGTO 402030 
             40204f      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
             402050      1 INSTR BELONGTO 402030 
@@ -2229,7 +2229,7 @@
             402076      5 INSTR BELONGTO 402060 
             40207b      2 INSTR BELONGTO 402060 
             40207b      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 ZZ xor     eax, eax 
-            40207b     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40207b     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40207d     -1 INSTR LOCAL NoMetaUpdate jmp     ___fprintf_chk 
             40207d      5 INSTR BELONGTO 402060 
             40207d      5 INSTR DEADREGS  EFLAGS RSI RDI R8 ZZ jmp     ___fprintf_chk 
@@ -2242,10 +2242,10 @@
             402090      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402094      7 INSTR BELONGTO 402090 
             402094      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, cs:stderr  ; s 
-            40209b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0EBh       ; n 
+            40209b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0EBh       ; n 
             40209b      5 INSTR BELONGTO 402090 
             40209b      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, 0EBh       ; n 
-            4020a0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            4020a0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             4020a0      5 INSTR BELONGTO 402090 
             4020a0      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, 1          ; size 
             4020a5      5 INSTR BELONGTO 402090 
@@ -2272,7 +2272,7 @@
             4020d0    432 FUNC GLOBAL sub_4020D0 FUNC_UNSAFE NOFP NORET             40227f 
             4020d1      2 INSTR BELONGTO 4020d0 
             4020d1      2 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, edi 
-            4020d1     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, edi 
+            4020d1     -2 INSTR LOCAL n RBX ZZ  NumericDEFs mov     ebx, edi 
             4020d3    160 DATAREF STACK 276 esp + 0 PARENT LocalFrame LOCALFRAME
             4020d3      4 DATAREF STACK 277 esp + 0 CHILDOF 276 OFFSET 0 OutArgsRegion OUTARGS
             4020d3      7 INSTR BELONGTO 4020d0 
@@ -2323,7 +2323,7 @@
             402132      5 PTRIMMEDESP STACK 16 displ lea     rdx, [rsp+0A8h+stat_buf]; stat_buf
             402137      5 INSTR BELONGTO 4020d0 
             402137      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset dest; filename 
-            40213c     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            40213c     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             40213c      5 INSTR BELONGTO 4020d0 
             40213c      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 1          ; ver 
             402141     -1 INSTR LOCAL NoMetaUpdate call    ___xstat64 
@@ -2361,12 +2361,12 @@
             402185      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rdi, cs:stderr 
             40218c      5 INSTR BELONGTO 4020d0 
             40218c      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSWarningDeleti; "%s: WARNING: deletion of output file (a"... 
-            402191     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402191     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402191      5 INSTR BELONGTO 4020d0 
             402191      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             402196      2 INSTR BELONGTO 4020d0 
             402196      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            402196     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402196     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402198     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             402198      5 INSTR BELONGTO 4020d0 
             402198      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -2380,12 +2380,12 @@
             4021ac      7 INSTR DEADREGS  EFLAGS RSI RDI R8 ZZ mov     rdi, cs:stderr 
             4021b3      2 INSTR BELONGTO 4020d0 
             4021b3      2 INSTR DEADREGS  EFLAGS RSI R8 ZZ sub     edx, eax 
-            4021b5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4021b5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4021b5      5 INSTR BELONGTO 4020d0 
             4021b5      5 INSTR DEADREGS  EFLAGS RAX RSI R8 ZZ mov     esi, 1 
             4021ba      2 INSTR BELONGTO 4020d0 
             4021ba      2 INSTR DEADREGS  EFLAGS RAX R8 ZZ xor     eax, eax 
-            4021ba     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4021ba     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4021bc      3 INSTR BELONGTO 4020d0 
             4021bc      3 INSTR DEADREGS  EFLAGS R8 ZZ mov     [rsp+0A8h+var_A8], edx 
             4021bc      3 PTRIMMEDESP STACK 0 displ mov     [rsp+0A8h+var_A8], edx
@@ -2404,12 +2404,12 @@
             4021d8      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rdi, cs:stderr 
             4021df      5 INSTR BELONGTO 4020d0 
             4021df      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSWarningDele_0; "%s: WARNING: deletion of output file su"... 
-            4021e4     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4021e4     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4021e4      5 INSTR BELONGTO 4020d0 
             4021e4      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             4021e9      2 INSTR BELONGTO 4020d0 
             4021e9      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4021e9     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4021e9     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4021eb     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4021eb      5 INSTR BELONGTO 4020d0 
             4021eb      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -2423,7 +2423,7 @@
             402203      5 INSTR BELONGTO 4020d0 
             402208      2 INSTR BELONGTO 4020d0 
             402208      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            402208     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402208     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40220a     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40220a      5 INSTR BELONGTO 4020d0 
             40220a      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -2439,7 +2439,7 @@
             402228      5 INSTR BELONGTO 4020d0 
             40222d      2 INSTR BELONGTO 4020d0 
             40222d      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40222d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40222d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40222f     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40222f      5 INSTR BELONGTO 4020d0 
             40222f      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -2453,7 +2453,7 @@
             402247      5 INSTR BELONGTO 4020d0 
             40224c      2 INSTR BELONGTO 4020d0 
             40224c      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40224c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40224c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40224e     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40224e      5 INSTR BELONGTO 4020d0 
             40224e      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -2467,7 +2467,7 @@
             402266      6 INSTR DEADREGS  EFLAGS RDX RSI R8 ZZ mov     r8d, offset file 
             40226c      5 INSTR BELONGTO 4020d0 
             40226c      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ mov     edx, offset aSDeletingOutpu; "%s: Deleting output file %s, if it exis"... 
-            402271     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402271     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402271      5 INSTR BELONGTO 4020d0 
             402271      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1 
             402276     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -2488,16 +2488,16 @@
             40228b      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ mov     rcx, cs:s 
             402292      5 INSTR BELONGTO 402280 
             402292      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSControlCOrSim; "\n%s: Control-C or similar caught, quit"... 
-            402297     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402297     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402297      5 INSTR BELONGTO 402280 
             402297      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             40229c      2 INSTR BELONGTO 402280 
             40229c      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40229c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40229c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40229e     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40229e      5 INSTR BELONGTO 402280 
             40229e      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
-            4022a3     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            4022a3     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             4022a3      5 INSTR BELONGTO 402280 
             4022a3      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1 
             4022a8     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -2523,7 +2523,7 @@
             4022c8      5 INSTR BELONGTO 4022b0 
             4022cd      2 INSTR BELONGTO 4022b0 
             4022cd      2 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            4022cd     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4022cd     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4022cf     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 8 
             4022cf      4 INSTR BELONGTO 4022b0 
             4022d3     -1 INSTR LOCAL NoMetaUpdate jmp     ___fprintf_chk 
@@ -2556,7 +2556,7 @@
             4022fc      5 INSTR BELONGTO 4022e0 
             402301      2 INSTR BELONGTO 4022e0 
             402301      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 R9 R10 R11 ZZ xor     eax, eax 
-            402301     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402301     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402303     -1 INSTR LOCAL NoMetaUpdate jmp     ___fprintf_chk 
             402303      5 INSTR BELONGTO 4022e0 
             402303      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     ___fprintf_chk 
@@ -2572,7 +2572,7 @@
             402319      2 INSTR DEADREGS  EFLAGS ZZ rep retn 
             402320      7 INSTR BELONGTO 402310 
             402320      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     rcx, cs:stderr 
-            402327     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0F0h 
+            402327     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 0F0h 
             402327      5 INSTR BELONGTO 402310 
             402327      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 0F0h 
             40232c     -1 INSTR LOCAL MetadataUnused mov     esi, 1 
@@ -2604,7 +2604,7 @@
             402367      5 INSTR BELONGTO 402340 
             40236c      2 INSTR BELONGTO 402340 
             40236c      2 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R8 ZZ xor     eax, eax 
-            40236c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40236c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40236e     -1 INSTR LOCAL NoMetaUpdate jmp     ___fprintf_chk 
             40236e      5 INSTR BELONGTO 402340 
             40236e      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 ZZ jmp     ___fprintf_chk 
@@ -2621,19 +2621,19 @@
             40238b      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ mov     rcx, cs:s 
             402392      5 INSTR BELONGTO 402380 
             402392      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSCouldnTAlloca; "\n%s: couldn't allocate enough memory\n" 
-            402397     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402397     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402397      5 INSTR BELONGTO 402380 
             402397      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             40239c      2 INSTR BELONGTO 402380 
             40239c      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40239c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40239c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40239e     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40239e      5 INSTR BELONGTO 402380 
             40239e      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
             4023a3     -1 INSTR LOCAL NoMetaUpdate call    sub_402340 
             4023a3      5 INSTR BELONGTO 402380 
             4023a3      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_402340 
-            4023a8     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            4023a8     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             4023a8      5 INSTR BELONGTO 402380 
             4023a8      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1 
             4023ad     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -2654,19 +2654,19 @@
             4023ce      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rdi, cs:stderr 
             4023d5      5 INSTR BELONGTO 4023c0 
             4023d5      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSPanicInternal; "\n%s: PANIC -- internal consistency err"... 
-            4023da     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4023da     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4023da      5 INSTR BELONGTO 4023c0 
             4023da      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             4023df      2 INSTR BELONGTO 4023c0 
             4023df      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4023df     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4023df     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4023e1     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4023e1      5 INSTR BELONGTO 4023c0 
             4023e1      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
             4023e6     -1 INSTR LOCAL NoMetaUpdate call    sub_402340 
             4023e6      5 INSTR BELONGTO 4023c0 
             4023e6      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_402340 
-            4023eb     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
+            4023eb     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
             4023eb      5 INSTR BELONGTO 4023c0 
             4023eb      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 3 
             4023f0     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -2689,12 +2689,12 @@
             402414      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rdi, cs:stderr 
             40241b      5 INSTR BELONGTO 402400 
             40241b      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSCaughtASigseg; "\n%s: Caught a SIGSEGV or SIGBUS whilst"... 
-            402420     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402420     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402420      5 INSTR BELONGTO 402400 
             402420      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             402425      2 INSTR BELONGTO 402400 
             402425      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            402425     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402425     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402427     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             402427      5 INSTR BELONGTO 402400 
             402427      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -2708,7 +2708,7 @@
             40243a     -1 INSTR LOCAL NoMetaUpdate call    sub_402310 
             40243a      5 INSTR BELONGTO 402400 
             40243a      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_402310 
-            40243f     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            40243f     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             40243f      5 INSTR BELONGTO 402400 
             40243f      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 2 
             402444     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -2718,18 +2718,18 @@
             402449      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rdi, cs:stderr 
             402450      5 INSTR BELONGTO 402400 
             402450      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSCaughtASigs_0; "\n%s: Caught a SIGSEGV or SIGBUS whilst"... 
-            402455     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402455     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402455      5 INSTR BELONGTO 402400 
             402455      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             40245a      2 INSTR BELONGTO 402400 
             40245a      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40245a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40245a     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40245c     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40245c      5 INSTR BELONGTO 402400 
             40245c      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
             402461     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40242C 
             402461      2 INSTR BELONGTO 402400 
-            402463     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
+            402463     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
             402463      5 INSTR BELONGTO 402400 
             402463      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 3 
             402468     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -2748,12 +2748,12 @@
             40247b      7 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     rdi, cs:stderr 
             402482      5 INSTR BELONGTO 402470 
             402482      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSIOOrOtherErro; "\n%s: I/O or other error, bailing out. "... 
-            402487     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402487     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402487      5 INSTR BELONGTO 402470 
             402487      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             40248c      2 INSTR BELONGTO 402470 
             40248c      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            40248c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40248c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40248e     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40248e      5 INSTR BELONGTO 402470 
             40248e      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -2765,7 +2765,7 @@
             40249f     -1 INSTR LOCAL NoMetaUpdate call    sub_402340 
             40249f      5 INSTR BELONGTO 402470 
             40249f      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_402340 
-            4024a4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
+            4024a4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             4024a4      5 INSTR BELONGTO 402470 
             4024a4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     edi, 1 
             4024a9     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -2890,7 +2890,7 @@
             40255f      2 INSTR BELONGTO 4024e0 
             402561      7 INSTR BELONGTO 4024e0 
             402561      7 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 ZZ mov     rsi, cs:stderr  ; stream 
-            402568     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ah        ; c 
+            402568     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ah        ; c 
             402568      5 INSTR BELONGTO 4024e0 
             402568      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     edi, 0Ah        ; c 
             40256d     -1 INSTR LOCAL NoMetaUpdate call    _fputc 
@@ -2911,10 +2911,10 @@
             402588      5 PTRIMMEDESP STACK 112 displ lea     rdi, [rsp+1498h+ptr]; ptr
             40258d      3 INSTR BELONGTO 4024e0 
             40258d      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R12 R13 ZZ mov     rcx, r14        ; stream 
-            402590     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1388h      ; n 
+            402590     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1388h      ; n 
             402590      5 INSTR BELONGTO 4024e0 
             402590      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 ZZ mov     edx, 1388h      ; n 
-            402595     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402595     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402595      5 INSTR BELONGTO 4024e0 
             402595      5 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 ZZ mov     esi, 1          ; size 
             40259a     -1 INSTR LOCAL NoMetaUpdate call    _fread 
@@ -2976,7 +2976,7 @@
             4025ea      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R12 R14 XMM0 XMM1 XMM2 XMM3 XMM4 ZZ mov     r8, rbp 
             4025ed      3 INSTR BELONGTO 4024e0 
             4025ed      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R14 XMM0 XMM1 XMM2 XMM3 XMM4 ZZ mov     rcx, rbx 
-            4025f0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            4025f0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             4025f0      5 INSTR BELONGTO 4024e0 
             4025f0      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R14 XMM0 XMM1 XMM2 XMM3 XMM4 ZZ mov     edx, 1 
             4025f5      3 INSTR BELONGTO 4024e0 
@@ -3033,7 +3033,7 @@
             40264c      5 PTRIMMEDESP STACK 104 displ lea     rdi, [rsp+1498h+var_1430]
             402651      2 INSTR BELONGTO 4024e0 
             402651      2 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 R9 ZZ xor     edx, edx 
-            402651     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
+            402651     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM xor     edx, edx 
             402653      3 INSTR BELONGTO 4024e0 
             402653      3 INSTR DEADREGS  EFLAGS RCX RSI R8 R9 ZZ mov     r9, r12 
             402656      3 INSTR BELONGTO 4024e0 
@@ -3347,7 +3347,7 @@
             4028f9      4 INSTR BELONGTO 4024e0 
             4028fd      5 INSTR BELONGTO 4024e0 
             4028fd      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 R13 R14 R15 ZZ mov     edx, offset a6_3f16_3fBitsB; "%6.3f:1, %6.3f bits/byte, %5.2f%% saved"... 
-            402902     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402902     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402902      5 INSTR BELONGTO 4024e0 
             402902      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 R14 R15 ZZ mov     esi, 1 
             402907     -1 INSTR LOCAL MetadataRedundant mov     eax, 3 
@@ -3396,10 +3396,10 @@
             402957      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 ZZ retn 
             402958      7 INSTR BELONGTO 4024e0 
             402958      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 ZZ mov     rcx, cs:stderr  ; s 
-            40295f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 15h        ; n 
+            40295f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 15h        ; n 
             40295f      5 INSTR BELONGTO 4024e0 
             40295f      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 ZZ mov     edx, 15h        ; n 
-            402964     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402964     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402964      5 INSTR BELONGTO 4024e0 
             402964      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 ZZ mov     esi, 1          ; size 
             402969      5 INSTR BELONGTO 4024e0 
@@ -3438,7 +3438,7 @@
             402997      8 PTRIMMEDESP STACK 10040 displ mov     [rsp+2758h+var_20], rax
             40299f      2 INSTR BELONGTO 402980 
             40299f      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            40299f     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40299f     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4029a1      8 INSTR BELONGTO 402980 
             4029a1      8 INSTR DEADREGS  EFLAGS R12 ZZ mov     [rsp+2758h+var_273C], 0 
             4029a1      8 PTRIMMEDESP STACK 28 displ mov     [rsp+2758h+var_273C], 0
@@ -3454,7 +3454,7 @@
             4029b6      5 PTRIMMEDESP STACK 28 displ mov     r9d, [rsp+2758h+var_273C]
             4029bb     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
             4029bb      2 INSTR BELONGTO 402980 
-            4029bd     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movzx   ecx, cs:byte_607AF4 
+            4029bd     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movzx   ecx, cs:byte_607AF4 
             4029bd      7 INSTR BELONGTO 402980 
             4029bd      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R12 ZZ movzx   ecx, cs:byte_607AF4 
             4029c4      6 INSTR BELONGTO 402980 
@@ -3497,7 +3497,7 @@
             402a09      5 INSTR BELONGTO 402980 
             402a09      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ lea     rdi, [rsp+2758h+var_2744] 
             402a09      5 PTRIMMEDESP STACK 20 displ lea     rdi, [rsp+2758h+var_2744]
-            402a0e     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1388h 
+            402a0e     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1388h 
             402a0e      5 INSTR BELONGTO 402980 
             402a0e      5 INSTR DEADREGS  EFLAGS RCX RSI ZZ mov     ecx, 1388h 
             402a13      3 INSTR BELONGTO 402980 
@@ -3568,7 +3568,7 @@
             402a81      3 INSTR BELONGTO 402980 
             402a84     -1 INSTR LOCAL NoMetaUpdate jnz     loc_402C4F 
             402a84      6 INSTR BELONGTO 402980 
-            402a8a     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rsp+2758h+var_273C] 
+            402a8a     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rsp+2758h+var_273C] 
             402a8a      4 INSTR BELONGTO 402980 
             402a8a      4 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ mov     eax, [rsp+2758h+var_273C] 
             402a8a      4 PTRIMMEDESP STACK 28 displ mov     eax, [rsp+2758h+var_273C]
@@ -3585,8 +3585,8 @@
             402a9a      4 INSTR BELONGTO 402980 
             402a9e      2 INSTR BELONGTO 402980 
             402a9e      2 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ xor     eax, eax 
-            402a9e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            402aa0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [rcx+rax] 
+            402a9e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            402aa0     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [rcx+rax] 
             402aa0      4 INSTR BELONGTO 402980 
             402aa0      4 INSTR DEADREGS  EFLAGS RDX RDI ZZ movzx   edx, byte ptr [rcx+rax] 
             402aa4      7 INSTR BELONGTO 402980 
@@ -3642,12 +3642,12 @@
             402b05      6 INSTR DEADREGS  EFLAGS RAX RDX RSI R8 R12 ZZ mov     r8d, offset dest 
             402b0b      5 INSTR BELONGTO 402980 
             402b0b      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 ZZ mov     edx, offset aSS ; "%s: %s: " 
-            402b10     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402b10     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402b10      5 INSTR BELONGTO 402980 
             402b10      5 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ mov     esi, 1 
             402b15      2 INSTR BELONGTO 402980 
             402b15      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            402b15     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402b15     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402b17     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             402b17      5 INSTR BELONGTO 402980 
             402b17      5 INSTR DEADREGS  EFLAGS R12 ZZ call    ___fprintf_chk 
@@ -3661,17 +3661,17 @@
             402b26      5 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ call    sub_402090      ; jumptable 0000000000402A58 case 0 
             402b2b      7 INSTR BELONGTO 402980 
             402b2b      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; jumptable 0000000000402A58 case 2 
-            402b32     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 17h        ; n 
+            402b32     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 17h        ; n 
             402b32      5 INSTR BELONGTO 402980 
             402b32      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 17h        ; n 
-            402b37     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402b37     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402b37      5 INSTR BELONGTO 402980 
             402b37      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 1          ; size 
             402b3c      5 INSTR BELONGTO 402980 
             402b3c      5 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     edi, offset aFileEndsUnexpe; "file ends unexpectedly\n" 
             402b41      2 INSTR BELONGTO 402980 
             402b41      2 INSTR DEADREGS  EFLAGS RBX R12 ZZ xor     ebx, ebx 
-            402b41     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            402b41     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             402b43     -1 INSTR LOCAL NoMetaUpdate call    _fwrite 
             402b43      5 INSTR BELONGTO 402980 
             402b43      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _fwrite 
@@ -3683,7 +3683,7 @@
             402b50      9 INSTR BELONGTO 402980 
             402b59      2 INSTR BELONGTO 402980 
             402b59      2 INSTR DEADREGS  RAX R12 ZZ mov     eax, ebx 
-            402b59     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            402b59     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             402b5b     -1 INSTR LOCAL NoMetaUpdate jnz     loc_402C4A 
             402b5b      6 INSTR BELONGTO 402980 
             402b61     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 2740h 
@@ -3712,17 +3712,17 @@
             402b81      2 INSTR BELONGTO 402980 
             402b83     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_607B18, 0 
             402b83      7 INSTR BELONGTO 402980 
-            402b8a     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            402b8a     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             402b8a      5 INSTR BELONGTO 402980 
             402b8a      5 INSTR DEADREGS  RDX RBX R12 ZZ mov     ebx, 1 
             402b8f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_402B48 
             402b8f      2 INSTR BELONGTO 402980 
             402b91      7 INSTR BELONGTO 402980 
             402b91      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; s 
-            402b98     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 23h        ; n 
+            402b98     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 23h        ; n 
             402b98      5 INSTR BELONGTO 402980 
             402b98      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 23h        ; n 
-            402b9d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402b9d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402b9d      5 INSTR BELONGTO 402980 
             402b9d      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 1          ; size 
             402ba2      5 INSTR BELONGTO 402980 
@@ -3734,17 +3734,17 @@
             402bac      2 INSTR BELONGTO 402980 
             402bae      7 INSTR BELONGTO 402980 
             402bae      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; jumptable 0000000000402A58 case 5 
-            402bb5     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 23h        ; n 
+            402bb5     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 23h        ; n 
             402bb5      5 INSTR BELONGTO 402980 
             402bb5      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 23h        ; n 
-            402bba     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402bba     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402bba      5 INSTR BELONGTO 402980 
             402bba      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 1          ; size 
             402bbf      5 INSTR BELONGTO 402980 
             402bbf      5 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     edi, offset aDataIntegrityC; "data integrity (CRC) error in data\n" 
             402bc4      2 INSTR BELONGTO 402980 
             402bc4      2 INSTR DEADREGS  EFLAGS RBX R12 ZZ xor     ebx, ebx 
-            402bc4     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            402bc4     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             402bc6     -1 INSTR LOCAL NoMetaUpdate call    _fwrite 
             402bc6      5 INSTR BELONGTO 402980 
             402bc6      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _fwrite 
@@ -3755,17 +3755,17 @@
             402bd0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R12 ZZ call    sub_402380      ; jumptable 0000000000402A58 case 6 
             402bd5      7 INSTR BELONGTO 402980 
             402bd5      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; s 
-            402bdc     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2Dh        ; n 
+            402bdc     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 2Dh        ; n 
             402bdc      5 INSTR BELONGTO 402980 
             402bdc      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 2Dh        ; n 
-            402be1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402be1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402be1      5 INSTR BELONGTO 402980 
             402be1      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 1          ; size 
             402be6      5 INSTR BELONGTO 402980 
             402be6      5 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     edi, offset aBadMagicNumber; "bad magic number (file not created by b"... 
             402beb      2 INSTR BELONGTO 402980 
             402beb      2 INSTR DEADREGS  EFLAGS RBX R12 ZZ xor     ebx, ebx 
-            402beb     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            402beb     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             402bed     -1 INSTR LOCAL NoMetaUpdate call    _fwrite 
             402bed      5 INSTR BELONGTO 402980 
             402bed      5 INSTR DEADREGS  EFLAGS R12 ZZ call    _fwrite 
@@ -3791,17 +3791,17 @@
             402c12      6 INSTR BELONGTO 402980 
             402c18     -1 INSTR LOCAL NoMetaUpdate cmp     cs:dword_6076CC, 1 
             402c18      7 INSTR BELONGTO 402980 
-            402c1f     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            402c1f     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             402c1f      5 INSTR BELONGTO 402980 
             402c1f      5 INSTR DEADREGS  RDX RBX R12 ZZ mov     ebx, 1 
             402c24     -1 INSTR LOCAL NoMetaUpdate jle     loc_402B48 
             402c24      6 INSTR BELONGTO 402980 
             402c2a      7 INSTR BELONGTO 402980 
             402c2a      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; s 
-            402c31     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; n 
+            402c31     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; n 
             402c31      5 INSTR BELONGTO 402980 
             402c31      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     edx, 5          ; n 
-            402c36     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402c36     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402c36      5 INSTR BELONGTO 402980 
             402c36      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, 1          ; size 
             402c3b      5 INSTR BELONGTO 402980 
@@ -3852,7 +3852,7 @@
             402c7f      8 PTRIMMEDESP STACK 10040 displ mov     [rsp+2768h+var_30], rax
             402c87      2 INSTR BELONGTO 402c60 
             402c87      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            402c87     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402c87     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402c89      8 INSTR BELONGTO 402c60 
             402c89      8 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     [rsp+2768h+var_274C], 0 
             402c89      8 PTRIMMEDESP STACK 28 displ mov     [rsp+2768h+var_274C], 0
@@ -3877,7 +3877,7 @@
             402cae      5 PTRIMMEDESP STACK 28 displ mov     r9d, [rsp+2768h+var_274C]
             402cb3     -1 INSTR LOCAL MetadataUnused xor     r12d, r12d 
             402cb3      3 INSTR BELONGTO 402c60 
-            402cb6     -2 INSTR LOCAL n ECX ZZ  NumericDEFs movzx   ecx, cs:byte_607AF4 
+            402cb6     -2 INSTR LOCAL n RCX ZZ  NumericDEFs movzx   ecx, cs:byte_607AF4 
             402cb6      7 INSTR BELONGTO 402c60 
             402cb6      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R13 ZZ movzx   ecx, cs:byte_607AF4 
             402cbd      6 INSTR BELONGTO 402c60 
@@ -3915,7 +3915,7 @@
             402cfd      5 INSTR BELONGTO 402c60 
             402cfd      5 INSTR DEADREGS  EFLAGS RCX RSI RDI ZZ lea     rdi, [rsp+2768h+var_2754] 
             402cfd      5 PTRIMMEDESP STACK 20 displ lea     rdi, [rsp+2768h+var_2754]
-            402d02     -2 INSTR LOCAL n ECX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1388h 
+            402d02     -2 INSTR LOCAL n RCX ZZ  NUMVia2ndSrcIMMEDNUM mov     ecx, 1388h 
             402d02      5 INSTR BELONGTO 402c60 
             402d02      5 INSTR DEADREGS  EFLAGS RCX RSI ZZ mov     ecx, 1388h 
             402d07      3 INSTR BELONGTO 402c60 
@@ -3950,7 +3950,7 @@
             402d2e      3 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ movsxd  rdx, eax        ; n 
             402d31      3 INSTR BELONGTO 402c60 
             402d31      3 INSTR DEADREGS  EFLAGS RCX RSI ZZ mov     rcx, rbx        ; s 
-            402d34     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402d34     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402d34      5 INSTR BELONGTO 402c60 
             402d34      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, 1          ; size 
             402d39     -1 INSTR LOCAL NoMetaUpdate call    _fwrite 
@@ -3996,7 +3996,7 @@
             402d7a      2 INSTR BELONGTO 402c60 
             402d7c     -1 INSTR LOCAL NoMetaUpdate jnz     loc_403067 
             402d7c      6 INSTR BELONGTO 402c60 
-            402d82     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rsp+2768h+var_274C] 
+            402d82     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, [rsp+2768h+var_274C] 
             402d82      4 INSTR BELONGTO 402c60 
             402d82      4 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ mov     eax, [rsp+2768h+var_274C] 
             402d82      4 PTRIMMEDESP STACK 28 displ mov     eax, [rsp+2768h+var_274C]
@@ -4013,9 +4013,9 @@
             402d92      4 INSTR BELONGTO 402c60 
             402d96      2 INSTR BELONGTO 402c60 
             402d96      2 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ xor     eax, eax 
-            402d96     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402d96     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402d98      8 INSTR BELONGTO 402c60 
-            402da0     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [rcx+rax] 
+            402da0     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [rcx+rax] 
             402da0      4 INSTR BELONGTO 402c60 
             402da0      4 INSTR DEADREGS  EFLAGS RDX RDI ZZ movzx   edx, byte ptr [rcx+rax] 
             402da4      7 INSTR BELONGTO 402c60 
@@ -4104,10 +4104,10 @@
             402e38      5 PTRIMMEDESP STACK 32 displ lea     rdi, [rsp+2768h+ptr]; ptr
             402e3d      3 INSTR BELONGTO 402c60 
             402e3d      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R12 R13 ZZ mov     rcx, rbp        ; stream 
-            402e40     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1388h      ; n 
+            402e40     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1388h      ; n 
             402e40      5 INSTR BELONGTO 402c60 
             402e40      5 INSTR DEADREGS  EFLAGS RDX RSI R12 R13 ZZ mov     edx, 1388h      ; n 
-            402e45     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402e45     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402e45      5 INSTR BELONGTO 402c60 
             402e45      5 INSTR DEADREGS  EFLAGS RSI R12 R13 ZZ mov     esi, 1          ; size 
             402e4a     -1 INSTR LOCAL NoMetaUpdate call    _fread 
@@ -4137,7 +4137,7 @@
             402e6c      3 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 ZZ movsxd  rdx, r12d       ; n 
             402e6f      3 INSTR BELONGTO 402c60 
             402e6f      3 INSTR DEADREGS  EFLAGS RCX RSI R12 R13 ZZ mov     rcx, rbx        ; s 
-            402e72     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402e72     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402e72      5 INSTR BELONGTO 402c60 
             402e72      5 INSTR DEADREGS  EFLAGS RSI R12 R13 ZZ mov     esi, 1          ; size 
             402e77     -1 INSTR LOCAL NoMetaUpdate call    _fwrite 
@@ -4234,17 +4234,17 @@
             402f16      7 INSTR BELONGTO 402c60 
             402f1d     11 INSTR BELONGTO 402c60 
             402f1d     11 INSTR DEADREGS  RDX RBX R12 R13 ZZ mov     cs:stream, 0 
-            402f28     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            402f28     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             402f28      5 INSTR BELONGTO 402c60 
             402f28      5 INSTR DEADREGS  RDX RBX R12 R13 ZZ mov     ebx, 1 
             402f2d     -1 INSTR LOCAL NoMetaUpdate jle     short loc_402F4A 
             402f2d      2 INSTR BELONGTO 402c60 
             402f2f      7 INSTR BELONGTO 402c60 
             402f2f      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R12 R13 ZZ mov     rcx, cs:stderr  ; s 
-            402f36     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; n 
+            402f36     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; n 
             402f36      5 INSTR BELONGTO 402c60 
             402f36      5 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 R13 ZZ mov     edx, 5          ; n 
-            402f3b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            402f3b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             402f3b      5 INSTR BELONGTO 402c60 
             402f3b      5 INSTR DEADREGS  EFLAGS RSI RDI R12 R13 ZZ mov     esi, 1          ; size 
             402f40      5 INSTR BELONGTO 402c60 
@@ -4260,7 +4260,7 @@
             402f52      9 INSTR BELONGTO 402c60 
             402f5b      2 INSTR BELONGTO 402c60 
             402f5b      2 INSTR DEADREGS  RAX R12 R13 ZZ mov     eax, ebx 
-            402f5b     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ebx 
+            402f5b     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, ebx 
             402f5d     -1 INSTR LOCAL NoMetaUpdate jnz     loc_403071 
             402f5d      6 INSTR BELONGTO 402c60 
             402f63     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 2748h 
@@ -4288,12 +4288,12 @@
             402f82      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R12 R13 ZZ mov     rcx, cs:s 
             402f89      5 INSTR BELONGTO 402c60 
             402f89      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 R13 ZZ mov     edx, offset aSDataIntegrity; "\n%s: Data integrity error when decompr"... 
-            402f8e     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            402f8e     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             402f8e      5 INSTR BELONGTO 402c60 
             402f8e      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 ZZ mov     esi, 1 
             402f93      2 INSTR BELONGTO 402c60 
             402f93      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-            402f93     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            402f93     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             402f95     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             402f95      5 INSTR BELONGTO 402c60 
             402f95      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    ___fprintf_chk 
@@ -4303,7 +4303,7 @@
             402f9f     -1 INSTR LOCAL NoMetaUpdate call    sub_402310 
             402f9f      5 INSTR BELONGTO 402c60 
             402f9f      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ call    sub_402310 
-            402fa4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            402fa4     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             402fa4      5 INSTR BELONGTO 402c60 
             402fa4      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ mov     edi, 2 
             402fa9     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -4329,14 +4329,14 @@
             402fcb      5 INSTR DEADREGS  EFLAGS RBX R13 ZZ call    _fclose 
             402fd0      2 INSTR BELONGTO 402c60 
             402fd0      2 INSTR DEADREGS  EFLAGS RAX RDX RBX R13 ZZ xor     ebx, ebx 
-            402fd0     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            402fd0     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             402fd2     -1 INSTR LOCAL NoMetaUpdate cmp     r12d, 1 
             402fd2      4 INSTR BELONGTO 402c60 
             402fd6     -1 INSTR LOCAL NoMetaUpdate jz      loc_402F4A 
             402fd6      6 INSTR BELONGTO 402c60 
             402fdc     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_607B18, 0 
             402fdc      7 INSTR BELONGTO 402c60 
-            402fe3     -2 INSTR LOCAL n EBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
+            402fe3     -2 INSTR LOCAL n RBX ZZ  NUMVia2ndSrcIMMEDNUM mov     ebx, 1 
             402fe3      5 INSTR BELONGTO 402c60 
             402fe3      5 INSTR DEADREGS  RAX RDX RBX R12 R13 ZZ mov     ebx, 1 
             402fe8     -1 INSTR LOCAL NoMetaUpdate jz      loc_402F4A 
@@ -4349,12 +4349,12 @@
             402ffc      6 INSTR DEADREGS  EFLAGS RAX RDX RSI R8 R12 R13 ZZ mov     r8d, offset dest 
             403002      5 INSTR BELONGTO 402c60 
             403002      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 ZZ mov     edx, offset aSSTrailingGarb; "\n%s: %s: trailing garbage after EOF ig"... 
-            403007     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403007     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403007      5 INSTR BELONGTO 402c60 
             403007      5 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 ZZ mov     esi, 1 
             40300c      2 INSTR BELONGTO 402c60 
             40300c      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
-            40300c     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40300c     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40300e     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40300e      5 INSTR BELONGTO 402c60 
             40300e      5 INSTR DEADREGS  EFLAGS R12 R13 ZZ call    ___fprintf_chk 
@@ -4364,7 +4364,7 @@
             403018      7 INSTR BELONGTO 402c60 
             40301f     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_403030 
             40301f      2 INSTR BELONGTO 402c60 
-            403021     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
+            403021     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             403021      5 INSTR BELONGTO 402c60 
             403021      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ mov     edi, 2 
             403026     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
@@ -4379,12 +4379,12 @@
             403037      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 R13 ZZ mov     rdi, cs:stderr 
             40303e      5 INSTR BELONGTO 402c60 
             40303e      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 R13 ZZ mov     edx, offset aSCompressedFil; "\n%s: Compressed file ends unexpectedly"... 
-            403043     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403043     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403043      5 INSTR BELONGTO 402c60 
             403043      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 ZZ mov     esi, 1 
             403048      2 INSTR BELONGTO 402c60 
             403048      2 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ xor     eax, eax 
-            403048     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403048     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40304a     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40304a      5 INSTR BELONGTO 402c60 
             40304a      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    ___fprintf_chk 
@@ -4439,7 +4439,7 @@
             4030a4      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rsi, rbx        ; src 
             4030a7      3 INSTR BELONGTO 403080 
             4030a7      3 INSTR DEADREGS  EFLAGS RDX RBX RDI ZZ mov     rdi, rbp        ; dest 
-            4030aa     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 400h       ; n 
+            4030aa     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 400h       ; n 
             4030aa      5 INSTR BELONGTO 403080 
             4030aa      5 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     edx, 400h       ; n 
             4030af     -1 INSTR LOCAL NoMetaUpdate call    _strncpy 
@@ -4462,7 +4462,7 @@
             4030ca      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 ZZ mov     rdi, cs:stderr 
             4030d1      2 INSTR BELONGTO 403080 
             4030d1      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 ZZ xor     eax, eax 
-            4030d1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4030d1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4030d3     -2 INSTR LOCAL n R8 ZZ  NUMVia2ndSrcIMMEDNUM mov     r8d, 400h 
             4030d3      6 INSTR BELONGTO 403080 
             4030d3      6 INSTR DEADREGS  EFLAGS RCX RDX RSI R8 ZZ mov     r8d, 400h 
@@ -4470,7 +4470,7 @@
             4030d9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI ZZ mov     rcx, rbx 
             4030dc      5 INSTR BELONGTO 403080 
             4030dc      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, offset aBzip2FileNameS; "bzip2: file name\n`%s'\nis suspiciously"... 
-            4030e1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4030e1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4030e1      5 INSTR BELONGTO 403080 
             4030e1      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             4030e6     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -4523,7 +4523,7 @@
             403132      2 INSTR BELONGTO 403110 
             403134      2 INSTR BELONGTO 403110 
             403134      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ xor     edi, edi 
-            403134     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
+            403134     -2 INSTR LOCAL n RDI ZZ  AlwaysNUM xor     edi, edi 
             403136     -1 INSTR LOCAL NoMetaUpdate call    sub_403110 
             403136      5 INSTR BELONGTO 403110 
             403136      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_403110 
@@ -4540,7 +4540,7 @@
             403147      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
             403148      1 INSTR BELONGTO 403110 
             403148      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-            403149     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h        ; size 
+            403149     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h        ; size 
             403149      5 INSTR BELONGTO 403110 
             403149      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 10h        ; size 
             40314e      5 INSTR BELONGTO 403110 
@@ -4570,7 +4570,7 @@
             40317c     -1 INSTR LOCAL NoMetaUpdate call    _strlen 
             40317c      5 INSTR BELONGTO 403110 
             40317c      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _strlen 
-            403181     -2 INSTR LOCAL n EDI ZZ  NumericDEFs lea     edi, [rax+5] 
+            403181     -2 INSTR LOCAL n RDI ZZ  NumericDEFs lea     edi, [rax+5] 
             403181      3 INSTR BELONGTO 403110 
             403181      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ lea     edi, [rax+5] 
             403184     -1 INSTR LOCAL MetadataRedundant movsxd  rdi, edi        ; size 
@@ -4666,7 +4666,7 @@
             403209      2 INSTR BELONGTO 4031b0 
             40320b      2 INSTR BELONGTO 4031b0 
             40320b      2 INSTR DEADREGS  EFLAGS ZZ xor     ebp, ebp 
-            40320b     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            40320b     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             40320d     -1 INSTR LOCAL NoMetaUpdate test    r14b, r14b 
             40320d      3 INSTR BELONGTO 4031b0 
             403210     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4031D7 
@@ -4693,16 +4693,16 @@
             403238      2 INSTR BELONGTO 4031b0 
             40323a     -1 INSTR LOCAL NoMetaUpdate cmp     ebp, 400h 
             40323a      6 INSTR BELONGTO 4031b0 
-            403240     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, r13d 
+            403240     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, r13d 
             403240      3 INSTR BELONGTO 4031b0 
             403240      3 INSTR DEADREGS  RAX RCX RDX RSI RDI R14 ZZ mov     ecx, r13d 
             403243     -1 INSTR LOCAL MetadataRedundant cmovle  ecx, ebp 
             403243      3 INSTR BELONGTO 4031b0 
             403246      2 INSTR BELONGTO 4031b0 
             403246      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R14 ZZ xor     eax, eax 
-            403246     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403246     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403248      8 INSTR BELONGTO 4031b0 
-            403250     -2 INSTR LOCAL n EDX ZZ  NumericDEFs movzx   edx, byte ptr [rbx+rax] 
+            403250     -2 INSTR LOCAL n RDX ZZ  NumericDEFs movzx   edx, byte ptr [rbx+rax] 
             403250      4 INSTR BELONGTO 4031b0 
             403250      4 INSTR DEADREGS  EFLAGS RDX RSI RDI R14 ZZ movzx   edx, byte ptr [rbx+rax] 
             403254      6 INSTR BELONGTO 4031b0 
@@ -4761,22 +4761,22 @@
             4032a5      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
             4032aa      2 INSTR BELONGTO 4032a0 
             4032aa      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ xor     eax, eax 
-            4032aa     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4032aa     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4032ac     24 DATAREF STACK 290 esp + 0 PARENT LocalFrame LOCALFRAME
             4032ac      4 INSTR BELONGTO 4032a0 
             4032ac      4 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ sub     rsp, 18h 
             4032ac      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
-            4032b0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 180h 
+            4032b0     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 180h 
             4032b0      5 INSTR BELONGTO 4032a0 
             4032b0      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 180h 
-            4032b5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0C1h       ; oflag 
+            4032b5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 0C1h       ; oflag 
             4032b5      5 INSTR BELONGTO 4032a0 
             4032b5      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 0C1h       ; oflag 
             4032ba      5 INSTR BELONGTO 4032a0 
             4032ba      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, offset file; file 
             4032bf      2 INSTR BELONGTO 4032a0 
             4032bf      2 INSTR DEADREGS  EFLAGS RBX ZZ xor     ebp, ebp 
-            4032bf     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
+            4032bf     -2 INSTR LOCAL n RBP ZZ  AlwaysNUM xor     ebp, ebp 
             4032c1     -1 INSTR LOCAL NoMetaUpdate call    _open64 
             4032c1      5 INSTR BELONGTO 4032a0 
             4032c1      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _open64 
@@ -4827,7 +4827,7 @@
             403310      8 MEMORYHOLE STACK esp + 152 ReturnAddress 
             403317      5 INSTR BELONGTO 403310 
             403317      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     esi, offset dest; filename 
-            40331c     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            40331c     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             40331c      5 INSTR BELONGTO 403310 
             40331c      5 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edi, 1          ; ver 
             403321      3 INSTR BELONGTO 403310 
@@ -4838,7 +4838,7 @@
             403324      5 INSTR DEADREGS  EFLAGS ZZ call    ___lxstat64 
             403329     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
             403329      2 INSTR BELONGTO 403310 
-            40332b     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
+            40332b     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
             40332b      5 INSTR BELONGTO 403310 
             40332b      5 INSTR DEADREGS  RAX RDX R8 R9 R10 R11 ZZ mov     edx, 1 
             403330     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_403343 
@@ -4849,12 +4849,12 @@
             403336      5 INSTR BELONGTO 403310 
             40333b     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 8000h 
             40333b      5 INSTR BELONGTO 403310 
-            403340     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM setnz   dl 
+            403340     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM setnz   dl 
             403340      3 INSTR BELONGTO 403310 
             403340      3 INSTR DEADREGS  RAX RDX R8 R9 R10 R11 ZZ setnz   dl 
             403343      2 INSTR BELONGTO 403310 
             403343      2 INSTR DEADREGS  EFLAGS RAX R8 R9 R10 R11 ZZ mov     eax, edx 
-            403343     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, edx 
+            403343     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     eax, edx 
             403345     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 98h 
             403345      7 INSTR BELONGTO 403310 
             40334c    152 DEALLOC STACK esp - 152 retn
@@ -4871,7 +4871,7 @@
             403354      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset stat_buf; stat_buf 
             403359      5 INSTR BELONGTO 403350 
             403359      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset dest; filename 
-            40335e     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            40335e     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             40335e      5 INSTR BELONGTO 403350 
             40335e      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 1          ; ver 
             403363     -1 INSTR LOCAL NoMetaUpdate call    ___xstat64 
@@ -4944,7 +4944,7 @@
             4033cc      6 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ lea     eax, [rcx-1010101h] 
             4033d2      2 INSTR BELONGTO 4033c0 
             4033d2      2 INSTR DEADREGS  EFLAGS RBX RSI ZZ not     ecx 
-            4033d2     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM not     ecx 
+            4033d2     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM not     ecx 
             4033d4      2 INSTR BELONGTO 4033c0 
             4033d4      2 INSTR DEADREGS  EFLAGS RBX RSI ZZ and     eax, ecx 
             4033d6      5 INSTR BELONGTO 4033c0 
@@ -4953,7 +4953,7 @@
             4033db      2 INSTR BELONGTO 4033c0 
             4033dd      2 INSTR BELONGTO 4033c0 
             4033dd      2 INSTR DEADREGS  EFLAGS RCX RBX RSI ZZ mov     ecx, eax 
-            4033dd     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, eax 
+            4033dd     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, eax 
             4033df      6 INSTR BELONGTO 4033c0 
             4033df      6 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, cs:dword_607B04 
             4033e5     -1 INSTR LOCAL MetadataUnused mov     ebx, 1 
@@ -4984,7 +4984,7 @@
             403412      2 INSTR BELONGTO 4033c0 
             403414      7 INSTR BELONGTO 4033c0 
             403414      7 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rsi, cs:stderr  ; stream 
-            40341b     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 20h        ; c 
+            40341b     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 20h        ; c 
             40341b      5 INSTR BELONGTO 4033c0 
             40341b      5 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, 20h        ; c 
             403420     -1 INSTR LOCAL MetadataUnused add     ebx, 1 
@@ -5004,7 +5004,7 @@
             403439      6 INSTR DEADREGS  EFLAGS RAX ZZ lea     eax, [rcx-1010101h] 
             40343f      2 INSTR BELONGTO 4033c0 
             40343f      2 INSTR DEADREGS  EFLAGS ZZ not     ecx 
-            40343f     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM not     ecx 
+            40343f     -2 INSTR LOCAL n RCX ZZ  AlwaysNUM not     ecx 
             403441      2 INSTR BELONGTO 4033c0 
             403441      2 INSTR DEADREGS  EFLAGS ZZ and     eax, ecx 
             403443      5 INSTR BELONGTO 4033c0 
@@ -5013,7 +5013,7 @@
             403448      2 INSTR BELONGTO 4033c0 
             40344a      2 INSTR BELONGTO 4033c0 
             40344a      2 INSTR DEADREGS  EFLAGS RCX ZZ mov     ecx, eax 
-            40344a     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, eax 
+            40344a     -2 INSTR LOCAL n RCX ZZ  NumericDEFs mov     ecx, eax 
             40344c     -1 INSTR LOCAL MetadataRedundant shr     ecx, 10h 
             40344c      3 INSTR BELONGTO 4033c0 
             40344f     -1 INSTR LOCAL NoMetaUpdate test    eax, 8080h 
@@ -5169,7 +5169,7 @@
             40356f      4 INSTR BELONGTO 403480 
             403573     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_40354C 
             403573      2 INSTR BELONGTO 403480 
-            403575     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40Ah 
+            403575     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40Ah 
             403575      5 INSTR BELONGTO 403480 
             403575      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 40Ah 
             40357a      5 INSTR BELONGTO 403480 
@@ -5223,7 +5223,7 @@
             4035f4      6 INSTR DEADREGS  EFLAGS RAX RDI ZZ lea     eax, [rdx-1010101h] 
             4035fa      2 INSTR BELONGTO 403480 
             4035fa      2 INSTR DEADREGS  EFLAGS RDI ZZ not     edx 
-            4035fa     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM not     edx 
+            4035fa     -2 INSTR LOCAL n RDX ZZ  AlwaysNUM not     edx 
             4035fc      2 INSTR BELONGTO 403480 
             4035fc      2 INSTR DEADREGS  EFLAGS RDI ZZ and     eax, edx 
             4035fe      5 INSTR BELONGTO 403480 
@@ -5232,7 +5232,7 @@
             403603      2 INSTR BELONGTO 403480 
             403605      2 INSTR BELONGTO 403480 
             403605      2 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     edx, eax 
-            403605     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, eax 
+            403605     -2 INSTR LOCAL n RDX ZZ  NumericDEFs mov     edx, eax 
             403607      3 INSTR BELONGTO 403480 
             403607      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, r12        ; s 
             40360a     -1 INSTR LOCAL MetadataRedundant shr     edx, 10h 
@@ -5258,7 +5258,7 @@
             40362f      3 INSTR DEADREGS  EFLAGS RDX RSI RDI R12 ZZ mov     rsi, rbx 
             403632     -1 INSTR LOCAL 2ndSrcNumeric sub     rbp, rax 
             403632      3 INSTR BELONGTO 403480 
-            403635     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40Ah 
+            403635     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40Ah 
             403635      5 INSTR BELONGTO 403480 
             403635      5 INSTR DEADREGS  EFLAGS RDX RBX RDI R12 ZZ mov     edx, 40Ah 
             40363a      5 INSTR BELONGTO 403480 
@@ -5304,12 +5304,12 @@
             403696      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R12 ZZ mov     ecx, offset dest 
             40369b      5 INSTR BELONGTO 403480 
             40369b      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 ZZ mov     edx, offset aS  ; "  %s: " 
-            4036a0     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4036a0     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4036a0      5 INSTR BELONGTO 403480 
             4036a0      5 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ mov     esi, 1 
             4036a5      2 INSTR BELONGTO 403480 
             4036a5      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            4036a5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4036a5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4036a7     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4036a7      5 INSTR BELONGTO 403480 
             4036a7      5 INSTR DEADREGS  EFLAGS R12 ZZ call    ___fprintf_chk 
@@ -5352,10 +5352,10 @@
             403701      2 INSTR BELONGTO 403480 
             403703      7 INSTR BELONGTO 403480 
             403703      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; s 
-            40370a     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; n 
+            40370a     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; n 
             40370a      5 INSTR BELONGTO 403480 
             40370a      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 5          ; n 
-            40370f     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            40370f     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             40370f      5 INSTR BELONGTO 403480 
             40370f      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 1          ; size 
             403714      5 INSTR BELONGTO 403480 
@@ -5395,10 +5395,10 @@
             403767      6 INSTR BELONGTO 403480 
             40376d      7 INSTR BELONGTO 403480 
             40376d      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI R12 ZZ mov     rcx, cs:stderr  ; s 
-            403774     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 12h        ; n 
+            403774     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 12h        ; n 
             403774      5 INSTR BELONGTO 403480 
             403774      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI R12 ZZ mov     edx, 12h        ; n 
-            403779     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            403779     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             403779      5 INSTR BELONGTO 403480 
             403779      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, 1          ; size 
             40377e      5 INSTR BELONGTO 403480 
@@ -5457,12 +5457,12 @@
             4037e1      6 INSTR DEADREGS  EFLAGS RAX RDX RSI R8 R12 ZZ mov     r8d, offset dest 
             4037e7      5 INSTR BELONGTO 403480 
             4037e7      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 ZZ mov     edx, offset aSCanTOpenInput; "%s: Can't open input file %s: %s.\n" 
-            4037ec     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4037ec     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4037ec      5 INSTR BELONGTO 403480 
             4037ec      5 INSTR DEADREGS  EFLAGS RAX RSI R12 ZZ mov     esi, 1 
             4037f1      2 INSTR BELONGTO 403480 
             4037f1      2 INSTR DEADREGS  EFLAGS RAX R12 ZZ xor     eax, eax 
-            4037f1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4037f1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4037f3     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4037f3      5 INSTR BELONGTO 403480 
             4037f3      5 INSTR DEADREGS  EFLAGS R12 ZZ call    ___fprintf_chk 
@@ -5526,8 +5526,8 @@
             403871      7 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 ZZ mov     rdi, cs:stderr 
             403878      2 INSTR BELONGTO 403480 
             403878      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 ZZ xor     eax, eax 
-            403878     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            40387a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403878     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            40387a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40387a      5 INSTR BELONGTO 403480 
             40387a      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 1 
             40387f     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -5549,14 +5549,14 @@
             4038af      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 R9 R12 ZZ mov     rdi, cs:stderr 
             4038b6      2 INSTR BELONGTO 403480 
             4038b6      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 R9 R12 ZZ xor     eax, eax 
-            4038b6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4038b6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4038b8      6 INSTR BELONGTO 403480 
             4038b8      6 INSTR DEADREGS  EFLAGS RDX RBX RSI R8 R9 R12 ZZ mov     r9d, offset file 
             4038be      6 INSTR BELONGTO 403480 
             4038be      6 INSTR DEADREGS  EFLAGS RDX RBX RSI R8 R12 ZZ mov     r8d, offset dest 
             4038c4      5 INSTR BELONGTO 403480 
             4038c4      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 ZZ mov     edx, offset aSCanTGuessOrig; "%s: Can't guess original name for %s --"... 
-            4038c9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4038c9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4038c9      5 INSTR BELONGTO 403480 
             4038c9      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 1 
             4038ce     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -5609,7 +5609,7 @@
             403940      5 PTRIMMEDESP STACK 16 displ lea     rdx, [rsp+148h+stat_buf]; stat_buf
             403945      5 INSTR BELONGTO 403480 
             403945      5 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     esi, offset dest; filename 
-            40394a     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            40394a     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             40394a      5 INSTR BELONGTO 403480 
             40394a      5 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     edi, 1          ; ver 
             40394f     -1 INSTR LOCAL NoMetaUpdate call    ___xstat64 
@@ -5659,12 +5659,12 @@
             4039be      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 R12 ZZ mov     r8d, offset dest 
             4039c4      5 INSTR BELONGTO 403480 
             4039c4      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 ZZ mov     edx, offset byte_404723 
-            4039c9     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4039c9     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4039c9      5 INSTR BELONGTO 403480 
             4039c9      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 ZZ mov     esi, 1 
             4039ce      2 INSTR BELONGTO 403480 
             4039ce      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            4039ce     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4039ce     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4039d0     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4039d0      5 INSTR BELONGTO 403480 
             4039d0      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    ___fprintf_chk 
@@ -5675,7 +5675,7 @@
             4039e0      8 PTRIMMEDESP STACK 160 displ lea     rdx, [rsp+148h+var_A8]; stat_buf
             4039e8      5 INSTR BELONGTO 403480 
             4039e8      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R12 ZZ mov     esi, offset dest; filename 
-            4039ed     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            4039ed     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             4039ed      5 INSTR BELONGTO 403480 
             4039ed      5 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     edi, 1          ; ver 
             4039f2     -1 INSTR LOCAL NoMetaUpdate call    ___lxstat64 
@@ -5709,12 +5709,12 @@
             403a34      4 INSTR BELONGTO 403480 
             403a34      4 INSTR DEADREGS  EFLAGS RDX RBX RSI R8 R12 ZZ mov     [rsp+148h+var_148], rax 
             403a34      4 PTRIMMEDESP STACK 0 displ mov     [rsp+148h+var_148], rax
-            403a38     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403a38     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403a38      5 INSTR BELONGTO 403480 
             403a38      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 R12 ZZ mov     esi, 1 
             403a3d      2 INSTR BELONGTO 403480 
             403a3d      2 INSTR DEADREGS  EFLAGS RAX RDX RBX R8 R12 ZZ xor     eax, eax 
-            403a3d     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403a3d     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403a3f      6 INSTR BELONGTO 403480 
             403a3f      6 INSTR DEADREGS  EFLAGS RDX RBX R8 R12 ZZ mov     r8d, offset dest 
             403a45      5 INSTR BELONGTO 403480 
@@ -5740,12 +5740,12 @@
             403a87      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R12 ZZ mov     rdi, cs:stderr 
             403a8e      5 INSTR BELONGTO 403480 
             403a8e      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 ZZ mov     edx, offset aSIWonTReadComp; "%s: I won't read compressed data from a"... 
-            403a93     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403a93     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403a93      5 INSTR BELONGTO 403480 
             403a93      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 ZZ mov     esi, 1 
             403a98      2 INSTR BELONGTO 403480 
             403a98      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            403a98     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403a98     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403a9a     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             403a9a      5 INSTR BELONGTO 403480 
             403a9a      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    ___fprintf_chk 
@@ -5759,8 +5759,8 @@
             403aae      7 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 ZZ mov     rdi, cs:stderr 
             403ab5      2 INSTR BELONGTO 403480 
             403ab5      2 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 ZZ xor     eax, eax 
-            403ab5     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            403ab7     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403ab5     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            403ab7     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403ab7      5 INSTR BELONGTO 403480 
             403ab7      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 1 
             403abc     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -5853,10 +5853,10 @@
             403b9d      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 R12 ZZ mov     r8d, offset file 
             403ba3      2 INSTR BELONGTO 403480 
             403ba3      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 ZZ xor     eax, eax 
-            403ba3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403ba3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403ba5      5 INSTR BELONGTO 403480 
             403ba5      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 ZZ mov     edx, offset aSCanTCreateOut; "%s: Can't create output file %s: %s.\n" 
-            403baa     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403baa     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403baa      5 INSTR BELONGTO 403480 
             403baa      5 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, 1 
             403baf     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -5881,12 +5881,12 @@
             403bd8      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 R12 ZZ mov     r8d, offset dest 
             403bde      5 INSTR BELONGTO 403480 
             403bde      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R12 ZZ mov     edx, offset aSInputFileSIsN; "%s: Input file %s is not a normal file."... 
-            403be3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403be3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403be3      5 INSTR BELONGTO 403480 
             403be3      5 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 ZZ mov     esi, 1 
             403be8      2 INSTR BELONGTO 403480 
             403be8      2 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ xor     eax, eax 
-            403be8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403be8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403bea     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             403bea      5 INSTR BELONGTO 403480 
             403bea      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    ___fprintf_chk 
@@ -5950,7 +5950,7 @@
             403c6a      3 PTRIMMEDESP STACK 0 displ mov     rdx, rsp        ; stat_buf
             403c6d      5 INSTR BELONGTO 403c00 
             403c6d      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset dest; filename 
-            403c72     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            403c72     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             403c72      5 INSTR BELONGTO 403c00 
             403c72      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 1          ; ver 
             403c77     -1 INSTR LOCAL NoMetaUpdate call    ___xstat64 
@@ -6001,12 +6001,12 @@
             403cdc      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ mov     ecx, offset dest 
             403ce1      5 INSTR BELONGTO 403c00 
             403ce1      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aS  ; "  %s: " 
-            403ce6     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403ce6     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403ce6      5 INSTR BELONGTO 403c00 
             403ce6      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             403ceb      2 INSTR BELONGTO 403c00 
             403ceb      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            403ceb     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403ceb     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403ced     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             403ced      5 INSTR BELONGTO 403c00 
             403ced      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -6037,10 +6037,10 @@
             403d26      2 INSTR BELONGTO 403c00 
             403d28      7 INSTR BELONGTO 403c00 
             403d28      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI RDI ZZ mov     rcx, cs:stderr  ; s 
-            403d2f     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3          ; n 
+            403d2f     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 3          ; n 
             403d2f      5 INSTR BELONGTO 403c00 
             403d2f      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 3          ; n 
-            403d34     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
+            403d34     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1          ; size 
             403d34      5 INSTR BELONGTO 403c00 
             403d34      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, 1          ; size 
             403d39      5 INSTR BELONGTO 403c00 
@@ -6089,12 +6089,12 @@
             403d95      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     rdi, cs:stderr 
             403d9c      5 INSTR BELONGTO 403c00 
             403d9c      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     edx, offset aSIWonTReadComp; "%s: I won't read compressed data from a"... 
-            403da1     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403da1     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403da1      5 INSTR BELONGTO 403c00 
             403da1      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 1 
             403da6      2 INSTR BELONGTO 403c00 
             403da6      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            403da6     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            403da6     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             403da8     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             403da8      5 INSTR BELONGTO 403c00 
             403da8      5 INSTR DEADREGS  EFLAGS RBX ZZ call    ___fprintf_chk 
@@ -6108,8 +6108,8 @@
             403dbc      7 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     rdi, cs:stderr 
             403dc3      2 INSTR BELONGTO 403c00 
             403dc3      2 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ xor     eax, eax 
-            403dc3     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            403dc5     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403dc3     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            403dc5     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403dc5      5 INSTR BELONGTO 403c00 
             403dc5      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             403dca     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -6178,8 +6178,8 @@
             403e71      7 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     rdi, cs:stderr 
             403e78      2 INSTR BELONGTO 403c00 
             403e78      2 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ xor     eax, eax 
-            403e78     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            403e7a     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            403e78     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            403e7a     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             403e7a      5 INSTR BELONGTO 403c00 
             403e7a      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             403e7f     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -6331,7 +6331,7 @@
             403fb5     -1 INSTR LOCAL NoMetaUpdate call    sub_403080 
             403fb5      5 INSTR BELONGTO 403ef0 
             403fb5      5 INSTR DEADREGS  EFLAGS RBX ZZ call    sub_403080 
-            403fba     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40Ah 
+            403fba     -2 INSTR LOCAL n RDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 40Ah 
             403fba      5 INSTR BELONGTO 403ef0 
             403fba      5 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ mov     edx, 40Ah 
             403fbf      5 INSTR BELONGTO 403ef0 
@@ -6374,10 +6374,10 @@
             40400c      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 ZZ mov     r8d, offset dest 
             404012      2 INSTR BELONGTO 403ef0 
             404012      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ xor     eax, eax 
-            404012     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404012     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404014      5 INSTR BELONGTO 403ef0 
             404014      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, offset aSCanTOpenInput; "%s: Can't open input file %s: %s.\n" 
-            404019     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            404019     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             404019      5 INSTR BELONGTO 403ef0 
             404019      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             40401e     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -6453,12 +6453,12 @@
             4040c0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ mov     ecx, offset dest 
             4040c5      5 INSTR BELONGTO 403ef0 
             4040c5      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aS  ; "  %s: " 
-            4040ca     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4040ca     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4040ca      5 INSTR BELONGTO 403ef0 
             4040ca      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             4040cf      2 INSTR BELONGTO 403ef0 
             4040cf      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            4040cf     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4040cf     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4040d1     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4040d1      5 INSTR BELONGTO 403ef0 
             4040d1      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -6537,12 +6537,12 @@
             404179      6 INSTR DEADREGS  EFLAGS RAX RDX RSI R8 ZZ mov     r8d, offset dest 
             40417f      5 INSTR BELONGTO 403ef0 
             40417f      5 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     edx, offset aSCanTOpenInput; "%s: Can't open input file %s: %s.\n" 
-            404184     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            404184     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             404184      5 INSTR BELONGTO 403ef0 
             404184      5 INSTR DEADREGS  EFLAGS RAX RSI ZZ mov     esi, 1 
             404189      2 INSTR BELONGTO 403ef0 
             404189      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
-            404189     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404189     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             40418b     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             40418b      5 INSTR BELONGTO 403ef0 
             40418b      5 INSTR DEADREGS  EFLAGS ZZ call    ___fprintf_chk 
@@ -6610,7 +6610,7 @@
             404210      5 PTRIMMEDESP STACK 16 displ lea     rdx, [rsp+148h+stat_buf]; stat_buf
             404215      5 INSTR BELONGTO 403ef0 
             404215      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset dest; filename 
-            40421a     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            40421a     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             40421a      5 INSTR BELONGTO 403ef0 
             40421a      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 1          ; ver 
             40421f     -1 INSTR LOCAL NoMetaUpdate call    ___xstat64 
@@ -6679,12 +6679,12 @@
             4042b8      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 ZZ mov     r8d, offset dest 
             4042be      5 INSTR BELONGTO 403ef0 
             4042be      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     edx, offset aSInputFileSIsN; "%s: Input file %s is not a normal file."... 
-            4042c3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4042c3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4042c3      5 INSTR BELONGTO 403ef0 
             4042c3      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 1 
             4042c8      2 INSTR BELONGTO 403ef0 
             4042c8      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            4042c8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4042c8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4042ca     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4042ca      5 INSTR BELONGTO 403ef0 
             4042ca      5 INSTR DEADREGS  EFLAGS RBX ZZ call    ___fprintf_chk 
@@ -6695,7 +6695,7 @@
             4042d8      8 PTRIMMEDESP STACK 160 displ lea     rdx, [rsp+148h+var_A8]; stat_buf
             4042e0      5 INSTR BELONGTO 403ef0 
             4042e0      5 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ mov     esi, offset dest; filename 
-            4042e5     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
+            4042e5     -2 INSTR LOCAL n RDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; ver 
             4042e5      5 INSTR BELONGTO 403ef0 
             4042e5      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 1          ; ver 
             4042ea     -1 INSTR LOCAL NoMetaUpdate call    ___lxstat64 
@@ -6733,10 +6733,10 @@
             404330      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 ZZ mov     r8d, offset dest 
             404336      2 INSTR BELONGTO 403ef0 
             404336      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ xor     eax, eax 
-            404336     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404336     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404338      5 INSTR BELONGTO 403ef0 
             404338      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, offset aSInputFileSHas; "%s: Input file %s has %d other link%s.\"... 
-            40433d     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40433d     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40433d      5 INSTR BELONGTO 403ef0 
             40433d      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             404342     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -6805,12 +6805,12 @@
             4043e7      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     rdi, cs:stderr 
             4043ee      5 INSTR BELONGTO 403ef0 
             4043ee      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     edx, offset aSIWonTWriteCom; "%s: I won't write compressed data to a "... 
-            4043f3     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4043f3     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4043f3      5 INSTR BELONGTO 403ef0 
             4043f3      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 1 
             4043f8      2 INSTR BELONGTO 403ef0 
             4043f8      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            4043f8     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4043f8     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4043fa     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4043fa      5 INSTR BELONGTO 403ef0 
             4043fa      5 INSTR DEADREGS  EFLAGS RBX ZZ call    ___fprintf_chk 
@@ -6824,8 +6824,8 @@
             40440e      7 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI ZZ mov     rdi, cs:stderr 
             404415      2 INSTR BELONGTO 403ef0 
             404415      2 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ xor     eax, eax 
-            404415     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            404417     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            404415     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
+            404417     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             404417      5 INSTR BELONGTO 403ef0 
             404417      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             40441c     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -6845,12 +6845,12 @@
             40443f      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI ZZ mov     rdi, cs:stderr 
             404446      5 INSTR BELONGTO 403ef0 
             404446      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     edx, offset aSIWonTWriteCom; "%s: I won't write compressed data to a "... 
-            40444b     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            40444b     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             40444b      5 INSTR BELONGTO 403ef0 
             40444b      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 1 
             404450      2 INSTR BELONGTO 403ef0 
             404450      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            404450     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404450     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404452     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             404452      5 INSTR BELONGTO 403ef0 
             404452      5 INSTR DEADREGS  EFLAGS RBX ZZ call    ___fprintf_chk 
@@ -6860,7 +6860,7 @@
             40445e      7 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI RDI R8 ZZ mov     rdi, cs:stderr 
             404465      2 INSTR BELONGTO 403ef0 
             404465      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 ZZ xor     eax, eax 
-            404465     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            404465     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404467      5 INSTR BELONGTO 403ef0 
             404467      5 INSTR DEADREGS  EFLAGS RDX RBX RSI R8 ZZ mov     edx, offset aSForHelpTypeSH; "%s: For help, type: `%s --help'.\n" 
             40446c     -1 INSTR LOCAL MetadataRedundant mov     esi, 1 
@@ -6891,12 +6891,12 @@
             4044a1      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 ZZ mov     r8d, offset dest 
             4044a7      5 INSTR BELONGTO 403ef0 
             4044a7      5 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ mov     edx, offset aSInputFileSAlr; "%s: Input file %s already has %s suffix"... 
-            4044ac     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            4044ac     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             4044ac      5 INSTR BELONGTO 403ef0 
             4044ac      5 INSTR DEADREGS  EFLAGS RAX RBX RSI ZZ mov     esi, 1 
             4044b1      2 INSTR BELONGTO 403ef0 
             4044b1      2 INSTR DEADREGS  EFLAGS RAX RBX ZZ xor     eax, eax 
-            4044b1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            4044b1     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             4044b3     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
             4044b3      5 INSTR BELONGTO 403ef0 
             4044b3      5 INSTR DEADREGS  EFLAGS RBX ZZ call    ___fprintf_chk 
@@ -6936,10 +6936,10 @@
             404508      6 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 ZZ mov     r8d, offset file 
             40450e      2 INSTR BELONGTO 403ef0 
             40450e      2 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI ZZ xor     eax, eax 
-            40450e     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
+            40450e     -2 INSTR LOCAL n RAX ZZ  AlwaysNUM xor     eax, eax 
             404510      5 INSTR BELONGTO 403ef0 
             404510      5 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     edx, offset aSCanTCreateOut; "%s: Can't create output file %s: %s.\n" 
-            404515     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
+            404515     -2 INSTR LOCAL n RSI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 1 
             404515      5 INSTR BELONGTO 403ef0 
             404515      5 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     esi, 1 
             40451a     -1 INSTR LOCAL NoMetaUpdate call    ___fprintf_chk 
@@ -7004,7 +7004,7 @@
             404588      2 INSTR BELONGTO 404540 
             40458a      2 INSTR BELONGTO 404540 
             40458a      2 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ xor     ebx, ebx 
-            40458a     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
+            40458a     -2 INSTR LOCAL n RBX ZZ  AlwaysNUM xor     ebx, ebx 
             40458c      4 INSTR BELONGTO 404540 
             404590      3 INSTR BELONGTO 404540 
             404590      3 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     rdx, r15 
-- 
GitLab