From 533ceeed7c3b8e82d207ea0a9fc1dc80df70c294 Mon Sep 17 00:00:00 2001
From: clc5q <clc5q@git.zephyr-software.com>
Date: Wed, 15 Jul 2015 17:26:49 +0000
Subject: [PATCH] Simplify stack frame analysis, eliminate FindAllocPoint() and
 other connections to IDA Pro.

Former-commit-id: 287ef5283718f1079f04deb4acd5a05a2cd3d021
---
 include/base/SMPFunction.h                    |   2 +-
 src/base/SMPFunction.cpp                      | 136 ++--
 tests/commit/save-busybox.psexe.infoannot     |  14 +-
 tests/commit/save-nginx.psexe.infoannot       |   3 +-
 tests/commit/save-openssl.psexe.infoannot     |   3 +-
 ...ed-save-busybox.psexe.annot.REMOVED.git-id |   2 +-
 .../trimmed-sorted-save-bzip2.psexe.annot     |  76 +-
 .../trimmed-sorted-save-destripe.psexe.annot  |  14 +-
 ...ted-save-ffmpeg.psexe.annot.REMOVED.git-id |   2 +-
 ...ave-firefox-bin.psexe.annot.REMOVED.git-id |   2 +-
 ...rted-save-gedit.psexe.annot.REMOVED.git-id |   2 +-
 ...orted-save-gimp.psexe.annot.REMOVED.git-id |   2 +-
 ...nome-calculator.psexe.annot.REMOVED.git-id |   2 +-
 ...orted-save-gnome-character-map.psexe.annot | 307 ++++---
 ...rted-save-gnome-control-center.psexe.annot | 355 ++++----
 ...d-sorted-save-gnome-dictionary.psexe.annot | 495 ++++++------
 ...ve-gnome-file-share-properties.psexe.annot |  91 ++-
 ...-sorted-save-gnome-font-viewer.psexe.annot |  14 +-
 ...trimmed-sorted-save-gnome-help.psexe.annot | 322 ++++----
 ...ed-sorted-save-gnome-keyring-3.psexe.annot |  47 +-
 ...-keyring-daemon.psexe.annot.REMOVED.git-id |   2 +-
 ...mmed-sorted-save-gnome-keyring.psexe.annot |  47 +-
 ...e-gnome-nettool.psexe.annot.REMOVED.git-id |   2 +-
 ...trimmed-sorted-save-gnome-open.psexe.annot |  14 +-
 ...ed-save-gnome-power-statistics.psexe.annot |  42 +-
 ...save-gnome-screensaver-command.psexe.annot |  14 +-
 ...-sorted-save-gnome-screensaver.psexe.annot | 759 +++++++++---------
 ...d-sorted-save-gnome-screenshot.psexe.annot | 493 ++++++------
 ...ome-search-tool.psexe.annot.REMOVED.git-id |   2 +-
 ...-save-gnome-session-properties.psexe.annot | 267 +++---
 ...sorted-save-gnome-session-quit.psexe.annot |  14 +-
 ...e-gnome-session.psexe.annot.REMOVED.git-id |   2 +-
 ...ted-save-gnome-settings-daemon.psexe.annot |  14 +-
 ...sorted-save-gnome-sound-applet.psexe.annot | 542 ++++++-------
 ...rted-save-gnome-sound-recorder.psexe.annot | 169 ++--
 ...d-sorted-save-gnome-system-log.psexe.annot | 611 +++++++-------
 ...-system-monitor.psexe.annot.REMOVED.git-id |   2 +-
 ...-gnome-terminal.psexe.annot.REMOVED.git-id |   2 +-
 ...ome-text-editor.psexe.annot.REMOVED.git-id |   2 +-
 ...rted-save-gnome-thumbnail-font.psexe.annot |  14 +-
 ...orted-save-grep.psexe.annot.REMOVED.git-id |   2 +-
 ...rted-save-httpd.psexe.annot.REMOVED.git-id |   2 +-
 ...orted-save-less.psexe.annot.REMOVED.git-id |   2 +-
 ...d-save-ls-64bit.psexe.annot.REMOVED.git-id |   2 +-
 ...ted-save-lt-svn.psexe.annot.REMOVED.git-id |   2 +-
 .../trimmed-sorted-save-malloc.psexe.annot    |  12 +-
 ...rted-save-nginx.psexe.annot.REMOVED.git-id |   2 +-
 ...ed-save-openssl.psexe.annot.REMOVED.git-id |   2 +-
 ...d-save-synaptic.psexe.annot.REMOVED.git-id |   2 +-
 .../commit/trimmed-sorted-save-toy.exe.annot  |  12 +-
 .../trimmed-sorted-save-xcalc.psexe.annot     | 164 ++--
 ...rted-save-xedit.psexe.annot.REMOVED.git-id |   2 +-
 .../trimmed-sorted-save-xeyes.psexe.annot     |  14 +-
 .../trimmed-sorted-save-bzip2.psexe.annot     |  76 +-
 .../trimmed-sorted-save-malloc.psexe.annot    |  12 +-
 55 files changed, 2613 insertions(+), 2600 deletions(-)

diff --git a/include/base/SMPFunction.h b/include/base/SMPFunction.h
index 0f1c9d12..1d6adc6d 100644
--- a/include/base/SMPFunction.h
+++ b/include/base/SMPFunction.h
@@ -200,7 +200,7 @@ public:
 	inline unsigned short GetFastReturnStatus(void) const { return FastReturnStatus; };
 
 	// exposing the start address of the function. Used in RecurseAndMark
-	inline const STARS_ea_t GetStartAddr(void) const { return FuncInfo->get_startEA(); }; 
+	inline const STARS_ea_t GetStartAddr(void) const { return FirstEA; }; 
 
 	inline const std::vector<STARS_ea_t> GetCallTargets(void) const { return AllCallTargets; };
 	inline std::size_t GetNumCallTargets(void) const { return AllCallTargets.size(); };
diff --git a/src/base/SMPFunction.cpp b/src/base/SMPFunction.cpp
index 80a4a2e8..9ce571f3 100644
--- a/src/base/SMPFunction.cpp
+++ b/src/base/SMPFunction.cpp
@@ -1746,6 +1746,42 @@ void SMPFunction::FindAllAllocsAndDeallocs(void) {
 	DebugFlag |= (0 == strcmp("frame_dummy", this->GetFuncName()));
 #endif
 
+	list<SMPInstr *>::iterator InstIter = this->Instrs.begin();
+#if SMP_USE_SSA_FNOP_MARKER
+	++InstIter;  // skip marker instruction
+#endif
+	for (; InstIter != this->Instrs.end(); ++InstIter) {
+		SMPInstr *CurrInst = (*InstIter);
+		STARS_ea_t addr = CurrInst->GetAddr();
+
+		// Keep the most recent instruction in the DeallocInstr
+		//  in case we reach the return without seeing a dealloc.
+		if (!FoundDeallocInstr) {
+			this->LocalVarsDeallocInstr = addr;
+		}
+
+		if (addr == this->LocalVarsAllocInstr) {
+			FoundAllocInstr = true;
+		}
+		else if (FoundAllocInstr) {
+			// We can now start searching for the DeallocInstr.
+			if (CurrInst->MDIsFrameDeallocInstr(UseFP, this->LocalVarsSize)) {
+				// Keep saving the most recent addr that looks
+				//  like the DeallocInstr until we reach the
+				//  end of the function. Last one to look like
+				//  it is used as the DeallocInstr.
+#if SMP_DEBUG_CONTROLFLOW
+				SMP_msg("Returned from MDIsFrameDeallocInstr()\n");
+#endif
+				this->LocalVarsDeallocInstr = addr;
+				FoundDeallocInstr = true;
+			}
+		}
+	}
+
+	// As of July, 2015, the code below seems unnecessary and obsolete.
+	return;
+
 	// Now, if LocalVarsSize is not zero, we need to find the instruction
 	//  in the function prologue that allocates space on the stack for
 	//  local vars. This code could be made more robust in the future
@@ -2053,12 +2089,12 @@ bool SMPFunction::MDFixFrameInfo(void) {
 	int SavedRegsSize = 0;
 	int OtherPushesSize = 0;  // besides callee-saved regs
 	int OtherAllocsSize = 0;  // additions to stack pointer, other odd instructions in prologue
-	int NewLocalsSize = 0;
-	int OldFrameTotal = this->CalleeSavedRegsSize + this->LocalVarsSize;
-	bool Changed = false;
+	long AllocValue = 0;
 	bool EBPSaved = false;  // detected push of frame pointer reg
 	bool ESPintoEBP = false;  // detected initialization of frame pointer reg with stack pointer reg value
+	bool FoundAllocInstr = false; // found simple alloc, e.g. subtraction from stack pointer
 	bool DebugFlag = (0 == strcmp("__libc_csu_init", this->GetFuncName()));
+	STARS_ea_t SaveAddr = this->GetStartAddr(); // keeps most recent best value for stack frame allocation instr
 
 	// Iterate through the first basic block in the function. If we find
 	//  a frame allocating Instr in it, then we have local vars. If not,
@@ -2073,7 +2109,15 @@ bool SMPFunction::MDFixFrameInfo(void) {
 #endif
 	for ( ; CurrIter != CurrBlock->GetLastInst(); ++CurrIter) {
 		SMPInstr *CurrInstr = (*CurrIter);
+		if (FoundAllocInstr && (DEFAULT != CurrInstr->GetDataFlowType())) {
+			// After we find the frame allocation instruction, a call or any other
+			//  control flow instruction should terminate our processing. A stack
+			//  frame adjustment could follow a call, which could falely look like another
+			//  frame allocation instruction.
+			break;
+		}
 		if (CurrInstr->MDIsPushInstr()) {
+			SaveAddr = CurrInstr->GetAddr();
 			// We will make the gcc-linux assumption that a PUSH in
 			//  the first basic block, prior to the stack allocating
 			//  instruction, is a callee register save. To make this
@@ -2083,8 +2127,7 @@ bool SMPFunction::MDFixFrameInfo(void) {
 			//  be a push of an outgoing argument to a call that happens
 			//  in the first block when there are no locals). **!!!!**
 			size_t PushWidth = CurrInstr->GetPushedOpndByteSize();
-			if (CurrInstr->MDUsesCalleeSavedReg()
-				&& !CurrInstr->HasSourceMemoryOperand()) {
+			if (CurrInstr->MDUsesCalleeSavedReg() && !CurrInstr->HasSourceMemoryOperand()) {
 				SavedRegsSize += PushWidth;
 				if (DebugFlag) SMP_msg("libc_csu_init SavedRegsSize: %d  %s\n", SavedRegsSize,
 					CurrInstr->GetDisasm());
@@ -2104,46 +2147,26 @@ bool SMPFunction::MDFixFrameInfo(void) {
 		}
 		else if (CurrInstr->MDIsFrameAllocInstr()) {
 			if (DebugFlag) SMP_msg("libc_csu_init allocinstr: %s\n", CurrInstr->GetDisasm());
-			SavedRegsSize += OtherPushesSize;
 			// Get the size being allocated.
 			set<DefOrUse, LessDefUse>::iterator CurrUse;
 			for (CurrUse = CurrInstr->GetFirstUse(); CurrUse != CurrInstr->GetLastUse(); ++CurrUse) {
 				// Find the immediate operand.
 				if (CurrUse->GetOp()->IsImmedOp()) {
 					// Get its value into LocalVarsSize.
-					long AllocValue = (signed long) CurrUse->GetOp()->GetImmedValue();
+					AllocValue = (signed long) CurrUse->GetOp()->GetImmedValue();
 					// One compiler might have sub esp,24 and another
 					//  might have add esp,-24. Take the absolute value.
 					if (0 > AllocValue)
 						AllocValue = -AllocValue;
-					if (AllocValue != (long) this->LocalVarsSize) {
-						Changed = true;
-#if SMP_DEBUG_FRAMEFIXUP
-						if ((AllocValue + SavedRegsSize + OtherAllocsSize) != OldFrameTotal)
-							SMP_msg("INFO: Total frame size changed: %s OldTotal: %d NewTotal: %ld\n",
-								this->GetFuncName(), OldFrameTotal, (AllocValue + SavedRegsSize + OtherAllocsSize));
-#endif
-						this->LocalVarsSize = (STARS_asize_t) AllocValue + OtherAllocsSize;
-						this->CalleeSavedRegsSize = (uint16_t) SavedRegsSize;
-						NewLocalsSize = this->LocalVarsSize;
-					}
-					else { // Old value was correct; no change.
-						NewLocalsSize = this->LocalVarsSize;
-						if (SavedRegsSize != this->CalleeSavedRegsSize) {
-							this->CalleeSavedRegsSize = (uint16_t) SavedRegsSize;
-							Changed = true;
-#if SMP_DEBUG_FRAMEFIXUP
-							SMP_msg("INFO: Only callee-saved regs size changed: %s\n", this->GetFuncName());
-#endif
-						}
-					}
+					SaveAddr = CurrInstr->GetAddr();  // ImmedOp, so now we know this is an alloc and not an alloca() call
+					FoundAllocInstr = true;
+					break; // only want to process the immediate operand
 				} // end if (o_imm == ...)
 			} // end for all uses
-			break; // After frame allocation instr, we are done
 		} // end if (push) .. elsif frame allocating instr
 		else if (CurrInstr->HasStackPointerDEF() && (DEFAULT == CurrInstr->GetDataFlowType())) { 
 			// Handle all other possible changes to stack pointer register from non-control-flow instructions
-			if (CurrInstr->MDIsLeaveInstr()) {
+			if (CurrInstr->MDIsLeaveInstr() && (STARS_BADADDR != this->LocalVarsAllocInstr)) {
 				SMP_msg("ERROR: MDFixFrameInfo() found LEAVE opcode at %llx before finding a frame allocation.\n",
 					(unsigned long long) CurrInstr->GetAddr());
 				break;  // should not find a LEAVE opcode before the frame allocation
@@ -2171,53 +2194,18 @@ bool SMPFunction::MDFixFrameInfo(void) {
 		}
 	} // end for all instructions in the first basic block
 
-	// If we did not find an allocating instruction, see if it would keep
-	//  the total size the same to set LocalVarsSize to 0 and to set
-	//  CalleeSavedRegsSize to SavedRegsSize. If so, do it. If not, we
-	//  might be better off to leave the numbers alone.
-	if (!Changed && (NewLocalsSize == 0)) {
-		if (DebugFlag) SMP_msg("libc_csu_init OldFrameTotal: %d \n", OldFrameTotal);
-		if (OldFrameTotal == SavedRegsSize) {
-			this->CalleeSavedRegsSize = (uint16_t) SavedRegsSize;
-			this->LocalVarsSize = 0;
-			Changed = true;
-		}
-#if SMP_DEBUG_FRAMEFIXUP
-		else {
-			SMP_msg("INFO: Could not update frame sizes: %s\n", this->GetFuncName());
-		}
-#endif
-	}
-
-#if SMP_DEBUG_FRAMEFIXUP
-	if ((0 < OtherPushesSize) && (0 < NewLocalsSize))
-		SMP_msg("INFO: pushes found of size %d in %s\n", OtherPushesSize,
-			this->GetFuncName());
-#endif
-
-#if SMP_DEBUG_FRAMEFIXUP
-	if (Changed) {
-		SMP_msg("INFO: Fixed stack frame size info: %s\n", this->GetFuncName());
-#if SMP_DEBUG_FRAMEFIXUP_VERBOSE
-		SMPBasicBlock *CurrBlock = this->Blocks.front();
-		SMP_msg("First basic block:\n");
-		vector<SMPInstr *>::iterator InstIter = CurrBlock->GetFirstInst();
-#if SMP_USE_SSA_FNOP_MARKER
-		++InstIter;
-#endif
-		while (InstIter != CurrBlock->GetLastInst()) {
-			SMP_msg("%s\n", (*InstIter)->GetDisasm());
-			++InstIter;
-		}
-#endif
-	}
-#endif
+	this->LocalVarsSize = (STARS_asize_t) AllocValue + (STARS_asize_t) OtherAllocsSize;
+	this->CalleeSavedRegsSize = (uint16_t) SavedRegsSize + OtherPushesSize;
+	this->LocalVarsAllocInstr = SaveAddr;
 
 	// If we found ESPintoEBP, we also found EBPSaved first, and we need to set
 	//  this->UseFP to true.
 	this->UseFP = ESPintoEBP;
+	if (ESPintoEBP) {
+		this->FindFramePointerDelta();
+	}
 
-	return Changed;
+	return true;
 } // end of SMPFunction::MDFixFrameInfo()
 
 // Some functions have difficult to find stack allocations. For example, in some
@@ -2325,6 +2313,7 @@ STARS_ea_t SMPFunction::FindAllocPoint(STARS_asize_t OriginalLocSize) {
 //  the function as not using a frame pointer. We will reset UseFP to true in
 //  this case.
 // NOTE: This logic should work for both Linux and Windows x86 prologues.
+// NOTE As of July, 2015, this logic was incorporated into MDFixFrameInfo().
 bool SMPFunction::MDFixUseFP(void) {
 	bool OldUseFP = this->UsesFramePointer();
 	bool HasLocals = (0 < this->LocalVarsSize);
@@ -4059,6 +4048,9 @@ void SMPFunction::AdvancedAnalysis(void) {
 	//  pushes below the stack frame as being part of the stack frame,
 	//  even when they are temporary saves and restores. __brk in the
 	//  Gnu stdclib is an example as of November of 2012.
+	// NOTE: We are no longer fixing IDA Pro frame info as of July, 2015.
+	//  We just compute our own frame info, which has always proved to be at
+	//  least as good as IDA Pro info.
 	bool FrameInfoFixed = this->MDFixFrameInfo();
 #if SMP_DEBUG_CONTROLFLOW
 	SMP_msg("Returned from MDFixFrameInfo()\n");
diff --git a/tests/commit/save-busybox.psexe.infoannot b/tests/commit/save-busybox.psexe.infoannot
index 40e97105..fcd00979 100644
--- a/tests/commit/save-busybox.psexe.infoannot
+++ b/tests/commit/save-busybox.psexe.infoannot
@@ -3661,7 +3661,6 @@
     447cac      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ inc     rdx 
     447cbc    103 FUNC RETURNTYPE RAX 0
     447cbc    103 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
-    447d0f      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBP+RDI ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+rdi+s]; s 
     447d23    321 FUNC RETURNTYPE RAX 4
     447d23    321 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     447d54      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+160 ZZ lea     rsi, [rbx+0A0h] 
@@ -4563,13 +4562,13 @@
     45d584     45 FUNC RETURNTYPE RAX 0
     45d584     45 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 1 ARG3 96 ARG4 0 ARG5 0 
     45d5b1    107 FUNC RETURNTYPE RAX 1
-    45d5b1    107 FUNC INARGS    6  ARG0 16 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    45d5b1    107 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     45d5c2      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+360 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rax+168h] 
     45d61c    119 FUNC RETURNTYPE RAX 0
     45d61c    119 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     45d66b      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+5540 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rbx+15A4h] 
-    45d693     94 FUNC RETURNTYPE RAX 1
-    45d693     94 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
+    45d693     94 FUNC RETURNTYPE RAX 0
+    45d693     94 FUNC PROBLEM sub_45D693 STACKANALYSIS 
     45d6f1    150 FUNC RETURNTYPE RAX 0
     45d6f1    150 FUNC INARGS    6  ARG0 0 ARG1 4 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
     45d764      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+5540 ZZ IDIOM 18 MEMORYSINK lea     rcx, [rbp+15A4h] 
@@ -5006,9 +5005,9 @@
     47409d      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+168 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+0A8h] 
     4740d9      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+168 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+0A8h] 
     474113      3 INSTR CHECK UNDERFLOW UNSIGNED 64  RAX ZZ sub     rax, rsi 
-    474276      4 INSTR CHECK UNDERFLOW UNSIGNED 64  RAX ZZ sub     rax, [rbp+10h] 
+    474276      4 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RAX ZZ sub     rax, [rbp+10h] 
     4742b5      3 INSTR CHECK UNDERFLOW UNKNOWNSIGN 64  RSI ZZ sub     rsi, rdi 
-    4742b8      5 INSTR CHECK OVERFLOW UNSIGNED 64  RDI ZZ add     rdi, [rsp+78h+var_50] 
+    4742b8      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, [rsp+78h+var_50] 
     4742fd      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+96 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+60h] 
     474301      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, [rbp+48h] 
     47430a      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ add     rdx, rax 
@@ -5020,7 +5019,7 @@
     474555      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+188 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+0BCh] 
     46854c     12 FUNC RETURNTYPE RAX 0
     46854c     12 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
-    472427      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBX+RAX ZZ IDIOM 1 lea     ecx, [rbx+rax] 
+    472427      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RBX+RAX ZZ IDIOM 1 lea     ecx, [rbx+rax] 
     47243a      3 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, rdi 
     4724ef      3 INSTR CHECK OVERFLOW SIGNED 64  RDX ZZ add     rdx, rax 
     4724f6      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ IDIOM 18 MEMORYSINK add     rsi, r12 
@@ -7512,7 +7511,6 @@
     4a176c     48 FUNC INARGS    6  ARG0 16 ARG1 0 ARG2 96 ARG3 96 ARG4 1 ARG5 0 
     4a179c    268 FUNC RETURNTYPE RAX 0
     4a179c    268 FUNC INARGS    6  ARG0 96 ARG1 1 ARG2 8 ARG3 16 ARG4 4 ARG5 0 
-    4a180f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+76 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rbp+var_s4C] 
     4a1854      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+3 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbx+3] 
     4a18a8    321 FUNC RETURNTYPE RAX 0
     4a18a8    321 FUNC INARGS    6  ARG0 96 ARG1 1 ARG2 96 ARG3 96 ARG4 1 ARG5 0 
diff --git a/tests/commit/save-nginx.psexe.infoannot b/tests/commit/save-nginx.psexe.infoannot
index 9a993733..70257141 100644
--- a/tests/commit/save-nginx.psexe.infoannot
+++ b/tests/commit/save-nginx.psexe.infoannot
@@ -12044,7 +12044,8 @@
     511480    344 FUNC RETURNTYPE RAX 4
     511480    344 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 4 
     5115e0   1196 FUNC RETURNTYPE RAX 0
-    5115e0   1196 FUNC PROBLEM bsaes_cbc_encrypt STACKANALYSIS 
+    5115e0   1196 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 4 ARG5 0 
+    511a24      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+32 ZZ IDIOM 18 STACKMEMSINK lea     rsi, [rbp+20h] 
     511a90    850 FUNC RETURNTYPE RAX 0
     511a90    850 FUNC PROBLEM bsaes_ctr32_encrypt_blocks STACKANALYSIS 
     511df0   2011 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/save-openssl.psexe.infoannot b/tests/commit/save-openssl.psexe.infoannot
index 4dfba279..bca1bdfa 100644
--- a/tests/commit/save-openssl.psexe.infoannot
+++ b/tests/commit/save-openssl.psexe.infoannot
@@ -12683,7 +12683,8 @@
     565330    344 FUNC RETURNTYPE RAX 4
     565330    344 FUNC INARGS    4  ARG0 0 ARG1 0 ARG2 0 ARG3 4 
     565490   1196 FUNC RETURNTYPE RAX 0
-    565490   1196 FUNC PROBLEM bsaes_cbc_encrypt STACKANALYSIS 
+    565490   1196 FUNC INARGS    6  ARG0 4 ARG1 4 ARG2 0 ARG3 0 ARG4 4 ARG5 0 
+    5658d4      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+32 ZZ IDIOM 18 STACKMEMSINK lea     rsi, [rbp+20h] 
     565940    850 FUNC RETURNTYPE RAX 0
     565940    850 FUNC PROBLEM bsaes_ctr32_encrypt_blocks STACKANALYSIS 
     565ca0   2011 FUNC RETURNTYPE RAX 0
diff --git a/tests/commit/trimmed-sorted-save-busybox.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-busybox.psexe.annot.REMOVED.git-id
index 0acadc0c..a5da950a 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 @@
-71a357a0619a41d2a53abbd14355f6b2c8e427d1
\ No newline at end of file
+581373860dd3decc3f78b2ce0957be902a70c9cc
\ 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 be4c2414..3efacb45 100644
--- a/tests/commit/trimmed-sorted-save-bzip2.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-bzip2.psexe.annot
@@ -1808,12 +1808,11 @@
     401de8      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _fwrite 
     401ded     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401C4A 
     401ded      5 INSTR BELONGTO 4013a0 
-    401df4      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
-    401df4      0 FUNC MMSAFENESS UNSAFE
+    401df4      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    401df4      0 FUNC MMSAFENESS SAFE
     401df4     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     401df4      2 INSTR BELONGTO 401df4 
     401df4     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     401e1d 
-    401df4      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     401df6      3 INSTR BELONGTO 401df4 
     401df6      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     401df9      1 INSTR BELONGTO 401df4 
@@ -1825,8 +1824,11 @@
     401dfd      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     401e01      1 INSTR BELONGTO 401df4 
     401e01      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    401e01     -3 INSTR LOCAL NoWarn push    rax 
+    401e02     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     401e02      1 INSTR BELONGTO 401df4 
     401e02      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    401e02      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     401e03     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     401e03      7 INSTR BELONGTO 401df4 
     401e03      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -1921,14 +1923,14 @@
     401ea2      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     401ea3      1 INSTR BELONGTO 401e40 
     401ea3      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    401eb0      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
+    401eb0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     401eb0      0 FUNC MMSAFENESS UNSAFE
     401eb0     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_606E38, 0 
     401eb0     34 FUNC GLOBAL sub_401EB0 FUNC_UNSAFE USEFP RET     401ed1 
     401eb0      8 INSTR BELONGTO 401eb0 
-    401eb0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    401eb0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401eb8      1 INSTR BELONGTO 401eb0 
+    401eb8      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    401eb8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401eb9      3 INSTR BELONGTO 401eb0 
     401ebc     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401ED0 
     401ebc      2 INSTR BELONGTO 401eb0 
@@ -2778,15 +2780,15 @@
     4024a9     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
     4024a9      5 INSTR BELONGTO 402470 
     4024a9      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_4020D0 
-    4024b0      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
+    4024b0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -4 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
     4024b0      0 FUNC MMSAFENESS SAFE
     4024b0     43 FUNC GLOBAL sub_4024B0 FUNC_UNSAFE NOFP RET     4024da 
     4024b0      6 INSTR BELONGTO 4024b0 
     4024b0      6 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, cs:stat_buf.st_mode; mode 
-    4024b0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    4024b0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4024b6      1 INSTR BELONGTO 4024b0 
     4024b6      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
+    4024b6      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    4024b6      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4024b7     -1 INSTR LOCAL MetadataUnused mov     ebx, edi 
     4024b7      2 INSTR BELONGTO 4024b0 
     4024b9     -1 INSTR LOCAL NoMetaUpdate call    _fchmod 
@@ -4678,7 +4680,7 @@
     4031c3      2 INSTR BELONGTO 4031b0 
     4031c5      1 INSTR BELONGTO 4031b0 
     4031c5      1 INSTR DEADREGS  EFLAGS R14 ZZ push    rbx 
-    4031c5     40 DATAREF STACK 347 esp + 0 PARENT LocalFrame LOCALFRAME
+    4031c5     40 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     4031c5      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     4031c6     -1 INSTR LOCAL NoMetaUpdate call    _getenv 
     4031c6      5 INSTR BELONGTO 4031b0 
@@ -4817,11 +4819,11 @@
     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 
-    4032ac     24 DATAREF STACK 348 esp + 0 PARENT LocalFrame LOCALFRAME
+    4032ac     24 DATAREF STACK 347 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 DATAREF STACK 349 esp + 8 CHILDOF 348 OFFSET 8 LOCALVAR var_10 
-    4032ac      8 DATAREF STACK 350 esp + 16 CHILDOF 348 OFFSET 16 LOCALVAR var_8 
+    4032ac      8 DATAREF STACK 348 esp + 8 CHILDOF 347 OFFSET 8 LOCALVAR var_10 
+    4032ac      8 DATAREF STACK 349 esp + 16 CHILDOF 347 OFFSET 16 LOCALVAR var_8 
     4032ac      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4032b0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 180h 
     4032b0      5 INSTR BELONGTO 4032a0 
@@ -4877,8 +4879,8 @@
     4032ff      2 INSTR BELONGTO 4032a0 
     403310      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 1 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     403310      0 FUNC MMSAFENESS SAFE
-    403310    128 DATAREF STACK 352 esp + 24 CHILDOF 351 OFFSET 24 LOCALVAR var_80 
-    403310    152 DATAREF STACK 351 esp + 0 PARENT LocalFrame LOCALFRAME
+    403310    128 DATAREF STACK 351 esp + 24 CHILDOF 350 OFFSET 24 LOCALVAR var_80 
+    403310    152 DATAREF STACK 350 esp + 0 PARENT LocalFrame LOCALFRAME
     403310     61 FUNC GLOBAL sub_403310 FUNC_UNSAFE NOFP RET     40334c 
     403310      7 INSTR BELONGTO 403310 
     403310      7 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ sub     rsp, 98h 
@@ -4923,7 +4925,7 @@
     403350     38 FUNC GLOBAL sub_403350 FUNC_UNSAFE NOFP RET     403375 
     403350      4 INSTR BELONGTO 403350 
     403350      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ sub     rsp, 8 
-    403350      8 DATAREF STACK 353 esp + 0 PARENT LocalFrame LOCALFRAME
+    403350      8 DATAREF STACK 352 esp + 0 PARENT LocalFrame LOCALFRAME
     403350      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     403354      5 INSTR BELONGTO 403350 
     403354      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset stat_buf; stat_buf 
@@ -4949,8 +4951,8 @@
     403371      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI ZZ call    sub_402470 
     403380      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
     403380      0 FUNC MMSAFENESS SAFE
-    403380     16 DATAREF STACK 355 esp + 0 CHILDOF 354 OFFSET 0 OutArgsRegion OUTARGS
-    403380     24 DATAREF STACK 354 esp + 0 PARENT LocalFrame LOCALFRAME
+    403380     16 DATAREF STACK 354 esp + 0 CHILDOF 353 OFFSET 0 OutArgsRegion OUTARGS
+    403380     24 DATAREF STACK 353 esp + 0 PARENT LocalFrame LOCALFRAME
     403380      4 INSTR BELONGTO 403380 
     403380      4 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ sub     rsp, 18h 
     403380     54 FUNC GLOBAL sub_403380 FUNC_UNSAFE NOFP RET     4033b5 
@@ -5110,13 +5112,13 @@
     403483     -3 INSTR LOCAL NoWarn push    rbx 
     403484      3 INSTR BELONGTO 403480 
     403484      3 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     rbx, rdi 
-    403487    144 DATAREF STACK 358 esp + 16 CHILDOF 356 OFFSET 16 LOCALVAR stat_buf 
-    403487    144 DATAREF STACK 359 esp + 160 CHILDOF 356 OFFSET 160 LOCALVAR var_A8 
+    403487    144 DATAREF STACK 357 esp + 16 CHILDOF 355 OFFSET 16 LOCALVAR stat_buf 
+    403487    144 DATAREF STACK 358 esp + 160 CHILDOF 355 OFFSET 160 LOCALVAR var_A8 
     403487     24 MEMORYHOLE STACK esp + 304 CalleeSavedRegs 
-    403487    304 DATAREF STACK 356 esp + 0 PARENT LocalFrame LOCALFRAME
+    403487    304 DATAREF STACK 355 esp + 0 PARENT LocalFrame LOCALFRAME
     403487      7 INSTR BELONGTO 403480 
     403487      7 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 130h 
-    403487      8 DATAREF STACK 357 esp + 0 CHILDOF 356 OFFSET 0 OutArgsRegion OUTARGS
+    403487      8 DATAREF STACK 356 esp + 0 CHILDOF 355 OFFSET 0 OutArgsRegion OUTARGS
     403487      8 MEMORYHOLE STACK esp + 328 ReturnAddress 
     40348e     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40348e      3 INSTR BELONGTO 403480 
@@ -5960,8 +5962,8 @@
     403c00    739 FUNC GLOBAL sub_403C00 FUNC_UNSAFE NOFP RET     403ee2 
     403c01      3 INSTR BELONGTO 403c00 
     403c01      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    403c04    120 DATAREF STACK 361 esp + 24 CHILDOF 360 OFFSET 24 LOCALVAR var_80 
-    403c04    144 DATAREF STACK 360 esp + 0 PARENT LocalFrame LOCALFRAME
+    403c04    120 DATAREF STACK 360 esp + 24 CHILDOF 359 OFFSET 24 LOCALVAR var_80 
+    403c04    144 DATAREF STACK 359 esp + 0 PARENT LocalFrame LOCALFRAME
     403c04      7 INSTR BELONGTO 403c00 
     403c04      7 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 90h 
     403c04      8 MEMORYHOLE STACK esp + 144 CalleeSavedRegs 
@@ -6296,13 +6298,13 @@
     403ef1     -3 INSTR LOCAL NoWarn push    rbx 
     403ef2      3 INSTR BELONGTO 403ef0 
     403ef2      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    403ef5    144 DATAREF STACK 364 esp + 16 CHILDOF 362 OFFSET 16 LOCALVAR stat_buf 
-    403ef5    152 DATAREF STACK 365 esp + 160 CHILDOF 362 OFFSET 160 LOCALVAR var_A8 
+    403ef5    144 DATAREF STACK 363 esp + 16 CHILDOF 361 OFFSET 16 LOCALVAR stat_buf 
+    403ef5    152 DATAREF STACK 364 esp + 160 CHILDOF 361 OFFSET 160 LOCALVAR var_A8 
     403ef5     16 MEMORYHOLE STACK esp + 312 CalleeSavedRegs 
-    403ef5    312 DATAREF STACK 362 esp + 0 PARENT LocalFrame LOCALFRAME
+    403ef5    312 DATAREF STACK 361 esp + 0 PARENT LocalFrame LOCALFRAME
     403ef5      7 INSTR BELONGTO 403ef0 
     403ef5      7 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 138h 
-    403ef5      8 DATAREF STACK 363 esp + 0 CHILDOF 362 OFFSET 0 OutArgsRegion OUTARGS
+    403ef5      8 DATAREF STACK 362 esp + 0 CHILDOF 361 OFFSET 0 OutArgsRegion OUTARGS
     403ef5      8 MEMORYHOLE STACK esp + 328 ReturnAddress 
     403efc     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     403efc      3 INSTR BELONGTO 403ef0 
@@ -7046,13 +7048,13 @@
     404567      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
     40456c      4 INSTR BELONGTO 404540 
     40456c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-    40456c     56 DATAREF STACK 366 esp + 0 PARENT LocalFrame LOCALFRAME
-    40456c      8 DATAREF STACK 367 esp + 8 CHILDOF 366 OFFSET 8 LOCALVAR var_30 
-    40456c      8 DATAREF STACK 368 esp + 16 CHILDOF 366 OFFSET 16 LOCALVAR var_28 
-    40456c      8 DATAREF STACK 369 esp + 24 CHILDOF 366 OFFSET 24 LOCALVAR var_20 
-    40456c      8 DATAREF STACK 370 esp + 32 CHILDOF 366 OFFSET 32 LOCALVAR var_18 
-    40456c      8 DATAREF STACK 371 esp + 40 CHILDOF 366 OFFSET 40 LOCALVAR var_10 
-    40456c      8 DATAREF STACK 372 esp + 48 CHILDOF 366 OFFSET 48 LOCALVAR var_8 
+    40456c     56 DATAREF STACK 365 esp + 0 PARENT LocalFrame LOCALFRAME
+    40456c      8 DATAREF STACK 366 esp + 8 CHILDOF 365 OFFSET 8 LOCALVAR var_30 
+    40456c      8 DATAREF STACK 367 esp + 16 CHILDOF 365 OFFSET 16 LOCALVAR var_28 
+    40456c      8 DATAREF STACK 368 esp + 24 CHILDOF 365 OFFSET 24 LOCALVAR var_20 
+    40456c      8 DATAREF STACK 369 esp + 32 CHILDOF 365 OFFSET 32 LOCALVAR var_18 
+    40456c      8 DATAREF STACK 370 esp + 40 CHILDOF 365 OFFSET 40 LOCALVAR var_10 
+    40456c      8 DATAREF STACK 371 esp + 48 CHILDOF 365 OFFSET 48 LOCALVAR var_8 
     40456c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     404570     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
     404570      3 INSTR BELONGTO 404540 
@@ -7129,7 +7131,7 @@
     4045e5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4045e5      4 INSTR BELONGTO 4045e0 
     4045e5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    4045e5      8 DATAREF STACK 373 esp + 0 PARENT LocalFrame LOCALFRAME
+    4045e5      8 DATAREF STACK 372 esp + 0 PARENT LocalFrame LOCALFRAME
     4045e5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4045e9      7 INSTR BELONGTO 4045e0 
     4045e9      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_606E18 
@@ -7164,7 +7166,7 @@
     404618     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     404625 
     404618      4 INSTR BELONGTO 404618 
     404618      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    404618      8 DATAREF STACK 374 esp + 0 PARENT LocalFrame LOCALFRAME
+    404618      8 DATAREF STACK 373 esp + 0 PARENT LocalFrame LOCALFRAME
     404618      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40461c     -1 INSTR LOCAL NoMetaUpdate call    sub_401E40 
     40461c      5 INSTR BELONGTO 404618 
diff --git a/tests/commit/trimmed-sorted-save-destripe.psexe.annot b/tests/commit/trimmed-sorted-save-destripe.psexe.annot
index 307b25a2..92f5a03f 100644
--- a/tests/commit/trimmed-sorted-save-destripe.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-destripe.psexe.annot
@@ -528,12 +528,11 @@
     401bb0      6 FUNC GLOBAL .gimp_drawable_preview_draw_region FUNC_UNSAFE NOFP RET     401bb5 
     401bb0      6 INSTR BELONGTO 401bb0 
     401bb0      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
-    401bc0      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
-    401bc0      0 FUNC MMSAFENESS UNSAFE
+    401bc0      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    401bc0      0 FUNC MMSAFENESS SAFE
     401bc0     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     401bc0      2 INSTR BELONGTO 401bc0 
     401bc0     42 FUNC GLOBAL _start FUNC_UNSAFE NOFP NORET     401be9 
-    401bc0      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     401bc2      3 INSTR BELONGTO 401bc0 
     401bc2      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     401bc5      1 INSTR BELONGTO 401bc0 
@@ -545,8 +544,11 @@
     401bc9      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     401bcd      1 INSTR BELONGTO 401bc0 
     401bcd      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    401bcd     -3 INSTR LOCAL NoWarn push    rax 
+    401bce     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     401bce      1 INSTR BELONGTO 401bc0 
     401bce      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    401bce      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     401bcf     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset __libc_csu_fini; fini 
     401bcf      7 INSTR BELONGTO 401bc0 
     401bcf      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset __libc_csu_fini; fini 
@@ -641,14 +643,14 @@
     401c72      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     401c73      1 INSTR BELONGTO 401c10 
     401c73      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    401c80      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
+    401c80      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     401c80      0 FUNC MMSAFENESS UNSAFE
     401c80     -1 INSTR LOCAL NoMetaUpdate cmp     cs:__JCR_LIST__, 0 
     401c80     34 FUNC GLOBAL frame_dummy FUNC_UNSAFE USEFP RET     401ca1 
     401c80      8 INSTR BELONGTO 401c80 
-    401c80      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    401c80      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401c88      1 INSTR BELONGTO 401c80 
+    401c88      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    401c88      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401c89      3 INSTR BELONGTO 401c80 
     401c8c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401CA0 
     401c8c      2 INSTR BELONGTO 401c80 
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 77a3ebff..68d007c8 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 @@
-eb398df953061373fb981ac3c9fb8eddba4e169b
\ No newline at end of file
+0e2d8771ec154d31994de0770e66330bd2e49ac4
\ 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 ee2e453b..c88132d6 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 @@
-94228dea1aaa7618ae6b0d1cc4b870fddd559942
\ No newline at end of file
+a1751abc82ce1389bc7d015f8bff063264597b72
\ 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 11231123..90d2af3d 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 @@
-fcf0581b9358163ad6f18d9594d048ecfa514777
\ No newline at end of file
+d4d6e5c44bc8a949da730f46219d3ca2b30ca958
\ 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 73562533..4bf153b8 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 @@
-0bc7cb1b1ad5a6cb81a99de295f3e89634f2e0f9
\ No newline at end of file
+bd98689dc7b2cc072eb924a6c13411952b78538e
\ 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 931b91a9..cd249953 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 @@
-a8b968af834e58b202d408ae879b905e69e86dde
\ No newline at end of file
+8f2a86f1deb39e8c6fbb4e232768c464e6b33f99
\ 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 9ffeecd2..100bf959 100644
--- a/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
@@ -2759,12 +2759,11 @@
     406f26     -1 INSTR LOCAL NoMetaUpdate call    _exit 
     406f26      5 INSTR BELONGTO 406ce0 
     406f26      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _exit 
-    406f2c      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
-    406f2c      0 FUNC MMSAFENESS UNSAFE
+    406f2c      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    406f2c      0 FUNC MMSAFENESS SAFE
     406f2c     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     406f2c      2 INSTR BELONGTO 406f2c 
     406f2c     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     406f55 
-    406f2c      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     406f2e      3 INSTR BELONGTO 406f2c 
     406f2e      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     406f31      1 INSTR BELONGTO 406f2c 
@@ -2776,8 +2775,11 @@
     406f35      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     406f39      1 INSTR BELONGTO 406f2c 
     406f39      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    406f39     -3 INSTR LOCAL NoWarn push    rax 
+    406f3a     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     406f3a      1 INSTR BELONGTO 406f2c 
     406f3a      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    406f3a      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     406f3b     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     406f3b      7 INSTR BELONGTO 406f2c 
     406f3b      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -2872,14 +2874,14 @@
     406fd2      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     406fd3      1 INSTR BELONGTO 406f70 
     406fd3      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    406fe0      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
+    406fe0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     406fe0      0 FUNC MMSAFENESS UNSAFE
     406fe0     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_60ED88, 0 
     406fe0     34 FUNC GLOBAL sub_406FE0 FUNC_UNSAFE USEFP RET     407001 
     406fe0      8 INSTR BELONGTO 406fe0 
-    406fe0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    406fe0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     406fe8      1 INSTR BELONGTO 406fe0 
+    406fe8      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    406fe8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     406fe9      3 INSTR BELONGTO 406fe0 
     406fec     -1 INSTR LOCAL NoMetaUpdate jz      short loc_407000 
     406fec      2 INSTR BELONGTO 406fe0 
@@ -4144,12 +4146,8 @@
     407ce2     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 48h 
     407ce6     -1 INSTR LOCAL NoMetaUpdate jmp     _g_value_set_boxed 
     407cf0      1 INSTR BELONGTO 40aa50 
-    407cf0     -3 INSTR LOCAL NoWarn push    rbx 
     407cf1      3 INSTR BELONGTO 40aa50 
-    407cf4     24 DATAREF STACK 786 esp + 0 PARENT LocalFrame LOCALFRAME
-    407cf4     24 DATAREF STACK 787 esp + 0 CHILDOF 786 OFFSET 0 LOCALVAR var_18 
     407cf4      4 INSTR BELONGTO 40aa50 
-    407cf4      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     407cf8     -1 INSTR LOCAL NoMetaUpdate ucomiss xmm0, cs:dword_40BED0 
     407cf8      7 INSTR BELONGTO 40aa50 
     407cff     -1 INSTR LOCAL NoMetaUpdate jbe     short loc_407D50 
@@ -4210,8 +4208,8 @@
     407d78      3 INSTR BELONGTO 40aa50 
     407d7b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 10h 
     407d7b      4 INSTR BELONGTO 40aa50 
+    407d7f      0 DEALLOC STACK esp - 0 pop     rbx
     407d7f      1 INSTR BELONGTO 40aa50 
-    407d7f     24 DEALLOC STACK esp - 24 pop     rbx
     407d80     -1 INSTR LOCAL NoMetaUpdate jmp     sub_407010 
     407d80      5 INSTR BELONGTO 40aa50 
     407d90      1 INSTR BELONGTO 40aa00 
@@ -4783,7 +4781,7 @@
     408592     -3 INSTR LOCAL NoWarn push    rbp 
     408593      1 INSTR BELONGTO 408590 
     408593      1 INSTR DEADREGS  EFLAGS R12 ZZ push    rbx 
-    408593     24 DATAREF STACK 706 esp + 0 PARENT LocalFrame LOCALFRAME
+    408593     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     408593      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     408594     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_get_text 
     408594      5 INSTR BELONGTO 408590 
@@ -4913,16 +4911,16 @@
     40863d      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     rbx, rdi 
     408640      3 INSTR BELONGTO 408630 
     408640      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ mov     rdi, rsi        ; s 
-    408643     12 DATAREF STACK 709 esp + 8 CHILDOF 707 OFFSET 8 LOCALVAR var_60 
-    408643     16 DATAREF STACK 713 esp + 40 CHILDOF 707 OFFSET 40 LOCALVAR var_40 
+    408643     12 DATAREF STACK 708 esp + 8 CHILDOF 706 OFFSET 8 LOCALVAR var_60 
+    408643     16 DATAREF STACK 712 esp + 40 CHILDOF 706 OFFSET 40 LOCALVAR var_40 
     408643     48 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
-    408643      4 DATAREF STACK 710 esp + 20 CHILDOF 707 OFFSET 20 LOCALVAR var_54 
+    408643      4 DATAREF STACK 709 esp + 20 CHILDOF 706 OFFSET 20 LOCALVAR var_54 
     408643      4 INSTR BELONGTO 408630 
     408643      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 38h 
-    408643     56 DATAREF STACK 707 esp + 0 PARENT LocalFrame LOCALFRAME
-    408643      8 DATAREF STACK 708 esp + 0 CHILDOF 707 OFFSET 0 LOCALVAR var_68 
-    408643      8 DATAREF STACK 711 esp + 24 CHILDOF 707 OFFSET 24 LOCALVAR var_50 
-    408643      8 DATAREF STACK 712 esp + 32 CHILDOF 707 OFFSET 32 LOCALVAR var_48 
+    408643     56 DATAREF STACK 706 esp + 0 PARENT LocalFrame LOCALFRAME
+    408643      8 DATAREF STACK 707 esp + 0 CHILDOF 706 OFFSET 0 LOCALVAR var_68 
+    408643      8 DATAREF STACK 710 esp + 24 CHILDOF 706 OFFSET 24 LOCALVAR var_50 
+    408643      8 DATAREF STACK 711 esp + 32 CHILDOF 706 OFFSET 32 LOCALVAR var_48 
     408643      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
     408647      4 INSTR BELONGTO 408630 
     408647      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ mov     [rsp+68h+var_54], edx 
@@ -5154,11 +5152,11 @@
     4087d5      5 INSTR BELONGTO 4087d0 
     4087da      3 INSTR BELONGTO 4087d0 
     4087da      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    4087dd     24 DATAREF STACK 714 esp + 0 PARENT LocalFrame LOCALFRAME
+    4087dd     24 DATAREF STACK 713 esp + 0 PARENT LocalFrame LOCALFRAME
     4087dd      4 INSTR BELONGTO 4087d0 
     4087dd      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 18h 
-    4087dd      8 DATAREF STACK 715 esp + 8 CHILDOF 714 OFFSET 8 LOCALVAR var_10 
-    4087dd      8 DATAREF STACK 716 esp + 16 CHILDOF 714 OFFSET 16 LOCALVAR var_8 
+    4087dd      8 DATAREF STACK 714 esp + 8 CHILDOF 713 OFFSET 8 LOCALVAR var_10 
+    4087dd      8 DATAREF STACK 715 esp + 16 CHILDOF 713 OFFSET 16 LOCALVAR var_8 
     4087dd      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4087e1      3 INSTR BELONGTO 4087d0 
     4087e1      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rsi 
@@ -5204,8 +5202,8 @@
     408830      1 INSTR BELONGTO 408830 
     408830      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     408830     -3 INSTR LOCAL NoWarn push    rbx 
-    408831     16 DATAREF STACK 717 esp + 0 PARENT LocalFrame LOCALFRAME
-    408831      4 DATAREF STACK 718 esp + 0 CHILDOF 717 OFFSET 0 OutArgsRegion OUTARGS
+    408831     16 DATAREF STACK 716 esp + 0 PARENT LocalFrame LOCALFRAME
+    408831      4 DATAREF STACK 717 esp + 0 CHILDOF 716 OFFSET 0 OutArgsRegion OUTARGS
     408831      4 INSTR BELONGTO 408830 
     408831      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
     408831      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -5302,16 +5300,16 @@
     4088bc     -3 INSTR LOCAL NoWarn push    rbx 
     4088bd      3 INSTR BELONGTO 4088b0 
     4088bd      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 R13 R15 ZZ mov     rbx, rdi 
-    4088c0     12 DATAREF STACK 724 esp + 28 CHILDOF 719 OFFSET 28 LOCALVAR var_4C 
-    4088c0     16 DATAREF STACK 725 esp + 40 CHILDOF 719 OFFSET 40 LOCALVAR endptr 
+    4088c0     12 DATAREF STACK 723 esp + 28 CHILDOF 718 OFFSET 28 LOCALVAR var_4C 
+    4088c0     16 DATAREF STACK 724 esp + 40 CHILDOF 718 OFFSET 40 LOCALVAR endptr 
     4088c0     48 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
-    4088c0      4 DATAREF STACK 723 esp + 24 CHILDOF 719 OFFSET 24 LOCALVAR var_50 
+    4088c0      4 DATAREF STACK 722 esp + 24 CHILDOF 718 OFFSET 24 LOCALVAR var_50 
     4088c0      4 INSTR BELONGTO 4088b0 
     4088c0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R15 ZZ sub     rsp, 38h 
-    4088c0     56 DATAREF STACK 719 esp + 0 PARENT LocalFrame LOCALFRAME
-    4088c0      8 DATAREF STACK 720 esp + 0 CHILDOF 719 OFFSET 0 LOCALVAR var_68 
-    4088c0      8 DATAREF STACK 721 esp + 8 CHILDOF 719 OFFSET 8 LOCALVAR var_60 
-    4088c0      8 DATAREF STACK 722 esp + 16 CHILDOF 719 OFFSET 16 LOCALVAR var_58 
+    4088c0     56 DATAREF STACK 718 esp + 0 PARENT LocalFrame LOCALFRAME
+    4088c0      8 DATAREF STACK 719 esp + 0 CHILDOF 718 OFFSET 0 LOCALVAR var_68 
+    4088c0      8 DATAREF STACK 720 esp + 8 CHILDOF 718 OFFSET 8 LOCALVAR var_60 
+    4088c0      8 DATAREF STACK 721 esp + 16 CHILDOF 718 OFFSET 16 LOCALVAR var_58 
     4088c0      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
     4088c4     -1 INSTR LOCAL NoMetaUpdate call    sub_408830 
     4088c4      5 INSTR BELONGTO 4088b0 
@@ -6232,13 +6230,13 @@
     408f4c      5 INSTR BELONGTO 408f30 
     408f51      4 INSTR BELONGTO 408f30 
     408f51      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ sub     rsp, 38h 
-    408f51     56 DATAREF STACK 726 esp + 0 PARENT LocalFrame LOCALFRAME
-    408f51      8 DATAREF STACK 727 esp + 8 CHILDOF 726 OFFSET 8 LOCALVAR var_30 
-    408f51      8 DATAREF STACK 728 esp + 16 CHILDOF 726 OFFSET 16 LOCALVAR var_28 
-    408f51      8 DATAREF STACK 729 esp + 24 CHILDOF 726 OFFSET 24 LOCALVAR var_20 
-    408f51      8 DATAREF STACK 730 esp + 32 CHILDOF 726 OFFSET 32 LOCALVAR var_18 
-    408f51      8 DATAREF STACK 731 esp + 40 CHILDOF 726 OFFSET 40 LOCALVAR var_10 
-    408f51      8 DATAREF STACK 732 esp + 48 CHILDOF 726 OFFSET 48 LOCALVAR var_8 
+    408f51     56 DATAREF STACK 725 esp + 0 PARENT LocalFrame LOCALFRAME
+    408f51      8 DATAREF STACK 726 esp + 8 CHILDOF 725 OFFSET 8 LOCALVAR var_30 
+    408f51      8 DATAREF STACK 727 esp + 16 CHILDOF 725 OFFSET 16 LOCALVAR var_28 
+    408f51      8 DATAREF STACK 728 esp + 24 CHILDOF 725 OFFSET 24 LOCALVAR var_20 
+    408f51      8 DATAREF STACK 729 esp + 32 CHILDOF 725 OFFSET 32 LOCALVAR var_18 
+    408f51      8 DATAREF STACK 730 esp + 40 CHILDOF 725 OFFSET 40 LOCALVAR var_10 
+    408f51      8 DATAREF STACK 731 esp + 48 CHILDOF 725 OFFSET 48 LOCALVAR var_8 
     408f51      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     408f55     -1 INSTR LOCAL NoMetaUpdate call    sub_408830 
     408f55      5 INSTR BELONGTO 408f30 
@@ -6561,14 +6559,14 @@
     409159      1 INSTR BELONGTO 409150 
     409159      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 R12 R13 R14 R15 ZZ push    rbx 
     409159     -3 INSTR LOCAL NoWarn push    rbx 
-    40915a     16 DATAREF STACK 737 esp + 24 CHILDOF 733 OFFSET 24 LOCALVAR var_40 
-    40915a     40 DATAREF STACK 733 esp + 0 PARENT LocalFrame LOCALFRAME
+    40915a     16 DATAREF STACK 736 esp + 24 CHILDOF 732 OFFSET 24 LOCALVAR var_40 
+    40915a     40 DATAREF STACK 732 esp + 0 PARENT LocalFrame LOCALFRAME
     40915a     48 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
     40915a      4 INSTR BELONGTO 409150 
     40915a      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 R13 R14 R15 ZZ sub     rsp, 28h 
-    40915a      8 DATAREF STACK 734 esp + 0 CHILDOF 733 OFFSET 0 LOCALVAR var_58 
-    40915a      8 DATAREF STACK 735 esp + 8 CHILDOF 733 OFFSET 8 LOCALVAR var_50 
-    40915a      8 DATAREF STACK 736 esp + 16 CHILDOF 733 OFFSET 16 LOCALVAR var_48 
+    40915a      8 DATAREF STACK 733 esp + 0 CHILDOF 732 OFFSET 0 LOCALVAR var_58 
+    40915a      8 DATAREF STACK 734 esp + 8 CHILDOF 732 OFFSET 8 LOCALVAR var_50 
+    40915a      8 DATAREF STACK 735 esp + 16 CHILDOF 732 OFFSET 16 LOCALVAR var_48 
     40915a      8 MEMORYHOLE STACK esp + 88 ReturnAddress 
     40915e      5 INSTR BELONGTO 409150 
     40915e      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     [rsp+58h+var_50], rdi 
@@ -7353,11 +7351,11 @@
     409680     -3 INSTR LOCAL NoWarn push    rbx 
     409681      3 INSTR BELONGTO 409680 
     409681      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    409684     20 DATAREF STACK 739 esp + 0 CHILDOF 738 OFFSET 0 OutArgsRegion OUTARGS
-    409684     32 DATAREF STACK 738 esp + 0 PARENT LocalFrame LOCALFRAME
+    409684     20 DATAREF STACK 738 esp + 0 CHILDOF 737 OFFSET 0 OutArgsRegion OUTARGS
+    409684     32 DATAREF STACK 737 esp + 0 PARENT LocalFrame LOCALFRAME
     409684      4 INSTR BELONGTO 409680 
     409684      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 20h 
-    409684      8 DATAREF STACK 740 esp + 24 CHILDOF 738 OFFSET 24 LOCALVAR var_10 
+    409684      8 DATAREF STACK 739 esp + 24 CHILDOF 737 OFFSET 24 LOCALVAR var_10 
     409684      8 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
     409684      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     409688     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
@@ -7488,7 +7486,7 @@
     409782      3 INSTR BELONGTO 409780 
     409785     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     409785      4 INSTR BELONGTO 409780 
-    409785      8 DATAREF STACK 741 esp + 0 PARENT LocalFrame LOCALFRAME
+    409785      8 DATAREF STACK 740 esp + 0 PARENT LocalFrame LOCALFRAME
     409785      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     409789     -1 INSTR LOCAL NoMetaUpdate call    sub_408830 
     409789      5 INSTR BELONGTO 409780 
@@ -7743,7 +7741,7 @@
     409d77     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     409d77      4 INSTR BELONGTO 409d70 
     409d77      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    409d77      8 DATAREF STACK 742 esp + 0 PARENT LocalFrame LOCALFRAME
+    409d77      8 DATAREF STACK 741 esp + 0 PARENT LocalFrame LOCALFRAME
     409d77      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     409d7b     -1 INSTR LOCAL NoMetaUpdate call    sub_408830 
     409d7b      5 INSTR BELONGTO 409d70 
@@ -7806,12 +7804,7 @@
     409dda      3 INSTR BELONGTO 40b2d0 
     409ddd      5 INSTR BELONGTO 40b2d0 
     409ddd      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r12
-    409de2     24 DATAREF STACK 801 esp + 0 PARENT LocalFrame LOCALFRAME
     409de2      4 INSTR BELONGTO 40b2d0 
-    409de2      8 DATAREF STACK 802 esp + 0 CHILDOF 801 OFFSET 0 LOCALVAR var_18 
-    409de2      8 DATAREF STACK 803 esp + 8 CHILDOF 801 OFFSET 8 LOCALVAR var_10 
-    409de2      8 DATAREF STACK 804 esp + 16 CHILDOF 801 OFFSET 16 LOCALVAR var_8 
-    409de2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     409de6      2 INSTR BELONGTO 40b2d0 
     409de8     -1 INSTR LOCAL NoMetaUpdate call    sub_408830 
     409de8      5 INSTR BELONGTO 40b2d0 
@@ -7864,8 +7857,8 @@
     409e5e      5 PTRIMMEDESP STACK 16 displ mov     r12, [rsp+18h+var_8]
     409e63     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
     409e63      4 INSTR BELONGTO 40b2d0 
+    409e67      0 DEALLOC STACK esp - 0 jmp     sub_4088B0
     409e67     -1 INSTR LOCAL NoMetaUpdate jmp     sub_4088B0 
-    409e67     24 DEALLOC STACK esp - 24 jmp     sub_4088B0
     409e67      5 INSTR BELONGTO 40b2d0 
     409e70      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     409e70      0 FUNC MMSAFENESS SAFE
@@ -7880,13 +7873,13 @@
     409e7d      5 INSTR BELONGTO 409e70 
     409e82     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     409e82      5 INSTR BELONGTO 409e70 
-    409e87     40 DATAREF STACK 743 esp + 0 PARENT LocalFrame LOCALFRAME
+    409e87     40 DATAREF STACK 742 esp + 0 PARENT LocalFrame LOCALFRAME
     409e87      4 INSTR BELONGTO 409e70 
     409e87      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 28h 
-    409e87      8 DATAREF STACK 744 esp + 8 CHILDOF 743 OFFSET 8 LOCALVAR var_20 
-    409e87      8 DATAREF STACK 745 esp + 16 CHILDOF 743 OFFSET 16 LOCALVAR var_18 
-    409e87      8 DATAREF STACK 746 esp + 24 CHILDOF 743 OFFSET 24 LOCALVAR var_10 
-    409e87      8 DATAREF STACK 747 esp + 32 CHILDOF 743 OFFSET 32 LOCALVAR var_8 
+    409e87      8 DATAREF STACK 743 esp + 8 CHILDOF 742 OFFSET 8 LOCALVAR var_20 
+    409e87      8 DATAREF STACK 744 esp + 16 CHILDOF 742 OFFSET 16 LOCALVAR var_18 
+    409e87      8 DATAREF STACK 745 esp + 24 CHILDOF 742 OFFSET 24 LOCALVAR var_10 
+    409e87      8 DATAREF STACK 746 esp + 32 CHILDOF 742 OFFSET 32 LOCALVAR var_8 
     409e87      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     409e8b     -1 INSTR LOCAL NoMetaUpdate call    sub_408830 
     409e8b      5 INSTR BELONGTO 409e70 
@@ -8237,17 +8230,17 @@
     40a167      5 INSTR BELONGTO 40a150 
     40a16c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
     40a16c      5 INSTR BELONGTO 40a150 
-    40a171     12 DATAREF STACK 750 esp + 12 CHILDOF 748 OFFSET 12 LOCALVAR var_3C 
-    40a171      4 DATAREF STACK 749 esp + 8 CHILDOF 748 OFFSET 8 LOCALVAR var_40 
+    40a171     12 DATAREF STACK 749 esp + 12 CHILDOF 747 OFFSET 12 LOCALVAR var_3C 
+    40a171      4 DATAREF STACK 748 esp + 8 CHILDOF 747 OFFSET 8 LOCALVAR var_40 
     40a171      4 INSTR BELONGTO 40a150 
     40a171      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 48h 
-    40a171     72 DATAREF STACK 748 esp + 0 PARENT LocalFrame LOCALFRAME
-    40a171      8 DATAREF STACK 751 esp + 24 CHILDOF 748 OFFSET 24 LOCALVAR var_30 
-    40a171      8 DATAREF STACK 752 esp + 32 CHILDOF 748 OFFSET 32 LOCALVAR var_28 
-    40a171      8 DATAREF STACK 753 esp + 40 CHILDOF 748 OFFSET 40 LOCALVAR var_20 
-    40a171      8 DATAREF STACK 754 esp + 48 CHILDOF 748 OFFSET 48 LOCALVAR var_18 
-    40a171      8 DATAREF STACK 755 esp + 56 CHILDOF 748 OFFSET 56 LOCALVAR var_10 
-    40a171      8 DATAREF STACK 756 esp + 64 CHILDOF 748 OFFSET 64 LOCALVAR var_8 
+    40a171     72 DATAREF STACK 747 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a171      8 DATAREF STACK 750 esp + 24 CHILDOF 747 OFFSET 24 LOCALVAR var_30 
+    40a171      8 DATAREF STACK 751 esp + 32 CHILDOF 747 OFFSET 32 LOCALVAR var_28 
+    40a171      8 DATAREF STACK 752 esp + 40 CHILDOF 747 OFFSET 40 LOCALVAR var_20 
+    40a171      8 DATAREF STACK 753 esp + 48 CHILDOF 747 OFFSET 48 LOCALVAR var_18 
+    40a171      8 DATAREF STACK 754 esp + 56 CHILDOF 747 OFFSET 56 LOCALVAR var_10 
+    40a171      8 DATAREF STACK 755 esp + 64 CHILDOF 747 OFFSET 64 LOCALVAR var_8 
     40a171      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     40a175     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
     40a175      5 INSTR BELONGTO 40a150 
@@ -8548,12 +8541,12 @@
     40a37a      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbp, rsi 
     40a37d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40a37d      5 INSTR BELONGTO 40a370 
-    40a382     24 DATAREF STACK 757 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a382     24 DATAREF STACK 756 esp + 0 PARENT LocalFrame LOCALFRAME
     40a382      4 INSTR BELONGTO 40a370 
     40a382      4 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ sub     rsp, 18h 
-    40a382      8 DATAREF STACK 758 esp + 0 CHILDOF 757 OFFSET 0 LOCALVAR var_18 
-    40a382      8 DATAREF STACK 759 esp + 8 CHILDOF 757 OFFSET 8 LOCALVAR var_10 
-    40a382      8 DATAREF STACK 760 esp + 16 CHILDOF 757 OFFSET 16 LOCALVAR var_8 
+    40a382      8 DATAREF STACK 757 esp + 0 CHILDOF 756 OFFSET 0 LOCALVAR var_18 
+    40a382      8 DATAREF STACK 758 esp + 8 CHILDOF 756 OFFSET 8 LOCALVAR var_10 
+    40a382      8 DATAREF STACK 759 esp + 16 CHILDOF 756 OFFSET 16 LOCALVAR var_8 
     40a382      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40a386      3 INSTR BELONGTO 40a370 
     40a386      3 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     r12, rdi 
@@ -8652,28 +8645,28 @@
     40a414      1 INSTR BELONGTO 40a400 
     40a414      1 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ push    rbx 
     40a414     -3 INSTR LOCAL NoWarn push    rbx 
-    40a415     16 DATAREF STACK 776 esp + 176 CHILDOF 761 OFFSET 176 LOCALVAR var_58 
-    40a415     16 DATAREF STACK 779 esp + 208 CHILDOF 761 OFFSET 208 LOCALVAR var_38 
-    40a415    224 DATAREF STACK 761 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a415     16 DATAREF STACK 775 esp + 176 CHILDOF 760 OFFSET 176 LOCALVAR var_58 
+    40a415     16 DATAREF STACK 778 esp + 208 CHILDOF 760 OFFSET 208 LOCALVAR var_38 
+    40a415    224 DATAREF STACK 760 esp + 0 PARENT LocalFrame LOCALFRAME
     40a415     40 MEMORYHOLE STACK esp + 224 CalleeSavedRegs 
-    40a415     68 DATAREF STACK 762 esp + 0 CHILDOF 761 OFFSET 0 OutArgsRegion OUTARGS
+    40a415     68 DATAREF STACK 761 esp + 0 CHILDOF 760 OFFSET 0 OutArgsRegion OUTARGS
     40a415      7 INSTR BELONGTO 40a400 
     40a415      7 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ sub     rsp, 0E0h 
-    40a415      8 DATAREF STACK 763 esp + 72 CHILDOF 761 OFFSET 72 LOCALVAR var_C0 
-    40a415      8 DATAREF STACK 764 esp + 80 CHILDOF 761 OFFSET 80 LOCALVAR var_B8 
-    40a415      8 DATAREF STACK 765 esp + 88 CHILDOF 761 OFFSET 88 LOCALVAR var_B0 
-    40a415      8 DATAREF STACK 766 esp + 96 CHILDOF 761 OFFSET 96 LOCALVAR var_A8 
-    40a415      8 DATAREF STACK 767 esp + 104 CHILDOF 761 OFFSET 104 LOCALVAR var_A0 
-    40a415      8 DATAREF STACK 768 esp + 112 CHILDOF 761 OFFSET 112 LOCALVAR var_98 
-    40a415      8 DATAREF STACK 769 esp + 120 CHILDOF 761 OFFSET 120 LOCALVAR var_90 
-    40a415      8 DATAREF STACK 770 esp + 128 CHILDOF 761 OFFSET 128 LOCALVAR var_88 
-    40a415      8 DATAREF STACK 771 esp + 136 CHILDOF 761 OFFSET 136 LOCALVAR var_80 
-    40a415      8 DATAREF STACK 772 esp + 144 CHILDOF 761 OFFSET 144 LOCALVAR var_78 
-    40a415      8 DATAREF STACK 773 esp + 152 CHILDOF 761 OFFSET 152 LOCALVAR var_70 
-    40a415      8 DATAREF STACK 774 esp + 160 CHILDOF 761 OFFSET 160 LOCALVAR var_68 
-    40a415      8 DATAREF STACK 775 esp + 168 CHILDOF 761 OFFSET 168 LOCALVAR var_60 
-    40a415      8 DATAREF STACK 777 esp + 192 CHILDOF 761 OFFSET 192 LOCALVAR var_48 
-    40a415      8 DATAREF STACK 778 esp + 200 CHILDOF 761 OFFSET 200 LOCALVAR var_40 
+    40a415      8 DATAREF STACK 762 esp + 72 CHILDOF 760 OFFSET 72 LOCALVAR var_C0 
+    40a415      8 DATAREF STACK 763 esp + 80 CHILDOF 760 OFFSET 80 LOCALVAR var_B8 
+    40a415      8 DATAREF STACK 764 esp + 88 CHILDOF 760 OFFSET 88 LOCALVAR var_B0 
+    40a415      8 DATAREF STACK 765 esp + 96 CHILDOF 760 OFFSET 96 LOCALVAR var_A8 
+    40a415      8 DATAREF STACK 766 esp + 104 CHILDOF 760 OFFSET 104 LOCALVAR var_A0 
+    40a415      8 DATAREF STACK 767 esp + 112 CHILDOF 760 OFFSET 112 LOCALVAR var_98 
+    40a415      8 DATAREF STACK 768 esp + 120 CHILDOF 760 OFFSET 120 LOCALVAR var_90 
+    40a415      8 DATAREF STACK 769 esp + 128 CHILDOF 760 OFFSET 128 LOCALVAR var_88 
+    40a415      8 DATAREF STACK 770 esp + 136 CHILDOF 760 OFFSET 136 LOCALVAR var_80 
+    40a415      8 DATAREF STACK 771 esp + 144 CHILDOF 760 OFFSET 144 LOCALVAR var_78 
+    40a415      8 DATAREF STACK 772 esp + 152 CHILDOF 760 OFFSET 152 LOCALVAR var_70 
+    40a415      8 DATAREF STACK 773 esp + 160 CHILDOF 760 OFFSET 160 LOCALVAR var_68 
+    40a415      8 DATAREF STACK 774 esp + 168 CHILDOF 760 OFFSET 168 LOCALVAR var_60 
+    40a415      8 DATAREF STACK 776 esp + 192 CHILDOF 760 OFFSET 192 LOCALVAR var_48 
+    40a415      8 DATAREF STACK 777 esp + 200 CHILDOF 760 OFFSET 200 LOCALVAR var_40 
     40a415      8 MEMORYHOLE STACK esp + 264 ReturnAddress 
     40a41c     12 INSTR BELONGTO 40a400 
     40a41c     -1 INSTR LOCAL MetadataUnused mov     [rsp+108h+var_78], offset aNoahLevittNlev; "Noah Levitt <nlevitt@columbia.edu>" 
@@ -8922,8 +8915,8 @@
     40a64c      1 INSTR BELONGTO 40a640 
     40a64c      1 INSTR DEADREGS  EFLAGS R12 R13 R15 ZZ push    rbx 
     40a64c     -3 INSTR LOCAL NoWarn push    rbx 
-    40a64d     16 DATAREF STACK 781 esp + 8 CHILDOF 780 OFFSET 8 LOCALVAR var_40 
-    40a64d     24 DATAREF STACK 780 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a64d     16 DATAREF STACK 780 esp + 8 CHILDOF 779 OFFSET 8 LOCALVAR var_40 
+    40a64d     24 DATAREF STACK 779 esp + 0 PARENT LocalFrame LOCALFRAME
     40a64d     48 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
     40a64d      4 INSTR BELONGTO 40a640 
     40a64d      4 INSTR DEADREGS  EFLAGS RBX R12 R13 R15 ZZ sub     rsp, 18h 
@@ -9228,12 +9221,12 @@
     40a81a      3 INSTR BELONGTO 40a810 
     40a81d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40a81d      5 INSTR BELONGTO 40a810 
-    40a822     24 DATAREF STACK 782 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a822     24 DATAREF STACK 781 esp + 0 PARENT LocalFrame LOCALFRAME
     40a822      4 INSTR BELONGTO 40a810 
     40a822      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 18h 
-    40a822      8 DATAREF STACK 783 esp + 0 CHILDOF 782 OFFSET 0 LOCALVAR var_18 
-    40a822      8 DATAREF STACK 784 esp + 8 CHILDOF 782 OFFSET 8 LOCALVAR var_10 
-    40a822      8 DATAREF STACK 785 esp + 16 CHILDOF 782 OFFSET 16 LOCALVAR var_8 
+    40a822      8 DATAREF STACK 782 esp + 0 CHILDOF 781 OFFSET 0 LOCALVAR var_18 
+    40a822      8 DATAREF STACK 783 esp + 8 CHILDOF 781 OFFSET 8 LOCALVAR var_10 
+    40a822      8 DATAREF STACK 784 esp + 16 CHILDOF 781 OFFSET 16 LOCALVAR var_8 
     40a822      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40a826     -1 INSTR LOCAL MetadataUnused mov     ebx, 0FF53h 
     40a826      5 INSTR BELONGTO 40a810 
@@ -9421,11 +9414,12 @@
     40aa41     -1 INSTR LOCAL NoMetaUpdate jmp     loc_407CF0 
     40aa41      5 INSTR BELONGTO 40aa20 
     40aa41      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 XMM0 ZZ jmp     loc_407CF0 
-    40aa50      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 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
+    40aa50      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -4 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     40aa50      0 FUNC MMSAFENESS UNSAFE
     40aa50      1 INSTR BELONGTO 40aa50 
     40aa50     38 FUNC GLOBAL sub_40AA50 FUNC_UNSAFE NOFP RET     40aa75 
-    40aa50     -3 INSTR LOCAL NoWarn push    rbx 
+    40aa50      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    40aa50      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40aa51      3 INSTR BELONGTO 40aa50 
     40aa54     -1 INSTR LOCAL NoMetaUpdate call    sub_407720 
     40aa54      5 INSTR BELONGTO 40aa50 
@@ -9450,12 +9444,12 @@
     40aa8a      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
     40aa8d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40aa8d      5 INSTR BELONGTO 40aa80 
-    40aa92     24 DATAREF STACK 788 esp + 0 PARENT LocalFrame LOCALFRAME
+    40aa92     24 DATAREF STACK 785 esp + 0 PARENT LocalFrame LOCALFRAME
     40aa92      4 INSTR BELONGTO 40aa80 
     40aa92      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-    40aa92      8 DATAREF STACK 789 esp + 0 CHILDOF 788 OFFSET 0 LOCALVAR var_18 
-    40aa92      8 DATAREF STACK 790 esp + 8 CHILDOF 788 OFFSET 8 LOCALVAR var_10 
-    40aa92      8 DATAREF STACK 791 esp + 16 CHILDOF 788 OFFSET 16 LOCALVAR var_8 
+    40aa92      8 DATAREF STACK 786 esp + 0 CHILDOF 785 OFFSET 0 LOCALVAR var_18 
+    40aa92      8 DATAREF STACK 787 esp + 8 CHILDOF 785 OFFSET 8 LOCALVAR var_10 
+    40aa92      8 DATAREF STACK 788 esp + 16 CHILDOF 785 OFFSET 16 LOCALVAR var_8 
     40aa92      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40aa96     -1 INSTR LOCAL NoMetaUpdate test    esi, esi 
     40aa96      2 INSTR BELONGTO 40aa80 
@@ -9572,11 +9566,11 @@
     40abb0     -3 INSTR LOCAL NoWarn push    rbx 
     40abb1     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
     40abb1      3 INSTR BELONGTO 40abb0 
-    40abb4     24 DATAREF STACK 793 esp + 0 CHILDOF 792 OFFSET 0 OutArgsRegion OUTARGS
-    40abb4     32 DATAREF STACK 792 esp + 0 PARENT LocalFrame LOCALFRAME
+    40abb4     24 DATAREF STACK 790 esp + 0 CHILDOF 789 OFFSET 0 OutArgsRegion OUTARGS
+    40abb4     32 DATAREF STACK 789 esp + 0 PARENT LocalFrame LOCALFRAME
     40abb4      4 INSTR BELONGTO 40abb0 
     40abb4      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 20h 
-    40abb4      8 DATAREF STACK 794 esp + 24 CHILDOF 792 OFFSET 24 LOCALVAR var_10 
+    40abb4      8 DATAREF STACK 791 esp + 24 CHILDOF 789 OFFSET 24 LOCALVAR var_10 
     40abb4      8 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
     40abb4      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40abb8      7 INSTR BELONGTO 40abb0 
@@ -9682,8 +9676,8 @@
     40ad10     47 FUNC GLOBAL sub_40AD10 FUNC_UNSAFE NOFP RET     40ad3e 
     40ad11     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
     40ad11      3 INSTR BELONGTO 40ad10 
-    40ad14     16 DATAREF STACK 795 esp + 0 PARENT LocalFrame LOCALFRAME
-    40ad14      4 DATAREF STACK 796 esp + 12 CHILDOF 795 OFFSET 12 LOCALVAR var_C 
+    40ad14     16 DATAREF STACK 792 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ad14      4 DATAREF STACK 793 esp + 12 CHILDOF 792 OFFSET 12 LOCALVAR var_C 
     40ad14      4 INSTR BELONGTO 40ad10 
     40ad14      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 10h 
     40ad14      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -9783,7 +9777,7 @@
     40ae95     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40ae95      4 INSTR BELONGTO 40ae90 
     40ae95      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-    40ae95      8 DATAREF STACK 797 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ae95      8 DATAREF STACK 794 esp + 0 PARENT LocalFrame LOCALFRAME
     40ae95      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40ae99     -1 INSTR LOCAL NoMetaUpdate call    _gtk_editable_get_type 
     40ae99      5 INSTR BELONGTO 40ae90 
@@ -9925,8 +9919,8 @@
     40b0e0      1 INSTR BELONGTO 40b0e0 
     40b0e0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     40b0e0     -3 INSTR LOCAL NoWarn push    rbx 
-    40b0e1     16 DATAREF STACK 798 esp + 0 PARENT LocalFrame LOCALFRAME
-    40b0e1      4 DATAREF STACK 799 esp + 0 CHILDOF 798 OFFSET 0 OutArgsRegion OUTARGS
+    40b0e1     16 DATAREF STACK 795 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b0e1      4 DATAREF STACK 796 esp + 0 CHILDOF 795 OFFSET 0 OutArgsRegion OUTARGS
     40b0e1      4 INSTR BELONGTO 40b0e0 
     40b0e1      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
     40b0e1      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -10008,7 +10002,7 @@
     40b162      3 INSTR BELONGTO 40b160 
     40b165     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40b165      4 INSTR BELONGTO 40b160 
-    40b165      8 DATAREF STACK 800 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b165      8 DATAREF STACK 797 esp + 0 PARENT LocalFrame LOCALFRAME
     40b165      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40b169     -1 INSTR LOCAL NoMetaUpdate call    sub_40B0E0 
     40b169      5 INSTR BELONGTO 40b160 
@@ -10208,11 +10202,12 @@
     40b2c1     -1 INSTR LOCAL NoMetaUpdate jmp     sub_40B1D0 
     40b2c1      5 INSTR BELONGTO 40b290 
     40b2c1      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     sub_40B1D0 
-    40b2d0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 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
+    40b2d0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -4 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     40b2d0      0 FUNC MMSAFENESS UNSAFE
     40b2d0      1 INSTR BELONGTO 40b2d0 
-    40b2d0     -3 INSTR LOCAL NoWarn push    rbx 
     40b2d0     54 FUNC GLOBAL sub_40B2D0 FUNC_UNSAFE NOFP RET     40b305 
+    40b2d0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    40b2d0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40b2d1     -1 INSTR LOCAL NoMetaUpdate cmp     qword ptr [rsi+70h], 0 
     40b2d1      5 INSTR BELONGTO 40b2d0 
     40b2d6      3 INSTR BELONGTO 40b2d0 
@@ -10284,7 +10279,7 @@
     40b348     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40b348      4 INSTR BELONGTO 40b340 
     40b348      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40b348      8 DATAREF STACK 805 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b348      8 DATAREF STACK 798 esp + 0 PARENT LocalFrame LOCALFRAME
     40b348      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40b34c     -1 INSTR LOCAL NoMetaUpdate call    sub_40B0E0 
     40b34c      5 INSTR BELONGTO 40b340 
@@ -10429,40 +10424,40 @@
     40b413     -3 INSTR LOCAL NoWarn push    rbx 
     40b414      3 INSTR BELONGTO 40b400 
     40b414      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     rbx, rdi 
-    40b417   1112 DATAREF STACK 806 esp + 0 PARENT LocalFrame LOCALFRAME
-    40b417     16 DATAREF STACK 835 esp + 1080 CHILDOF 806 OFFSET 1080 LOCALVAR var_50 
-    40b417     16 DATAREF STACK 836 esp + 1096 CHILDOF 806 OFFSET 1096 LOCALVAR var_40 
+    40b417   1112 DATAREF STACK 799 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b417     16 DATAREF STACK 828 esp + 1080 CHILDOF 799 OFFSET 1080 LOCALVAR var_50 
+    40b417     16 DATAREF STACK 829 esp + 1096 CHILDOF 799 OFFSET 1096 LOCALVAR var_40 
     40b417     48 MEMORYHOLE STACK esp + 1112 CalleeSavedRegs 
     40b417      7 INSTR BELONGTO 40b400 
     40b417      7 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ sub     rsp, 458h 
-    40b417    864 DATAREF STACK 809 esp + 16 CHILDOF 806 OFFSET 16 LOCALVAR var_478 
-    40b417      8 DATAREF STACK 807 esp + 0 CHILDOF 806 OFFSET 0 LOCALVAR var_488 
-    40b417      8 DATAREF STACK 808 esp + 8 CHILDOF 806 OFFSET 8 LOCALVAR var_480 
-    40b417      8 DATAREF STACK 810 esp + 880 CHILDOF 806 OFFSET 880 LOCALVAR var_118 
-    40b417      8 DATAREF STACK 811 esp + 888 CHILDOF 806 OFFSET 888 LOCALVAR var_110 
-    40b417      8 DATAREF STACK 812 esp + 896 CHILDOF 806 OFFSET 896 LOCALVAR var_108 
-    40b417      8 DATAREF STACK 813 esp + 904 CHILDOF 806 OFFSET 904 LOCALVAR var_100 
-    40b417      8 DATAREF STACK 814 esp + 912 CHILDOF 806 OFFSET 912 LOCALVAR var_F8 
-    40b417      8 DATAREF STACK 815 esp + 920 CHILDOF 806 OFFSET 920 LOCALVAR var_F0 
-    40b417      8 DATAREF STACK 816 esp + 928 CHILDOF 806 OFFSET 928 LOCALVAR var_E8 
-    40b417      8 DATAREF STACK 817 esp + 936 CHILDOF 806 OFFSET 936 LOCALVAR var_E0 
-    40b417      8 DATAREF STACK 818 esp + 944 CHILDOF 806 OFFSET 944 LOCALVAR var_D8 
-    40b417      8 DATAREF STACK 819 esp + 952 CHILDOF 806 OFFSET 952 LOCALVAR var_D0 
-    40b417      8 DATAREF STACK 820 esp + 960 CHILDOF 806 OFFSET 960 LOCALVAR var_C8 
-    40b417      8 DATAREF STACK 821 esp + 968 CHILDOF 806 OFFSET 968 LOCALVAR var_C0 
-    40b417      8 DATAREF STACK 822 esp + 976 CHILDOF 806 OFFSET 976 LOCALVAR var_B8 
-    40b417      8 DATAREF STACK 823 esp + 984 CHILDOF 806 OFFSET 984 LOCALVAR var_B0 
-    40b417      8 DATAREF STACK 824 esp + 992 CHILDOF 806 OFFSET 992 LOCALVAR var_A8 
-    40b417      8 DATAREF STACK 825 esp + 1000 CHILDOF 806 OFFSET 1000 LOCALVAR var_A0 
-    40b417      8 DATAREF STACK 826 esp + 1008 CHILDOF 806 OFFSET 1008 LOCALVAR var_98 
-    40b417      8 DATAREF STACK 827 esp + 1016 CHILDOF 806 OFFSET 1016 LOCALVAR var_90 
-    40b417      8 DATAREF STACK 828 esp + 1024 CHILDOF 806 OFFSET 1024 LOCALVAR var_88 
-    40b417      8 DATAREF STACK 829 esp + 1032 CHILDOF 806 OFFSET 1032 LOCALVAR var_80 
-    40b417      8 DATAREF STACK 830 esp + 1040 CHILDOF 806 OFFSET 1040 LOCALVAR var_78 
-    40b417      8 DATAREF STACK 831 esp + 1048 CHILDOF 806 OFFSET 1048 LOCALVAR var_70 
-    40b417      8 DATAREF STACK 832 esp + 1056 CHILDOF 806 OFFSET 1056 LOCALVAR var_68 
-    40b417      8 DATAREF STACK 833 esp + 1064 CHILDOF 806 OFFSET 1064 LOCALVAR var_60 
-    40b417      8 DATAREF STACK 834 esp + 1072 CHILDOF 806 OFFSET 1072 LOCALVAR var_58 
+    40b417    864 DATAREF STACK 802 esp + 16 CHILDOF 799 OFFSET 16 LOCALVAR var_478 
+    40b417      8 DATAREF STACK 800 esp + 0 CHILDOF 799 OFFSET 0 LOCALVAR var_488 
+    40b417      8 DATAREF STACK 801 esp + 8 CHILDOF 799 OFFSET 8 LOCALVAR var_480 
+    40b417      8 DATAREF STACK 803 esp + 880 CHILDOF 799 OFFSET 880 LOCALVAR var_118 
+    40b417      8 DATAREF STACK 804 esp + 888 CHILDOF 799 OFFSET 888 LOCALVAR var_110 
+    40b417      8 DATAREF STACK 805 esp + 896 CHILDOF 799 OFFSET 896 LOCALVAR var_108 
+    40b417      8 DATAREF STACK 806 esp + 904 CHILDOF 799 OFFSET 904 LOCALVAR var_100 
+    40b417      8 DATAREF STACK 807 esp + 912 CHILDOF 799 OFFSET 912 LOCALVAR var_F8 
+    40b417      8 DATAREF STACK 808 esp + 920 CHILDOF 799 OFFSET 920 LOCALVAR var_F0 
+    40b417      8 DATAREF STACK 809 esp + 928 CHILDOF 799 OFFSET 928 LOCALVAR var_E8 
+    40b417      8 DATAREF STACK 810 esp + 936 CHILDOF 799 OFFSET 936 LOCALVAR var_E0 
+    40b417      8 DATAREF STACK 811 esp + 944 CHILDOF 799 OFFSET 944 LOCALVAR var_D8 
+    40b417      8 DATAREF STACK 812 esp + 952 CHILDOF 799 OFFSET 952 LOCALVAR var_D0 
+    40b417      8 DATAREF STACK 813 esp + 960 CHILDOF 799 OFFSET 960 LOCALVAR var_C8 
+    40b417      8 DATAREF STACK 814 esp + 968 CHILDOF 799 OFFSET 968 LOCALVAR var_C0 
+    40b417      8 DATAREF STACK 815 esp + 976 CHILDOF 799 OFFSET 976 LOCALVAR var_B8 
+    40b417      8 DATAREF STACK 816 esp + 984 CHILDOF 799 OFFSET 984 LOCALVAR var_B0 
+    40b417      8 DATAREF STACK 817 esp + 992 CHILDOF 799 OFFSET 992 LOCALVAR var_A8 
+    40b417      8 DATAREF STACK 818 esp + 1000 CHILDOF 799 OFFSET 1000 LOCALVAR var_A0 
+    40b417      8 DATAREF STACK 819 esp + 1008 CHILDOF 799 OFFSET 1008 LOCALVAR var_98 
+    40b417      8 DATAREF STACK 820 esp + 1016 CHILDOF 799 OFFSET 1016 LOCALVAR var_90 
+    40b417      8 DATAREF STACK 821 esp + 1024 CHILDOF 799 OFFSET 1024 LOCALVAR var_88 
+    40b417      8 DATAREF STACK 822 esp + 1032 CHILDOF 799 OFFSET 1032 LOCALVAR var_80 
+    40b417      8 DATAREF STACK 823 esp + 1040 CHILDOF 799 OFFSET 1040 LOCALVAR var_78 
+    40b417      8 DATAREF STACK 824 esp + 1048 CHILDOF 799 OFFSET 1048 LOCALVAR var_70 
+    40b417      8 DATAREF STACK 825 esp + 1056 CHILDOF 799 OFFSET 1056 LOCALVAR var_68 
+    40b417      8 DATAREF STACK 826 esp + 1064 CHILDOF 799 OFFSET 1064 LOCALVAR var_60 
+    40b417      8 DATAREF STACK 827 esp + 1072 CHILDOF 799 OFFSET 1072 LOCALVAR var_58 
     40b417      8 MEMORYHOLE STACK esp + 1160 ReturnAddress 
     40b41e      5 INSTR BELONGTO 40b400 
     40b41e      5 INSTR DEADREGS  RDI R12 R13 R14 R15 ZZ lea     rdi, [rsp+488h+var_478] 
@@ -11512,7 +11507,7 @@
     40bb90     48 FUNC GLOBAL sub_40BB90 FUNC_UNSAFE NOFP NORET     40bbbf 
     40bb90      4 INSTR BELONGTO 40bb90 
     40bb90      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ sub     rsp, 8 
-    40bb90      8 DATAREF STACK 837 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bb90      8 DATAREF STACK 830 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      5 INSTR BELONGTO 40bb90 
@@ -11570,13 +11565,13 @@
     40bbe7      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
     40bbec      4 INSTR BELONGTO 40bbc0 
     40bbec      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-    40bbec     56 DATAREF STACK 838 esp + 0 PARENT LocalFrame LOCALFRAME
-    40bbec      8 DATAREF STACK 839 esp + 8 CHILDOF 838 OFFSET 8 LOCALVAR var_30 
-    40bbec      8 DATAREF STACK 840 esp + 16 CHILDOF 838 OFFSET 16 LOCALVAR var_28 
-    40bbec      8 DATAREF STACK 841 esp + 24 CHILDOF 838 OFFSET 24 LOCALVAR var_20 
-    40bbec      8 DATAREF STACK 842 esp + 32 CHILDOF 838 OFFSET 32 LOCALVAR var_18 
-    40bbec      8 DATAREF STACK 843 esp + 40 CHILDOF 838 OFFSET 40 LOCALVAR var_10 
-    40bbec      8 DATAREF STACK 844 esp + 48 CHILDOF 838 OFFSET 48 LOCALVAR var_8 
+    40bbec     56 DATAREF STACK 831 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bbec      8 DATAREF STACK 832 esp + 8 CHILDOF 831 OFFSET 8 LOCALVAR var_30 
+    40bbec      8 DATAREF STACK 833 esp + 16 CHILDOF 831 OFFSET 16 LOCALVAR var_28 
+    40bbec      8 DATAREF STACK 834 esp + 24 CHILDOF 831 OFFSET 24 LOCALVAR var_20 
+    40bbec      8 DATAREF STACK 835 esp + 32 CHILDOF 831 OFFSET 32 LOCALVAR var_18 
+    40bbec      8 DATAREF STACK 836 esp + 40 CHILDOF 831 OFFSET 40 LOCALVAR var_10 
+    40bbec      8 DATAREF STACK 837 esp + 48 CHILDOF 831 OFFSET 48 LOCALVAR var_8 
     40bbec      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40bbf0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
     40bbf0      3 INSTR BELONGTO 40bbc0 
@@ -11653,7 +11648,7 @@
     40bc65     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40bc65      4 INSTR BELONGTO 40bc60 
     40bc65      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    40bc65      8 DATAREF STACK 845 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bc65      8 DATAREF STACK 838 esp + 0 PARENT LocalFrame LOCALFRAME
     40bc65      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40bc69      7 INSTR BELONGTO 40bc60 
     40bc69      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_60ED68 
@@ -11688,7 +11683,7 @@
     40bc98     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     40bca5 
     40bc98      4 INSTR BELONGTO 40bc98 
     40bc98      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    40bc98      8 DATAREF STACK 846 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bc98      8 DATAREF STACK 839 esp + 0 PARENT LocalFrame LOCALFRAME
     40bc98      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40bc9c     -1 INSTR LOCAL NoMetaUpdate call    sub_406F70 
     40bc9c      5 INSTR BELONGTO 40bc98 
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 34a8a08a..9f8324e4 100644
--- a/tests/commit/trimmed-sorted-save-gnome-control-center.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-control-center.psexe.annot
@@ -2495,12 +2495,11 @@
       77bc      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ pop     r12 
       77be      1 INSTR BELONGTO 76b0 
       77be      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ retn 
-      77c0      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
-      77c0      0 FUNC MMSAFENESS UNSAFE
+      77c0      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+      77c0      0 FUNC MMSAFENESS SAFE
       77c0     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
       77c0      2 INSTR BELONGTO 77c0 
       77c0     42 FUNC GLOBAL _start FUNC_UNSAFE NOFP NORET       77e9 
-      77c0      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
       77c2      3 INSTR BELONGTO 77c0 
       77c2      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
       77c5      1 INSTR BELONGTO 77c0 
@@ -2512,8 +2511,11 @@
       77c9      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
       77cd      1 INSTR BELONGTO 77c0 
       77cd      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+      77cd     -3 INSTR LOCAL NoWarn push    rax 
+      77ce     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
       77ce      1 INSTR BELONGTO 77c0 
       77ce      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+      77ce      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
       77cf      7 INSTR BELONGTO 77c0 
       77cf      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, cs:fini     ; fini 
       77d6      7 INSTR BELONGTO 77c0 
@@ -2558,10 +2560,9 @@
       7818      3 INSTR BELONGTO 7810 
       781b      2 INSTR BELONGTO 7810 
       781b     -3 INSTR LOCAL NoWarn push    r12 
-      781d     16 DATAREF STACK 589 esp + 0 PARENT LocalFrame LOCALFRAME
       781d      1 INSTR BELONGTO 7810 
       781d      1 INSTR DEADREGS  R12 ZZ push    rbx 
-      781d      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
+      781d     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
       781d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       781e     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_7882 
       781e      2 INSTR BELONGTO 7810 
@@ -2613,14 +2614,14 @@
       7885      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ pop     rbp 
       7886      1 INSTR BELONGTO 7810 
       7886      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ retn 
-      7890      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
+      7890      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
       7890      0 FUNC MMSAFENESS UNSAFE
       7890     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_210240, 0 
       7890     42 FUNC GLOBAL sub_7890 FUNC_UNSAFE USEFP RET       78b9 
       7890      8 INSTR BELONGTO 7890 
-      7890      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-      7890      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       7898      1 INSTR BELONGTO 7890 
+      7898      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+      7898      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       7899      3 INSTR BELONGTO 7890 
       789c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_78B8 
       789c      2 INSTR BELONGTO 7890 
@@ -2653,7 +2654,7 @@
       78de      7 INSTR DEADREGS  EFLAGS RAX RSI ZZ lea     rsi, aGnomeControl_0; "gnome-control-center" 
       78e5      4 INSTR BELONGTO 78d0 
       78e5      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-      78e5      8 DATAREF STACK 590 esp + 0 PARENT LocalFrame LOCALFRAME
+      78e5      8 DATAREF STACK 589 esp + 0 PARENT LocalFrame LOCALFRAME
       78e5      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       78e9      2 INSTR BELONGTO 78d0 
       78e9      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
@@ -2871,10 +2872,10 @@
       7d5c     -2 INSTR LOCAL n EDX 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 591 esp + 0 PARENT LocalFrame LOCALFRAME
+      7d61     16 DATAREF STACK 590 esp + 0 PARENT LocalFrame LOCALFRAME
       7d61      4 INSTR BELONGTO 7d50 
       7d61      4 INSTR DEADREGS  EFLAGS RCX ZZ sub     rsp, 10h 
-      7d61      8 DATAREF STACK 592 esp + 8 CHILDOF 591 OFFSET 8 LOCALVAR var_10 
+      7d61      8 DATAREF STACK 591 esp + 8 CHILDOF 590 OFFSET 8 LOCALVAR var_10 
       7d61      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
       7d61      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       7d65      5 INSTR BELONGTO 7d50 
@@ -2944,14 +2945,14 @@
       7db8      1 INSTR BELONGTO 7da0 
       7db8      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
       7db8     -3 INSTR LOCAL NoWarn push    rbx 
-      7db9     12 DATAREF STACK 597 esp + 44 CHILDOF 593 OFFSET 44 LOCALVAR var_3C 
-      7db9     20 DATAREF STACK 596 esp + 24 CHILDOF 593 OFFSET 24 LOCALVAR var_50 
+      7db9     12 DATAREF STACK 596 esp + 44 CHILDOF 592 OFFSET 44 LOCALVAR var_3C 
+      7db9     20 DATAREF STACK 595 esp + 24 CHILDOF 592 OFFSET 24 LOCALVAR var_50 
       7db9     48 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
       7db9      4 INSTR BELONGTO 7da0 
       7db9      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 38h 
-      7db9     56 DATAREF STACK 593 esp + 0 PARENT LocalFrame LOCALFRAME
-      7db9      8 DATAREF STACK 594 esp + 8 CHILDOF 593 OFFSET 8 LOCALVAR var_60 
-      7db9      8 DATAREF STACK 595 esp + 16 CHILDOF 593 OFFSET 16 LOCALVAR var_58 
+      7db9     56 DATAREF STACK 592 esp + 0 PARENT LocalFrame LOCALFRAME
+      7db9      8 DATAREF STACK 593 esp + 8 CHILDOF 592 OFFSET 8 LOCALVAR var_60 
+      7db9      8 DATAREF STACK 594 esp + 16 CHILDOF 592 OFFSET 16 LOCALVAR var_58 
       7db9      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
       7dbd     -1 INSTR LOCAL MetadataUnused mov     rbx, [rdi+20h] 
       7dbd      4 INSTR BELONGTO 7da0 
@@ -3559,14 +3560,14 @@
       817f     -3 INSTR LOCAL NoWarn push    rbx 
       8180     -1 INSTR LOCAL MetadataUnused mov     rbx, rdx 
       8180      3 INSTR BELONGTO 8170 
-      8183     16 DATAREF STACK 602 esp + 56 CHILDOF 598 OFFSET 56 LOCALVAR var_40 
-      8183     40 DATAREF STACK 601 esp + 16 CHILDOF 598 OFFSET 16 LOCALVAR var_68 
+      8183     16 DATAREF STACK 601 esp + 56 CHILDOF 597 OFFSET 56 LOCALVAR var_40 
+      8183     40 DATAREF STACK 600 esp + 16 CHILDOF 597 OFFSET 16 LOCALVAR var_68 
       8183     48 MEMORYHOLE STACK esp + 72 CalleeSavedRegs 
       8183      4 INSTR BELONGTO 8170 
       8183      4 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ sub     rsp, 48h 
-      8183     72 DATAREF STACK 598 esp + 0 PARENT LocalFrame LOCALFRAME
-      8183      8 DATAREF STACK 599 esp + 0 CHILDOF 598 OFFSET 0 LOCALVAR var_78 
-      8183      8 DATAREF STACK 600 esp + 8 CHILDOF 598 OFFSET 8 LOCALVAR var_70 
+      8183     72 DATAREF STACK 597 esp + 0 PARENT LocalFrame LOCALFRAME
+      8183      8 DATAREF STACK 598 esp + 0 CHILDOF 597 OFFSET 0 LOCALVAR var_78 
+      8183      8 DATAREF STACK 599 esp + 8 CHILDOF 597 OFFSET 8 LOCALVAR var_70 
       8183      8 MEMORYHOLE STACK esp + 120 ReturnAddress 
       8187     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_get_type 
       8187      5 INSTR BELONGTO 8170 
@@ -4110,13 +4111,13 @@
       84aa      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
       84ad     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
       84ad      5 INSTR BELONGTO 84a0 
-      84b2     40 DATAREF STACK 603 esp + 0 PARENT LocalFrame LOCALFRAME
+      84b2     40 DATAREF STACK 602 esp + 0 PARENT LocalFrame LOCALFRAME
       84b2      4 INSTR BELONGTO 84a0 
       84b2      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 28h 
-      84b2      8 DATAREF STACK 604 esp + 8 CHILDOF 603 OFFSET 8 LOCALVAR var_20 
-      84b2      8 DATAREF STACK 605 esp + 16 CHILDOF 603 OFFSET 16 LOCALVAR var_18 
-      84b2      8 DATAREF STACK 606 esp + 24 CHILDOF 603 OFFSET 24 LOCALVAR var_10 
-      84b2      8 DATAREF STACK 607 esp + 32 CHILDOF 603 OFFSET 32 LOCALVAR var_8 
+      84b2      8 DATAREF STACK 603 esp + 8 CHILDOF 602 OFFSET 8 LOCALVAR var_20 
+      84b2      8 DATAREF STACK 604 esp + 16 CHILDOF 602 OFFSET 16 LOCALVAR var_18 
+      84b2      8 DATAREF STACK 605 esp + 24 CHILDOF 602 OFFSET 24 LOCALVAR var_10 
+      84b2      8 DATAREF STACK 606 esp + 32 CHILDOF 602 OFFSET 32 LOCALVAR var_8 
       84b2      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
       84b6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_icon_view_get_type 
       84b6      5 INSTR BELONGTO 84a0 
@@ -4231,9 +4232,9 @@
       8554     -3 INSTR LOCAL NoWarn push    rbx 
       8555      3 INSTR BELONGTO 8550 
       8555      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdx 
-      8558     16 DATAREF STACK 609 esp + 8 CHILDOF 608 OFFSET 8 LOCALVAR var_20 
+      8558     16 DATAREF STACK 608 esp + 8 CHILDOF 607 OFFSET 8 LOCALVAR var_20 
       8558     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-      8558     24 DATAREF STACK 608 esp + 0 PARENT LocalFrame LOCALFRAME
+      8558     24 DATAREF STACK 607 esp + 0 PARENT LocalFrame LOCALFRAME
       8558      4 INSTR BELONGTO 8550 
       8558      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
       8558      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -4439,7 +4440,7 @@
       887c     -3 INSTR LOCAL NoWarn push    rbp 
       887d      1 INSTR BELONGTO 8870 
       887d      1 INSTR DEADREGS  EFLAGS R14 ZZ push    rbx 
-      887d     40 DATAREF STACK 610 esp + 0 PARENT LocalFrame LOCALFRAME
+      887d     40 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
       887d      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
       887e     -1 INSTR LOCAL NoMetaUpdate call    _gtk_box_get_type 
       887e      5 INSTR BELONGTO 8870 
@@ -4548,7 +4549,7 @@
       8912     -3 INSTR LOCAL NoWarn push    rbp 
       8913      1 INSTR BELONGTO 8910 
       8913      1 INSTR DEADREGS  EFLAGS R12 ZZ push    rbx 
-      8913     24 DATAREF STACK 611 esp + 0 PARENT LocalFrame LOCALFRAME
+      8913     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
       8913      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       8914      3 INSTR BELONGTO 8910 
       8914      3 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     rbx, rdi 
@@ -4756,13 +4757,13 @@
       8a5c      1 INSTR BELONGTO 8a50 
       8a5c      1 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 R14 R15 ZZ push    rbx 
       8a5c     -3 INSTR LOCAL NoWarn push    rbx 
-      8a5d     16 DATAREF STACK 614 esp + 8 CHILDOF 612 OFFSET 8 LOCALVAR var_50 
-      8a5d     16 DATAREF STACK 615 esp + 24 CHILDOF 612 OFFSET 24 LOCALVAR var_40 
-      8a5d     40 DATAREF STACK 612 esp + 0 PARENT LocalFrame LOCALFRAME
+      8a5d     16 DATAREF STACK 611 esp + 8 CHILDOF 609 OFFSET 8 LOCALVAR var_50 
+      8a5d     16 DATAREF STACK 612 esp + 24 CHILDOF 609 OFFSET 24 LOCALVAR var_40 
+      8a5d     40 DATAREF STACK 609 esp + 0 PARENT LocalFrame LOCALFRAME
       8a5d     48 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
       8a5d      4 INSTR BELONGTO 8a50 
       8a5d      4 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 R14 R15 ZZ sub     rsp, 28h 
-      8a5d      8 DATAREF STACK 613 esp + 0 CHILDOF 612 OFFSET 0 LOCALVAR var_58 
+      8a5d      8 DATAREF STACK 610 esp + 0 CHILDOF 609 OFFSET 0 LOCALVAR var_58 
       8a5d      8 MEMORYHOLE STACK esp + 88 ReturnAddress 
       8a61      4 INSTR BELONGTO 8a50 
       8a61      4 INSTR DEADREGS  EFLAGS RAX RBX RSI R12 R13 R14 R15 ZZ mov     rax, [rdi+20h] 
@@ -5291,15 +5292,15 @@
       8dc3      5 INSTR DEADREGS  EFLAGS R15 ZZ call    _gtk_widget_show 
       8dc8     -1 INSTR LOCAL NoMetaUpdate jmp     loc_8BE6 
       8dc8      5 INSTR BELONGTO 8a50 
-      8dd0      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
+      8dd0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -4 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
       8dd0      0 FUNC MMSAFENESS SAFE
       8dd0     26 FUNC GLOBAL sub_8DD0 FUNC_UNSAFE NOFP RET       8de9 
       8dd0      4 INSTR BELONGTO 8dd0 
       8dd0      4 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     rax, [rsi+20h] 
-      8dd0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-      8dd0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       8dd4      1 INSTR BELONGTO 8dd0 
       8dd4      1 INSTR DEADREGS  EFLAGS RDI ZZ push    rbx 
+      8dd4      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+      8dd4      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       8dd5     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
       8dd5      3 INSTR BELONGTO 8dd0 
       8dd8      4 INSTR BELONGTO 8dd0 
@@ -5320,11 +5321,11 @@
       8df0      1 INSTR BELONGTO 8df0 
       8df0      1 INSTR DEADREGS  EFLAGS RCX ZZ push    rbx 
       8df0     -3 INSTR LOCAL NoWarn push    rbx 
-      8df1     16 DATAREF STACK 616 esp + 0 PARENT LocalFrame LOCALFRAME
+      8df1     16 DATAREF STACK 613 esp + 0 PARENT LocalFrame LOCALFRAME
       8df1      4 INSTR BELONGTO 8df0 
       8df1      4 INSTR DEADREGS  EFLAGS RCX RBX ZZ sub     rsp, 10h 
-      8df1      8 DATAREF STACK 617 esp + 0 CHILDOF 616 OFFSET 0 LOCALVAR var_18 
-      8df1      8 DATAREF STACK 618 esp + 8 CHILDOF 616 OFFSET 8 LOCALVAR var_10 
+      8df1      8 DATAREF STACK 614 esp + 0 CHILDOF 613 OFFSET 0 LOCALVAR var_18 
+      8df1      8 DATAREF STACK 615 esp + 8 CHILDOF 613 OFFSET 8 LOCALVAR var_10 
       8df1      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
       8df1      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       8df5      3 INSTR BELONGTO 8df0 
@@ -5425,14 +5426,14 @@
       8e9a      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rsi 
       8e9d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
       8e9d      5 INSTR BELONGTO 8e90 
-      8ea2     40 DATAREF STACK 619 esp + 0 PARENT LocalFrame LOCALFRAME
-      8ea2      4 DATAREF STACK 620 esp + 0 CHILDOF 619 OFFSET 0 OutArgsRegion OUTARGS
+      8ea2     40 DATAREF STACK 616 esp + 0 PARENT LocalFrame LOCALFRAME
+      8ea2      4 DATAREF STACK 617 esp + 0 CHILDOF 616 OFFSET 0 OutArgsRegion OUTARGS
       8ea2      4 INSTR BELONGTO 8e90 
       8ea2      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 28h 
-      8ea2      8 DATAREF STACK 621 esp + 8 CHILDOF 619 OFFSET 8 LOCALVAR var_20 
-      8ea2      8 DATAREF STACK 622 esp + 16 CHILDOF 619 OFFSET 16 LOCALVAR var_18 
-      8ea2      8 DATAREF STACK 623 esp + 24 CHILDOF 619 OFFSET 24 LOCALVAR var_10 
-      8ea2      8 DATAREF STACK 624 esp + 32 CHILDOF 619 OFFSET 32 LOCALVAR var_8 
+      8ea2      8 DATAREF STACK 618 esp + 8 CHILDOF 616 OFFSET 8 LOCALVAR var_20 
+      8ea2      8 DATAREF STACK 619 esp + 16 CHILDOF 616 OFFSET 16 LOCALVAR var_18 
+      8ea2      8 DATAREF STACK 620 esp + 24 CHILDOF 616 OFFSET 24 LOCALVAR var_10 
+      8ea2      8 DATAREF STACK 621 esp + 32 CHILDOF 616 OFFSET 32 LOCALVAR var_8 
       8ea2      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
       8ea6      3 INSTR BELONGTO 8e90 
       8ea6      3 INSTR DEADREGS  EFLAGS R12 ZZ mov     rbp, rdi 
@@ -5661,7 +5662,7 @@
       9055     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       9055      4 INSTR BELONGTO 9050 
       9055      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-      9055      8 DATAREF STACK 625 esp + 0 PARENT LocalFrame LOCALFRAME
+      9055      8 DATAREF STACK 622 esp + 0 PARENT LocalFrame LOCALFRAME
       9055      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       9059     -1 INSTR LOCAL NoMetaUpdate cmp     edx, 1 
       9059      3 INSTR BELONGTO 9050 
@@ -5798,10 +5799,10 @@
       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 
-      9143     16 DATAREF STACK 626 esp + 0 PARENT LocalFrame LOCALFRAME
+      9143     16 DATAREF STACK 623 esp + 0 PARENT LocalFrame LOCALFRAME
       9143      4 INSTR BELONGTO 9140 
       9143      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 10h 
-      9143      8 DATAREF STACK 627 esp + 8 CHILDOF 626 OFFSET 8 LOCALVAR var_10 
+      9143      8 DATAREF STACK 624 esp + 8 CHILDOF 623 OFFSET 8 LOCALVAR var_10 
       9143      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
       9143      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       9147     -1 INSTR LOCAL MetadataUnused mov     eax, [rsi+18h] 
@@ -5947,8 +5948,8 @@
       9240      1 INSTR BELONGTO 9240 
       9240      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
       9240     -3 INSTR LOCAL NoWarn push    rbx 
-      9241     16 DATAREF STACK 628 esp + 0 PARENT LocalFrame LOCALFRAME
-      9241      4 DATAREF STACK 629 esp + 0 CHILDOF 628 OFFSET 0 OutArgsRegion OUTARGS
+      9241     16 DATAREF STACK 625 esp + 0 PARENT LocalFrame LOCALFRAME
+      9241      4 DATAREF STACK 626 esp + 0 CHILDOF 625 OFFSET 0 OutArgsRegion OUTARGS
       9241      4 INSTR BELONGTO 9240 
       9241      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
       9241      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -6206,9 +6207,9 @@
       96d4      1 INSTR BELONGTO 96d0 
       96d4     -3 INSTR LOCAL NoWarn push    rbx 
       96d5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-      96d5     24 DATAREF STACK 630 esp + 0 PARENT LocalFrame LOCALFRAME
+      96d5     24 DATAREF STACK 627 esp + 0 PARENT LocalFrame LOCALFRAME
       96d5      4 INSTR BELONGTO 96d0 
-      96d5      8 DATAREF STACK 631 esp + 0 CHILDOF 630 OFFSET 0 OutArgsRegion OUTARGS
+      96d5      8 DATAREF STACK 628 esp + 0 CHILDOF 627 OFFSET 0 OutArgsRegion OUTARGS
       96d5      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
       96d9     -1 INSTR LOCAL NoMetaUpdate call    gnome_control_center_get_type 
       96d9      5 INSTR BELONGTO 96d0 
@@ -6293,7 +6294,7 @@
       97a2      3 INSTR BELONGTO 97a0 
       97a5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       97a5      4 INSTR BELONGTO 97a0 
-      97a5      8 DATAREF STACK 632 esp + 0 PARENT LocalFrame LOCALFRAME
+      97a5      8 DATAREF STACK 629 esp + 0 PARENT LocalFrame LOCALFRAME
       97a5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       97a9     -1 INSTR LOCAL NoMetaUpdate call    gnome_control_center_get_type 
       97a9      5 INSTR BELONGTO 97a0 
@@ -6611,7 +6612,7 @@
       a010     25 FUNC GLOBAL gnome_control_center_new FUNC_UNSAFE NOFP RET       a028 
       a010      4 INSTR BELONGTO a010 
       a010      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-      a010      8 DATAREF STACK 633 esp + 0 PARENT LocalFrame LOCALFRAME
+      a010      8 DATAREF STACK 630 esp + 0 PARENT LocalFrame LOCALFRAME
       a010      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       a014     -1 INSTR LOCAL NoMetaUpdate call    gnome_control_center_get_type 
       a014      5 INSTR BELONGTO a010 
@@ -6640,12 +6641,12 @@
       a03a      3 INSTR BELONGTO a030 
       a03d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_10], rbp 
       a03d      5 INSTR BELONGTO a030 
-      a042     24 DATAREF STACK 634 esp + 0 PARENT LocalFrame LOCALFRAME
+      a042     24 DATAREF STACK 631 esp + 0 PARENT LocalFrame LOCALFRAME
       a042      4 INSTR BELONGTO a030 
       a042      4 INSTR DEADREGS  EFLAGS RCX R12 ZZ sub     rsp, 18h 
-      a042      8 DATAREF STACK 635 esp + 0 CHILDOF 634 OFFSET 0 LOCALVAR var_18 
-      a042      8 DATAREF STACK 636 esp + 8 CHILDOF 634 OFFSET 8 LOCALVAR var_10 
-      a042      8 DATAREF STACK 637 esp + 16 CHILDOF 634 OFFSET 16 LOCALVAR var_8 
+      a042      8 DATAREF STACK 632 esp + 0 CHILDOF 631 OFFSET 0 LOCALVAR var_18 
+      a042      8 DATAREF STACK 633 esp + 8 CHILDOF 631 OFFSET 8 LOCALVAR var_10 
+      a042      8 DATAREF STACK 634 esp + 16 CHILDOF 631 OFFSET 16 LOCALVAR var_8 
       a042      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       a046     -1 INSTR LOCAL MetadataUnused mov     r12, [rdi+20h] 
       a046      4 INSTR BELONGTO a030 
@@ -6718,7 +6719,7 @@
       a0b8     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       a0b8      4 INSTR BELONGTO a0b0 
       a0b8      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-      a0b8      8 DATAREF STACK 638 esp + 0 PARENT LocalFrame LOCALFRAME
+      a0b8      8 DATAREF STACK 635 esp + 0 PARENT LocalFrame LOCALFRAME
       a0b8      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       a0bc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
       a0bc      5 INSTR BELONGTO a0b0 
@@ -6808,17 +6809,17 @@
       a294      5 INSTR BELONGTO a280 
       a299     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
       a299      5 INSTR BELONGTO a280 
-      a29e     16 DATAREF STACK 641 esp + 8 CHILDOF 639 OFFSET 8 LOCALVAR var_40 
+      a29e     16 DATAREF STACK 638 esp + 8 CHILDOF 636 OFFSET 8 LOCALVAR var_40 
       a29e      4 INSTR BELONGTO a280 
       a29e      4 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ sub     rsp, 48h 
-      a29e     72 DATAREF STACK 639 esp + 0 PARENT LocalFrame LOCALFRAME
-      a29e      8 DATAREF STACK 640 esp + 0 CHILDOF 639 OFFSET 0 LOCALVAR var_48 
-      a29e      8 DATAREF STACK 642 esp + 24 CHILDOF 639 OFFSET 24 LOCALVAR var_30 
-      a29e      8 DATAREF STACK 643 esp + 32 CHILDOF 639 OFFSET 32 LOCALVAR var_28 
-      a29e      8 DATAREF STACK 644 esp + 40 CHILDOF 639 OFFSET 40 LOCALVAR var_20 
-      a29e      8 DATAREF STACK 645 esp + 48 CHILDOF 639 OFFSET 48 LOCALVAR var_18 
-      a29e      8 DATAREF STACK 646 esp + 56 CHILDOF 639 OFFSET 56 LOCALVAR var_10 
-      a29e      8 DATAREF STACK 647 esp + 64 CHILDOF 639 OFFSET 64 LOCALVAR var_8 
+      a29e     72 DATAREF STACK 636 esp + 0 PARENT LocalFrame LOCALFRAME
+      a29e      8 DATAREF STACK 637 esp + 0 CHILDOF 636 OFFSET 0 LOCALVAR var_48 
+      a29e      8 DATAREF STACK 639 esp + 24 CHILDOF 636 OFFSET 24 LOCALVAR var_30 
+      a29e      8 DATAREF STACK 640 esp + 32 CHILDOF 636 OFFSET 32 LOCALVAR var_28 
+      a29e      8 DATAREF STACK 641 esp + 40 CHILDOF 636 OFFSET 40 LOCALVAR var_20 
+      a29e      8 DATAREF STACK 642 esp + 48 CHILDOF 636 OFFSET 48 LOCALVAR var_18 
+      a29e      8 DATAREF STACK 643 esp + 56 CHILDOF 636 OFFSET 56 LOCALVAR var_10 
+      a29e      8 DATAREF STACK 644 esp + 64 CHILDOF 636 OFFSET 64 LOCALVAR var_8 
       a29e      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
       a2a2      4 INSTR BELONGTO a280 
       a2a2      4 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     rbx, [rdi+28h] 
@@ -7085,8 +7086,8 @@
       a4f0      1 INSTR BELONGTO a4f0 
       a4f0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
       a4f0     -3 INSTR LOCAL NoWarn push    rbx 
-      a4f1     16 DATAREF STACK 648 esp + 0 PARENT LocalFrame LOCALFRAME
-      a4f1      4 DATAREF STACK 649 esp + 0 CHILDOF 648 OFFSET 0 OutArgsRegion OUTARGS
+      a4f1     16 DATAREF STACK 645 esp + 0 PARENT LocalFrame LOCALFRAME
+      a4f1      4 DATAREF STACK 646 esp + 0 CHILDOF 645 OFFSET 0 OutArgsRegion OUTARGS
       a4f1      4 INSTR BELONGTO a4f0 
       a4f1      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
       a4f1      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -7215,17 +7216,17 @@
       a68a      5 INSTR BELONGTO a670 
       a68f     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
       a68f      5 INSTR BELONGTO a670 
-      a694     12 DATAREF STACK 652 esp + 12 CHILDOF 650 OFFSET 12 LOCALVAR var_3C 
-      a694      4 DATAREF STACK 651 esp + 8 CHILDOF 650 OFFSET 8 LOCALVAR var_40 
+      a694     12 DATAREF STACK 649 esp + 12 CHILDOF 647 OFFSET 12 LOCALVAR var_3C 
+      a694      4 DATAREF STACK 648 esp + 8 CHILDOF 647 OFFSET 8 LOCALVAR var_40 
       a694      4 INSTR BELONGTO a670 
       a694      4 INSTR DEADREGS  EFLAGS RAX RDX RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ sub     rsp, 48h 
-      a694     72 DATAREF STACK 650 esp + 0 PARENT LocalFrame LOCALFRAME
-      a694      8 DATAREF STACK 653 esp + 24 CHILDOF 650 OFFSET 24 LOCALVAR var_30 
-      a694      8 DATAREF STACK 654 esp + 32 CHILDOF 650 OFFSET 32 LOCALVAR var_28 
-      a694      8 DATAREF STACK 655 esp + 40 CHILDOF 650 OFFSET 40 LOCALVAR var_20 
-      a694      8 DATAREF STACK 656 esp + 48 CHILDOF 650 OFFSET 48 LOCALVAR var_18 
-      a694      8 DATAREF STACK 657 esp + 56 CHILDOF 650 OFFSET 56 LOCALVAR var_10 
-      a694      8 DATAREF STACK 658 esp + 64 CHILDOF 650 OFFSET 64 LOCALVAR var_8 
+      a694     72 DATAREF STACK 647 esp + 0 PARENT LocalFrame LOCALFRAME
+      a694      8 DATAREF STACK 650 esp + 24 CHILDOF 647 OFFSET 24 LOCALVAR var_30 
+      a694      8 DATAREF STACK 651 esp + 32 CHILDOF 647 OFFSET 32 LOCALVAR var_28 
+      a694      8 DATAREF STACK 652 esp + 40 CHILDOF 647 OFFSET 40 LOCALVAR var_20 
+      a694      8 DATAREF STACK 653 esp + 48 CHILDOF 647 OFFSET 48 LOCALVAR var_18 
+      a694      8 DATAREF STACK 654 esp + 56 CHILDOF 647 OFFSET 56 LOCALVAR var_10 
+      a694      8 DATAREF STACK 655 esp + 64 CHILDOF 647 OFFSET 64 LOCALVAR var_8 
       a694      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
       a698      3 INSTR BELONGTO a670 
       a698      3 INSTR DEADREGS  EFLAGS RAX RDX RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     r13, rcx 
@@ -7363,7 +7364,7 @@
       a822      3 INSTR BELONGTO a820 
       a825     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       a825      4 INSTR BELONGTO a820 
-      a825      8 DATAREF STACK 659 esp + 0 PARENT LocalFrame LOCALFRAME
+      a825      8 DATAREF STACK 656 esp + 0 PARENT LocalFrame LOCALFRAME
       a825      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       a829     -1 INSTR LOCAL NoMetaUpdate call    shell_search_renderer_get_type 
       a829      5 INSTR BELONGTO a820 
@@ -7420,7 +7421,7 @@
       a8a2      3 INSTR BELONGTO a8a0 
       a8a5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       a8a5      4 INSTR BELONGTO a8a0 
-      a8a5      8 DATAREF STACK 660 esp + 0 PARENT LocalFrame LOCALFRAME
+      a8a5      8 DATAREF STACK 657 esp + 0 PARENT LocalFrame LOCALFRAME
       a8a5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       a8a9     -1 INSTR LOCAL NoMetaUpdate call    shell_search_renderer_get_type 
       a8a9      5 INSTR BELONGTO a8a0 
@@ -7529,7 +7530,7 @@
       aa70     25 FUNC GLOBAL shell_search_renderer_new FUNC_UNSAFE NOFP RET       aa88 
       aa70      4 INSTR BELONGTO aa70 
       aa70      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-      aa70      8 DATAREF STACK 661 esp + 0 PARENT LocalFrame LOCALFRAME
+      aa70      8 DATAREF STACK 658 esp + 0 PARENT LocalFrame LOCALFRAME
       aa70      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       aa74     -1 INSTR LOCAL NoMetaUpdate call    shell_search_renderer_get_type 
       aa74      5 INSTR BELONGTO aa70 
@@ -7561,7 +7562,7 @@
       aa95     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       aa95      4 INSTR BELONGTO aa90 
       aa95      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-      aa95      8 DATAREF STACK 662 esp + 0 PARENT LocalFrame LOCALFRAME
+      aa95      8 DATAREF STACK 659 esp + 0 PARENT LocalFrame LOCALFRAME
       aa95      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       aa99     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
       aa99      5 INSTR BELONGTO aa90 
@@ -7695,8 +7696,8 @@
       aba0      1 INSTR BELONGTO aba0 
       aba0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
       aba0     -3 INSTR LOCAL NoWarn push    rbx 
-      aba1     16 DATAREF STACK 663 esp + 0 PARENT LocalFrame LOCALFRAME
-      aba1      4 DATAREF STACK 664 esp + 0 CHILDOF 663 OFFSET 0 OutArgsRegion OUTARGS
+      aba1     16 DATAREF STACK 660 esp + 0 PARENT LocalFrame LOCALFRAME
+      aba1      4 DATAREF STACK 661 esp + 0 CHILDOF 660 OFFSET 0 OutArgsRegion OUTARGS
       aba1      4 INSTR BELONGTO aba0 
       aba1      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
       aba1      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -7886,7 +7887,7 @@
       aef2      3 INSTR BELONGTO aef0 
       aef5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       aef5      4 INSTR BELONGTO aef0 
-      aef5      8 DATAREF STACK 665 esp + 0 PARENT LocalFrame LOCALFRAME
+      aef5      8 DATAREF STACK 662 esp + 0 PARENT LocalFrame LOCALFRAME
       aef5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       aef9     -1 INSTR LOCAL NoMetaUpdate call    cc_shell_category_view_get_type 
       aef9      5 INSTR BELONGTO aef0 
@@ -7927,7 +7928,7 @@
       af52      3 INSTR BELONGTO af50 
       af55     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       af55      4 INSTR BELONGTO af50 
-      af55      8 DATAREF STACK 666 esp + 0 PARENT LocalFrame LOCALFRAME
+      af55      8 DATAREF STACK 663 esp + 0 PARENT LocalFrame LOCALFRAME
       af55      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       af59     -1 INSTR LOCAL NoMetaUpdate call    cc_shell_category_view_get_type 
       af59      5 INSTR BELONGTO af50 
@@ -8096,13 +8097,13 @@
       b22a      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
       b22d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
       b22d      5 INSTR BELONGTO b220 
-      b232     16 DATAREF STACK 668 esp + 0 CHILDOF 667 OFFSET 0 OutArgsRegion OUTARGS
-      b232     40 DATAREF STACK 667 esp + 0 PARENT LocalFrame LOCALFRAME
+      b232     16 DATAREF STACK 665 esp + 0 CHILDOF 664 OFFSET 0 OutArgsRegion OUTARGS
+      b232     40 DATAREF STACK 664 esp + 0 PARENT LocalFrame LOCALFRAME
       b232      4 INSTR BELONGTO b220 
       b232      4 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 28h 
-      b232      8 DATAREF STACK 669 esp + 16 CHILDOF 667 OFFSET 16 LOCALVAR var_18 
-      b232      8 DATAREF STACK 670 esp + 24 CHILDOF 667 OFFSET 24 LOCALVAR var_10 
-      b232      8 DATAREF STACK 671 esp + 32 CHILDOF 667 OFFSET 32 LOCALVAR var_8 
+      b232      8 DATAREF STACK 666 esp + 16 CHILDOF 664 OFFSET 16 LOCALVAR var_18 
+      b232      8 DATAREF STACK 667 esp + 24 CHILDOF 664 OFFSET 24 LOCALVAR var_10 
+      b232      8 DATAREF STACK 668 esp + 32 CHILDOF 664 OFFSET 32 LOCALVAR var_8 
       b232      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
       b236      3 INSTR BELONGTO b220 
       b236      3 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
@@ -8303,8 +8304,8 @@
       b580      1 INSTR BELONGTO b580 
       b580      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
       b580     -3 INSTR LOCAL NoWarn push    rbx 
-      b581     16 DATAREF STACK 672 esp + 0 PARENT LocalFrame LOCALFRAME
-      b581      4 DATAREF STACK 673 esp + 0 CHILDOF 672 OFFSET 0 OutArgsRegion OUTARGS
+      b581     16 DATAREF STACK 669 esp + 0 PARENT LocalFrame LOCALFRAME
+      b581      4 DATAREF STACK 670 esp + 0 CHILDOF 669 OFFSET 0 OutArgsRegion OUTARGS
       b581      4 INSTR BELONGTO b580 
       b581      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
       b581      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -8387,14 +8388,14 @@
       b611     -3 INSTR LOCAL NoWarn push    rbx 
       b612      3 INSTR BELONGTO b610 
       b612      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-      b615     16 DATAREF STACK 678 esp + 40 CHILDOF 674 OFFSET 40 LOCALVAR var_20 
+      b615     16 DATAREF STACK 675 esp + 40 CHILDOF 671 OFFSET 40 LOCALVAR var_20 
       b615     16 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
-      b615     20 DATAREF STACK 675 esp + 0 CHILDOF 674 OFFSET 0 OutArgsRegion OUTARGS
+      b615     20 DATAREF STACK 672 esp + 0 CHILDOF 671 OFFSET 0 OutArgsRegion OUTARGS
       b615      4 INSTR BELONGTO b610 
       b615      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 38h 
-      b615     56 DATAREF STACK 674 esp + 0 PARENT LocalFrame LOCALFRAME
-      b615      8 DATAREF STACK 676 esp + 24 CHILDOF 674 OFFSET 24 LOCALVAR var_30 
-      b615      8 DATAREF STACK 677 esp + 32 CHILDOF 674 OFFSET 32 LOCALVAR var_28 
+      b615     56 DATAREF STACK 671 esp + 0 PARENT LocalFrame LOCALFRAME
+      b615      8 DATAREF STACK 673 esp + 24 CHILDOF 671 OFFSET 24 LOCALVAR var_30 
+      b615      8 DATAREF STACK 674 esp + 32 CHILDOF 671 OFFSET 32 LOCALVAR var_28 
       b615      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
       b619     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
       b619      5 INSTR BELONGTO b610 
@@ -8588,7 +8589,7 @@
       b772     -3 INSTR LOCAL NoWarn push    rbp 
       b773      1 INSTR BELONGTO b770 
       b773      1 INSTR DEADREGS  EFLAGS R12 ZZ push    rbx 
-      b773     24 DATAREF STACK 679 esp + 0 PARENT LocalFrame LOCALFRAME
+      b773     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
       b773      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       b774      3 INSTR BELONGTO b770 
       b774      3 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     rbx, rdi 
@@ -8696,7 +8697,7 @@
       b810     25 FUNC GLOBAL cc_shell_item_view_new FUNC_UNSAFE NOFP RET       b828 
       b810      4 INSTR BELONGTO b810 
       b810      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-      b810      8 DATAREF STACK 680 esp + 0 PARENT LocalFrame LOCALFRAME
+      b810      8 DATAREF STACK 676 esp + 0 PARENT LocalFrame LOCALFRAME
       b810      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       b814     -1 INSTR LOCAL NoMetaUpdate call    cc_shell_item_view_get_type 
       b814      5 INSTR BELONGTO b810 
@@ -8728,13 +8729,13 @@
       b83a     -2 INSTR LOCAL n EBP ZZ  AlwaysNUM xor     ebp, ebp 
       b83c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
       b83c      5 INSTR BELONGTO b830 
-      b841     40 DATAREF STACK 681 esp + 0 PARENT LocalFrame LOCALFRAME
+      b841     40 DATAREF STACK 677 esp + 0 PARENT LocalFrame LOCALFRAME
       b841      4 INSTR BELONGTO b830 
       b841      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 28h 
-      b841      8 DATAREF STACK 682 esp + 8 CHILDOF 681 OFFSET 8 LOCALVAR var_20 
-      b841      8 DATAREF STACK 683 esp + 16 CHILDOF 681 OFFSET 16 LOCALVAR var_18 
-      b841      8 DATAREF STACK 684 esp + 24 CHILDOF 681 OFFSET 24 LOCALVAR var_10 
-      b841      8 DATAREF STACK 685 esp + 32 CHILDOF 681 OFFSET 32 LOCALVAR var_8 
+      b841      8 DATAREF STACK 678 esp + 8 CHILDOF 677 OFFSET 8 LOCALVAR var_20 
+      b841      8 DATAREF STACK 679 esp + 16 CHILDOF 677 OFFSET 16 LOCALVAR var_18 
+      b841      8 DATAREF STACK 680 esp + 24 CHILDOF 677 OFFSET 24 LOCALVAR var_10 
+      b841      8 DATAREF STACK 681 esp + 32 CHILDOF 677 OFFSET 32 LOCALVAR var_8 
       b841      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
       b845     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
       b845      3 INSTR BELONGTO b830 
@@ -8856,7 +8857,7 @@
       b900     21 FUNC GLOBAL sub_B900 FUNC_UNSAFE NOFP RET       b914 
       b900      4 INSTR BELONGTO b900 
       b900      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-      b900      8 DATAREF STACK 686 esp + 0 PARENT LocalFrame LOCALFRAME
+      b900      8 DATAREF STACK 682 esp + 0 PARENT LocalFrame LOCALFRAME
       b900      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       b904     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
       b904      5 INSTR BELONGTO b900 
@@ -8878,8 +8879,8 @@
       b921      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
       b924      4 INSTR BELONGTO b920 
       b924      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 40h 
-      b924     64 DATAREF STACK 687 esp + 0 PARENT LocalFrame LOCALFRAME
-      b924     64 DATAREF STACK 688 esp + 0 CHILDOF 687 OFFSET 0 OutArgsRegion OUTARGS
+      b924     64 DATAREF STACK 683 esp + 0 PARENT LocalFrame LOCALFRAME
+      b924     64 DATAREF STACK 684 esp + 0 CHILDOF 683 OFFSET 0 OutArgsRegion OUTARGS
       b924      8 MEMORYHOLE STACK esp + 64 CalleeSavedRegs 
       b924      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
       b928      8 INSTR BELONGTO b920 
@@ -9031,8 +9032,8 @@
       baa0      1 INSTR BELONGTO baa0 
       baa0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
       baa0     -3 INSTR LOCAL NoWarn push    rbx 
-      baa1     16 DATAREF STACK 689 esp + 0 PARENT LocalFrame LOCALFRAME
-      baa1      4 DATAREF STACK 690 esp + 0 CHILDOF 689 OFFSET 0 OutArgsRegion OUTARGS
+      baa1     16 DATAREF STACK 685 esp + 0 PARENT LocalFrame LOCALFRAME
+      baa1      4 DATAREF STACK 686 esp + 0 CHILDOF 685 OFFSET 0 OutArgsRegion OUTARGS
       baa1      4 INSTR BELONGTO baa0 
       baa1      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
       baa1      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -9109,7 +9110,7 @@
       bb30     25 FUNC GLOBAL cc_shell_model_new FUNC_UNSAFE NOFP RET       bb48 
       bb30      4 INSTR BELONGTO bb30 
       bb30      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-      bb30      8 DATAREF STACK 691 esp + 0 PARENT LocalFrame LOCALFRAME
+      bb30      8 DATAREF STACK 687 esp + 0 PARENT LocalFrame LOCALFRAME
       bb30      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       bb34     -1 INSTR LOCAL NoMetaUpdate call    cc_shell_model_get_type 
       bb34      5 INSTR BELONGTO bb30 
@@ -9146,33 +9147,33 @@
       bb67      5 INSTR BELONGTO bb50 
       bb6c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
       bb6c      5 INSTR BELONGTO bb50 
-      bb71     12 DATAREF STACK 693 esp + 0 CHILDOF 692 OFFSET 0 OutArgsRegion OUTARGS
-      bb71     16 DATAREF STACK 709 esp + 136 CHILDOF 692 OFFSET 136 LOCALVAR var_50 
-      bb71     16 DATAREF STACK 710 esp + 152 CHILDOF 692 OFFSET 152 LOCALVAR var_40 
-      bb71    216 DATAREF STACK 692 esp + 0 PARENT LocalFrame LOCALFRAME
+      bb71     12 DATAREF STACK 689 esp + 0 CHILDOF 688 OFFSET 0 OutArgsRegion OUTARGS
+      bb71     16 DATAREF STACK 705 esp + 136 CHILDOF 688 OFFSET 136 LOCALVAR var_50 
+      bb71     16 DATAREF STACK 706 esp + 152 CHILDOF 688 OFFSET 152 LOCALVAR var_40 
+      bb71    216 DATAREF STACK 688 esp + 0 PARENT LocalFrame LOCALFRAME
       bb71      7 INSTR BELONGTO bb50 
       bb71      7 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 0D8h 
-      bb71      8 DATAREF STACK 694 esp + 16 CHILDOF 692 OFFSET 16 LOCALVAR var_C8 
-      bb71      8 DATAREF STACK 695 esp + 24 CHILDOF 692 OFFSET 24 LOCALVAR var_C0 
-      bb71      8 DATAREF STACK 696 esp + 32 CHILDOF 692 OFFSET 32 LOCALVAR var_B8 
-      bb71      8 DATAREF STACK 697 esp + 40 CHILDOF 692 OFFSET 40 LOCALVAR var_B0 
-      bb71      8 DATAREF STACK 698 esp + 48 CHILDOF 692 OFFSET 48 LOCALVAR var_A8 
-      bb71      8 DATAREF STACK 699 esp + 56 CHILDOF 692 OFFSET 56 LOCALVAR var_A0 
-      bb71      8 DATAREF STACK 700 esp + 64 CHILDOF 692 OFFSET 64 LOCALVAR var_98 
-      bb71      8 DATAREF STACK 701 esp + 72 CHILDOF 692 OFFSET 72 LOCALVAR var_90 
-      bb71      8 DATAREF STACK 702 esp + 80 CHILDOF 692 OFFSET 80 LOCALVAR var_88 
-      bb71      8 DATAREF STACK 703 esp + 88 CHILDOF 692 OFFSET 88 LOCALVAR var_80 
-      bb71      8 DATAREF STACK 704 esp + 96 CHILDOF 692 OFFSET 96 LOCALVAR var_78 
-      bb71      8 DATAREF STACK 705 esp + 104 CHILDOF 692 OFFSET 104 LOCALVAR var_70 
-      bb71      8 DATAREF STACK 706 esp + 112 CHILDOF 692 OFFSET 112 LOCALVAR var_68 
-      bb71      8 DATAREF STACK 707 esp + 120 CHILDOF 692 OFFSET 120 LOCALVAR var_60 
-      bb71      8 DATAREF STACK 708 esp + 128 CHILDOF 692 OFFSET 128 LOCALVAR var_58 
-      bb71      8 DATAREF STACK 711 esp + 168 CHILDOF 692 OFFSET 168 LOCALVAR var_30 
-      bb71      8 DATAREF STACK 712 esp + 176 CHILDOF 692 OFFSET 176 LOCALVAR var_28 
-      bb71      8 DATAREF STACK 713 esp + 184 CHILDOF 692 OFFSET 184 LOCALVAR var_20 
-      bb71      8 DATAREF STACK 714 esp + 192 CHILDOF 692 OFFSET 192 LOCALVAR var_18 
-      bb71      8 DATAREF STACK 715 esp + 200 CHILDOF 692 OFFSET 200 LOCALVAR var_10 
-      bb71      8 DATAREF STACK 716 esp + 208 CHILDOF 692 OFFSET 208 LOCALVAR var_8 
+      bb71      8 DATAREF STACK 690 esp + 16 CHILDOF 688 OFFSET 16 LOCALVAR var_C8 
+      bb71      8 DATAREF STACK 691 esp + 24 CHILDOF 688 OFFSET 24 LOCALVAR var_C0 
+      bb71      8 DATAREF STACK 692 esp + 32 CHILDOF 688 OFFSET 32 LOCALVAR var_B8 
+      bb71      8 DATAREF STACK 693 esp + 40 CHILDOF 688 OFFSET 40 LOCALVAR var_B0 
+      bb71      8 DATAREF STACK 694 esp + 48 CHILDOF 688 OFFSET 48 LOCALVAR var_A8 
+      bb71      8 DATAREF STACK 695 esp + 56 CHILDOF 688 OFFSET 56 LOCALVAR var_A0 
+      bb71      8 DATAREF STACK 696 esp + 64 CHILDOF 688 OFFSET 64 LOCALVAR var_98 
+      bb71      8 DATAREF STACK 697 esp + 72 CHILDOF 688 OFFSET 72 LOCALVAR var_90 
+      bb71      8 DATAREF STACK 698 esp + 80 CHILDOF 688 OFFSET 80 LOCALVAR var_88 
+      bb71      8 DATAREF STACK 699 esp + 88 CHILDOF 688 OFFSET 88 LOCALVAR var_80 
+      bb71      8 DATAREF STACK 700 esp + 96 CHILDOF 688 OFFSET 96 LOCALVAR var_78 
+      bb71      8 DATAREF STACK 701 esp + 104 CHILDOF 688 OFFSET 104 LOCALVAR var_70 
+      bb71      8 DATAREF STACK 702 esp + 112 CHILDOF 688 OFFSET 112 LOCALVAR var_68 
+      bb71      8 DATAREF STACK 703 esp + 120 CHILDOF 688 OFFSET 120 LOCALVAR var_60 
+      bb71      8 DATAREF STACK 704 esp + 128 CHILDOF 688 OFFSET 128 LOCALVAR var_58 
+      bb71      8 DATAREF STACK 707 esp + 168 CHILDOF 688 OFFSET 168 LOCALVAR var_30 
+      bb71      8 DATAREF STACK 708 esp + 176 CHILDOF 688 OFFSET 176 LOCALVAR var_28 
+      bb71      8 DATAREF STACK 709 esp + 184 CHILDOF 688 OFFSET 184 LOCALVAR var_20 
+      bb71      8 DATAREF STACK 710 esp + 192 CHILDOF 688 OFFSET 192 LOCALVAR var_18 
+      bb71      8 DATAREF STACK 711 esp + 200 CHILDOF 688 OFFSET 200 LOCALVAR var_10 
+      bb71      8 DATAREF STACK 712 esp + 208 CHILDOF 688 OFFSET 208 LOCALVAR var_8 
       bb71      8 MEMORYHOLE STACK esp + 216 ReturnAddress 
       bb78     -1 INSTR LOCAL MetadataUnused mov     [rsp+0D8h+var_58], rsi 
       bb78      8 INSTR BELONGTO bb50 
@@ -9566,8 +9567,8 @@
       bf40      1 INSTR BELONGTO bf40 
       bf40      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
       bf40     -3 INSTR LOCAL NoWarn push    rbx 
-      bf41     16 DATAREF STACK 717 esp + 0 PARENT LocalFrame LOCALFRAME
-      bf41      4 DATAREF STACK 718 esp + 0 CHILDOF 717 OFFSET 0 OutArgsRegion OUTARGS
+      bf41     16 DATAREF STACK 713 esp + 0 PARENT LocalFrame LOCALFRAME
+      bf41      4 DATAREF STACK 714 esp + 0 CHILDOF 713 OFFSET 0 OutArgsRegion OUTARGS
       bf41      4 INSTR BELONGTO bf40 
       bf41      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
       bf41      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -9651,8 +9652,8 @@
       bfd2      3 INSTR BELONGTO bfd0 
       bfd2      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
       bfd5     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-      bfd5     20 DATAREF STACK 720 esp + 0 CHILDOF 719 OFFSET 0 OutArgsRegion OUTARGS
-      bfd5     40 DATAREF STACK 719 esp + 0 PARENT LocalFrame LOCALFRAME
+      bfd5     20 DATAREF STACK 716 esp + 0 CHILDOF 715 OFFSET 0 OutArgsRegion OUTARGS
+      bfd5     40 DATAREF STACK 715 esp + 0 PARENT LocalFrame LOCALFRAME
       bfd5      4 INSTR BELONGTO bfd0 
       bfd5      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 28h 
       bfd5      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
@@ -9780,7 +9781,7 @@
       c190     25 FUNC GLOBAL cc_shell_nav_bar_new FUNC_UNSAFE NOFP RET       c1a8 
       c190      4 INSTR BELONGTO c190 
       c190      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-      c190      8 DATAREF STACK 721 esp + 0 PARENT LocalFrame LOCALFRAME
+      c190      8 DATAREF STACK 717 esp + 0 PARENT LocalFrame LOCALFRAME
       c190      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       c194     -1 INSTR LOCAL NoMetaUpdate call    cc_shell_nav_bar_get_type 
       c194      5 INSTR BELONGTO c190 
@@ -9805,11 +9806,11 @@
       c1b0     79 FUNC GLOBAL cc_shell_nav_bar_show_detail_button FUNC_UNSAFE NOFP RET       c1fe 
       c1b5     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], rbp 
       c1b5      5 INSTR BELONGTO c1b0 
-      c1ba     24 DATAREF STACK 722 esp + 0 PARENT LocalFrame LOCALFRAME
+      c1ba     24 DATAREF STACK 718 esp + 0 PARENT LocalFrame LOCALFRAME
       c1ba      4 INSTR BELONGTO c1b0 
       c1ba      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 18h 
-      c1ba      8 DATAREF STACK 723 esp + 8 CHILDOF 722 OFFSET 8 LOCALVAR var_10 
-      c1ba      8 DATAREF STACK 724 esp + 16 CHILDOF 722 OFFSET 16 LOCALVAR var_8 
+      c1ba      8 DATAREF STACK 719 esp + 8 CHILDOF 718 OFFSET 8 LOCALVAR var_10 
+      c1ba      8 DATAREF STACK 720 esp + 16 CHILDOF 718 OFFSET 16 LOCALVAR var_8 
       c1ba      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       c1be      4 INSTR BELONGTO c1b0 
       c1be      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, [rdi+30h] 
@@ -9867,8 +9868,8 @@
       c210     -3 INSTR LOCAL NoWarn push    rbx 
       c211      3 INSTR BELONGTO c210 
       c211      3 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ mov     rbx, rdi 
-      c214     16 DATAREF STACK 725 esp + 0 PARENT LocalFrame LOCALFRAME
-      c214      4 DATAREF STACK 726 esp + 0 CHILDOF 725 OFFSET 0 OutArgsRegion OUTARGS
+      c214     16 DATAREF STACK 721 esp + 0 PARENT LocalFrame LOCALFRAME
+      c214      4 DATAREF STACK 722 esp + 0 CHILDOF 721 OFFSET 0 OutArgsRegion OUTARGS
       c214      4 INSTR BELONGTO c210 
       c214      4 INSTR DEADREGS  EFLAGS XMM0 ZZ sub     rsp, 10h 
       c214      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -9975,15 +9976,15 @@
       c2e9     -2 INSTR LOCAL n EAX 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 727 esp + 0 PARENT LocalFrame LOCALFRAME
-      c2ee     16 DATAREF STACK 728 esp + 0 CHILDOF 727 OFFSET 0 LOCALVAR var_88 
-      c2ee     16 DATAREF STACK 729 esp + 16 CHILDOF 727 OFFSET 16 LOCALVAR var_78 
-      c2ee     16 DATAREF STACK 730 esp + 32 CHILDOF 727 OFFSET 32 LOCALVAR var_68 
-      c2ee     16 DATAREF STACK 731 esp + 48 CHILDOF 727 OFFSET 48 LOCALVAR var_58 
-      c2ee     16 DATAREF STACK 732 esp + 64 CHILDOF 727 OFFSET 64 LOCALVAR var_48 
-      c2ee     16 DATAREF STACK 733 esp + 80 CHILDOF 727 OFFSET 80 LOCALVAR var_38 
-      c2ee     16 DATAREF STACK 734 esp + 96 CHILDOF 727 OFFSET 96 LOCALVAR var_28 
-      c2ee     16 DATAREF STACK 735 esp + 112 CHILDOF 727 OFFSET 112 LOCALVAR var_18 
+      c2ee    128 DATAREF STACK 723 esp + 0 PARENT LocalFrame LOCALFRAME
+      c2ee     16 DATAREF STACK 724 esp + 0 CHILDOF 723 OFFSET 0 LOCALVAR var_88 
+      c2ee     16 DATAREF STACK 725 esp + 16 CHILDOF 723 OFFSET 16 LOCALVAR var_78 
+      c2ee     16 DATAREF STACK 726 esp + 32 CHILDOF 723 OFFSET 32 LOCALVAR var_68 
+      c2ee     16 DATAREF STACK 727 esp + 48 CHILDOF 723 OFFSET 48 LOCALVAR var_58 
+      c2ee     16 DATAREF STACK 728 esp + 64 CHILDOF 723 OFFSET 64 LOCALVAR var_48 
+      c2ee     16 DATAREF STACK 729 esp + 80 CHILDOF 723 OFFSET 80 LOCALVAR var_38 
+      c2ee     16 DATAREF STACK 730 esp + 96 CHILDOF 723 OFFSET 96 LOCALVAR var_28 
+      c2ee     16 DATAREF STACK 731 esp + 112 CHILDOF 723 OFFSET 112 LOCALVAR var_18 
       c2ee      4 INSTR BELONGTO c2e0 
       c2ee      4 INSTR DEADREGS  EFLAGS RDX RBX XMM7 XMM9 XMM10 XMM12 ZZ add     rsp, 0FFFFFFFFFFFFFF80h 
       c2ee      8 MEMORYHOLE STACK esp + 128 CalleeSavedRegs 
@@ -10643,8 +10644,8 @@
       c950      1 INSTR BELONGTO c950 
       c950      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
       c950     -3 INSTR LOCAL NoWarn push    rbx 
-      c951     16 DATAREF STACK 736 esp + 0 PARENT LocalFrame LOCALFRAME
-      c951      4 DATAREF STACK 737 esp + 0 CHILDOF 736 OFFSET 0 OutArgsRegion OUTARGS
+      c951     16 DATAREF STACK 732 esp + 0 PARENT LocalFrame LOCALFRAME
+      c951      4 DATAREF STACK 733 esp + 0 CHILDOF 732 OFFSET 0 OutArgsRegion OUTARGS
       c951      4 INSTR BELONGTO c950 
       c951      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
       c951      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -10951,7 +10952,7 @@
       cf45     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       cf45      4 INSTR BELONGTO cf40 
       cf45      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-      cf45      8 DATAREF STACK 738 esp + 0 PARENT LocalFrame LOCALFRAME
+      cf45      8 DATAREF STACK 734 esp + 0 PARENT LocalFrame LOCALFRAME
       cf45      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       cf49     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_type 
       cf49      5 INSTR BELONGTO cf40 
@@ -11060,7 +11061,7 @@
       d0c0     25 FUNC GLOBAL cc_strength_bar_new FUNC_UNSAFE NOFP RET       d0d8 
       d0c0      4 INSTR BELONGTO d0c0 
       d0c0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-      d0c0      8 DATAREF STACK 739 esp + 0 PARENT LocalFrame LOCALFRAME
+      d0c0      8 DATAREF STACK 735 esp + 0 PARENT LocalFrame LOCALFRAME
       d0c0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       d0c4     -1 INSTR LOCAL NoMetaUpdate call    cc_strength_bar_get_type 
       d0c4      5 INSTR BELONGTO d0c0 
@@ -11095,7 +11096,7 @@
       d0ea     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       d0ea      4 INSTR BELONGTO d0e0 
       d0ea      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-      d0ea      8 DATAREF STACK 740 esp + 0 PARENT LocalFrame LOCALFRAME
+      d0ea      8 DATAREF STACK 736 esp + 0 PARENT LocalFrame LOCALFRAME
       d0ea      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       d0ee      4 INSTR BELONGTO d0e0 
       d0ee      4 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, [rdi+20h] 
@@ -11195,7 +11196,7 @@
       d175     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       d175      4 INSTR BELONGTO d170 
       d175      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-      d175      8 DATAREF STACK 741 esp + 0 PARENT LocalFrame LOCALFRAME
+      d175      8 DATAREF STACK 737 esp + 0 PARENT LocalFrame LOCALFRAME
       d175      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       d179      4 INSTR BELONGTO d170 
       d179      4 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, [rdi+20h] 
@@ -11318,12 +11319,12 @@
       d30d      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r13
       d312      5 INSTR BELONGTO d300 
       d312      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], rbp
-      d317     40 DATAREF STACK 742 esp + 0 PARENT LocalFrame LOCALFRAME
+      d317     40 DATAREF STACK 738 esp + 0 PARENT LocalFrame LOCALFRAME
       d317      4 INSTR BELONGTO d300 
-      d317      8 DATAREF STACK 743 esp + 8 CHILDOF 742 OFFSET 8 LOCALVAR var_20 
-      d317      8 DATAREF STACK 744 esp + 16 CHILDOF 742 OFFSET 16 LOCALVAR var_18 
-      d317      8 DATAREF STACK 745 esp + 24 CHILDOF 742 OFFSET 24 LOCALVAR var_10 
-      d317      8 DATAREF STACK 746 esp + 32 CHILDOF 742 OFFSET 32 LOCALVAR var_8 
+      d317      8 DATAREF STACK 739 esp + 8 CHILDOF 738 OFFSET 8 LOCALVAR var_20 
+      d317      8 DATAREF STACK 740 esp + 16 CHILDOF 738 OFFSET 16 LOCALVAR var_18 
+      d317      8 DATAREF STACK 741 esp + 24 CHILDOF 738 OFFSET 24 LOCALVAR var_10 
+      d317      8 DATAREF STACK 742 esp + 32 CHILDOF 738 OFFSET 32 LOCALVAR var_8 
       d317      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
       d31b     -1 INSTR LOCAL NoMetaUpdate cmp     edx, 4 
       d31b      3 INSTR BELONGTO d300 
@@ -11418,13 +11419,13 @@
       d3f7      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
       d3fc      4 INSTR BELONGTO d3d0 
       d3fc      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-      d3fc     56 DATAREF STACK 747 esp + 0 PARENT LocalFrame LOCALFRAME
-      d3fc      8 DATAREF STACK 748 esp + 8 CHILDOF 747 OFFSET 8 LOCALVAR var_30 
-      d3fc      8 DATAREF STACK 749 esp + 16 CHILDOF 747 OFFSET 16 LOCALVAR var_28 
-      d3fc      8 DATAREF STACK 750 esp + 24 CHILDOF 747 OFFSET 24 LOCALVAR var_20 
-      d3fc      8 DATAREF STACK 751 esp + 32 CHILDOF 747 OFFSET 32 LOCALVAR var_18 
-      d3fc      8 DATAREF STACK 752 esp + 40 CHILDOF 747 OFFSET 40 LOCALVAR var_10 
-      d3fc      8 DATAREF STACK 753 esp + 48 CHILDOF 747 OFFSET 48 LOCALVAR var_8 
+      d3fc     56 DATAREF STACK 743 esp + 0 PARENT LocalFrame LOCALFRAME
+      d3fc      8 DATAREF STACK 744 esp + 8 CHILDOF 743 OFFSET 8 LOCALVAR var_30 
+      d3fc      8 DATAREF STACK 745 esp + 16 CHILDOF 743 OFFSET 16 LOCALVAR var_28 
+      d3fc      8 DATAREF STACK 746 esp + 24 CHILDOF 743 OFFSET 24 LOCALVAR var_20 
+      d3fc      8 DATAREF STACK 747 esp + 32 CHILDOF 743 OFFSET 32 LOCALVAR var_18 
+      d3fc      8 DATAREF STACK 748 esp + 40 CHILDOF 743 OFFSET 40 LOCALVAR var_10 
+      d3fc      8 DATAREF STACK 749 esp + 48 CHILDOF 743 OFFSET 48 LOCALVAR var_8 
       d3fc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
       d400     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
       d400      3 INSTR BELONGTO d3d0 
@@ -11501,7 +11502,7 @@
       d475     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       d475      4 INSTR BELONGTO d470 
       d475      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-      d475      8 DATAREF STACK 754 esp + 0 PARENT LocalFrame LOCALFRAME
+      d475      8 DATAREF STACK 750 esp + 0 PARENT LocalFrame LOCALFRAME
       d475      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       d479      7 INSTR BELONGTO d470 
       d479      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_210220 
@@ -11536,7 +11537,7 @@
       d4a8     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET       d4b5 
       d4a8      4 INSTR BELONGTO d4a8 
       d4a8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-      d4a8      8 DATAREF STACK 755 esp + 0 PARENT LocalFrame LOCALFRAME
+      d4a8      8 DATAREF STACK 751 esp + 0 PARENT LocalFrame LOCALFRAME
       d4a8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       d4ac     -1 INSTR LOCAL NoMetaUpdate call    sub_7810 
       d4ac      5 INSTR BELONGTO d4a8 
diff --git a/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
index ad5c5b0e..cdd38169 100644
--- a/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
@@ -3583,12 +3583,11 @@
     40902c      1 INSTR BELONGTO 408fe0 
     40902c      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
     40902c     24 DEALLOC STACK esp - 24 retn
-    409030      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
-    409030      0 FUNC MMSAFENESS UNSAFE
+    409030      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    409030      0 FUNC MMSAFENESS SAFE
     409030     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     409030      2 INSTR BELONGTO 409030 
     409030     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     409059 
-    409030      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     409032      3 INSTR BELONGTO 409030 
     409032      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     409035      1 INSTR BELONGTO 409030 
@@ -3600,8 +3599,11 @@
     409039      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     40903d      1 INSTR BELONGTO 409030 
     40903d      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    40903d     -3 INSTR LOCAL NoWarn push    rax 
+    40903e     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40903e      1 INSTR BELONGTO 409030 
     40903e      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    40903e      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     40903f     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     40903f      7 INSTR BELONGTO 409030 
     40903f      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -3696,14 +3698,14 @@
     4090e2      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     4090e3      1 INSTR BELONGTO 409080 
     4090e3      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    4090f0      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
+    4090f0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     4090f0      0 FUNC MMSAFENESS UNSAFE
     4090f0     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_616D98, 0 
     4090f0     34 FUNC GLOBAL sub_4090F0 FUNC_UNSAFE USEFP RET     409111 
     4090f0      8 INSTR BELONGTO 4090f0 
-    4090f0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    4090f0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4090f8      1 INSTR BELONGTO 4090f0 
+    4090f8      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    4090f8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4090f9      3 INSTR BELONGTO 4090f0 
     4090fc     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409110 
     4090fc      2 INSTR BELONGTO 4090f0 
@@ -3736,29 +3738,7 @@
     40913e      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
     409143     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
     409143      5 INSTR BELONGTO 40f660 
-    409148    100 DATAREF STACK 1340 esp + 0 CHILDOF 1339 OFFSET 0 OutArgsRegion OUTARGS
-    409148     16 DATAREF STACK 1353 esp + 200 CHILDOF 1339 OFFSET 200 LOCALVAR var_40 
-    409148    264 DATAREF STACK 1339 esp + 0 PARENT LocalFrame LOCALFRAME
     409148      7 INSTR BELONGTO 40f660 
-    409148      8 DATAREF STACK 1341 esp + 104 CHILDOF 1339 OFFSET 104 LOCALVAR var_A0 
-    409148      8 DATAREF STACK 1342 esp + 112 CHILDOF 1339 OFFSET 112 LOCALVAR var_98 
-    409148      8 DATAREF STACK 1343 esp + 120 CHILDOF 1339 OFFSET 120 LOCALVAR var_90 
-    409148      8 DATAREF STACK 1344 esp + 128 CHILDOF 1339 OFFSET 128 LOCALVAR var_88 
-    409148      8 DATAREF STACK 1345 esp + 136 CHILDOF 1339 OFFSET 136 LOCALVAR var_80 
-    409148      8 DATAREF STACK 1346 esp + 144 CHILDOF 1339 OFFSET 144 LOCALVAR var_78 
-    409148      8 DATAREF STACK 1347 esp + 152 CHILDOF 1339 OFFSET 152 LOCALVAR var_70 
-    409148      8 DATAREF STACK 1348 esp + 160 CHILDOF 1339 OFFSET 160 LOCALVAR var_68 
-    409148      8 DATAREF STACK 1349 esp + 168 CHILDOF 1339 OFFSET 168 LOCALVAR var_60 
-    409148      8 DATAREF STACK 1350 esp + 176 CHILDOF 1339 OFFSET 176 LOCALVAR var_58 
-    409148      8 DATAREF STACK 1351 esp + 184 CHILDOF 1339 OFFSET 184 LOCALVAR var_50 
-    409148      8 DATAREF STACK 1352 esp + 192 CHILDOF 1339 OFFSET 192 LOCALVAR var_48 
-    409148      8 DATAREF STACK 1354 esp + 216 CHILDOF 1339 OFFSET 216 LOCALVAR var_30 
-    409148      8 DATAREF STACK 1355 esp + 224 CHILDOF 1339 OFFSET 224 LOCALVAR var_28 
-    409148      8 DATAREF STACK 1356 esp + 232 CHILDOF 1339 OFFSET 232 LOCALVAR var_20 
-    409148      8 DATAREF STACK 1357 esp + 240 CHILDOF 1339 OFFSET 240 LOCALVAR var_18 
-    409148      8 DATAREF STACK 1358 esp + 248 CHILDOF 1339 OFFSET 248 LOCALVAR var_10 
-    409148      8 DATAREF STACK 1359 esp + 256 CHILDOF 1339 OFFSET 256 LOCALVAR var_8 
-    409148      8 MEMORYHOLE STACK esp + 264 ReturnAddress 
     40914f      5 INSTR BELONGTO 40f660 
     409154     12 INSTR BELONGTO 40f660 
     409154     12 PTRIMMEDESP STACK 128 displ mov     [rsp+108h+var_88], offset aMikeHughesMfh@; "Mike Hughes <mfh@psilord.com>"
@@ -3834,8 +3814,8 @@
     409248      8 PTRIMMEDESP STACK 256 displ mov     r15, [rsp+108h+var_8]
     409250     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 108h 
     409250      7 INSTR BELONGTO 40f660 
+    409257      0 DEALLOC STACK esp - 0 retn
     409257      1 INSTR BELONGTO 40f660 
-    409257    264 DEALLOC STACK esp - 264 retn
     409260      3 INSTR BELONGTO 40f660 
     409263     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_get_screen 
     409263      5 INSTR BELONGTO 40f660 
@@ -4153,7 +4133,7 @@
     409726      5 INSTR DEADREGS  EFLAGS RDI R12 ZZ mov     edi, offset domainname; "gnome-dictionary" 
     40972b      1 INSTR BELONGTO 409720 
     40972b      1 INSTR DEADREGS  EFLAGS R12 ZZ push    rbx 
-    40972b     24 DATAREF STACK 1187 esp + 0 PARENT LocalFrame LOCALFRAME
+    40972b     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40972b      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40972c      3 INSTR BELONGTO 409720 
     40972c      3 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     rbx, rsi 
@@ -4324,7 +4304,7 @@
     409840      4 INSTR BELONGTO 409840 
     409840      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
     409840     69 FUNC GLOBAL sub_409840 FUNC_UNSAFE NOFP RET     409884 
-    409840      8 DATAREF STACK 1188 esp + 0 PARENT LocalFrame LOCALFRAME
+    409840      8 DATAREF STACK 1187 esp + 0 PARENT LocalFrame LOCALFRAME
     409840      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     409844      7 INSTR BELONGTO 409840 
     409844      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_617E20 
@@ -4391,7 +4371,7 @@
     4098b0     35 FUNC GLOBAL sub_4098B0 FUNC_UNSAFE NOFP RET     4098d2 
     4098b0      4 INSTR BELONGTO 4098b0 
     4098b0      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    4098b0      8 DATAREF STACK 1189 esp + 0 PARENT LocalFrame LOCALFRAME
+    4098b0      8 DATAREF STACK 1188 esp + 0 PARENT LocalFrame LOCALFRAME
     4098b0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4098b4     -1 INSTR LOCAL NoMetaUpdate call    _g_get_home_dir 
     4098b4      5 INSTR BELONGTO 4098b0 
@@ -4455,12 +4435,12 @@
     409905      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], rbp
     40990a     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40990a      5 INSTR BELONGTO 409900 
-    40990f     24 DATAREF STACK 1190 esp + 0 PARENT LocalFrame LOCALFRAME
+    40990f     24 DATAREF STACK 1189 esp + 0 PARENT LocalFrame LOCALFRAME
     40990f      4 INSTR BELONGTO 409900 
     40990f      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 18h 
-    40990f      8 DATAREF STACK 1191 esp + 0 CHILDOF 1190 OFFSET 0 LOCALVAR var_18 
-    40990f      8 DATAREF STACK 1192 esp + 8 CHILDOF 1190 OFFSET 8 LOCALVAR var_10 
-    40990f      8 DATAREF STACK 1193 esp + 16 CHILDOF 1190 OFFSET 16 LOCALVAR var_8 
+    40990f      8 DATAREF STACK 1190 esp + 0 CHILDOF 1189 OFFSET 0 LOCALVAR var_18 
+    40990f      8 DATAREF STACK 1191 esp + 8 CHILDOF 1189 OFFSET 8 LOCALVAR var_10 
+    40990f      8 DATAREF STACK 1192 esp + 16 CHILDOF 1189 OFFSET 16 LOCALVAR var_8 
     40990f      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     409913     -2 INSTR LOCAL n R12 ZZ  NUMVia2ndSrcIMMEDNUM mov     r12d, 1 
     409913      6 INSTR BELONGTO 409900 
@@ -4586,11 +4566,11 @@
     4099b5      5 INSTR BELONGTO 4099b0 
     4099b5      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+var_8], rbp 
     4099b5      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
-    4099ba     24 DATAREF STACK 1194 esp + 0 PARENT LocalFrame LOCALFRAME
+    4099ba     24 DATAREF STACK 1193 esp + 0 PARENT LocalFrame LOCALFRAME
     4099ba      4 INSTR BELONGTO 4099b0 
     4099ba      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-    4099ba      8 DATAREF STACK 1195 esp + 8 CHILDOF 1194 OFFSET 8 LOCALVAR var_10 
-    4099ba      8 DATAREF STACK 1196 esp + 16 CHILDOF 1194 OFFSET 16 LOCALVAR var_8 
+    4099ba      8 DATAREF STACK 1194 esp + 8 CHILDOF 1193 OFFSET 8 LOCALVAR var_10 
+    4099ba      8 DATAREF STACK 1195 esp + 16 CHILDOF 1193 OFFSET 16 LOCALVAR var_8 
     4099ba      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4099be     -1 INSTR LOCAL NoMetaUpdate call    sub_4098E0 
     4099be      5 INSTR BELONGTO 4099b0 
@@ -4718,12 +4698,12 @@
     409a75      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], rbp
     409a7a     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     409a7a      5 INSTR BELONGTO 409a70 
-    409a7f     24 DATAREF STACK 1197 esp + 0 PARENT LocalFrame LOCALFRAME
+    409a7f     24 DATAREF STACK 1196 esp + 0 PARENT LocalFrame LOCALFRAME
     409a7f      4 INSTR BELONGTO 409a70 
     409a7f      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 18h 
-    409a7f      8 DATAREF STACK 1198 esp + 0 CHILDOF 1197 OFFSET 0 LOCALVAR var_18 
-    409a7f      8 DATAREF STACK 1199 esp + 8 CHILDOF 1197 OFFSET 8 LOCALVAR var_10 
-    409a7f      8 DATAREF STACK 1200 esp + 16 CHILDOF 1197 OFFSET 16 LOCALVAR var_8 
+    409a7f      8 DATAREF STACK 1197 esp + 0 CHILDOF 1196 OFFSET 0 LOCALVAR var_18 
+    409a7f      8 DATAREF STACK 1198 esp + 8 CHILDOF 1196 OFFSET 8 LOCALVAR var_10 
+    409a7f      8 DATAREF STACK 1199 esp + 16 CHILDOF 1196 OFFSET 16 LOCALVAR var_8 
     409a7f      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     409a83     -1 INSTR LOCAL NoMetaUpdate call    sub_409890 
     409a83      5 INSTR BELONGTO 409a70 
@@ -4933,7 +4913,7 @@
     409baf     32 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     409baf      4 INSTR BELONGTO 409ba0 
     409baf      4 INSTR DEADREGS  EFLAGS R13 ZZ sub     rsp, 8 
-    409baf      8 DATAREF STACK 1201 esp + 0 PARENT LocalFrame LOCALFRAME
+    409baf      8 DATAREF STACK 1200 esp + 0 PARENT LocalFrame LOCALFRAME
     409baf      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     409bb3     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     409bb3      3 INSTR BELONGTO 409ba0 
@@ -5134,12 +5114,12 @@
     409cea      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
     409ced     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     409ced      5 INSTR BELONGTO 409ce0 
-    409cf2     24 DATAREF STACK 1202 esp + 0 PARENT LocalFrame LOCALFRAME
+    409cf2     24 DATAREF STACK 1201 esp + 0 PARENT LocalFrame LOCALFRAME
     409cf2      4 INSTR BELONGTO 409ce0 
     409cf2      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-    409cf2      8 DATAREF STACK 1203 esp + 0 CHILDOF 1202 OFFSET 0 LOCALVAR var_18 
-    409cf2      8 DATAREF STACK 1204 esp + 8 CHILDOF 1202 OFFSET 8 LOCALVAR var_10 
-    409cf2      8 DATAREF STACK 1205 esp + 16 CHILDOF 1202 OFFSET 16 LOCALVAR var_8 
+    409cf2      8 DATAREF STACK 1202 esp + 0 CHILDOF 1201 OFFSET 0 LOCALVAR var_18 
+    409cf2      8 DATAREF STACK 1203 esp + 8 CHILDOF 1201 OFFSET 8 LOCALVAR var_10 
+    409cf2      8 DATAREF STACK 1204 esp + 16 CHILDOF 1201 OFFSET 16 LOCALVAR var_8 
     409cf2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     409cf6     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     409cf6      3 INSTR BELONGTO 409ce0 
@@ -5310,15 +5290,15 @@
     409e19     -3 INSTR LOCAL NoWarn push    rbx 
     409e1a      3 INSTR BELONGTO 409e10 
     409e1a      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     rbx, rdi 
-    409e1d     24 DATAREF STACK 1209 esp + 16 CHILDOF 1206 OFFSET 16 LOCALVAR var_78 
-    409e1d     40 DATAREF STACK 1211 esp + 48 CHILDOF 1206 OFFSET 48 LOCALVAR var_58 
+    409e1d     24 DATAREF STACK 1208 esp + 16 CHILDOF 1205 OFFSET 16 LOCALVAR var_78 
+    409e1d     40 DATAREF STACK 1210 esp + 48 CHILDOF 1205 OFFSET 48 LOCALVAR var_58 
     409e1d     48 MEMORYHOLE STACK esp + 88 CalleeSavedRegs 
-    409e1d      4 DATAREF STACK 1207 esp + 0 CHILDOF 1206 OFFSET 0 OutArgsRegion OUTARGS
+    409e1d      4 DATAREF STACK 1206 esp + 0 CHILDOF 1205 OFFSET 0 OutArgsRegion OUTARGS
     409e1d      4 INSTR BELONGTO 409e10 
     409e1d      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 58h 
-    409e1d     88 DATAREF STACK 1206 esp + 0 PARENT LocalFrame LOCALFRAME
-    409e1d      8 DATAREF STACK 1208 esp + 8 CHILDOF 1206 OFFSET 8 LOCALVAR var_80 
-    409e1d      8 DATAREF STACK 1210 esp + 40 CHILDOF 1206 OFFSET 40 LOCALVAR var_60 
+    409e1d     88 DATAREF STACK 1205 esp + 0 PARENT LocalFrame LOCALFRAME
+    409e1d      8 DATAREF STACK 1207 esp + 8 CHILDOF 1205 OFFSET 8 LOCALVAR var_80 
+    409e1d      8 DATAREF STACK 1209 esp + 40 CHILDOF 1205 OFFSET 40 LOCALVAR var_60 
     409e1d      8 MEMORYHOLE STACK esp + 136 ReturnAddress 
     409e21     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_type 
     409e21      5 INSTR BELONGTO 409e10 
@@ -6015,8 +5995,8 @@
     40acf0      1 INSTR BELONGTO 40acf0 
     40acf0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     40acf0     -3 INSTR LOCAL NoWarn push    rbx 
-    40acf1     16 DATAREF STACK 1212 esp + 0 PARENT LocalFrame LOCALFRAME
-    40acf1      4 DATAREF STACK 1213 esp + 0 CHILDOF 1212 OFFSET 0 OutArgsRegion OUTARGS
+    40acf1     16 DATAREF STACK 1211 esp + 0 PARENT LocalFrame LOCALFRAME
+    40acf1      4 DATAREF STACK 1212 esp + 0 CHILDOF 1211 OFFSET 0 OutArgsRegion OUTARGS
     40acf1      4 INSTR BELONGTO 40acf0 
     40acf1      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
     40acf1      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -6098,7 +6078,7 @@
     40ad72      3 INSTR BELONGTO 40ad70 
     40ad75     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40ad75      4 INSTR BELONGTO 40ad70 
-    40ad75      8 DATAREF STACK 1214 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ad75      8 DATAREF STACK 1213 esp + 0 PARENT LocalFrame LOCALFRAME
     40ad75      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40ad79     -1 INSTR LOCAL NoMetaUpdate call    sub_40ACF0 
     40ad79      5 INSTR BELONGTO 40ad70 
@@ -6231,13 +6211,13 @@
     40afad      5 INSTR BELONGTO 40afa0 
     40afb2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_18], rbp 
     40afb2      5 INSTR BELONGTO 40afa0 
-    40afb7     40 DATAREF STACK 1215 esp + 0 PARENT LocalFrame LOCALFRAME
+    40afb7     40 DATAREF STACK 1214 esp + 0 PARENT LocalFrame LOCALFRAME
     40afb7      4 INSTR BELONGTO 40afa0 
     40afb7      4 INSTR DEADREGS  EFLAGS R12 R13 ZZ sub     rsp, 28h 
-    40afb7      8 DATAREF STACK 1216 esp + 8 CHILDOF 1215 OFFSET 8 LOCALVAR var_20 
-    40afb7      8 DATAREF STACK 1217 esp + 16 CHILDOF 1215 OFFSET 16 LOCALVAR var_18 
-    40afb7      8 DATAREF STACK 1218 esp + 24 CHILDOF 1215 OFFSET 24 LOCALVAR var_10 
-    40afb7      8 DATAREF STACK 1219 esp + 32 CHILDOF 1215 OFFSET 32 LOCALVAR var_8 
+    40afb7      8 DATAREF STACK 1215 esp + 8 CHILDOF 1214 OFFSET 8 LOCALVAR var_20 
+    40afb7      8 DATAREF STACK 1216 esp + 16 CHILDOF 1214 OFFSET 16 LOCALVAR var_18 
+    40afb7      8 DATAREF STACK 1217 esp + 24 CHILDOF 1214 OFFSET 24 LOCALVAR var_10 
+    40afb7      8 DATAREF STACK 1218 esp + 32 CHILDOF 1214 OFFSET 32 LOCALVAR var_8 
     40afb7      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40afbb      3 INSTR BELONGTO 40afa0 
     40afbb      3 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     r13, rsi 
@@ -6533,7 +6513,7 @@
     40b1b0      4 INSTR BELONGTO 40b1b0 
     40b1b0      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 8 
     40b1b0     66 FUNC GLOBAL sub_40B1B0 FUNC_UNSAFE NOFP RET     40b1f1 
-    40b1b0      8 DATAREF STACK 1220 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b1b0      8 DATAREF STACK 1219 esp + 0 PARENT LocalFrame LOCALFRAME
     40b1b0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40b1b4     -1 INSTR LOCAL MetadataUnused mov     rdi, cs:qword_617E68 
     40b1b4      7 INSTR BELONGTO 40b1b0 
@@ -6565,15 +6545,15 @@
     40b1ed      5 INSTR BELONGTO 40b1b0 
     40b1ed      5 INSTR DEADREGS  EFLAGS RSI RDI R8 R9 R10 R11 ZZ jmp     _g_settings_get_string 
     40b1ed      8 DEALLOC STACK esp - 8 jmp     _g_settings_get_string
-    40b200      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
+    40b200      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -4 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
     40b200      0 FUNC MMSAFENESS SAFE
     40b200     40 FUNC GLOBAL sub_40B200 FUNC_UNSAFE NOFP RET     40b227 
     40b200      4 INSTR BELONGTO 40b200 
     40b200      4 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, [rdx+10h] 
-    40b200      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    40b200      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40b204      1 INSTR BELONGTO 40b200 
     40b204      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
+    40b204      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    40b204      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40b205     -1 INSTR LOCAL MetadataUnused mov     rbx, rdx 
     40b205      3 INSTR BELONGTO 40b200 
     40b208     -1 INSTR LOCAL NoMetaUpdate call    _pango_font_description_free 
@@ -6625,14 +6605,14 @@
     40b241     -3 INSTR LOCAL NoWarn push    rbx 
     40b242      3 INSTR BELONGTO 40b230 
     40b242      3 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 XMM2 XMM4 ZZ mov     rbx, rsi 
-    40b245     12 DATAREF STACK 1225 esp + 44 CHILDOF 1221 OFFSET 44 LOCALVAR var_3C 
-    40b245     16 DATAREF STACK 1222 esp + 0 CHILDOF 1221 OFFSET 0 LOCALVAR var_68 
-    40b245     24 DATAREF STACK 1223 esp + 16 CHILDOF 1221 OFFSET 16 LOCALVAR var_58 
+    40b245     12 DATAREF STACK 1224 esp + 44 CHILDOF 1220 OFFSET 44 LOCALVAR var_3C 
+    40b245     16 DATAREF STACK 1221 esp + 0 CHILDOF 1220 OFFSET 0 LOCALVAR var_68 
+    40b245     24 DATAREF STACK 1222 esp + 16 CHILDOF 1220 OFFSET 16 LOCALVAR var_58 
     40b245     48 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
-    40b245      4 DATAREF STACK 1224 esp + 40 CHILDOF 1221 OFFSET 40 LOCALVAR var_40 
+    40b245      4 DATAREF STACK 1223 esp + 40 CHILDOF 1220 OFFSET 40 LOCALVAR var_40 
     40b245      4 INSTR BELONGTO 40b230 
     40b245      4 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM2 XMM4 ZZ sub     rsp, 38h 
-    40b245     56 DATAREF STACK 1221 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b245     56 DATAREF STACK 1220 esp + 0 PARENT LocalFrame LOCALFRAME
     40b245      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
     40b249     -1 INSTR LOCAL NoMetaUpdate call    _gtk_print_context_get_cairo_context 
     40b249      5 INSTR BELONGTO 40b230 
@@ -7051,14 +7031,14 @@
     40b542      5 INSTR BELONGTO 40b530 
     40b547      3 INSTR BELONGTO 40b530 
     40b547      3 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     r12, rdi 
-    40b54a     24 DATAREF STACK 1227 esp + 0 CHILDOF 1226 OFFSET 0 LOCALVAR var_38 
+    40b54a     24 DATAREF STACK 1226 esp + 0 CHILDOF 1225 OFFSET 0 LOCALVAR var_38 
     40b54a      4 INSTR BELONGTO 40b530 
     40b54a      4 INSTR DEADREGS  EFLAGS RDI R13 ZZ sub     rsp, 38h 
-    40b54a     56 DATAREF STACK 1226 esp + 0 PARENT LocalFrame LOCALFRAME
-    40b54a      8 DATAREF STACK 1228 esp + 24 CHILDOF 1226 OFFSET 24 LOCALVAR var_20 
-    40b54a      8 DATAREF STACK 1229 esp + 32 CHILDOF 1226 OFFSET 32 LOCALVAR var_18 
-    40b54a      8 DATAREF STACK 1230 esp + 40 CHILDOF 1226 OFFSET 40 LOCALVAR var_10 
-    40b54a      8 DATAREF STACK 1231 esp + 48 CHILDOF 1226 OFFSET 48 LOCALVAR var_8 
+    40b54a     56 DATAREF STACK 1225 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b54a      8 DATAREF STACK 1227 esp + 24 CHILDOF 1225 OFFSET 24 LOCALVAR var_20 
+    40b54a      8 DATAREF STACK 1228 esp + 32 CHILDOF 1225 OFFSET 32 LOCALVAR var_18 
+    40b54a      8 DATAREF STACK 1229 esp + 40 CHILDOF 1225 OFFSET 40 LOCALVAR var_10 
+    40b54a      8 DATAREF STACK 1230 esp + 48 CHILDOF 1225 OFFSET 48 LOCALVAR var_8 
     40b54a      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40b54e      3 INSTR BELONGTO 40b530 
     40b54e      3 INSTR DEADREGS  EFLAGS RDI R13 ZZ mov     rdi, rsi 
@@ -7171,12 +7151,12 @@
     40b5fb      1 INSTR BELONGTO 40b5f0 
     40b5fb      1 INSTR DEADREGS  EFLAGS R13 ZZ push    rbx 
     40b5fb     -3 INSTR LOCAL NoWarn push    rbx 
-    40b5fc     16 DATAREF STACK 1234 esp + 8 CHILDOF 1232 OFFSET 8 LOCALVAR var_30 
-    40b5fc     24 DATAREF STACK 1232 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b5fc     16 DATAREF STACK 1233 esp + 8 CHILDOF 1231 OFFSET 8 LOCALVAR var_30 
+    40b5fc     24 DATAREF STACK 1231 esp + 0 PARENT LocalFrame LOCALFRAME
     40b5fc     32 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
     40b5fc      4 INSTR BELONGTO 40b5f0 
     40b5fc      4 INSTR DEADREGS  EFLAGS RBX R13 ZZ sub     rsp, 18h 
-    40b5fc      8 DATAREF STACK 1233 esp + 0 CHILDOF 1232 OFFSET 0 LOCALVAR var_38 
+    40b5fc      8 DATAREF STACK 1232 esp + 0 CHILDOF 1231 OFFSET 0 LOCALVAR var_38 
     40b5fc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40b600     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40b600      3 INSTR BELONGTO 40b5f0 
@@ -7547,12 +7527,12 @@
     40b82b      1 INSTR BELONGTO 40b820 
     40b82b      1 INSTR DEADREGS  EFLAGS R13 ZZ push    rbx 
     40b82b     -3 INSTR LOCAL NoWarn push    rbx 
-    40b82c     16 DATAREF STACK 1237 esp + 8 CHILDOF 1235 OFFSET 8 LOCALVAR var_30 
-    40b82c     24 DATAREF STACK 1235 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b82c     16 DATAREF STACK 1236 esp + 8 CHILDOF 1234 OFFSET 8 LOCALVAR var_30 
+    40b82c     24 DATAREF STACK 1234 esp + 0 PARENT LocalFrame LOCALFRAME
     40b82c     32 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
     40b82c      4 INSTR BELONGTO 40b820 
     40b82c      4 INSTR DEADREGS  EFLAGS RBX R13 ZZ sub     rsp, 18h 
-    40b82c      8 DATAREF STACK 1236 esp + 0 CHILDOF 1235 OFFSET 0 LOCALVAR var_38 
+    40b82c      8 DATAREF STACK 1235 esp + 0 CHILDOF 1234 OFFSET 0 LOCALVAR var_38 
     40b82c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40b830     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40b830      3 INSTR BELONGTO 40b820 
@@ -7904,14 +7884,14 @@
     40ba3e      5 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM0 ZZ call    _g_log 
     40ba43     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40B868 
     40ba43      5 INSTR BELONGTO 40b820 
-    40ba50      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 4 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
+    40ba50      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -4 0 4 0 8 5 0 0 6 0 0 7 0 4 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
     40ba50      0 FUNC MMSAFENESS SAFE
     40ba50     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40ba50      3 INSTR BELONGTO 40ba50 
     40ba50     50 FUNC GLOBAL sub_40BA50 FUNC_UNSAFE NOFP RET     40ba81 
-    40ba50      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    40ba50      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40ba53      1 INSTR BELONGTO 40ba50 
+    40ba53      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    40ba53      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40ba54     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
     40ba54      3 INSTR BELONGTO 40ba50 
     40ba57     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40BA80 
@@ -7947,8 +7927,8 @@
     40ba90     -3 INSTR LOCAL NoWarn push    rbx 
     40ba91      3 INSTR BELONGTO 40ba90 
     40ba91      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    40ba94     20 DATAREF STACK 1239 esp + 0 CHILDOF 1238 OFFSET 0 OutArgsRegion OUTARGS
-    40ba94     32 DATAREF STACK 1238 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ba94     20 DATAREF STACK 1238 esp + 0 CHILDOF 1237 OFFSET 0 OutArgsRegion OUTARGS
+    40ba94     32 DATAREF STACK 1237 esp + 0 PARENT LocalFrame LOCALFRAME
     40ba94      4 INSTR BELONGTO 40ba90 
     40ba94      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 20h 
     40ba94      8 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
@@ -8069,16 +8049,16 @@
     40bb7d      5 INSTR BELONGTO 40bb70 
     40bb82     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     40bb82      5 INSTR BELONGTO 40bb70 
-    40bb87     12 DATAREF STACK 1243 esp + 12 CHILDOF 1240 OFFSET 12 LOCALVAR var_2C 
-    40bb87      4 DATAREF STACK 1241 esp + 0 CHILDOF 1240 OFFSET 0 LOCALVAR var_38 
+    40bb87     12 DATAREF STACK 1242 esp + 12 CHILDOF 1239 OFFSET 12 LOCALVAR var_2C 
+    40bb87      4 DATAREF STACK 1240 esp + 0 CHILDOF 1239 OFFSET 0 LOCALVAR var_38 
     40bb87      4 INSTR BELONGTO 40bb70 
     40bb87      4 INSTR DEADREGS  EFLAGS R12 R13 ZZ sub     rsp, 38h 
-    40bb87     56 DATAREF STACK 1240 esp + 0 PARENT LocalFrame LOCALFRAME
-    40bb87      8 DATAREF STACK 1242 esp + 4 CHILDOF 1240 OFFSET 4 LOCALVAR var_34 
-    40bb87      8 DATAREF STACK 1244 esp + 24 CHILDOF 1240 OFFSET 24 LOCALVAR var_20 
-    40bb87      8 DATAREF STACK 1245 esp + 32 CHILDOF 1240 OFFSET 32 LOCALVAR var_18 
-    40bb87      8 DATAREF STACK 1246 esp + 40 CHILDOF 1240 OFFSET 40 LOCALVAR var_10 
-    40bb87      8 DATAREF STACK 1247 esp + 48 CHILDOF 1240 OFFSET 48 LOCALVAR var_8 
+    40bb87     56 DATAREF STACK 1239 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bb87      8 DATAREF STACK 1241 esp + 4 CHILDOF 1239 OFFSET 4 LOCALVAR var_34 
+    40bb87      8 DATAREF STACK 1243 esp + 24 CHILDOF 1239 OFFSET 24 LOCALVAR var_20 
+    40bb87      8 DATAREF STACK 1244 esp + 32 CHILDOF 1239 OFFSET 32 LOCALVAR var_18 
+    40bb87      8 DATAREF STACK 1245 esp + 40 CHILDOF 1239 OFFSET 40 LOCALVAR var_10 
+    40bb87      8 DATAREF STACK 1246 esp + 48 CHILDOF 1239 OFFSET 48 LOCALVAR var_8 
     40bb87      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40bb8b      3 INSTR BELONGTO 40bb70 
     40bb8b      3 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     r13, r8 
@@ -8200,8 +8180,8 @@
     40bc50      1 INSTR BELONGTO 40bc50 
     40bc50      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     40bc50     -3 INSTR LOCAL NoWarn push    rbx 
-    40bc51     16 DATAREF STACK 1248 esp + 0 PARENT LocalFrame LOCALFRAME
-    40bc51      4 DATAREF STACK 1249 esp + 0 CHILDOF 1248 OFFSET 0 OutArgsRegion OUTARGS
+    40bc51     16 DATAREF STACK 1247 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bc51      4 DATAREF STACK 1248 esp + 0 CHILDOF 1247 OFFSET 0 OutArgsRegion OUTARGS
     40bc51      4 INSTR BELONGTO 40bc50 
     40bc51      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
     40bc51      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -8287,7 +8267,7 @@
     40bce2      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], r13
     40bce7      5 INSTR BELONGTO 40bcd0 
     40bce7      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r14
-    40bcec     40 DATAREF STACK 1250 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bcec     40 DATAREF STACK 1249 esp + 0 PARENT LocalFrame LOCALFRAME
     40bcec      4 INSTR BELONGTO 40bcd0 
     40bcec      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40bcf0     -1 INSTR LOCAL NoMetaUpdate call    sub_40BC50 
@@ -8477,7 +8457,7 @@
     40bee2      3 INSTR BELONGTO 40bee0 
     40bee5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40bee5      4 INSTR BELONGTO 40bee0 
-    40bee5      8 DATAREF STACK 1251 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bee5      8 DATAREF STACK 1250 esp + 0 PARENT LocalFrame LOCALFRAME
     40bee5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40bee9     -1 INSTR LOCAL NoMetaUpdate call    sub_40BC50 
     40bee9      5 INSTR BELONGTO 40bee0 
@@ -8847,13 +8827,13 @@
     40c577     -2 INSTR LOCAL n EDI 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 1252 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c57c     40 DATAREF STACK 1251 esp + 0 PARENT LocalFrame LOCALFRAME
     40c57c      4 INSTR BELONGTO 40c560 
     40c57c      4 INSTR DEADREGS  EFLAGS R12 R13 ZZ sub     rsp, 28h 
-    40c57c      8 DATAREF STACK 1253 esp + 8 CHILDOF 1252 OFFSET 8 LOCALVAR var_20 
-    40c57c      8 DATAREF STACK 1254 esp + 16 CHILDOF 1252 OFFSET 16 LOCALVAR var_18 
-    40c57c      8 DATAREF STACK 1255 esp + 24 CHILDOF 1252 OFFSET 24 LOCALVAR var_10 
-    40c57c      8 DATAREF STACK 1256 esp + 32 CHILDOF 1252 OFFSET 32 LOCALVAR var_8 
+    40c57c      8 DATAREF STACK 1252 esp + 8 CHILDOF 1251 OFFSET 8 LOCALVAR var_20 
+    40c57c      8 DATAREF STACK 1253 esp + 16 CHILDOF 1251 OFFSET 16 LOCALVAR var_18 
+    40c57c      8 DATAREF STACK 1254 esp + 24 CHILDOF 1251 OFFSET 24 LOCALVAR var_10 
+    40c57c      8 DATAREF STACK 1255 esp + 32 CHILDOF 1251 OFFSET 32 LOCALVAR var_8 
     40c57c      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40c580      3 INSTR BELONGTO 40c560 
     40c580      3 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     rbp, rsi 
@@ -8906,7 +8886,7 @@
     40c5e0     25 FUNC GLOBAL sub_40C5E0 FUNC_UNSAFE NOFP RET     40c5f8 
     40c5e0      4 INSTR BELONGTO 40c5e0 
     40c5e0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40c5e0      8 DATAREF STACK 1257 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c5e0      8 DATAREF STACK 1256 esp + 0 PARENT LocalFrame LOCALFRAME
     40c5e0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40c5e4     -1 INSTR LOCAL NoMetaUpdate call    sub_40BC50 
     40c5e4      5 INSTR BELONGTO 40c5e0 
@@ -8943,17 +8923,17 @@
     40c61a      5 INSTR BELONGTO 40c600 
     40c61f     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_18], r13 
     40c61f      5 INSTR BELONGTO 40c600 
-    40c624     12 DATAREF STACK 1259 esp + 0 CHILDOF 1258 OFFSET 0 LOCALVAR var_48 
-    40c624     12 DATAREF STACK 1260 esp + 12 CHILDOF 1258 OFFSET 12 LOCALVAR var_3C 
+    40c624     12 DATAREF STACK 1258 esp + 0 CHILDOF 1257 OFFSET 0 LOCALVAR var_48 
+    40c624     12 DATAREF STACK 1259 esp + 12 CHILDOF 1257 OFFSET 12 LOCALVAR var_3C 
     40c624      4 INSTR BELONGTO 40c600 
     40c624      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 R12 R13 R15 ZZ sub     rsp, 48h 
-    40c624     72 DATAREF STACK 1258 esp + 0 PARENT LocalFrame LOCALFRAME
-    40c624      8 DATAREF STACK 1261 esp + 24 CHILDOF 1258 OFFSET 24 LOCALVAR var_30 
-    40c624      8 DATAREF STACK 1262 esp + 32 CHILDOF 1258 OFFSET 32 LOCALVAR var_28 
-    40c624      8 DATAREF STACK 1263 esp + 40 CHILDOF 1258 OFFSET 40 LOCALVAR var_20 
-    40c624      8 DATAREF STACK 1264 esp + 48 CHILDOF 1258 OFFSET 48 LOCALVAR var_18 
-    40c624      8 DATAREF STACK 1265 esp + 56 CHILDOF 1258 OFFSET 56 LOCALVAR var_10 
-    40c624      8 DATAREF STACK 1266 esp + 64 CHILDOF 1258 OFFSET 64 LOCALVAR var_8 
+    40c624     72 DATAREF STACK 1257 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c624      8 DATAREF STACK 1260 esp + 24 CHILDOF 1257 OFFSET 24 LOCALVAR var_30 
+    40c624      8 DATAREF STACK 1261 esp + 32 CHILDOF 1257 OFFSET 32 LOCALVAR var_28 
+    40c624      8 DATAREF STACK 1262 esp + 40 CHILDOF 1257 OFFSET 40 LOCALVAR var_20 
+    40c624      8 DATAREF STACK 1263 esp + 48 CHILDOF 1257 OFFSET 48 LOCALVAR var_18 
+    40c624      8 DATAREF STACK 1264 esp + 56 CHILDOF 1257 OFFSET 56 LOCALVAR var_10 
+    40c624      8 DATAREF STACK 1265 esp + 64 CHILDOF 1257 OFFSET 64 LOCALVAR var_8 
     40c624      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     40c628      3 INSTR BELONGTO 40c600 
     40c628      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 R12 R13 R15 ZZ mov     r12, rdx 
@@ -9392,7 +9372,7 @@
     40cac3      3 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
     40cac6      1 INSTR BELONGTO 40cac0 
     40cac6      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 R12 ZZ push    rbx 
-    40cac6     24 DATAREF STACK 1267 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cac6     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40cac6      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40cac7      3 INSTR BELONGTO 40cac0 
     40cac7      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 ZZ mov     rbx, rdi 
@@ -9681,8 +9661,8 @@
     40cd00     -3 INSTR LOCAL NoWarn push    rbx 
     40cd01      3 INSTR BELONGTO 40cd00 
     40cd01      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    40cd04     16 DATAREF STACK 1268 esp + 0 PARENT LocalFrame LOCALFRAME
-    40cd04      4 DATAREF STACK 1269 esp + 0 CHILDOF 1268 OFFSET 0 OutArgsRegion OUTARGS
+    40cd04     16 DATAREF STACK 1266 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cd04      4 DATAREF STACK 1267 esp + 0 CHILDOF 1266 OFFSET 0 OutArgsRegion OUTARGS
     40cd04      4 INSTR BELONGTO 40cd00 
     40cd04      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 10h 
     40cd04      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -9812,13 +9792,13 @@
     40cded      5 INSTR BELONGTO 40cde0 
     40cdf2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     40cdf2      5 INSTR BELONGTO 40cde0 
-    40cdf7     40 DATAREF STACK 1270 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cdf7     40 DATAREF STACK 1268 esp + 0 PARENT LocalFrame LOCALFRAME
     40cdf7      4 INSTR BELONGTO 40cde0 
     40cdf7      4 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ sub     rsp, 28h 
-    40cdf7      8 DATAREF STACK 1271 esp + 8 CHILDOF 1270 OFFSET 8 LOCALVAR var_20 
-    40cdf7      8 DATAREF STACK 1272 esp + 16 CHILDOF 1270 OFFSET 16 LOCALVAR var_18 
-    40cdf7      8 DATAREF STACK 1273 esp + 24 CHILDOF 1270 OFFSET 24 LOCALVAR var_10 
-    40cdf7      8 DATAREF STACK 1274 esp + 32 CHILDOF 1270 OFFSET 32 LOCALVAR var_8 
+    40cdf7      8 DATAREF STACK 1269 esp + 8 CHILDOF 1268 OFFSET 8 LOCALVAR var_20 
+    40cdf7      8 DATAREF STACK 1270 esp + 16 CHILDOF 1268 OFFSET 16 LOCALVAR var_18 
+    40cdf7      8 DATAREF STACK 1271 esp + 24 CHILDOF 1268 OFFSET 24 LOCALVAR var_10 
+    40cdf7      8 DATAREF STACK 1272 esp + 32 CHILDOF 1268 OFFSET 32 LOCALVAR var_8 
     40cdf7      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40cdfb     -1 INSTR LOCAL MetadataUnused mov     r12, rdx 
     40cdfb      3 INSTR BELONGTO 40cde0 
@@ -9973,12 +9953,12 @@
     40cefa      3 INSTR BELONGTO 40cef0 
     40cefd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40cefd      5 INSTR BELONGTO 40cef0 
-    40cf02     24 DATAREF STACK 1275 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cf02     24 DATAREF STACK 1273 esp + 0 PARENT LocalFrame LOCALFRAME
     40cf02      4 INSTR BELONGTO 40cef0 
     40cf02      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 18h 
-    40cf02      8 DATAREF STACK 1276 esp + 0 CHILDOF 1275 OFFSET 0 LOCALVAR var_18 
-    40cf02      8 DATAREF STACK 1277 esp + 8 CHILDOF 1275 OFFSET 8 LOCALVAR var_10 
-    40cf02      8 DATAREF STACK 1278 esp + 16 CHILDOF 1275 OFFSET 16 LOCALVAR var_8 
+    40cf02      8 DATAREF STACK 1274 esp + 0 CHILDOF 1273 OFFSET 0 LOCALVAR var_18 
+    40cf02      8 DATAREF STACK 1275 esp + 8 CHILDOF 1273 OFFSET 8 LOCALVAR var_10 
+    40cf02      8 DATAREF STACK 1276 esp + 16 CHILDOF 1273 OFFSET 16 LOCALVAR var_8 
     40cf02      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40cf06      3 INSTR BELONGTO 40cef0 
     40cf06      3 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     r12, rsi 
@@ -10057,8 +10037,8 @@
     40cf80      1 INSTR BELONGTO 40cf80 
     40cf80      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     40cf80     -3 INSTR LOCAL NoWarn push    rbx 
-    40cf81     16 DATAREF STACK 1279 esp + 0 PARENT LocalFrame LOCALFRAME
-    40cf81      4 DATAREF STACK 1280 esp + 0 CHILDOF 1279 OFFSET 0 OutArgsRegion OUTARGS
+    40cf81     16 DATAREF STACK 1277 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cf81      4 DATAREF STACK 1278 esp + 0 CHILDOF 1277 OFFSET 0 OutArgsRegion OUTARGS
     40cf81      4 INSTR BELONGTO 40cf80 
     40cf81      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
     40cf81      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -10140,7 +10120,7 @@
     40d002      3 INSTR BELONGTO 40d000 
     40d005     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40d005      4 INSTR BELONGTO 40d000 
-    40d005      8 DATAREF STACK 1281 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d005      8 DATAREF STACK 1279 esp + 0 PARENT LocalFrame LOCALFRAME
     40d005      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40d009     -1 INSTR LOCAL NoMetaUpdate call    sub_40CF80 
     40d009      5 INSTR BELONGTO 40d000 
@@ -10492,7 +10472,7 @@
     40d8d8     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40d8d8      4 INSTR BELONGTO 40d8d0 
     40d8d8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40d8d8      8 DATAREF STACK 1282 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d8d8      8 DATAREF STACK 1280 esp + 0 PARENT LocalFrame LOCALFRAME
     40d8d8      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40d8dc     -1 INSTR LOCAL NoMetaUpdate call    sub_40CF80 
     40d8dc      5 INSTR BELONGTO 40d8d0 
@@ -10893,18 +10873,18 @@
     40de87      3 INSTR BELONGTO 40de70 
     40de8a     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
     40de8a      5 INSTR BELONGTO 40de70 
-    40de8f      4 DATAREF STACK 1284 esp + 0 CHILDOF 1283 OFFSET 0 OutArgsRegion OUTARGS
+    40de8f      4 DATAREF STACK 1282 esp + 0 CHILDOF 1281 OFFSET 0 OutArgsRegion OUTARGS
     40de8f      4 INSTR BELONGTO 40de70 
     40de8f      4 INSTR DEADREGS  EFLAGS R13 R14 ZZ sub     rsp, 48h 
-    40de8f     72 DATAREF STACK 1283 esp + 0 PARENT LocalFrame LOCALFRAME
-    40de8f      8 DATAREF STACK 1285 esp + 8 CHILDOF 1283 OFFSET 8 LOCALVAR var_40 
-    40de8f      8 DATAREF STACK 1286 esp + 16 CHILDOF 1283 OFFSET 16 LOCALVAR var_38 
-    40de8f      8 DATAREF STACK 1287 esp + 24 CHILDOF 1283 OFFSET 24 LOCALVAR var_30 
-    40de8f      8 DATAREF STACK 1288 esp + 32 CHILDOF 1283 OFFSET 32 LOCALVAR var_28 
-    40de8f      8 DATAREF STACK 1289 esp + 40 CHILDOF 1283 OFFSET 40 LOCALVAR var_20 
-    40de8f      8 DATAREF STACK 1290 esp + 48 CHILDOF 1283 OFFSET 48 LOCALVAR var_18 
-    40de8f      8 DATAREF STACK 1291 esp + 56 CHILDOF 1283 OFFSET 56 LOCALVAR var_10 
-    40de8f      8 DATAREF STACK 1292 esp + 64 CHILDOF 1283 OFFSET 64 LOCALVAR var_8 
+    40de8f     72 DATAREF STACK 1281 esp + 0 PARENT LocalFrame LOCALFRAME
+    40de8f      8 DATAREF STACK 1283 esp + 8 CHILDOF 1281 OFFSET 8 LOCALVAR var_40 
+    40de8f      8 DATAREF STACK 1284 esp + 16 CHILDOF 1281 OFFSET 16 LOCALVAR var_38 
+    40de8f      8 DATAREF STACK 1285 esp + 24 CHILDOF 1281 OFFSET 24 LOCALVAR var_30 
+    40de8f      8 DATAREF STACK 1286 esp + 32 CHILDOF 1281 OFFSET 32 LOCALVAR var_28 
+    40de8f      8 DATAREF STACK 1287 esp + 40 CHILDOF 1281 OFFSET 40 LOCALVAR var_20 
+    40de8f      8 DATAREF STACK 1288 esp + 48 CHILDOF 1281 OFFSET 48 LOCALVAR var_18 
+    40de8f      8 DATAREF STACK 1289 esp + 56 CHILDOF 1281 OFFSET 56 LOCALVAR var_10 
+    40de8f      8 DATAREF STACK 1290 esp + 64 CHILDOF 1281 OFFSET 64 LOCALVAR var_8 
     40de8f      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     40de93     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40de93      3 INSTR BELONGTO 40de70 
@@ -11135,12 +11115,12 @@
     40e008      1 INSTR BELONGTO 40e000 
     40e008      1 INSTR DEADREGS  EFLAGS R12 R13 ZZ push    rbx 
     40e008     -3 INSTR LOCAL NoWarn push    rbx 
-    40e009     16 DATAREF STACK 1295 esp + 8 CHILDOF 1293 OFFSET 8 LOCALVAR var_30 
-    40e009     24 DATAREF STACK 1293 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e009     16 DATAREF STACK 1293 esp + 8 CHILDOF 1291 OFFSET 8 LOCALVAR var_30 
+    40e009     24 DATAREF STACK 1291 esp + 0 PARENT LocalFrame LOCALFRAME
     40e009     32 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
     40e009      4 INSTR BELONGTO 40e000 
     40e009      4 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ sub     rsp, 18h 
-    40e009      8 DATAREF STACK 1294 esp + 0 CHILDOF 1293 OFFSET 0 LOCALVAR var_38 
+    40e009      8 DATAREF STACK 1292 esp + 0 CHILDOF 1291 OFFSET 0 LOCALVAR var_38 
     40e009      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40e00d     -1 INSTR LOCAL NoMetaUpdate call    _g_get_user_cache_dir 
     40e00d      5 INSTR BELONGTO 40e000 
@@ -11489,7 +11469,7 @@
     40e248     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40e248      4 INSTR BELONGTO 40e240 
     40e248      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    40e248      8 DATAREF STACK 1296 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e248      8 DATAREF STACK 1294 esp + 0 PARENT LocalFrame LOCALFRAME
     40e248      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40e24c      7 INSTR BELONGTO 40e240 
     40e24c      7 INSTR DEADREGS  EFLAGS ZZ mov     rdi, [rdi+120h] 
@@ -11742,14 +11722,14 @@
     40e667      3 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     rbp, rsi 
     40e66a     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
     40e66a      5 INSTR BELONGTO 40e650 
-    40e66f     40 DATAREF STACK 1297 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e66f     40 DATAREF STACK 1295 esp + 0 PARENT LocalFrame LOCALFRAME
     40e66f      4 INSTR BELONGTO 40e650 
     40e66f      4 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ sub     rsp, 28h 
-    40e66f      8 DATAREF STACK 1298 esp + 0 CHILDOF 1297 OFFSET 0 LOCALVAR var_28 
-    40e66f      8 DATAREF STACK 1299 esp + 8 CHILDOF 1297 OFFSET 8 LOCALVAR var_20 
-    40e66f      8 DATAREF STACK 1300 esp + 16 CHILDOF 1297 OFFSET 16 LOCALVAR var_18 
-    40e66f      8 DATAREF STACK 1301 esp + 24 CHILDOF 1297 OFFSET 24 LOCALVAR var_10 
-    40e66f      8 DATAREF STACK 1302 esp + 32 CHILDOF 1297 OFFSET 32 LOCALVAR var_8 
+    40e66f      8 DATAREF STACK 1296 esp + 0 CHILDOF 1295 OFFSET 0 LOCALVAR var_28 
+    40e66f      8 DATAREF STACK 1297 esp + 8 CHILDOF 1295 OFFSET 8 LOCALVAR var_20 
+    40e66f      8 DATAREF STACK 1298 esp + 16 CHILDOF 1295 OFFSET 16 LOCALVAR var_18 
+    40e66f      8 DATAREF STACK 1299 esp + 24 CHILDOF 1295 OFFSET 24 LOCALVAR var_10 
+    40e66f      8 DATAREF STACK 1300 esp + 32 CHILDOF 1295 OFFSET 32 LOCALVAR var_8 
     40e66f      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40e673      7 INSTR BELONGTO 40e650 
     40e673      7 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ mov     rdi, [rdi+0C8h] 
@@ -11936,12 +11916,12 @@
     40e7ca      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbp, rcx 
     40e7cd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40e7cd      5 INSTR BELONGTO 40e7c0 
-    40e7d2     24 DATAREF STACK 1303 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e7d2     24 DATAREF STACK 1301 esp + 0 PARENT LocalFrame LOCALFRAME
     40e7d2      4 INSTR BELONGTO 40e7c0 
     40e7d2      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 18h 
-    40e7d2      8 DATAREF STACK 1304 esp + 0 CHILDOF 1303 OFFSET 0 LOCALVAR var_18 
-    40e7d2      8 DATAREF STACK 1305 esp + 8 CHILDOF 1303 OFFSET 8 LOCALVAR var_10 
-    40e7d2      8 DATAREF STACK 1306 esp + 16 CHILDOF 1303 OFFSET 16 LOCALVAR var_8 
+    40e7d2      8 DATAREF STACK 1302 esp + 0 CHILDOF 1301 OFFSET 0 LOCALVAR var_18 
+    40e7d2      8 DATAREF STACK 1303 esp + 8 CHILDOF 1301 OFFSET 8 LOCALVAR var_10 
+    40e7d2      8 DATAREF STACK 1304 esp + 16 CHILDOF 1301 OFFSET 16 LOCALVAR var_8 
     40e7d2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40e7d6      3 INSTR BELONGTO 40e7c0 
     40e7d6      3 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     rbx, rsi 
@@ -12063,12 +12043,12 @@
     40e89a      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
     40e89d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40e89d      5 INSTR BELONGTO 40e890 
-    40e8a2     24 DATAREF STACK 1307 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e8a2     24 DATAREF STACK 1305 esp + 0 PARENT LocalFrame LOCALFRAME
     40e8a2      4 INSTR BELONGTO 40e890 
     40e8a2      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-    40e8a2      8 DATAREF STACK 1308 esp + 0 CHILDOF 1307 OFFSET 0 LOCALVAR var_18 
-    40e8a2      8 DATAREF STACK 1309 esp + 8 CHILDOF 1307 OFFSET 8 LOCALVAR var_10 
-    40e8a2      8 DATAREF STACK 1310 esp + 16 CHILDOF 1307 OFFSET 16 LOCALVAR var_8 
+    40e8a2      8 DATAREF STACK 1306 esp + 0 CHILDOF 1305 OFFSET 0 LOCALVAR var_18 
+    40e8a2      8 DATAREF STACK 1307 esp + 8 CHILDOF 1305 OFFSET 8 LOCALVAR var_10 
+    40e8a2      8 DATAREF STACK 1308 esp + 16 CHILDOF 1305 OFFSET 16 LOCALVAR var_8 
     40e8a2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40e8a6      7 INSTR BELONGTO 40e890 
     40e8a6      7 INSTR DEADREGS  EFLAGS R12 ZZ mov     rdi, [rdi+108h] 
@@ -12217,12 +12197,12 @@
     40e9c2      5 INSTR BELONGTO 40e9b0 
     40e9c7      4 INSTR BELONGTO 40e9b0 
     40e9c7      4 INSTR DEADREGS  EFLAGS R8 R9 R12 R13 ZZ sub     rsp, 38h 
-    40e9c7     56 DATAREF STACK 1311 esp + 0 PARENT LocalFrame LOCALFRAME
-    40e9c7      8 DATAREF STACK 1312 esp + 0 CHILDOF 1311 OFFSET 0 OutArgsRegion OUTARGS
-    40e9c7      8 DATAREF STACK 1313 esp + 24 CHILDOF 1311 OFFSET 24 LOCALVAR var_20 
-    40e9c7      8 DATAREF STACK 1314 esp + 32 CHILDOF 1311 OFFSET 32 LOCALVAR var_18 
-    40e9c7      8 DATAREF STACK 1315 esp + 40 CHILDOF 1311 OFFSET 40 LOCALVAR var_10 
-    40e9c7      8 DATAREF STACK 1316 esp + 48 CHILDOF 1311 OFFSET 48 LOCALVAR var_8 
+    40e9c7     56 DATAREF STACK 1309 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e9c7      8 DATAREF STACK 1310 esp + 0 CHILDOF 1309 OFFSET 0 OutArgsRegion OUTARGS
+    40e9c7      8 DATAREF STACK 1311 esp + 24 CHILDOF 1309 OFFSET 24 LOCALVAR var_20 
+    40e9c7      8 DATAREF STACK 1312 esp + 32 CHILDOF 1309 OFFSET 32 LOCALVAR var_18 
+    40e9c7      8 DATAREF STACK 1313 esp + 40 CHILDOF 1309 OFFSET 40 LOCALVAR var_10 
+    40e9c7      8 DATAREF STACK 1314 esp + 48 CHILDOF 1309 OFFSET 48 LOCALVAR var_8 
     40e9c7      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40e9cb     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
     40e9cb      3 INSTR BELONGTO 40e9b0 
@@ -12375,12 +12355,12 @@
     40eaba      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
     40eabd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40eabd      5 INSTR BELONGTO 40eab0 
-    40eac2     24 DATAREF STACK 1317 esp + 0 PARENT LocalFrame LOCALFRAME
+    40eac2     24 DATAREF STACK 1315 esp + 0 PARENT LocalFrame LOCALFRAME
     40eac2      4 INSTR BELONGTO 40eab0 
     40eac2      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-    40eac2      8 DATAREF STACK 1318 esp + 0 CHILDOF 1317 OFFSET 0 LOCALVAR var_18 
-    40eac2      8 DATAREF STACK 1319 esp + 8 CHILDOF 1317 OFFSET 8 LOCALVAR var_10 
-    40eac2      8 DATAREF STACK 1320 esp + 16 CHILDOF 1317 OFFSET 16 LOCALVAR var_8 
+    40eac2      8 DATAREF STACK 1316 esp + 0 CHILDOF 1315 OFFSET 0 LOCALVAR var_18 
+    40eac2      8 DATAREF STACK 1317 esp + 8 CHILDOF 1315 OFFSET 8 LOCALVAR var_10 
+    40eac2      8 DATAREF STACK 1318 esp + 16 CHILDOF 1315 OFFSET 16 LOCALVAR var_8 
     40eac2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40eac6      7 INSTR BELONGTO 40eab0 
     40eac6      7 INSTR DEADREGS  EFLAGS R12 ZZ mov     rdi, [rdi+110h] 
@@ -12535,7 +12515,7 @@
     40ebde      3 INSTR DEADREGS  R12 R14 ZZ mov     rbp, rsi 
     40ebe1      1 INSTR BELONGTO 40ebd0 
     40ebe1      1 INSTR DEADREGS  R12 R14 ZZ push    rbx 
-    40ebe1     40 DATAREF STACK 1321 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ebe1     40 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40ebe1      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40ebe2      3 INSTR BELONGTO 40ebd0 
     40ebe2      3 INSTR DEADREGS  RBX R12 R14 ZZ mov     rbx, rdi 
@@ -13118,12 +13098,12 @@
     40f022      5 INSTR BELONGTO 40f010 
     40f027      4 INSTR BELONGTO 40f010 
     40f027      4 INSTR DEADREGS  EFLAGS R8 R9 R12 R13 ZZ sub     rsp, 38h 
-    40f027     56 DATAREF STACK 1322 esp + 0 PARENT LocalFrame LOCALFRAME
-    40f027      8 DATAREF STACK 1323 esp + 0 CHILDOF 1322 OFFSET 0 OutArgsRegion OUTARGS
-    40f027      8 DATAREF STACK 1324 esp + 24 CHILDOF 1322 OFFSET 24 LOCALVAR var_20 
-    40f027      8 DATAREF STACK 1325 esp + 32 CHILDOF 1322 OFFSET 32 LOCALVAR var_18 
-    40f027      8 DATAREF STACK 1326 esp + 40 CHILDOF 1322 OFFSET 40 LOCALVAR var_10 
-    40f027      8 DATAREF STACK 1327 esp + 48 CHILDOF 1322 OFFSET 48 LOCALVAR var_8 
+    40f027     56 DATAREF STACK 1319 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f027      8 DATAREF STACK 1320 esp + 0 CHILDOF 1319 OFFSET 0 OutArgsRegion OUTARGS
+    40f027      8 DATAREF STACK 1321 esp + 24 CHILDOF 1319 OFFSET 24 LOCALVAR var_20 
+    40f027      8 DATAREF STACK 1322 esp + 32 CHILDOF 1319 OFFSET 32 LOCALVAR var_18 
+    40f027      8 DATAREF STACK 1323 esp + 40 CHILDOF 1319 OFFSET 40 LOCALVAR var_10 
+    40f027      8 DATAREF STACK 1324 esp + 48 CHILDOF 1319 OFFSET 48 LOCALVAR var_8 
     40f027      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40f02b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
     40f02b      3 INSTR BELONGTO 40f010 
@@ -13280,12 +13260,12 @@
     40f122      5 INSTR BELONGTO 40f110 
     40f127      4 INSTR BELONGTO 40f110 
     40f127      4 INSTR DEADREGS  EFLAGS R8 R9 R12 R13 ZZ sub     rsp, 38h 
-    40f127     56 DATAREF STACK 1328 esp + 0 PARENT LocalFrame LOCALFRAME
-    40f127      8 DATAREF STACK 1329 esp + 0 CHILDOF 1328 OFFSET 0 OutArgsRegion OUTARGS
-    40f127      8 DATAREF STACK 1330 esp + 24 CHILDOF 1328 OFFSET 24 LOCALVAR var_20 
-    40f127      8 DATAREF STACK 1331 esp + 32 CHILDOF 1328 OFFSET 32 LOCALVAR var_18 
-    40f127      8 DATAREF STACK 1332 esp + 40 CHILDOF 1328 OFFSET 40 LOCALVAR var_10 
-    40f127      8 DATAREF STACK 1333 esp + 48 CHILDOF 1328 OFFSET 48 LOCALVAR var_8 
+    40f127     56 DATAREF STACK 1325 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f127      8 DATAREF STACK 1326 esp + 0 CHILDOF 1325 OFFSET 0 OutArgsRegion OUTARGS
+    40f127      8 DATAREF STACK 1327 esp + 24 CHILDOF 1325 OFFSET 24 LOCALVAR var_20 
+    40f127      8 DATAREF STACK 1328 esp + 32 CHILDOF 1325 OFFSET 32 LOCALVAR var_18 
+    40f127      8 DATAREF STACK 1329 esp + 40 CHILDOF 1325 OFFSET 40 LOCALVAR var_10 
+    40f127      8 DATAREF STACK 1330 esp + 48 CHILDOF 1325 OFFSET 48 LOCALVAR var_8 
     40f127      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40f12b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
     40f12b      3 INSTR BELONGTO 40f110 
@@ -13436,8 +13416,8 @@
     40f220      1 INSTR BELONGTO 40f220 
     40f220      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     40f220     -3 INSTR LOCAL NoWarn push    rbx 
-    40f221     16 DATAREF STACK 1334 esp + 0 PARENT LocalFrame LOCALFRAME
-    40f221      4 DATAREF STACK 1335 esp + 0 CHILDOF 1334 OFFSET 0 OutArgsRegion OUTARGS
+    40f221     16 DATAREF STACK 1331 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f221      4 DATAREF STACK 1332 esp + 0 CHILDOF 1331 OFFSET 0 OutArgsRegion OUTARGS
     40f221      4 INSTR BELONGTO 40f220 
     40f221      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
     40f221      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -13525,7 +13505,7 @@
     40f2a7     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40f2a7      4 INSTR BELONGTO 40f2a0 
     40f2a7      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40f2a7      8 DATAREF STACK 1336 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f2a7      8 DATAREF STACK 1333 esp + 0 PARENT LocalFrame LOCALFRAME
     40f2a7      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40f2ab     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     40f2ab      5 INSTR BELONGTO 40f2a0 
@@ -13716,7 +13696,7 @@
     40f458     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40f458      4 INSTR BELONGTO 40f450 
     40f458      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40f458      8 DATAREF STACK 1337 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f458      8 DATAREF STACK 1334 esp + 0 PARENT LocalFrame LOCALFRAME
     40f458      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40f45c     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     40f45c      5 INSTR BELONGTO 40f450 
@@ -13822,7 +13802,7 @@
     40f4f8     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40f4f8      4 INSTR BELONGTO 40f4f0 
     40f4f8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40f4f8      8 DATAREF STACK 1338 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f4f8      8 DATAREF STACK 1335 esp + 0 PARENT LocalFrame LOCALFRAME
     40f4f8      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40f4fc     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     40f4fc      5 INSTR BELONGTO 40f4f0 
@@ -14044,11 +14024,12 @@
     40f655     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_widget_grab_focus 
     40f655      5 INSTR BELONGTO 40f600 
     40f655      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     _gtk_widget_grab_focus 
-    40f660      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 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
+    40f660      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -4 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     40f660      0 FUNC MMSAFENESS UNSAFE
     40f660    105 FUNC GLOBAL sub_40F660 FUNC_UNSAFE NOFP RET     40f6c8 
     40f660      1 INSTR BELONGTO 40f660 
-    40f660     -3 INSTR LOCAL NoWarn push    rbx 
+    40f660      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    40f660      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40f661      3 INSTR BELONGTO 40f660 
     40f664     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     40f664      5 INSTR BELONGTO 40f660 
@@ -14106,13 +14087,13 @@
     40f6da      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 ZZ mov     rbx, rsi 
     40f6dd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40f6dd      5 INSTR BELONGTO 40f6d0 
-    40f6e2     40 DATAREF STACK 1360 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f6e2     40 DATAREF STACK 1336 esp + 0 PARENT LocalFrame LOCALFRAME
     40f6e2      4 INSTR BELONGTO 40f6d0 
     40f6e2      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 28h 
-    40f6e2      8 DATAREF STACK 1361 esp + 8 CHILDOF 1360 OFFSET 8 LOCALVAR var_20 
-    40f6e2      8 DATAREF STACK 1362 esp + 16 CHILDOF 1360 OFFSET 16 LOCALVAR var_18 
-    40f6e2      8 DATAREF STACK 1363 esp + 24 CHILDOF 1360 OFFSET 24 LOCALVAR var_10 
-    40f6e2      8 DATAREF STACK 1364 esp + 32 CHILDOF 1360 OFFSET 32 LOCALVAR var_8 
+    40f6e2      8 DATAREF STACK 1337 esp + 8 CHILDOF 1336 OFFSET 8 LOCALVAR var_20 
+    40f6e2      8 DATAREF STACK 1338 esp + 16 CHILDOF 1336 OFFSET 16 LOCALVAR var_18 
+    40f6e2      8 DATAREF STACK 1339 esp + 24 CHILDOF 1336 OFFSET 24 LOCALVAR var_10 
+    40f6e2      8 DATAREF STACK 1340 esp + 32 CHILDOF 1336 OFFSET 32 LOCALVAR var_8 
     40f6e2      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40f6e6      9 INSTR BELONGTO 40f6d0 
     40f6e6      9 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 ZZ mov     [rsp+28h+var_20], 0 
@@ -14575,12 +14556,12 @@
     40f9ca      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 ZZ mov     rbx, rsi 
     40f9cd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40f9cd      5 INSTR BELONGTO 40f9c0 
-    40f9d2     24 DATAREF STACK 1365 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f9d2     24 DATAREF STACK 1341 esp + 0 PARENT LocalFrame LOCALFRAME
     40f9d2      4 INSTR BELONGTO 40f9c0 
     40f9d2      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-    40f9d2      8 DATAREF STACK 1366 esp + 0 CHILDOF 1365 OFFSET 0 LOCALVAR var_18 
-    40f9d2      8 DATAREF STACK 1367 esp + 8 CHILDOF 1365 OFFSET 8 LOCALVAR var_10 
-    40f9d2      8 DATAREF STACK 1368 esp + 16 CHILDOF 1365 OFFSET 16 LOCALVAR var_8 
+    40f9d2      8 DATAREF STACK 1342 esp + 0 CHILDOF 1341 OFFSET 0 LOCALVAR var_18 
+    40f9d2      8 DATAREF STACK 1343 esp + 8 CHILDOF 1341 OFFSET 8 LOCALVAR var_10 
+    40f9d2      8 DATAREF STACK 1344 esp + 16 CHILDOF 1341 OFFSET 16 LOCALVAR var_8 
     40f9d2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40f9d6     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     40f9d6      5 INSTR BELONGTO 40f9c0 
@@ -14771,7 +14752,7 @@
     40fb15     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40fb15      4 INSTR BELONGTO 40fb10 
     40fb15      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40fb15      8 DATAREF STACK 1369 esp + 0 PARENT LocalFrame LOCALFRAME
+    40fb15      8 DATAREF STACK 1345 esp + 0 PARENT LocalFrame LOCALFRAME
     40fb15      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40fb19     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     40fb19      5 INSTR BELONGTO 40fb10 
@@ -14898,7 +14879,7 @@
     40fbe5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40fbe5      4 INSTR BELONGTO 40fbe0 
     40fbe5      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40fbe5      8 DATAREF STACK 1370 esp + 0 PARENT LocalFrame LOCALFRAME
+    40fbe5      8 DATAREF STACK 1346 esp + 0 PARENT LocalFrame LOCALFRAME
     40fbe5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40fbe9     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     40fbe9      5 INSTR BELONGTO 40fbe0 
@@ -14997,12 +14978,12 @@
     40fc8a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 ZZ mov     rbx, rsi 
     40fc8d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40fc8d      5 INSTR BELONGTO 40fc80 
-    40fc92     24 DATAREF STACK 1371 esp + 0 PARENT LocalFrame LOCALFRAME
+    40fc92     24 DATAREF STACK 1347 esp + 0 PARENT LocalFrame LOCALFRAME
     40fc92      4 INSTR BELONGTO 40fc80 
     40fc92      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-    40fc92      8 DATAREF STACK 1372 esp + 0 CHILDOF 1371 OFFSET 0 LOCALVAR var_18 
-    40fc92      8 DATAREF STACK 1373 esp + 8 CHILDOF 1371 OFFSET 8 LOCALVAR var_10 
-    40fc92      8 DATAREF STACK 1374 esp + 16 CHILDOF 1371 OFFSET 16 LOCALVAR var_8 
+    40fc92      8 DATAREF STACK 1348 esp + 0 CHILDOF 1347 OFFSET 0 LOCALVAR var_18 
+    40fc92      8 DATAREF STACK 1349 esp + 8 CHILDOF 1347 OFFSET 8 LOCALVAR var_10 
+    40fc92      8 DATAREF STACK 1350 esp + 16 CHILDOF 1347 OFFSET 16 LOCALVAR var_8 
     40fc92      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40fc96     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     40fc96      5 INSTR BELONGTO 40fc80 
@@ -15382,11 +15363,11 @@
     40ff05      5 INSTR BELONGTO 40ff00 
     40ff0a      3 INSTR BELONGTO 40ff00 
     40ff0a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 ZZ mov     rbx, rsi 
-    40ff0d     24 DATAREF STACK 1375 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ff0d     24 DATAREF STACK 1351 esp + 0 PARENT LocalFrame LOCALFRAME
     40ff0d      4 INSTR BELONGTO 40ff00 
     40ff0d      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-    40ff0d      8 DATAREF STACK 1376 esp + 8 CHILDOF 1375 OFFSET 8 LOCALVAR var_10 
-    40ff0d      8 DATAREF STACK 1377 esp + 16 CHILDOF 1375 OFFSET 16 LOCALVAR var_8 
+    40ff0d      8 DATAREF STACK 1352 esp + 8 CHILDOF 1351 OFFSET 8 LOCALVAR var_10 
+    40ff0d      8 DATAREF STACK 1353 esp + 16 CHILDOF 1351 OFFSET 16 LOCALVAR var_8 
     40ff0d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40ff11     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     40ff11      5 INSTR BELONGTO 40ff00 
@@ -15480,7 +15461,7 @@
     40ffa8     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40ffa8      4 INSTR BELONGTO 40ffa0 
     40ffa8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40ffa8      8 DATAREF STACK 1378 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ffa8      8 DATAREF STACK 1354 esp + 0 PARENT LocalFrame LOCALFRAME
     40ffa8      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40ffac     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     40ffac      5 INSTR BELONGTO 40ffa0 
@@ -15580,7 +15561,7 @@
     410035     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     410035      4 INSTR BELONGTO 410030 
     410035      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    410035      8 DATAREF STACK 1379 esp + 0 PARENT LocalFrame LOCALFRAME
+    410035      8 DATAREF STACK 1355 esp + 0 PARENT LocalFrame LOCALFRAME
     410035      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     410039     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     410039      5 INSTR BELONGTO 410030 
@@ -15676,7 +15657,7 @@
     4100c5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4100c5      4 INSTR BELONGTO 4100c0 
     4100c5      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    4100c5      8 DATAREF STACK 1380 esp + 0 PARENT LocalFrame LOCALFRAME
+    4100c5      8 DATAREF STACK 1356 esp + 0 PARENT LocalFrame LOCALFRAME
     4100c5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4100c9     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     4100c9      5 INSTR BELONGTO 4100c0 
@@ -15777,20 +15758,20 @@
     410167      5 INSTR BELONGTO 410150 
     41016c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
     41016c      5 INSTR BELONGTO 410150 
-    410171    104 DATAREF STACK 1381 esp + 0 PARENT LocalFrame LOCALFRAME
-    410171     16 DATAREF STACK 1383 esp + 8 CHILDOF 1381 OFFSET 8 LOCALVAR var_60 
-    410171     16 DATAREF STACK 1386 esp + 40 CHILDOF 1381 OFFSET 40 LOCALVAR var_40 
-    410171      4 DATAREF STACK 1382 esp + 0 CHILDOF 1381 OFFSET 0 OutArgsRegion OUTARGS
+    410171    104 DATAREF STACK 1357 esp + 0 PARENT LocalFrame LOCALFRAME
+    410171     16 DATAREF STACK 1359 esp + 8 CHILDOF 1357 OFFSET 8 LOCALVAR var_60 
+    410171     16 DATAREF STACK 1362 esp + 40 CHILDOF 1357 OFFSET 40 LOCALVAR var_40 
+    410171      4 DATAREF STACK 1358 esp + 0 CHILDOF 1357 OFFSET 0 OutArgsRegion OUTARGS
     410171      4 INSTR BELONGTO 410150 
     410171      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ sub     rsp, 68h 
-    410171      8 DATAREF STACK 1384 esp + 24 CHILDOF 1381 OFFSET 24 LOCALVAR var_50 
-    410171      8 DATAREF STACK 1385 esp + 32 CHILDOF 1381 OFFSET 32 LOCALVAR var_48 
-    410171      8 DATAREF STACK 1387 esp + 56 CHILDOF 1381 OFFSET 56 LOCALVAR var_30 
-    410171      8 DATAREF STACK 1388 esp + 64 CHILDOF 1381 OFFSET 64 LOCALVAR var_28 
-    410171      8 DATAREF STACK 1389 esp + 72 CHILDOF 1381 OFFSET 72 LOCALVAR var_20 
-    410171      8 DATAREF STACK 1390 esp + 80 CHILDOF 1381 OFFSET 80 LOCALVAR var_18 
-    410171      8 DATAREF STACK 1391 esp + 88 CHILDOF 1381 OFFSET 88 LOCALVAR var_10 
-    410171      8 DATAREF STACK 1392 esp + 96 CHILDOF 1381 OFFSET 96 LOCALVAR var_8 
+    410171      8 DATAREF STACK 1360 esp + 24 CHILDOF 1357 OFFSET 24 LOCALVAR var_50 
+    410171      8 DATAREF STACK 1361 esp + 32 CHILDOF 1357 OFFSET 32 LOCALVAR var_48 
+    410171      8 DATAREF STACK 1363 esp + 56 CHILDOF 1357 OFFSET 56 LOCALVAR var_30 
+    410171      8 DATAREF STACK 1364 esp + 64 CHILDOF 1357 OFFSET 64 LOCALVAR var_28 
+    410171      8 DATAREF STACK 1365 esp + 72 CHILDOF 1357 OFFSET 72 LOCALVAR var_20 
+    410171      8 DATAREF STACK 1366 esp + 80 CHILDOF 1357 OFFSET 80 LOCALVAR var_18 
+    410171      8 DATAREF STACK 1367 esp + 88 CHILDOF 1357 OFFSET 88 LOCALVAR var_10 
+    410171      8 DATAREF STACK 1368 esp + 96 CHILDOF 1357 OFFSET 96 LOCALVAR var_8 
     410171      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
     410175     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     410175      5 INSTR BELONGTO 410150 
@@ -16130,7 +16111,7 @@
     4103a3      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 R12 ZZ mov     rbp, rdi 
     4103a6      1 INSTR BELONGTO 4103a0 
     4103a6      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 ZZ push    rbx 
-    4103a6     24 DATAREF STACK 1393 esp + 0 PARENT LocalFrame LOCALFRAME
+    4103a6     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     4103a6      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4103a7     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     4103a7      5 INSTR BELONGTO 4103a0 
@@ -16825,9 +16806,9 @@
     411614     -3 INSTR LOCAL NoWarn push    rbx 
     411615      3 INSTR BELONGTO 411610 
     411615      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    411618     16 DATAREF STACK 1395 esp + 8 CHILDOF 1394 OFFSET 8 LOCALVAR var_20 
+    411618     16 DATAREF STACK 1370 esp + 8 CHILDOF 1369 OFFSET 8 LOCALVAR var_20 
     411618     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    411618     24 DATAREF STACK 1394 esp + 0 PARENT LocalFrame LOCALFRAME
+    411618     24 DATAREF STACK 1369 esp + 0 PARENT LocalFrame LOCALFRAME
     411618      4 INSTR BELONGTO 411610 
     411618      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
     411618      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -16954,8 +16935,8 @@
     411715      3 INSTR BELONGTO 411710 
     411715      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 ZZ mov     rbx, rsi 
     411718     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    411718     24 DATAREF STACK 1396 esp + 0 PARENT LocalFrame LOCALFRAME
-    411718     24 DATAREF STACK 1397 esp + 0 CHILDOF 1396 OFFSET 0 LOCALVAR var_28 
+    411718     24 DATAREF STACK 1371 esp + 0 PARENT LocalFrame LOCALFRAME
+    411718     24 DATAREF STACK 1372 esp + 0 CHILDOF 1371 OFFSET 0 LOCALVAR var_28 
     411718      4 INSTR BELONGTO 411710 
     411718      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
     411718      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -17122,7 +17103,7 @@
     4118b5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4118b5      4 INSTR BELONGTO 4118b0 
     4118b5      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    4118b5      8 DATAREF STACK 1398 esp + 0 PARENT LocalFrame LOCALFRAME
+    4118b5      8 DATAREF STACK 1373 esp + 0 PARENT LocalFrame LOCALFRAME
     4118b5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4118b9     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     4118b9      5 INSTR BELONGTO 4118b0 
@@ -17397,7 +17378,7 @@
     411dc2      3 INSTR BELONGTO 411dc0 
     411dc5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     411dc5      4 INSTR BELONGTO 411dc0 
-    411dc5      8 DATAREF STACK 1399 esp + 0 PARENT LocalFrame LOCALFRAME
+    411dc5      8 DATAREF STACK 1374 esp + 0 PARENT LocalFrame LOCALFRAME
     411dc5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     411dc9     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     411dc9      5 INSTR BELONGTO 411dc0 
@@ -17528,7 +17509,7 @@
     411f82      3 INSTR BELONGTO 411f80 
     411f85     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     411f85      4 INSTR BELONGTO 411f80 
-    411f85      8 DATAREF STACK 1400 esp + 0 PARENT LocalFrame LOCALFRAME
+    411f85      8 DATAREF STACK 1375 esp + 0 PARENT LocalFrame LOCALFRAME
     411f85      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     411f89     -1 INSTR LOCAL NoMetaUpdate call    sub_40F220 
     411f89      5 INSTR BELONGTO 411f80 
@@ -17591,17 +17572,17 @@
     41202a      5 INSTR BELONGTO 412010 
     41202f     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
     41202f      5 INSTR BELONGTO 412010 
-    412034    120 DATAREF STACK 1401 esp + 0 PARENT LocalFrame LOCALFRAME
-    412034     16 DATAREF STACK 1403 esp + 56 CHILDOF 1401 OFFSET 56 LOCALVAR var_40 
-    412034     48 DATAREF STACK 1402 esp + 0 CHILDOF 1401 OFFSET 0 OutArgsRegion OUTARGS
+    412034    120 DATAREF STACK 1376 esp + 0 PARENT LocalFrame LOCALFRAME
+    412034     16 DATAREF STACK 1378 esp + 56 CHILDOF 1376 OFFSET 56 LOCALVAR var_40 
+    412034     48 DATAREF STACK 1377 esp + 0 CHILDOF 1376 OFFSET 0 OutArgsRegion OUTARGS
     412034      4 INSTR BELONGTO 412010 
     412034      4 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ sub     rsp, 78h 
-    412034      8 DATAREF STACK 1404 esp + 72 CHILDOF 1401 OFFSET 72 LOCALVAR var_30 
-    412034      8 DATAREF STACK 1405 esp + 80 CHILDOF 1401 OFFSET 80 LOCALVAR var_28 
-    412034      8 DATAREF STACK 1406 esp + 88 CHILDOF 1401 OFFSET 88 LOCALVAR var_20 
-    412034      8 DATAREF STACK 1407 esp + 96 CHILDOF 1401 OFFSET 96 LOCALVAR var_18 
-    412034      8 DATAREF STACK 1408 esp + 104 CHILDOF 1401 OFFSET 104 LOCALVAR var_10 
-    412034      8 DATAREF STACK 1409 esp + 112 CHILDOF 1401 OFFSET 112 LOCALVAR var_8 
+    412034      8 DATAREF STACK 1379 esp + 72 CHILDOF 1376 OFFSET 72 LOCALVAR var_30 
+    412034      8 DATAREF STACK 1380 esp + 80 CHILDOF 1376 OFFSET 80 LOCALVAR var_28 
+    412034      8 DATAREF STACK 1381 esp + 88 CHILDOF 1376 OFFSET 88 LOCALVAR var_20 
+    412034      8 DATAREF STACK 1382 esp + 96 CHILDOF 1376 OFFSET 96 LOCALVAR var_18 
+    412034      8 DATAREF STACK 1383 esp + 104 CHILDOF 1376 OFFSET 104 LOCALVAR var_10 
+    412034      8 DATAREF STACK 1384 esp + 112 CHILDOF 1376 OFFSET 112 LOCALVAR var_8 
     412034      8 MEMORYHOLE STACK esp + 120 ReturnAddress 
     412038     -2 INSTR LOCAL n R13 ZZ  NumericDEFs mov     r13, rdx 
     412038      3 INSTR BELONGTO 412010 
@@ -17946,12 +17927,12 @@
     41228d      3 INSTR BELONGTO 412280 
     412290     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     412290      5 INSTR BELONGTO 412280 
-    412295     24 DATAREF STACK 1410 esp + 0 PARENT LocalFrame LOCALFRAME
+    412295     24 DATAREF STACK 1385 esp + 0 PARENT LocalFrame LOCALFRAME
     412295      4 INSTR BELONGTO 412280 
     412295      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-    412295      8 DATAREF STACK 1411 esp + 0 CHILDOF 1410 OFFSET 0 LOCALVAR var_18 
-    412295      8 DATAREF STACK 1412 esp + 8 CHILDOF 1410 OFFSET 8 LOCALVAR var_10 
-    412295      8 DATAREF STACK 1413 esp + 16 CHILDOF 1410 OFFSET 16 LOCALVAR var_8 
+    412295      8 DATAREF STACK 1386 esp + 0 CHILDOF 1385 OFFSET 0 LOCALVAR var_18 
+    412295      8 DATAREF STACK 1387 esp + 8 CHILDOF 1385 OFFSET 8 LOCALVAR var_10 
+    412295      8 DATAREF STACK 1388 esp + 16 CHILDOF 1385 OFFSET 16 LOCALVAR var_8 
     412295      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     412299     -1 INSTR LOCAL NoMetaUpdate call    sub_40E000 
     412299      5 INSTR BELONGTO 412280 
@@ -18072,7 +18053,7 @@
     41234b     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     41234b      4 INSTR BELONGTO 412340 
     41234b      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    41234b      8 DATAREF STACK 1414 esp + 0 PARENT LocalFrame LOCALFRAME
+    41234b      8 DATAREF STACK 1389 esp + 0 PARENT LocalFrame LOCALFRAME
     41234b      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     41234f     -1 INSTR LOCAL NoMetaUpdate call    sub_40E000 
     41234f      5 INSTR BELONGTO 412340 
@@ -18132,7 +18113,7 @@
     4123a0     43 FUNC GLOBAL sub_4123A0 FUNC_UNSAFE NOFP RET     4123ca 
     4123a0      4 INSTR BELONGTO 4123a0 
     4123a0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-    4123a0      8 DATAREF STACK 1415 esp + 0 PARENT LocalFrame LOCALFRAME
+    4123a0      8 DATAREF STACK 1390 esp + 0 PARENT LocalFrame LOCALFRAME
     4123a0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4123a4      7 INSTR BELONGTO 4123a0 
     4123a4      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_617F18 
@@ -18165,10 +18146,10 @@
     4123d4      1 INSTR BELONGTO 4123d0 
     4123d4      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
     4123d4     -3 INSTR LOCAL NoWarn push    rbx 
-    4123d5     16 DATAREF STACK 1418 esp + 24 CHILDOF 1416 OFFSET 24 LOCALVAR var_20 
+    4123d5     16 DATAREF STACK 1393 esp + 24 CHILDOF 1391 OFFSET 24 LOCALVAR var_20 
     4123d5     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-    4123d5     20 DATAREF STACK 1417 esp + 0 CHILDOF 1416 OFFSET 0 OutArgsRegion OUTARGS
-    4123d5     40 DATAREF STACK 1416 esp + 0 PARENT LocalFrame LOCALFRAME
+    4123d5     20 DATAREF STACK 1392 esp + 0 CHILDOF 1391 OFFSET 0 OutArgsRegion OUTARGS
+    4123d5     40 DATAREF STACK 1391 esp + 0 PARENT LocalFrame LOCALFRAME
     4123d5      4 INSTR BELONGTO 4123d0 
     4123d5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 28h 
     4123d5      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
@@ -18447,13 +18428,13 @@
     412637      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
     41263c      4 INSTR BELONGTO 412610 
     41263c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-    41263c     56 DATAREF STACK 1419 esp + 0 PARENT LocalFrame LOCALFRAME
-    41263c      8 DATAREF STACK 1420 esp + 8 CHILDOF 1419 OFFSET 8 LOCALVAR var_30 
-    41263c      8 DATAREF STACK 1421 esp + 16 CHILDOF 1419 OFFSET 16 LOCALVAR var_28 
-    41263c      8 DATAREF STACK 1422 esp + 24 CHILDOF 1419 OFFSET 24 LOCALVAR var_20 
-    41263c      8 DATAREF STACK 1423 esp + 32 CHILDOF 1419 OFFSET 32 LOCALVAR var_18 
-    41263c      8 DATAREF STACK 1424 esp + 40 CHILDOF 1419 OFFSET 40 LOCALVAR var_10 
-    41263c      8 DATAREF STACK 1425 esp + 48 CHILDOF 1419 OFFSET 48 LOCALVAR var_8 
+    41263c     56 DATAREF STACK 1394 esp + 0 PARENT LocalFrame LOCALFRAME
+    41263c      8 DATAREF STACK 1395 esp + 8 CHILDOF 1394 OFFSET 8 LOCALVAR var_30 
+    41263c      8 DATAREF STACK 1396 esp + 16 CHILDOF 1394 OFFSET 16 LOCALVAR var_28 
+    41263c      8 DATAREF STACK 1397 esp + 24 CHILDOF 1394 OFFSET 24 LOCALVAR var_20 
+    41263c      8 DATAREF STACK 1398 esp + 32 CHILDOF 1394 OFFSET 32 LOCALVAR var_18 
+    41263c      8 DATAREF STACK 1399 esp + 40 CHILDOF 1394 OFFSET 40 LOCALVAR var_10 
+    41263c      8 DATAREF STACK 1400 esp + 48 CHILDOF 1394 OFFSET 48 LOCALVAR var_8 
     41263c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     412640     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
     412640      3 INSTR BELONGTO 412610 
@@ -18530,7 +18511,7 @@
     4126b5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4126b5      4 INSTR BELONGTO 4126b0 
     4126b5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    4126b5      8 DATAREF STACK 1426 esp + 0 PARENT LocalFrame LOCALFRAME
+    4126b5      8 DATAREF STACK 1401 esp + 0 PARENT LocalFrame LOCALFRAME
     4126b5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4126b9      7 INSTR BELONGTO 4126b0 
     4126b9      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_616D78 
@@ -18565,7 +18546,7 @@
     4126e8     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     4126f5 
     4126e8      4 INSTR BELONGTO 4126e8 
     4126e8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    4126e8      8 DATAREF STACK 1427 esp + 0 PARENT LocalFrame LOCALFRAME
+    4126e8      8 DATAREF STACK 1402 esp + 0 PARENT LocalFrame LOCALFRAME
     4126e8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4126ec     -1 INSTR LOCAL NoMetaUpdate call    sub_409080 
     4126ec      5 INSTR BELONGTO 4126e8 
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 277ea2bb..d3b17db1 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
@@ -719,7 +719,7 @@
     401f9e      5 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, offset dirname; "/usr/share/locale" 
     401fa3      1 INSTR BELONGTO 401f90 
     401fa3      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
-    401fa3     24 DATAREF STACK 209 esp + 0 PARENT LocalFrame LOCALFRAME
+    401fa3     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     401fa3      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     401fa4     -1 INSTR LOCAL NoMetaUpdate call    _bindtextdomain 
     401fa4      5 INSTR BELONGTO 401f90 
@@ -801,12 +801,11 @@
     402017      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ pop     r12 
     402019      1 INSTR BELONGTO 401f90 
     402019      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ retn 
-    40201c      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
-    40201c      0 FUNC MMSAFENESS UNSAFE
+    40201c      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    40201c      0 FUNC MMSAFENESS SAFE
     40201c     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     40201c      2 INSTR BELONGTO 40201c 
     40201c     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     402045 
-    40201c      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     40201e      3 INSTR BELONGTO 40201c 
     40201e      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     402021      1 INSTR BELONGTO 40201c 
@@ -818,8 +817,11 @@
     402025      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     402029      1 INSTR BELONGTO 40201c 
     402029      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    402029     -3 INSTR LOCAL NoWarn push    rax 
+    40202a     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40202a      1 INSTR BELONGTO 40201c 
     40202a      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    40202a      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     40202b     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     40202b      7 INSTR BELONGTO 40201c 
     40202b      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -840,7 +842,7 @@
     402048     23 FUNC GLOBAL sub_402048 FUNC_SAFE NOFP RET     40205e 
     402048      4 INSTR BELONGTO 402048 
     402048      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-    402048      8 DATAREF STACK 210 esp + 0 PARENT LocalFrame LOCALFRAME
+    402048      8 DATAREF STACK 209 esp + 0 PARENT LocalFrame LOCALFRAME
     402048      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40204c      7 INSTR BELONGTO 402048 
     40204c      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -870,7 +872,7 @@
     402065     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     402065      4 INSTR BELONGTO 402060 
     402065      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-    402065      8 DATAREF STACK 211 esp + 0 PARENT LocalFrame LOCALFRAME
+    402065      8 DATAREF STACK 210 esp + 0 PARENT LocalFrame LOCALFRAME
     402065      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     402069     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_605288, 0 
     402069      7 INSTR BELONGTO 402060 
@@ -914,14 +916,14 @@
     4020c2      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     4020c3      1 INSTR BELONGTO 402060 
     4020c3      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    4020d0      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
+    4020d0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     4020d0      0 FUNC MMSAFENESS UNSAFE
     4020d0     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_604DE8, 0 
     4020d0     34 FUNC GLOBAL sub_4020D0 FUNC_UNSAFE USEFP RET     4020f1 
     4020d0      8 INSTR BELONGTO 4020d0 
-    4020d0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    4020d0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4020d8      1 INSTR BELONGTO 4020d0 
+    4020d8      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    4020d8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4020d9      3 INSTR BELONGTO 4020d0 
     4020dc     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4020F0 
     4020dc      2 INSTR BELONGTO 4020d0 
@@ -952,9 +954,9 @@
     402107     -3 INSTR LOCAL NoWarn push    rbx 
     402108      3 INSTR BELONGTO 402100 
     402108      3 INSTR DEADREGS  EFLAGS RDX RBX RDI ZZ mov     rbx, rsi 
-    40210b     16 DATAREF STACK 213 esp + 8 CHILDOF 212 OFFSET 8 LOCALVAR var_20 
+    40210b     16 DATAREF STACK 212 esp + 8 CHILDOF 211 OFFSET 8 LOCALVAR var_20 
     40210b     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    40210b     24 DATAREF STACK 212 esp + 0 PARENT LocalFrame LOCALFRAME
+    40210b     24 DATAREF STACK 211 esp + 0 PARENT LocalFrame LOCALFRAME
     40210b      4 INSTR BELONGTO 402100 
     40210b      4 INSTR DEADREGS  EFLAGS RDX RDI ZZ sub     rsp, 18h 
     40210b      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -1130,27 +1132,27 @@
     40221c      1 INSTR BELONGTO 402210 
     40221c      1 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ push    rbx 
     40221c     -3 INSTR LOCAL NoWarn push    rbx 
-    40221d     12 DATAREF STACK 215 esp + 8 CHILDOF 214 OFFSET 8 LOCALVAR var_B0 
-    40221d    136 DATAREF STACK 214 esp + 0 PARENT LocalFrame LOCALFRAME
-    40221d     16 DATAREF STACK 231 esp + 120 CHILDOF 214 OFFSET 120 LOCALVAR var_40 
+    40221d     12 DATAREF STACK 214 esp + 8 CHILDOF 213 OFFSET 8 LOCALVAR var_B0 
+    40221d    136 DATAREF STACK 213 esp + 0 PARENT LocalFrame LOCALFRAME
+    40221d     16 DATAREF STACK 230 esp + 120 CHILDOF 213 OFFSET 120 LOCALVAR var_40 
     40221d     48 MEMORYHOLE STACK esp + 136 CalleeSavedRegs 
-    40221d      4 DATAREF STACK 216 esp + 20 CHILDOF 214 OFFSET 20 LOCALVAR var_A4 
-    40221d      4 DATAREF STACK 223 esp + 72 CHILDOF 214 OFFSET 72 LOCALVAR var_70 
-    40221d      4 DATAREF STACK 224 esp + 76 CHILDOF 214 OFFSET 76 LOCALVAR var_6C 
-    40221d      4 DATAREF STACK 225 esp + 80 CHILDOF 214 OFFSET 80 LOCALVAR var_68 
-    40221d      4 DATAREF STACK 226 esp + 84 CHILDOF 214 OFFSET 84 LOCALVAR var_64 
+    40221d      4 DATAREF STACK 215 esp + 20 CHILDOF 213 OFFSET 20 LOCALVAR var_A4 
+    40221d      4 DATAREF STACK 222 esp + 72 CHILDOF 213 OFFSET 72 LOCALVAR var_70 
+    40221d      4 DATAREF STACK 223 esp + 76 CHILDOF 213 OFFSET 76 LOCALVAR var_6C 
+    40221d      4 DATAREF STACK 224 esp + 80 CHILDOF 213 OFFSET 80 LOCALVAR var_68 
+    40221d      4 DATAREF STACK 225 esp + 84 CHILDOF 213 OFFSET 84 LOCALVAR var_64 
     40221d      7 INSTR BELONGTO 402210 
     40221d      7 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ sub     rsp, 88h 
-    40221d      8 DATAREF STACK 217 esp + 24 CHILDOF 214 OFFSET 24 LOCALVAR var_A0 
-    40221d      8 DATAREF STACK 218 esp + 32 CHILDOF 214 OFFSET 32 LOCALVAR var_98 
-    40221d      8 DATAREF STACK 219 esp + 40 CHILDOF 214 OFFSET 40 LOCALVAR var_90 
-    40221d      8 DATAREF STACK 220 esp + 48 CHILDOF 214 OFFSET 48 LOCALVAR var_88 
-    40221d      8 DATAREF STACK 221 esp + 56 CHILDOF 214 OFFSET 56 LOCALVAR var_80 
-    40221d      8 DATAREF STACK 222 esp + 64 CHILDOF 214 OFFSET 64 LOCALVAR var_78 
-    40221d      8 DATAREF STACK 227 esp + 88 CHILDOF 214 OFFSET 88 LOCALVAR var_60 
-    40221d      8 DATAREF STACK 228 esp + 96 CHILDOF 214 OFFSET 96 LOCALVAR var_58 
-    40221d      8 DATAREF STACK 229 esp + 104 CHILDOF 214 OFFSET 104 LOCALVAR var_50 
-    40221d      8 DATAREF STACK 230 esp + 112 CHILDOF 214 OFFSET 112 LOCALVAR var_48 
+    40221d      8 DATAREF STACK 216 esp + 24 CHILDOF 213 OFFSET 24 LOCALVAR var_A0 
+    40221d      8 DATAREF STACK 217 esp + 32 CHILDOF 213 OFFSET 32 LOCALVAR var_98 
+    40221d      8 DATAREF STACK 218 esp + 40 CHILDOF 213 OFFSET 40 LOCALVAR var_90 
+    40221d      8 DATAREF STACK 219 esp + 48 CHILDOF 213 OFFSET 48 LOCALVAR var_88 
+    40221d      8 DATAREF STACK 220 esp + 56 CHILDOF 213 OFFSET 56 LOCALVAR var_80 
+    40221d      8 DATAREF STACK 221 esp + 64 CHILDOF 213 OFFSET 64 LOCALVAR var_78 
+    40221d      8 DATAREF STACK 226 esp + 88 CHILDOF 213 OFFSET 88 LOCALVAR var_60 
+    40221d      8 DATAREF STACK 227 esp + 96 CHILDOF 213 OFFSET 96 LOCALVAR var_58 
+    40221d      8 DATAREF STACK 228 esp + 104 CHILDOF 213 OFFSET 104 LOCALVAR var_50 
+    40221d      8 DATAREF STACK 229 esp + 112 CHILDOF 213 OFFSET 112 LOCALVAR var_48 
     40221d      8 MEMORYHOLE STACK esp + 184 ReturnAddress 
     402224     -1 INSTR LOCAL NoMetaUpdate call    _gconf_client_get_default 
     402224      5 INSTR BELONGTO 402210 
@@ -1831,6 +1833,7 @@
     402680      5 FUNC GLOBAL sub_402680 FUNC_UNSAFE NOFP RET     402684 
     402680      5 INSTR BELONGTO 402680 
     402680      5 INSTR DEADREGS  EFLAGS ZZ jmp     sub_402210 
+    402680      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     402690     -1 INSTR LOCAL NoMetaUpdate jmp     sub_402210 
     4026a0     -1 INSTR LOCAL NoMetaUpdate jmp     sub_402210 
     4026b0     -1 INSTR LOCAL NoMetaUpdate jmp     sub_402210 
@@ -2283,8 +2286,8 @@
     4032c5     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_403247 
     4032d0      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
     4032d0      0 FUNC MMSAFENESS SAFE
-    4032d0     32 DATAREF STACK 233 esp + 0 CHILDOF 232 OFFSET 0 OutArgsRegion OUTARGS
-    4032d0     40 DATAREF STACK 232 esp + 0 PARENT LocalFrame LOCALFRAME
+    4032d0     32 DATAREF STACK 232 esp + 0 CHILDOF 231 OFFSET 0 OutArgsRegion OUTARGS
+    4032d0     40 DATAREF STACK 231 esp + 0 PARENT LocalFrame LOCALFRAME
     4032d0      4 INSTR BELONGTO 4032d0 
     4032d0      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 ZZ sub     rsp, 28h 
     4032d0     87 FUNC GLOBAL sub_4032D0 FUNC_UNSAFE NOFP RET     403326 
@@ -2356,7 +2359,7 @@
     403335     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     403335      4 INSTR BELONGTO 403330 
     403335      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    403335      8 DATAREF STACK 234 esp + 0 PARENT LocalFrame LOCALFRAME
+    403335      8 DATAREF STACK 233 esp + 0 PARENT LocalFrame LOCALFRAME
     403335      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     403339     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_get_type 
     403339      5 INSTR BELONGTO 403330 
@@ -2433,7 +2436,7 @@
     403395     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     403395      4 INSTR BELONGTO 403390 
     403395      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    403395      8 DATAREF STACK 235 esp + 0 PARENT LocalFrame LOCALFRAME
+    403395      8 DATAREF STACK 234 esp + 0 PARENT LocalFrame LOCALFRAME
     403395      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     403399     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_get_type 
     403399      5 INSTR BELONGTO 403390 
@@ -2510,7 +2513,7 @@
     4033f5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4033f5      4 INSTR BELONGTO 4033f0 
     4033f5      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    4033f5      8 DATAREF STACK 236 esp + 0 PARENT LocalFrame LOCALFRAME
+    4033f5      8 DATAREF STACK 235 esp + 0 PARENT LocalFrame LOCALFRAME
     4033f5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4033f9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_toggle_button_get_type 
     4033f9      5 INSTR BELONGTO 4033f0 
@@ -2805,7 +2808,7 @@
     40359c     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40359c      4 INSTR BELONGTO 403590 
     40359c      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    40359c      8 DATAREF STACK 237 esp + 0 PARENT LocalFrame LOCALFRAME
+    40359c      8 DATAREF STACK 236 esp + 0 PARENT LocalFrame LOCALFRAME
     40359c      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4035a0     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4035B5 
     4035a0      2 INSTR BELONGTO 403590 
@@ -2895,13 +2898,13 @@
     403627      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
     40362c      4 INSTR BELONGTO 403600 
     40362c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-    40362c     56 DATAREF STACK 238 esp + 0 PARENT LocalFrame LOCALFRAME
-    40362c      8 DATAREF STACK 239 esp + 8 CHILDOF 238 OFFSET 8 LOCALVAR var_30 
-    40362c      8 DATAREF STACK 240 esp + 16 CHILDOF 238 OFFSET 16 LOCALVAR var_28 
-    40362c      8 DATAREF STACK 241 esp + 24 CHILDOF 238 OFFSET 24 LOCALVAR var_20 
-    40362c      8 DATAREF STACK 242 esp + 32 CHILDOF 238 OFFSET 32 LOCALVAR var_18 
-    40362c      8 DATAREF STACK 243 esp + 40 CHILDOF 238 OFFSET 40 LOCALVAR var_10 
-    40362c      8 DATAREF STACK 244 esp + 48 CHILDOF 238 OFFSET 48 LOCALVAR var_8 
+    40362c     56 DATAREF STACK 237 esp + 0 PARENT LocalFrame LOCALFRAME
+    40362c      8 DATAREF STACK 238 esp + 8 CHILDOF 237 OFFSET 8 LOCALVAR var_30 
+    40362c      8 DATAREF STACK 239 esp + 16 CHILDOF 237 OFFSET 16 LOCALVAR var_28 
+    40362c      8 DATAREF STACK 240 esp + 24 CHILDOF 237 OFFSET 24 LOCALVAR var_20 
+    40362c      8 DATAREF STACK 241 esp + 32 CHILDOF 237 OFFSET 32 LOCALVAR var_18 
+    40362c      8 DATAREF STACK 242 esp + 40 CHILDOF 237 OFFSET 40 LOCALVAR var_10 
+    40362c      8 DATAREF STACK 243 esp + 48 CHILDOF 237 OFFSET 48 LOCALVAR var_8 
     40362c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     403630     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
     403630      3 INSTR BELONGTO 403600 
@@ -2978,7 +2981,7 @@
     4036a5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4036a5      4 INSTR BELONGTO 4036a0 
     4036a5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    4036a5      8 DATAREF STACK 245 esp + 0 PARENT LocalFrame LOCALFRAME
+    4036a5      8 DATAREF STACK 244 esp + 0 PARENT LocalFrame LOCALFRAME
     4036a5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4036a9      7 INSTR BELONGTO 4036a0 
     4036a9      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_604DC8 
@@ -3013,7 +3016,7 @@
     4036d8     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     4036e5 
     4036d8      4 INSTR BELONGTO 4036d8 
     4036d8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    4036d8      8 DATAREF STACK 246 esp + 0 PARENT LocalFrame LOCALFRAME
+    4036d8      8 DATAREF STACK 245 esp + 0 PARENT LocalFrame LOCALFRAME
     4036d8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4036dc     -1 INSTR LOCAL NoMetaUpdate call    sub_402060 
     4036dc      5 INSTR BELONGTO 4036d8 
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 64f223b8..6e0c3cd2 100644
--- a/tests/commit/trimmed-sorted-save-gnome-font-viewer.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-font-viewer.psexe.annot
@@ -2398,12 +2398,11 @@
     4036a2      5 INSTR DEADREGS  EFLAGS RAX RBX R12 R14 R15 ZZ call    sub_403A20 
     4036a7     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40338F 
     4036a7      5 INSTR BELONGTO 402d50 
-    4036ac      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
-    4036ac      0 FUNC MMSAFENESS UNSAFE
+    4036ac      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    4036ac      0 FUNC MMSAFENESS SAFE
     4036ac     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     4036ac      2 INSTR BELONGTO 4036ac 
     4036ac     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     4036d5 
-    4036ac      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     4036ae      3 INSTR BELONGTO 4036ac 
     4036ae      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     4036b1      1 INSTR BELONGTO 4036ac 
@@ -2415,8 +2414,11 @@
     4036b5      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     4036b9      1 INSTR BELONGTO 4036ac 
     4036b9      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    4036b9     -3 INSTR LOCAL NoWarn push    rax 
+    4036ba     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     4036ba      1 INSTR BELONGTO 4036ac 
     4036ba      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    4036ba      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     4036bb     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     4036bb      7 INSTR BELONGTO 4036ac 
     4036bb      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -2511,14 +2513,14 @@
     403752      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     403753      1 INSTR BELONGTO 4036f0 
     403753      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    403760      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
+    403760      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     403760      0 FUNC MMSAFENESS UNSAFE
     403760     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_604DB8, 0 
     403760     34 FUNC GLOBAL sub_403760 FUNC_UNSAFE USEFP RET     403781 
     403760      8 INSTR BELONGTO 403760 
-    403760      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    403760      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     403768      1 INSTR BELONGTO 403760 
+    403768      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    403768      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     403769      3 INSTR BELONGTO 403760 
     40376c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_403780 
     40376c      2 INSTR BELONGTO 403760 
diff --git a/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot
index db7c6f4a..81b634bb 100644
--- a/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot
@@ -1795,7 +1795,7 @@
     404f93      3 INSTR DEADREGS  EFLAGS R12 ZZ mov     rbp, rsi 
     404f96      1 INSTR BELONGTO 404f90 
     404f96      1 INSTR DEADREGS  EFLAGS R12 ZZ push    rbx 
-    404f96     24 DATAREF STACK 494 esp + 0 PARENT LocalFrame LOCALFRAME
+    404f96     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     404f96      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     404f97     -1 INSTR LOCAL MetadataUnused mov     ebx, edi 
     404f97      2 INSTR BELONGTO 404f90 
@@ -1859,12 +1859,11 @@
     404ff9     -1 INSTR LOCAL NoMetaUpdate jmp     _g_application_run 
     404ff9      5 INSTR BELONGTO 404f90 
     404ff9      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 ZZ jmp     _g_application_run 
-    405000      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
-    405000      0 FUNC MMSAFENESS UNSAFE
+    405000      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    405000      0 FUNC MMSAFENESS SAFE
     405000     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     405000      2 INSTR BELONGTO 405000 
     405000     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     405029 
-    405000      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     405002      3 INSTR BELONGTO 405000 
     405002      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     405005      1 INSTR BELONGTO 405000 
@@ -1876,8 +1875,11 @@
     405009      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     40500d      1 INSTR BELONGTO 405000 
     40500d      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    40500d     -3 INSTR LOCAL NoWarn push    rax 
+    40500e     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40500e      1 INSTR BELONGTO 405000 
     40500e      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    40500e      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     40500f     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     40500f      7 INSTR BELONGTO 405000 
     40500f      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -1898,7 +1900,7 @@
     40502c     23 FUNC GLOBAL sub_40502C FUNC_SAFE NOFP RET     405042 
     40502c      4 INSTR BELONGTO 40502c 
     40502c      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-    40502c      8 DATAREF STACK 495 esp + 0 PARENT LocalFrame LOCALFRAME
+    40502c      8 DATAREF STACK 494 esp + 0 PARENT LocalFrame LOCALFRAME
     40502c      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     405030      7 INSTR BELONGTO 40502c 
     405030      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -1928,7 +1930,7 @@
     405055     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     405055      4 INSTR BELONGTO 405050 
     405055      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-    405055      8 DATAREF STACK 496 esp + 0 PARENT LocalFrame LOCALFRAME
+    405055      8 DATAREF STACK 495 esp + 0 PARENT LocalFrame LOCALFRAME
     405055      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     405059     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_60C6D8, 0 
     405059      7 INSTR BELONGTO 405050 
@@ -1972,14 +1974,14 @@
     4050b2      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     4050b3      1 INSTR BELONGTO 405050 
     4050b3      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    4050c0      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
+    4050c0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     4050c0      0 FUNC MMSAFENESS UNSAFE
     4050c0     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_60BDB8, 0 
     4050c0     34 FUNC GLOBAL sub_4050C0 FUNC_UNSAFE USEFP RET     4050e1 
     4050c0      8 INSTR BELONGTO 4050c0 
-    4050c0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    4050c0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4050c8      1 INSTR BELONGTO 4050c0 
+    4050c8      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    4050c8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4050c9      3 INSTR BELONGTO 4050c0 
     4050cc     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4050E0 
     4050cc      2 INSTR BELONGTO 4050c0 
@@ -2086,13 +2088,13 @@
     4051a7     -2 INSTR LOCAL n EDI 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 497 esp + 0 PARENT LocalFrame LOCALFRAME
+    4051ac     40 DATAREF STACK 496 esp + 0 PARENT LocalFrame LOCALFRAME
     4051ac      4 INSTR BELONGTO 405190 
     4051ac      4 INSTR DEADREGS  EFLAGS R12 R13 ZZ sub     rsp, 28h 
-    4051ac      8 DATAREF STACK 498 esp + 8 CHILDOF 497 OFFSET 8 LOCALVAR var_20 
-    4051ac      8 DATAREF STACK 499 esp + 16 CHILDOF 497 OFFSET 16 LOCALVAR var_18 
-    4051ac      8 DATAREF STACK 500 esp + 24 CHILDOF 497 OFFSET 24 LOCALVAR var_10 
-    4051ac      8 DATAREF STACK 501 esp + 32 CHILDOF 497 OFFSET 32 LOCALVAR var_8 
+    4051ac      8 DATAREF STACK 497 esp + 8 CHILDOF 496 OFFSET 8 LOCALVAR var_20 
+    4051ac      8 DATAREF STACK 498 esp + 16 CHILDOF 496 OFFSET 16 LOCALVAR var_18 
+    4051ac      8 DATAREF STACK 499 esp + 24 CHILDOF 496 OFFSET 24 LOCALVAR var_10 
+    4051ac      8 DATAREF STACK 500 esp + 32 CHILDOF 496 OFFSET 32 LOCALVAR var_8 
     4051ac      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     4051b0      3 INSTR BELONGTO 405190 
     4051b0      3 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     rbp, rsi 
@@ -2172,10 +2174,10 @@
     405231     -3 INSTR LOCAL NoWarn push    rbx 
     405232      3 INSTR BELONGTO 405230 
     405232      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    405235     16 DATAREF STACK 504 esp + 24 CHILDOF 502 OFFSET 24 LOCALVAR var_20 
+    405235     16 DATAREF STACK 503 esp + 24 CHILDOF 501 OFFSET 24 LOCALVAR var_20 
     405235     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-    405235     20 DATAREF STACK 503 esp + 0 CHILDOF 502 OFFSET 0 OutArgsRegion OUTARGS
-    405235     40 DATAREF STACK 502 esp + 0 PARENT LocalFrame LOCALFRAME
+    405235     20 DATAREF STACK 502 esp + 0 CHILDOF 501 OFFSET 0 OutArgsRegion OUTARGS
+    405235     40 DATAREF STACK 501 esp + 0 PARENT LocalFrame LOCALFRAME
     405235      4 INSTR BELONGTO 405230 
     405235      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 28h 
     405235      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
@@ -2337,13 +2339,13 @@
     405490      1 INSTR BELONGTO 405490 
     405490      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     405490     -3 INSTR LOCAL NoWarn push    rbx 
-    405491     16 DATAREF STACK 509 esp + 32 CHILDOF 505 OFFSET 32 LOCALVAR var_18 
-    405491     48 DATAREF STACK 505 esp + 0 PARENT LocalFrame LOCALFRAME
-    405491      4 DATAREF STACK 506 esp + 0 CHILDOF 505 OFFSET 0 OutArgsRegion OUTARGS
+    405491     16 DATAREF STACK 508 esp + 32 CHILDOF 504 OFFSET 32 LOCALVAR var_18 
+    405491     48 DATAREF STACK 504 esp + 0 PARENT LocalFrame LOCALFRAME
+    405491      4 DATAREF STACK 505 esp + 0 CHILDOF 504 OFFSET 0 OutArgsRegion OUTARGS
     405491      4 INSTR BELONGTO 405490 
     405491      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 30h 
-    405491      8 DATAREF STACK 507 esp + 16 CHILDOF 505 OFFSET 16 LOCALVAR var_28 
-    405491      8 DATAREF STACK 508 esp + 24 CHILDOF 505 OFFSET 24 LOCALVAR var_20 
+    405491      8 DATAREF STACK 506 esp + 16 CHILDOF 504 OFFSET 16 LOCALVAR var_28 
+    405491      8 DATAREF STACK 507 esp + 24 CHILDOF 504 OFFSET 24 LOCALVAR var_20 
     405491      8 MEMORYHOLE STACK esp + 48 CalleeSavedRegs 
     405491      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     405495     -1 INSTR LOCAL NoMetaUpdate mfence 
@@ -2450,7 +2452,7 @@
     405558     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     405558      4 INSTR BELONGTO 405550 
     405558      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    405558      8 DATAREF STACK 510 esp + 0 PARENT LocalFrame LOCALFRAME
+    405558      8 DATAREF STACK 509 esp + 0 PARENT LocalFrame LOCALFRAME
     405558      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40555c     -1 INSTR LOCAL NoMetaUpdate call    sub_405490 
     40555c      5 INSTR BELONGTO 405550 
@@ -2565,7 +2567,7 @@
     4056e2      3 INSTR BELONGTO 4056e0 
     4056e5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4056e5      4 INSTR BELONGTO 4056e0 
-    4056e5      8 DATAREF STACK 511 esp + 0 PARENT LocalFrame LOCALFRAME
+    4056e5      8 DATAREF STACK 510 esp + 0 PARENT LocalFrame LOCALFRAME
     4056e5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4056e9     -1 INSTR LOCAL NoMetaUpdate call    sub_405490 
     4056e9      5 INSTR BELONGTO 4056e0 
@@ -2649,13 +2651,13 @@
     40581d      5 INSTR BELONGTO 405810 
     405822     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     405822      5 INSTR BELONGTO 405810 
-    405827     40 DATAREF STACK 512 esp + 0 PARENT LocalFrame LOCALFRAME
+    405827     40 DATAREF STACK 511 esp + 0 PARENT LocalFrame LOCALFRAME
     405827      4 INSTR BELONGTO 405810 
     405827      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 28h 
-    405827      8 DATAREF STACK 513 esp + 8 CHILDOF 512 OFFSET 8 LOCALVAR var_20 
-    405827      8 DATAREF STACK 514 esp + 16 CHILDOF 512 OFFSET 16 LOCALVAR var_18 
-    405827      8 DATAREF STACK 515 esp + 24 CHILDOF 512 OFFSET 24 LOCALVAR var_10 
-    405827      8 DATAREF STACK 516 esp + 32 CHILDOF 512 OFFSET 32 LOCALVAR var_8 
+    405827      8 DATAREF STACK 512 esp + 8 CHILDOF 511 OFFSET 8 LOCALVAR var_20 
+    405827      8 DATAREF STACK 513 esp + 16 CHILDOF 511 OFFSET 16 LOCALVAR var_18 
+    405827      8 DATAREF STACK 514 esp + 24 CHILDOF 511 OFFSET 24 LOCALVAR var_10 
+    405827      8 DATAREF STACK 515 esp + 32 CHILDOF 511 OFFSET 32 LOCALVAR var_8 
     405827      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40582b     -1 INSTR LOCAL NoMetaUpdate call    sub_405490 
     40582b      5 INSTR BELONGTO 405810 
@@ -2837,13 +2839,13 @@
     405acd      5 INSTR BELONGTO 405ac0 
     405ad2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     405ad2      5 INSTR BELONGTO 405ac0 
-    405ad7     40 DATAREF STACK 517 esp + 0 PARENT LocalFrame LOCALFRAME
+    405ad7     40 DATAREF STACK 516 esp + 0 PARENT LocalFrame LOCALFRAME
     405ad7      4 INSTR BELONGTO 405ac0 
     405ad7      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 28h 
-    405ad7      8 DATAREF STACK 518 esp + 8 CHILDOF 517 OFFSET 8 LOCALVAR var_20 
-    405ad7      8 DATAREF STACK 519 esp + 16 CHILDOF 517 OFFSET 16 LOCALVAR var_18 
-    405ad7      8 DATAREF STACK 520 esp + 24 CHILDOF 517 OFFSET 24 LOCALVAR var_10 
-    405ad7      8 DATAREF STACK 521 esp + 32 CHILDOF 517 OFFSET 32 LOCALVAR var_8 
+    405ad7      8 DATAREF STACK 517 esp + 8 CHILDOF 516 OFFSET 8 LOCALVAR var_20 
+    405ad7      8 DATAREF STACK 518 esp + 16 CHILDOF 516 OFFSET 16 LOCALVAR var_18 
+    405ad7      8 DATAREF STACK 519 esp + 24 CHILDOF 516 OFFSET 24 LOCALVAR var_10 
+    405ad7      8 DATAREF STACK 520 esp + 32 CHILDOF 516 OFFSET 32 LOCALVAR var_8 
     405ad7      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     405adb      3 INSTR BELONGTO 405ac0 
     405adb      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 R12 R13 ZZ mov     r13, rdi 
@@ -2980,9 +2982,9 @@
     405ba9      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
     405bb0      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
     405bb0      0 FUNC MMSAFENESS SAFE
-    405bb0     16 DATAREF STACK 524 esp + 8 CHILDOF 522 OFFSET 8 LOCALVAR var_10 
-    405bb0     24 DATAREF STACK 522 esp + 0 PARENT LocalFrame LOCALFRAME
-    405bb0      4 DATAREF STACK 523 esp + 0 CHILDOF 522 OFFSET 0 OutArgsRegion OUTARGS
+    405bb0     16 DATAREF STACK 523 esp + 8 CHILDOF 521 OFFSET 8 LOCALVAR var_10 
+    405bb0     24 DATAREF STACK 521 esp + 0 PARENT LocalFrame LOCALFRAME
+    405bb0      4 DATAREF STACK 522 esp + 0 CHILDOF 521 OFFSET 0 OutArgsRegion OUTARGS
     405bb0      4 INSTR BELONGTO 405bb0 
     405bb0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
     405bb0     67 FUNC GLOBAL sub_405BB0 FUNC_UNSAFE NOFP RET     405bf2 
@@ -3063,7 +3065,7 @@
     405c2d     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     405c2d      4 INSTR BELONGTO 405c20 
     405c2d      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    405c2d      8 DATAREF STACK 525 esp + 0 PARENT LocalFrame LOCALFRAME
+    405c2d      8 DATAREF STACK 524 esp + 0 PARENT LocalFrame LOCALFRAME
     405c2d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     405c31     -1 INSTR LOCAL NoMetaUpdate call    _getenv 
     405c31      5 INSTR BELONGTO 405c20 
@@ -3135,14 +3137,14 @@
     405ca7      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 R13 R14 ZZ mov     r14, rsi 
     405caa     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_18], r12 
     405caa      5 INSTR BELONGTO 405c90 
-    405caf     40 DATAREF STACK 526 esp + 0 PARENT LocalFrame LOCALFRAME
+    405caf     40 DATAREF STACK 525 esp + 0 PARENT LocalFrame LOCALFRAME
     405caf      4 INSTR BELONGTO 405c90 
     405caf      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 28h 
-    405caf      8 DATAREF STACK 527 esp + 0 CHILDOF 526 OFFSET 0 LOCALVAR var_28 
-    405caf      8 DATAREF STACK 528 esp + 8 CHILDOF 526 OFFSET 8 LOCALVAR var_20 
-    405caf      8 DATAREF STACK 529 esp + 16 CHILDOF 526 OFFSET 16 LOCALVAR var_18 
-    405caf      8 DATAREF STACK 530 esp + 24 CHILDOF 526 OFFSET 24 LOCALVAR var_10 
-    405caf      8 DATAREF STACK 531 esp + 32 CHILDOF 526 OFFSET 32 LOCALVAR var_8 
+    405caf      8 DATAREF STACK 526 esp + 0 CHILDOF 525 OFFSET 0 LOCALVAR var_28 
+    405caf      8 DATAREF STACK 527 esp + 8 CHILDOF 525 OFFSET 8 LOCALVAR var_20 
+    405caf      8 DATAREF STACK 528 esp + 16 CHILDOF 525 OFFSET 16 LOCALVAR var_18 
+    405caf      8 DATAREF STACK 529 esp + 24 CHILDOF 525 OFFSET 24 LOCALVAR var_10 
+    405caf      8 DATAREF STACK 530 esp + 32 CHILDOF 525 OFFSET 32 LOCALVAR var_8 
     405caf      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     405cb3     -1 INSTR LOCAL NoMetaUpdate call    sub_405490 
     405cb3      5 INSTR BELONGTO 405c90 
@@ -3335,12 +3337,12 @@
     405deb     -3 INSTR LOCAL NoWarn push    rbx 
     405dec      3 INSTR BELONGTO 405de0 
     405dec      3 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI RDI R8 R9 R10 R11 R13 ZZ mov     rbx, rdx 
-    405def     16 DATAREF STACK 534 esp + 8 CHILDOF 532 OFFSET 8 LOCALVAR var_30 
-    405def     24 DATAREF STACK 532 esp + 0 PARENT LocalFrame LOCALFRAME
+    405def     16 DATAREF STACK 533 esp + 8 CHILDOF 531 OFFSET 8 LOCALVAR var_30 
+    405def     24 DATAREF STACK 531 esp + 0 PARENT LocalFrame LOCALFRAME
     405def     32 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
     405def      4 INSTR BELONGTO 405de0 
     405def      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R13 ZZ sub     rsp, 18h 
-    405def      8 DATAREF STACK 533 esp + 0 CHILDOF 532 OFFSET 0 LOCALVAR var_38 
+    405def      8 DATAREF STACK 532 esp + 0 CHILDOF 531 OFFSET 0 LOCALVAR var_38 
     405def      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     405df3      9 INSTR BELONGTO 405de0 
     405df3      9 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R13 ZZ mov     [rsp+38h+var_30], 0 
@@ -3548,14 +3550,14 @@
     405f19     -3 INSTR LOCAL NoWarn push    rbx 
     405f1a      3 INSTR BELONGTO 405f10 
     405f1a      3 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI RDI R8 R9 R10 R11 ZZ mov     rbx, rdx 
-    405f1d    160 DATAREF STACK 535 esp + 0 PARENT LocalFrame LOCALFRAME
+    405f1d    160 DATAREF STACK 534 esp + 0 PARENT LocalFrame LOCALFRAME
     405f1d     24 MEMORYHOLE STACK esp + 160 CalleeSavedRegs 
     405f1d      7 INSTR BELONGTO 405f10 
     405f1d      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 0A0h 
-    405f1d      8 DATAREF STACK 536 esp + 128 CHILDOF 535 OFFSET 128 LOCALVAR var_38 
-    405f1d      8 DATAREF STACK 537 esp + 136 CHILDOF 535 OFFSET 136 LOCALVAR var_30 
-    405f1d      8 DATAREF STACK 538 esp + 144 CHILDOF 535 OFFSET 144 LOCALVAR var_28 
-    405f1d      8 DATAREF STACK 539 esp + 152 CHILDOF 535 OFFSET 152 LOCALVAR var_20 
+    405f1d      8 DATAREF STACK 535 esp + 128 CHILDOF 534 OFFSET 128 LOCALVAR var_38 
+    405f1d      8 DATAREF STACK 536 esp + 136 CHILDOF 534 OFFSET 136 LOCALVAR var_30 
+    405f1d      8 DATAREF STACK 537 esp + 144 CHILDOF 534 OFFSET 144 LOCALVAR var_28 
+    405f1d      8 DATAREF STACK 538 esp + 152 CHILDOF 534 OFFSET 152 LOCALVAR var_20 
     405f1d      8 MEMORYHOLE STACK esp + 184 ReturnAddress 
     405f24     -1 INSTR LOCAL NoMetaUpdate call    sub_405490 
     405f24      5 INSTR BELONGTO 405f10 
@@ -3771,14 +3773,14 @@
     406093     -3 INSTR LOCAL NoWarn push    rbx 
     406094      3 INSTR BELONGTO 406080 
     406094      3 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI RDI R8 R9 R10 R11 ZZ mov     rbx, rdx 
-    406097    160 DATAREF STACK 540 esp + 0 PARENT LocalFrame LOCALFRAME
+    406097    160 DATAREF STACK 539 esp + 0 PARENT LocalFrame LOCALFRAME
     406097     40 MEMORYHOLE STACK esp + 160 CalleeSavedRegs 
     406097      7 INSTR BELONGTO 406080 
     406097      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 0A0h 
-    406097      8 DATAREF STACK 541 esp + 128 CHILDOF 540 OFFSET 128 LOCALVAR var_48 
-    406097      8 DATAREF STACK 542 esp + 136 CHILDOF 540 OFFSET 136 LOCALVAR var_40 
-    406097      8 DATAREF STACK 543 esp + 144 CHILDOF 540 OFFSET 144 LOCALVAR var_38 
-    406097      8 DATAREF STACK 544 esp + 152 CHILDOF 540 OFFSET 152 LOCALVAR var_30 
+    406097      8 DATAREF STACK 540 esp + 128 CHILDOF 539 OFFSET 128 LOCALVAR var_48 
+    406097      8 DATAREF STACK 541 esp + 136 CHILDOF 539 OFFSET 136 LOCALVAR var_40 
+    406097      8 DATAREF STACK 542 esp + 144 CHILDOF 539 OFFSET 144 LOCALVAR var_38 
+    406097      8 DATAREF STACK 543 esp + 152 CHILDOF 539 OFFSET 152 LOCALVAR var_30 
     406097      8 MEMORYHOLE STACK esp + 200 ReturnAddress 
     40609e     -1 INSTR LOCAL NoMetaUpdate call    sub_405490 
     40609e      5 INSTR BELONGTO 406080 
@@ -4130,14 +4132,14 @@
     4064cd     -3 INSTR LOCAL NoWarn push    rbx 
     4064ce      3 INSTR BELONGTO 4064c0 
     4064ce      3 INSTR DEADREGS  EFLAGS RBX R12 R14 ZZ mov     rbx, r8 
-    4064d1    160 DATAREF STACK 545 esp + 0 PARENT LocalFrame LOCALFRAME
+    4064d1    160 DATAREF STACK 544 esp + 0 PARENT LocalFrame LOCALFRAME
     4064d1     40 MEMORYHOLE STACK esp + 160 CalleeSavedRegs 
     4064d1      7 INSTR BELONGTO 4064c0 
     4064d1      7 INSTR DEADREGS  EFLAGS R12 R14 ZZ sub     rsp, 0A0h 
-    4064d1      8 DATAREF STACK 546 esp + 128 CHILDOF 545 OFFSET 128 LOCALVAR var_48 
-    4064d1      8 DATAREF STACK 547 esp + 136 CHILDOF 545 OFFSET 136 LOCALVAR var_40 
-    4064d1      8 DATAREF STACK 548 esp + 144 CHILDOF 545 OFFSET 144 LOCALVAR var_38 
-    4064d1      8 DATAREF STACK 549 esp + 152 CHILDOF 545 OFFSET 152 LOCALVAR var_30 
+    4064d1      8 DATAREF STACK 545 esp + 128 CHILDOF 544 OFFSET 128 LOCALVAR var_48 
+    4064d1      8 DATAREF STACK 546 esp + 136 CHILDOF 544 OFFSET 136 LOCALVAR var_40 
+    4064d1      8 DATAREF STACK 547 esp + 144 CHILDOF 544 OFFSET 144 LOCALVAR var_38 
+    4064d1      8 DATAREF STACK 548 esp + 152 CHILDOF 544 OFFSET 152 LOCALVAR var_30 
     4064d1      8 MEMORYHOLE STACK esp + 200 ReturnAddress 
     4064d8     -1 INSTR LOCAL NoMetaUpdate test    rdx, rdx 
     4064d8      3 INSTR BELONGTO 4064c0 
@@ -4416,7 +4418,7 @@
     4066d0     26 FUNC GLOBAL sub_4066D0 FUNC_UNSAFE NOFP RET     4066e9 
     4066d0      4 INSTR BELONGTO 4066d0 
     4066d0      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    4066d0      8 DATAREF STACK 550 esp + 0 PARENT LocalFrame LOCALFRAME
+    4066d0      8 DATAREF STACK 549 esp + 0 PARENT LocalFrame LOCALFRAME
     4066d0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4066d4     -1 INSTR LOCAL NoMetaUpdate call    sub_405C90 
     4066d4      5 INSTR BELONGTO 4066d0 
@@ -4447,13 +4449,13 @@
     4066f6     -3 INSTR LOCAL NoWarn push    rbx 
     4066f7      3 INSTR BELONGTO 4066f0 
     4066f7      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdx 
-    4066fa    160 DATAREF STACK 551 esp + 0 PARENT LocalFrame LOCALFRAME
+    4066fa    160 DATAREF STACK 550 esp + 0 PARENT LocalFrame LOCALFRAME
     4066fa     24 MEMORYHOLE STACK esp + 160 CalleeSavedRegs 
     4066fa      7 INSTR BELONGTO 4066f0 
     4066fa      7 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 0A0h 
-    4066fa      8 DATAREF STACK 552 esp + 136 CHILDOF 551 OFFSET 136 LOCALVAR var_30 
-    4066fa      8 DATAREF STACK 553 esp + 144 CHILDOF 551 OFFSET 144 LOCALVAR var_28 
-    4066fa      8 DATAREF STACK 554 esp + 152 CHILDOF 551 OFFSET 152 LOCALVAR var_20 
+    4066fa      8 DATAREF STACK 551 esp + 136 CHILDOF 550 OFFSET 136 LOCALVAR var_30 
+    4066fa      8 DATAREF STACK 552 esp + 144 CHILDOF 550 OFFSET 144 LOCALVAR var_28 
+    4066fa      8 DATAREF STACK 553 esp + 152 CHILDOF 550 OFFSET 152 LOCALVAR var_20 
     4066fa      8 MEMORYHOLE STACK esp + 184 ReturnAddress 
     406701     -1 INSTR LOCAL NoMetaUpdate call    sub_405C90 
     406701      5 INSTR BELONGTO 4066f0 
@@ -4614,13 +4616,13 @@
     406811     -3 INSTR LOCAL NoWarn push    rbx 
     406812      3 INSTR BELONGTO 406810 
     406812      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdx 
-    406815    168 DATAREF STACK 555 esp + 0 PARENT LocalFrame LOCALFRAME
-    406815     16 DATAREF STACK 558 esp + 152 CHILDOF 555 OFFSET 152 LOCALVAR var_20 
+    406815    168 DATAREF STACK 554 esp + 0 PARENT LocalFrame LOCALFRAME
+    406815     16 DATAREF STACK 557 esp + 152 CHILDOF 554 OFFSET 152 LOCALVAR var_20 
     406815     16 MEMORYHOLE STACK esp + 168 CalleeSavedRegs 
     406815      7 INSTR BELONGTO 406810 
     406815      7 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 0A8h 
-    406815      8 DATAREF STACK 556 esp + 136 CHILDOF 555 OFFSET 136 LOCALVAR var_30 
-    406815      8 DATAREF STACK 557 esp + 144 CHILDOF 555 OFFSET 144 LOCALVAR var_28 
+    406815      8 DATAREF STACK 555 esp + 136 CHILDOF 554 OFFSET 136 LOCALVAR var_30 
+    406815      8 DATAREF STACK 556 esp + 144 CHILDOF 554 OFFSET 144 LOCALVAR var_28 
     406815      8 MEMORYHOLE STACK esp + 184 ReturnAddress 
     40681c     -1 INSTR LOCAL NoMetaUpdate call    sub_405C90 
     40681c      5 INSTR BELONGTO 406810 
@@ -4744,7 +4746,7 @@
     4068f0     26 FUNC GLOBAL sub_4068F0 FUNC_UNSAFE NOFP RET     406909 
     4068f0      4 INSTR BELONGTO 4068f0 
     4068f0      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    4068f0      8 DATAREF STACK 559 esp + 0 PARENT LocalFrame LOCALFRAME
+    4068f0      8 DATAREF STACK 558 esp + 0 PARENT LocalFrame LOCALFRAME
     4068f0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4068f4     -1 INSTR LOCAL NoMetaUpdate call    sub_405C90 
     4068f4      5 INSTR BELONGTO 4068f0 
@@ -4857,8 +4859,8 @@
     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 
-    406a70     16 DATAREF STACK 560 esp + 0 PARENT LocalFrame LOCALFRAME
-    406a70      4 DATAREF STACK 561 esp + 12 CHILDOF 560 OFFSET 12 LOCALVAR var_C 
+    406a70     16 DATAREF STACK 559 esp + 0 PARENT LocalFrame LOCALFRAME
+    406a70      4 DATAREF STACK 560 esp + 12 CHILDOF 559 OFFSET 12 LOCALVAR var_C 
     406a70      4 INSTR BELONGTO 406a60 
     406a70      4 INSTR DEADREGS  EFLAGS RCX ZZ sub     rsp, 10h 
     406a70      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -4911,9 +4913,9 @@
     406aba     -3 INSTR LOCAL NoWarn push    rbx 
     406abb      3 INSTR BELONGTO 406ab0 
     406abb      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdx 
-    406abe     16 DATAREF STACK 563 esp + 8 CHILDOF 562 OFFSET 8 LOCALVAR var_20 
+    406abe     16 DATAREF STACK 562 esp + 8 CHILDOF 561 OFFSET 8 LOCALVAR var_20 
     406abe     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    406abe     24 DATAREF STACK 562 esp + 0 PARENT LocalFrame LOCALFRAME
+    406abe     24 DATAREF STACK 561 esp + 0 PARENT LocalFrame LOCALFRAME
     406abe      4 INSTR BELONGTO 406ab0 
     406abe      4 INSTR DEADREGS  EFLAGS RDX ZZ sub     rsp, 18h 
     406abe      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -5011,11 +5013,11 @@
     406b45      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
     406b4a     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
     406b4a      3 INSTR BELONGTO 406b40 
-    406b4d     24 DATAREF STACK 564 esp + 0 PARENT LocalFrame LOCALFRAME
+    406b4d     24 DATAREF STACK 563 esp + 0 PARENT LocalFrame LOCALFRAME
     406b4d      4 INSTR BELONGTO 406b40 
     406b4d      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
-    406b4d      8 DATAREF STACK 565 esp + 8 CHILDOF 564 OFFSET 8 LOCALVAR var_10 
-    406b4d      8 DATAREF STACK 566 esp + 16 CHILDOF 564 OFFSET 16 LOCALVAR var_8 
+    406b4d      8 DATAREF STACK 564 esp + 8 CHILDOF 563 OFFSET 8 LOCALVAR var_10 
+    406b4d      8 DATAREF STACK 565 esp + 16 CHILDOF 563 OFFSET 16 LOCALVAR var_8 
     406b4d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     406b51     -1 INSTR LOCAL MetadataUnused mov     rbp, rsi 
     406b51      3 INSTR BELONGTO 406b40 
@@ -5080,8 +5082,8 @@
     406bc0      1 INSTR BELONGTO 406bc0 
     406bc0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     406bc0     -3 INSTR LOCAL NoWarn push    rbx 
-    406bc1     16 DATAREF STACK 567 esp + 0 PARENT LocalFrame LOCALFRAME
-    406bc1      4 DATAREF STACK 568 esp + 0 CHILDOF 567 OFFSET 0 OutArgsRegion OUTARGS
+    406bc1     16 DATAREF STACK 566 esp + 0 PARENT LocalFrame LOCALFRAME
+    406bc1      4 DATAREF STACK 567 esp + 0 CHILDOF 566 OFFSET 0 OutArgsRegion OUTARGS
     406bc1      4 INSTR BELONGTO 406bc0 
     406bc1      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
     406bc1      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -5168,10 +5170,10 @@
     406c44      3 INSTR BELONGTO 406c40 
     406c44      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 R12 ZZ mov     rbx, rsi 
     406c47     24 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
-    406c47     32 DATAREF STACK 569 esp + 0 PARENT LocalFrame LOCALFRAME
+    406c47     32 DATAREF STACK 568 esp + 0 PARENT LocalFrame LOCALFRAME
     406c47      4 INSTR BELONGTO 406c40 
     406c47      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 20h 
-    406c47      8 DATAREF STACK 570 esp + 24 CHILDOF 569 OFFSET 24 LOCALVAR var_20 
+    406c47      8 DATAREF STACK 569 esp + 24 CHILDOF 568 OFFSET 24 LOCALVAR var_20 
     406c47      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     406c4b      9 INSTR BELONGTO 406c40 
     406c4b      9 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 ZZ mov     [rsp+38h+var_20], 0 
@@ -5475,7 +5477,7 @@
     406e25     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     406e25      4 INSTR BELONGTO 406e20 
     406e25      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    406e25      8 DATAREF STACK 571 esp + 0 PARENT LocalFrame LOCALFRAME
+    406e25      8 DATAREF STACK 570 esp + 0 PARENT LocalFrame LOCALFRAME
     406e25      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     406e29     -1 INSTR LOCAL NoMetaUpdate call    sub_406BC0 
     406e29      5 INSTR BELONGTO 406e20 
@@ -5595,14 +5597,14 @@
     406eda      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 ZZ mov     rbx, rsi 
     406edd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     406edd      5 INSTR BELONGTO 406ed0 
-    406ee2     40 DATAREF STACK 572 esp + 0 PARENT LocalFrame LOCALFRAME
+    406ee2     40 DATAREF STACK 571 esp + 0 PARENT LocalFrame LOCALFRAME
     406ee2      4 INSTR BELONGTO 406ed0 
     406ee2      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 28h 
-    406ee2      8 DATAREF STACK 573 esp + 0 CHILDOF 572 OFFSET 0 LOCALVAR var_28 
-    406ee2      8 DATAREF STACK 574 esp + 8 CHILDOF 572 OFFSET 8 LOCALVAR var_20 
-    406ee2      8 DATAREF STACK 575 esp + 16 CHILDOF 572 OFFSET 16 LOCALVAR var_18 
-    406ee2      8 DATAREF STACK 576 esp + 24 CHILDOF 572 OFFSET 24 LOCALVAR var_10 
-    406ee2      8 DATAREF STACK 577 esp + 32 CHILDOF 572 OFFSET 32 LOCALVAR var_8 
+    406ee2      8 DATAREF STACK 572 esp + 0 CHILDOF 571 OFFSET 0 LOCALVAR var_28 
+    406ee2      8 DATAREF STACK 573 esp + 8 CHILDOF 571 OFFSET 8 LOCALVAR var_20 
+    406ee2      8 DATAREF STACK 574 esp + 16 CHILDOF 571 OFFSET 16 LOCALVAR var_18 
+    406ee2      8 DATAREF STACK 575 esp + 24 CHILDOF 571 OFFSET 24 LOCALVAR var_10 
+    406ee2      8 DATAREF STACK 576 esp + 32 CHILDOF 571 OFFSET 32 LOCALVAR var_8 
     406ee2      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     406ee6     -1 INSTR LOCAL NoMetaUpdate call    sub_406BC0 
     406ee6      5 INSTR BELONGTO 406ed0 
@@ -5714,19 +5716,19 @@
     406f92      5 INSTR BELONGTO 406f80 
     406f97     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
     406f97      5 INSTR BELONGTO 406f80 
-    406f9c    104 DATAREF STACK 578 esp + 0 PARENT LocalFrame LOCALFRAME
-    406f9c     32 DATAREF STACK 579 esp + 0 CHILDOF 578 OFFSET 0 OutArgsRegion OUTARGS
+    406f9c    104 DATAREF STACK 577 esp + 0 PARENT LocalFrame LOCALFRAME
+    406f9c     32 DATAREF STACK 578 esp + 0 CHILDOF 577 OFFSET 0 OutArgsRegion OUTARGS
     406f9c      4 INSTR BELONGTO 406f80 
     406f9c      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R14 ZZ sub     rsp, 68h 
-    406f9c      8 DATAREF STACK 580 esp + 32 CHILDOF 578 OFFSET 32 LOCALVAR var_48 
-    406f9c      8 DATAREF STACK 581 esp + 40 CHILDOF 578 OFFSET 40 LOCALVAR var_40 
-    406f9c      8 DATAREF STACK 582 esp + 48 CHILDOF 578 OFFSET 48 LOCALVAR var_38 
-    406f9c      8 DATAREF STACK 583 esp + 56 CHILDOF 578 OFFSET 56 LOCALVAR var_30 
-    406f9c      8 DATAREF STACK 584 esp + 64 CHILDOF 578 OFFSET 64 LOCALVAR var_28 
-    406f9c      8 DATAREF STACK 585 esp + 72 CHILDOF 578 OFFSET 72 LOCALVAR var_20 
-    406f9c      8 DATAREF STACK 586 esp + 80 CHILDOF 578 OFFSET 80 LOCALVAR var_18 
-    406f9c      8 DATAREF STACK 587 esp + 88 CHILDOF 578 OFFSET 88 LOCALVAR var_10 
-    406f9c      8 DATAREF STACK 588 esp + 96 CHILDOF 578 OFFSET 96 LOCALVAR var_8 
+    406f9c      8 DATAREF STACK 579 esp + 32 CHILDOF 577 OFFSET 32 LOCALVAR var_48 
+    406f9c      8 DATAREF STACK 580 esp + 40 CHILDOF 577 OFFSET 40 LOCALVAR var_40 
+    406f9c      8 DATAREF STACK 581 esp + 48 CHILDOF 577 OFFSET 48 LOCALVAR var_38 
+    406f9c      8 DATAREF STACK 582 esp + 56 CHILDOF 577 OFFSET 56 LOCALVAR var_30 
+    406f9c      8 DATAREF STACK 583 esp + 64 CHILDOF 577 OFFSET 64 LOCALVAR var_28 
+    406f9c      8 DATAREF STACK 584 esp + 72 CHILDOF 577 OFFSET 72 LOCALVAR var_20 
+    406f9c      8 DATAREF STACK 585 esp + 80 CHILDOF 577 OFFSET 80 LOCALVAR var_18 
+    406f9c      8 DATAREF STACK 586 esp + 88 CHILDOF 577 OFFSET 88 LOCALVAR var_10 
+    406f9c      8 DATAREF STACK 587 esp + 96 CHILDOF 577 OFFSET 96 LOCALVAR var_8 
     406f9c      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
     406fa0     -1 INSTR LOCAL NoMetaUpdate call    sub_406BC0 
     406fa0      5 INSTR BELONGTO 406f80 
@@ -5903,9 +5905,9 @@
     4070c1     -3 INSTR LOCAL NoWarn push    rbx 
     4070c2      3 INSTR BELONGTO 4070c0 
     4070c2      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 ZZ mov     rbx, rsi 
-    4070c5     16 DATAREF STACK 590 esp + 8 CHILDOF 589 OFFSET 8 LOCALVAR var_20 
+    4070c5     16 DATAREF STACK 589 esp + 8 CHILDOF 588 OFFSET 8 LOCALVAR var_20 
     4070c5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    4070c5     24 DATAREF STACK 589 esp + 0 PARENT LocalFrame LOCALFRAME
+    4070c5     24 DATAREF STACK 588 esp + 0 PARENT LocalFrame LOCALFRAME
     4070c5      4 INSTR BELONGTO 4070c0 
     4070c5      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
     4070c5      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -5991,14 +5993,14 @@
     407147      5 INSTR BELONGTO 407130 
     40714c      4 INSTR BELONGTO 407130 
     40714c      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R14 ZZ sub     rsp, 38h 
-    40714c     56 DATAREF STACK 591 esp + 0 PARENT LocalFrame LOCALFRAME
-    40714c      8 DATAREF STACK 592 esp + 0 CHILDOF 591 OFFSET 0 LOCALVAR var_38 
-    40714c      8 DATAREF STACK 593 esp + 8 CHILDOF 591 OFFSET 8 LOCALVAR var_30 
-    40714c      8 DATAREF STACK 594 esp + 16 CHILDOF 591 OFFSET 16 LOCALVAR var_28 
-    40714c      8 DATAREF STACK 595 esp + 24 CHILDOF 591 OFFSET 24 LOCALVAR var_20 
-    40714c      8 DATAREF STACK 596 esp + 32 CHILDOF 591 OFFSET 32 LOCALVAR var_18 
-    40714c      8 DATAREF STACK 597 esp + 40 CHILDOF 591 OFFSET 40 LOCALVAR var_10 
-    40714c      8 DATAREF STACK 598 esp + 48 CHILDOF 591 OFFSET 48 LOCALVAR var_8 
+    40714c     56 DATAREF STACK 590 esp + 0 PARENT LocalFrame LOCALFRAME
+    40714c      8 DATAREF STACK 591 esp + 0 CHILDOF 590 OFFSET 0 LOCALVAR var_38 
+    40714c      8 DATAREF STACK 592 esp + 8 CHILDOF 590 OFFSET 8 LOCALVAR var_30 
+    40714c      8 DATAREF STACK 593 esp + 16 CHILDOF 590 OFFSET 16 LOCALVAR var_28 
+    40714c      8 DATAREF STACK 594 esp + 24 CHILDOF 590 OFFSET 24 LOCALVAR var_20 
+    40714c      8 DATAREF STACK 595 esp + 32 CHILDOF 590 OFFSET 32 LOCALVAR var_18 
+    40714c      8 DATAREF STACK 596 esp + 40 CHILDOF 590 OFFSET 40 LOCALVAR var_10 
+    40714c      8 DATAREF STACK 597 esp + 48 CHILDOF 590 OFFSET 48 LOCALVAR var_8 
     40714c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     407150      8 INSTR BELONGTO 407130 
     407150      8 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R14 ZZ mov     [rsp+38h+var_38], 0 
@@ -6549,18 +6551,18 @@
     407c3c     -3 INSTR LOCAL NoWarn push    rbx 
     407c3d      3 INSTR BELONGTO 407c30 
     407c3d      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 R12 R13 R14 ZZ mov     rbx, rsi 
-    407c40     16 DATAREF STACK 607 esp + 72 CHILDOF 599 OFFSET 72 LOCALVAR var_40 
+    407c40     16 DATAREF STACK 606 esp + 72 CHILDOF 598 OFFSET 72 LOCALVAR var_40 
     407c40     48 MEMORYHOLE STACK esp + 88 CalleeSavedRegs 
-    407c40      4 DATAREF STACK 600 esp + 0 CHILDOF 599 OFFSET 0 OutArgsRegion OUTARGS
+    407c40      4 DATAREF STACK 599 esp + 0 CHILDOF 598 OFFSET 0 OutArgsRegion OUTARGS
     407c40      4 INSTR BELONGTO 407c30 
     407c40      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 R12 R13 R14 ZZ sub     rsp, 58h 
-    407c40     88 DATAREF STACK 599 esp + 0 PARENT LocalFrame LOCALFRAME
-    407c40      8 DATAREF STACK 601 esp + 24 CHILDOF 599 OFFSET 24 LOCALVAR var_70 
-    407c40      8 DATAREF STACK 602 esp + 32 CHILDOF 599 OFFSET 32 LOCALVAR var_68 
-    407c40      8 DATAREF STACK 603 esp + 40 CHILDOF 599 OFFSET 40 LOCALVAR var_60 
-    407c40      8 DATAREF STACK 604 esp + 48 CHILDOF 599 OFFSET 48 LOCALVAR var_58 
-    407c40      8 DATAREF STACK 605 esp + 56 CHILDOF 599 OFFSET 56 LOCALVAR var_50 
-    407c40      8 DATAREF STACK 606 esp + 64 CHILDOF 599 OFFSET 64 LOCALVAR var_48 
+    407c40     88 DATAREF STACK 598 esp + 0 PARENT LocalFrame LOCALFRAME
+    407c40      8 DATAREF STACK 600 esp + 24 CHILDOF 598 OFFSET 24 LOCALVAR var_70 
+    407c40      8 DATAREF STACK 601 esp + 32 CHILDOF 598 OFFSET 32 LOCALVAR var_68 
+    407c40      8 DATAREF STACK 602 esp + 40 CHILDOF 598 OFFSET 40 LOCALVAR var_60 
+    407c40      8 DATAREF STACK 603 esp + 48 CHILDOF 598 OFFSET 48 LOCALVAR var_58 
+    407c40      8 DATAREF STACK 604 esp + 56 CHILDOF 598 OFFSET 56 LOCALVAR var_50 
+    407c40      8 DATAREF STACK 605 esp + 64 CHILDOF 598 OFFSET 64 LOCALVAR var_48 
     407c40      8 MEMORYHOLE STACK esp + 136 ReturnAddress 
     407c44      5 INSTR BELONGTO 407c30 
     407c44      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 R12 R13 R14 ZZ mov     [rsp+88h+var_68], rdi 
@@ -7030,7 +7032,7 @@
     4080a5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4080a5      4 INSTR BELONGTO 4080a0 
     4080a5      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    4080a5      8 DATAREF STACK 608 esp + 0 PARENT LocalFrame LOCALFRAME
+    4080a5      8 DATAREF STACK 607 esp + 0 PARENT LocalFrame LOCALFRAME
     4080a5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4080a9     -1 INSTR LOCAL NoMetaUpdate call    sub_406BC0 
     4080a9      5 INSTR BELONGTO 4080a0 
@@ -7250,7 +7252,7 @@
     408455     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     408455      4 INSTR BELONGTO 408450 
     408455      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    408455      8 DATAREF STACK 609 esp + 0 PARENT LocalFrame LOCALFRAME
+    408455      8 DATAREF STACK 608 esp + 0 PARENT LocalFrame LOCALFRAME
     408455      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     408459     -1 INSTR LOCAL NoMetaUpdate call    sub_406BC0 
     408459      5 INSTR BELONGTO 408450 
@@ -7402,17 +7404,17 @@
     4085a1     -3 INSTR LOCAL NoWarn push    rbx 
     4085a2      3 INSTR BELONGTO 4085a0 
     4085a2      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    4085a5     16 DATAREF STACK 617 esp + 24 CHILDOF 610 OFFSET 24 LOCALVAR var_20 
+    4085a5     16 DATAREF STACK 616 esp + 24 CHILDOF 609 OFFSET 24 LOCALVAR var_20 
     4085a5     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-    4085a5      2 DATAREF STACK 611 esp + 4 CHILDOF 610 OFFSET 4 LOCALVAR var_34 
-    4085a5      2 DATAREF STACK 612 esp + 6 CHILDOF 610 OFFSET 6 LOCALVAR var_32 
-    4085a5      2 DATAREF STACK 615 esp + 20 CHILDOF 610 OFFSET 20 LOCALVAR var_24 
-    4085a5      2 DATAREF STACK 616 esp + 22 CHILDOF 610 OFFSET 22 LOCALVAR var_22 
-    4085a5     40 DATAREF STACK 610 esp + 0 PARENT LocalFrame LOCALFRAME
-    4085a5      4 DATAREF STACK 614 esp + 16 CHILDOF 610 OFFSET 16 LOCALVAR var_28 
+    4085a5      2 DATAREF STACK 610 esp + 4 CHILDOF 609 OFFSET 4 LOCALVAR var_34 
+    4085a5      2 DATAREF STACK 611 esp + 6 CHILDOF 609 OFFSET 6 LOCALVAR var_32 
+    4085a5      2 DATAREF STACK 614 esp + 20 CHILDOF 609 OFFSET 20 LOCALVAR var_24 
+    4085a5      2 DATAREF STACK 615 esp + 22 CHILDOF 609 OFFSET 22 LOCALVAR var_22 
+    4085a5     40 DATAREF STACK 609 esp + 0 PARENT LocalFrame LOCALFRAME
+    4085a5      4 DATAREF STACK 613 esp + 16 CHILDOF 609 OFFSET 16 LOCALVAR var_28 
     4085a5      4 INSTR BELONGTO 4085a0 
     4085a5      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 28h 
-    4085a5      8 DATAREF STACK 613 esp + 8 CHILDOF 610 OFFSET 8 LOCALVAR var_30 
+    4085a5      8 DATAREF STACK 612 esp + 8 CHILDOF 609 OFFSET 8 LOCALVAR var_30 
     4085a5      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     4085a9     -1 INSTR LOCAL NoMetaUpdate call    sub_406BC0 
     4085a9      5 INSTR BELONGTO 4085a0 
@@ -7666,14 +7668,14 @@
     4087bf      1 INSTR BELONGTO 4087b0 
     4087bf      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R15 ZZ push    rbx 
     4087bf     -3 INSTR LOCAL NoWarn push    rbx 
-    4087c0     16 DATAREF STACK 619 esp + 8 CHILDOF 618 OFFSET 8 LOCALVAR var_60 
-    4087c0     16 DATAREF STACK 622 esp + 40 CHILDOF 618 OFFSET 40 LOCALVAR var_40 
+    4087c0     16 DATAREF STACK 618 esp + 8 CHILDOF 617 OFFSET 8 LOCALVAR var_60 
+    4087c0     16 DATAREF STACK 621 esp + 40 CHILDOF 617 OFFSET 40 LOCALVAR var_40 
     4087c0     48 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
     4087c0      4 INSTR BELONGTO 4087b0 
     4087c0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 R15 ZZ sub     rsp, 38h 
-    4087c0     56 DATAREF STACK 618 esp + 0 PARENT LocalFrame LOCALFRAME
-    4087c0      8 DATAREF STACK 620 esp + 24 CHILDOF 618 OFFSET 24 LOCALVAR var_50 
-    4087c0      8 DATAREF STACK 621 esp + 32 CHILDOF 618 OFFSET 32 LOCALVAR var_48 
+    4087c0     56 DATAREF STACK 617 esp + 0 PARENT LocalFrame LOCALFRAME
+    4087c0      8 DATAREF STACK 619 esp + 24 CHILDOF 617 OFFSET 24 LOCALVAR var_50 
+    4087c0      8 DATAREF STACK 620 esp + 32 CHILDOF 617 OFFSET 32 LOCALVAR var_48 
     4087c0      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
     4087c4     -1 INSTR LOCAL NoMetaUpdate call    sub_406BC0 
     4087c4      5 INSTR BELONGTO 4087b0 
@@ -8133,14 +8135,14 @@
     408c02      5 INSTR BELONGTO 408bf0 
     408c07      5 INSTR BELONGTO 408bf0 
     408c07      5 INSTR DEADREGS  EFLAGS RBX RSI R12 R13 ZZ mov     esi, offset aLinkText; "link-text" 
-    408c0c     16 DATAREF STACK 624 esp + 8 CHILDOF 623 OFFSET 8 LOCALVAR var_30 
+    408c0c     16 DATAREF STACK 623 esp + 8 CHILDOF 622 OFFSET 8 LOCALVAR var_30 
     408c0c      4 INSTR BELONGTO 408bf0 
     408c0c      4 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ sub     rsp, 38h 
-    408c0c     56 DATAREF STACK 623 esp + 0 PARENT LocalFrame LOCALFRAME
-    408c0c      8 DATAREF STACK 625 esp + 24 CHILDOF 623 OFFSET 24 LOCALVAR var_20 
-    408c0c      8 DATAREF STACK 626 esp + 32 CHILDOF 623 OFFSET 32 LOCALVAR var_18 
-    408c0c      8 DATAREF STACK 627 esp + 40 CHILDOF 623 OFFSET 40 LOCALVAR var_10 
-    408c0c      8 DATAREF STACK 628 esp + 48 CHILDOF 623 OFFSET 48 LOCALVAR var_8 
+    408c0c     56 DATAREF STACK 622 esp + 0 PARENT LocalFrame LOCALFRAME
+    408c0c      8 DATAREF STACK 624 esp + 24 CHILDOF 622 OFFSET 24 LOCALVAR var_20 
+    408c0c      8 DATAREF STACK 625 esp + 32 CHILDOF 622 OFFSET 32 LOCALVAR var_18 
+    408c0c      8 DATAREF STACK 626 esp + 40 CHILDOF 622 OFFSET 40 LOCALVAR var_10 
+    408c0c      8 DATAREF STACK 627 esp + 48 CHILDOF 622 OFFSET 48 LOCALVAR var_8 
     408c0c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     408c10      3 INSTR BELONGTO 408bf0 
     408c10      3 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ mov     rbx, rdi 
@@ -8325,7 +8327,7 @@
     408e82      3 INSTR BELONGTO 408e80 
     408e85     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     408e85      4 INSTR BELONGTO 408e80 
-    408e85      8 DATAREF STACK 629 esp + 0 PARENT LocalFrame LOCALFRAME
+    408e85      8 DATAREF STACK 628 esp + 0 PARENT LocalFrame LOCALFRAME
     408e85      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     408e89     -1 INSTR LOCAL NoMetaUpdate call    sub_406BC0 
     408e89      5 INSTR BELONGTO 408e80 
@@ -8535,11 +8537,11 @@
     409150     62 FUNC GLOBAL sub_409150 FUNC_UNSAFE NOFP RET     40918d 
     409155     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], rbp 
     409155      5 INSTR BELONGTO 409150 
-    40915a     24 DATAREF STACK 630 esp + 0 PARENT LocalFrame LOCALFRAME
+    40915a     24 DATAREF STACK 629 esp + 0 PARENT LocalFrame LOCALFRAME
     40915a      4 INSTR BELONGTO 409150 
     40915a      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ sub     rsp, 18h 
-    40915a      8 DATAREF STACK 631 esp + 8 CHILDOF 630 OFFSET 8 LOCALVAR var_10 
-    40915a      8 DATAREF STACK 632 esp + 16 CHILDOF 630 OFFSET 16 LOCALVAR var_8 
+    40915a      8 DATAREF STACK 630 esp + 8 CHILDOF 629 OFFSET 8 LOCALVAR var_10 
+    40915a      8 DATAREF STACK 631 esp + 16 CHILDOF 629 OFFSET 16 LOCALVAR var_8 
     40915a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40915e      3 INSTR BELONGTO 409150 
     40915e      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbp, rdi 
@@ -8623,10 +8625,10 @@
     4092b0     71 FUNC GLOBAL sub_4092B0 FUNC_UNSAFE NOFP RET     4092f6 
     4092b1      3 INSTR BELONGTO 4092b0 
     4092b1      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    4092b4     16 DATAREF STACK 633 esp + 0 PARENT LocalFrame LOCALFRAME
+    4092b4     16 DATAREF STACK 632 esp + 0 PARENT LocalFrame LOCALFRAME
     4092b4      4 INSTR BELONGTO 4092b0 
     4092b4      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 10h 
-    4092b4      8 DATAREF STACK 634 esp + 8 CHILDOF 633 OFFSET 8 LOCALVAR var_10 
+    4092b4      8 DATAREF STACK 633 esp + 8 CHILDOF 632 OFFSET 8 LOCALVAR var_10 
     4092b4      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
     4092b4      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4092b8     -1 INSTR LOCAL NoMetaUpdate call    sub_406BC0 
@@ -8686,12 +8688,12 @@
     40930a      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 R9 R10 R11 ZZ mov     rbx, rsi 
     40930d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40930d      5 INSTR BELONGTO 409300 
-    409312     24 DATAREF STACK 635 esp + 0 PARENT LocalFrame LOCALFRAME
+    409312     24 DATAREF STACK 634 esp + 0 PARENT LocalFrame LOCALFRAME
     409312      4 INSTR BELONGTO 409300 
     409312      4 INSTR DEADREGS  EFLAGS RAX RCX RSI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-    409312      8 DATAREF STACK 636 esp + 0 CHILDOF 635 OFFSET 0 LOCALVAR var_18 
-    409312      8 DATAREF STACK 637 esp + 8 CHILDOF 635 OFFSET 8 LOCALVAR var_10 
-    409312      8 DATAREF STACK 638 esp + 16 CHILDOF 635 OFFSET 16 LOCALVAR var_8 
+    409312      8 DATAREF STACK 635 esp + 0 CHILDOF 634 OFFSET 0 LOCALVAR var_18 
+    409312      8 DATAREF STACK 636 esp + 8 CHILDOF 634 OFFSET 8 LOCALVAR var_10 
+    409312      8 DATAREF STACK 637 esp + 16 CHILDOF 634 OFFSET 16 LOCALVAR var_8 
     409312      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     409316      3 INSTR BELONGTO 409300 
     409316      3 INSTR DEADREGS  EFLAGS RAX RCX RSI R8 R9 R10 R11 R12 ZZ mov     r12, rdi 
@@ -8755,13 +8757,13 @@
     409377      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
     40937c      4 INSTR BELONGTO 409350 
     40937c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-    40937c     56 DATAREF STACK 639 esp + 0 PARENT LocalFrame LOCALFRAME
-    40937c      8 DATAREF STACK 640 esp + 8 CHILDOF 639 OFFSET 8 LOCALVAR var_30 
-    40937c      8 DATAREF STACK 641 esp + 16 CHILDOF 639 OFFSET 16 LOCALVAR var_28 
-    40937c      8 DATAREF STACK 642 esp + 24 CHILDOF 639 OFFSET 24 LOCALVAR var_20 
-    40937c      8 DATAREF STACK 643 esp + 32 CHILDOF 639 OFFSET 32 LOCALVAR var_18 
-    40937c      8 DATAREF STACK 644 esp + 40 CHILDOF 639 OFFSET 40 LOCALVAR var_10 
-    40937c      8 DATAREF STACK 645 esp + 48 CHILDOF 639 OFFSET 48 LOCALVAR var_8 
+    40937c     56 DATAREF STACK 638 esp + 0 PARENT LocalFrame LOCALFRAME
+    40937c      8 DATAREF STACK 639 esp + 8 CHILDOF 638 OFFSET 8 LOCALVAR var_30 
+    40937c      8 DATAREF STACK 640 esp + 16 CHILDOF 638 OFFSET 16 LOCALVAR var_28 
+    40937c      8 DATAREF STACK 641 esp + 24 CHILDOF 638 OFFSET 24 LOCALVAR var_20 
+    40937c      8 DATAREF STACK 642 esp + 32 CHILDOF 638 OFFSET 32 LOCALVAR var_18 
+    40937c      8 DATAREF STACK 643 esp + 40 CHILDOF 638 OFFSET 40 LOCALVAR var_10 
+    40937c      8 DATAREF STACK 644 esp + 48 CHILDOF 638 OFFSET 48 LOCALVAR var_8 
     40937c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     409380     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
     409380      3 INSTR BELONGTO 409350 
@@ -8838,7 +8840,7 @@
     4093f5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4093f5      4 INSTR BELONGTO 4093f0 
     4093f5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    4093f5      8 DATAREF STACK 646 esp + 0 PARENT LocalFrame LOCALFRAME
+    4093f5      8 DATAREF STACK 645 esp + 0 PARENT LocalFrame LOCALFRAME
     4093f5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4093f9      7 INSTR BELONGTO 4093f0 
     4093f9      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_60BD98 
@@ -8873,7 +8875,7 @@
     409428     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     409435 
     409428      4 INSTR BELONGTO 409428 
     409428      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    409428      8 DATAREF STACK 647 esp + 0 PARENT LocalFrame LOCALFRAME
+    409428      8 DATAREF STACK 646 esp + 0 PARENT LocalFrame LOCALFRAME
     409428      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40942c     -1 INSTR LOCAL NoMetaUpdate call    sub_405050 
     40942c      5 INSTR BELONGTO 409428 
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 145a03e5..6ea70cb4 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot
@@ -588,12 +588,11 @@
     401465      2 INSTR BELONGTO 401380 
     401467     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_401420 
     401467      2 INSTR BELONGTO 401380 
-    40146c      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
-    40146c      0 FUNC MMSAFENESS UNSAFE
+    40146c      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    40146c      0 FUNC MMSAFENESS SAFE
     40146c     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     40146c      2 INSTR BELONGTO 40146c 
     40146c     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     401495 
-    40146c      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     40146e      3 INSTR BELONGTO 40146c 
     40146e      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     401471      1 INSTR BELONGTO 40146c 
@@ -605,8 +604,11 @@
     401475      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     401479      1 INSTR BELONGTO 40146c 
     401479      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    401479     -3 INSTR LOCAL NoWarn push    rax 
+    40147a     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40147a      1 INSTR BELONGTO 40146c 
     40147a      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    40147a      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     40147b     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     40147b      7 INSTR BELONGTO 40146c 
     40147b      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -701,14 +703,14 @@
     401512      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     401513      1 INSTR BELONGTO 4014b0 
     401513      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    401520      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
+    401520      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     401520      0 FUNC MMSAFENESS UNSAFE
     401520     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_602DD8, 0 
     401520     34 FUNC GLOBAL sub_401520 FUNC_UNSAFE USEFP RET     401541 
     401520      8 INSTR BELONGTO 401520 
-    401520      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    401520      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401528      1 INSTR BELONGTO 401520 
+    401528      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    401528      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401529      3 INSTR BELONGTO 401520 
     40152c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401540 
     40152c      2 INSTR BELONGTO 401520 
@@ -1768,26 +1770,14 @@
     401d18     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
     401d1a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401B20 
     401d20      2 INSTR BELONGTO 401f00 
-    401d20     -3 INSTR LOCAL NoWarn push    r15 
     401d22      2 INSTR BELONGTO 401f00 
-    401d22     -3 INSTR LOCAL NoWarn push    r14 
     401d24      2 INSTR BELONGTO 401f00 
-    401d24     -3 INSTR LOCAL NoWarn push    r13 
     401d26      2 INSTR BELONGTO 401f00 
-    401d26     -3 INSTR LOCAL NoWarn push    r12 
     401d28      1 INSTR BELONGTO 401f00 
-    401d28     -3 INSTR LOCAL NoWarn push    rbp 
     401d29      3 INSTR BELONGTO 401f00 
     401d2c      1 INSTR BELONGTO 401f00 
-    401d2c     -3 INSTR LOCAL NoWarn push    rbx 
     401d2d      3 INSTR BELONGTO 401f00 
-    401d30      1 DATAREF STACK 182 esp + 11 CHILDOF 179 OFFSET 11 LOCALVAR var_3D 
-    401d30      4 DATAREF STACK 180 esp + 0 CHILDOF 179 OFFSET 0 LOCALVAR SMP_IDA_FixVar0 
     401d30      4 INSTR BELONGTO 401f00 
-    401d30     56 DATAREF STACK 183 esp + 12 CHILDOF 179 OFFSET 12 LOCALVAR var_3C 
-    401d30     68 DATAREF STACK 179 esp + 0 PARENT LocalFrame LOCALFRAME
-    401d30      7 DATAREF STACK 181 esp + 4 CHILDOF 179 OFFSET 4 LOCALVAR var_44 
-    401d30      8 MEMORYHOLE STACK esp + 68 ReturnAddress 
     401d34     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
     401d34      3 INSTR BELONGTO 401f00 
     401d37      5 INSTR BELONGTO 401f00 
@@ -1909,8 +1899,8 @@
     401e78      5 INSTR BELONGTO 401f00 
     401e80     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
     401e80      4 INSTR BELONGTO 401f00 
+    401e84      0 DEALLOC STACK esp - 0 mov     rdi, r12
     401e84      3 INSTR BELONGTO 401f00 
-    401e84     68 DEALLOC STACK esp - 68 mov     rdi, r12
     401e87      2 INSTR BELONGTO 401f00 
     401e87     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
     401e89      1 INSTR BELONGTO 401f00 
@@ -1951,6 +1941,7 @@
     401f00     15 FUNC GLOBAL sub_401F00 FUNC_UNSAFE NOFP RET     401f0e 
     401f00     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
     401f00      3 INSTR BELONGTO 401f00 
+    401f00      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     401f03      2 INSTR BELONGTO 401f00 
     401f03     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
     401f05     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
@@ -1984,13 +1975,13 @@
     401f37      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
     401f3c      4 INSTR BELONGTO 401f10 
     401f3c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-    401f3c     56 DATAREF STACK 184 esp + 0 PARENT LocalFrame LOCALFRAME
-    401f3c      8 DATAREF STACK 185 esp + 8 CHILDOF 184 OFFSET 8 LOCALVAR var_30 
-    401f3c      8 DATAREF STACK 186 esp + 16 CHILDOF 184 OFFSET 16 LOCALVAR var_28 
-    401f3c      8 DATAREF STACK 187 esp + 24 CHILDOF 184 OFFSET 24 LOCALVAR var_20 
-    401f3c      8 DATAREF STACK 188 esp + 32 CHILDOF 184 OFFSET 32 LOCALVAR var_18 
-    401f3c      8 DATAREF STACK 189 esp + 40 CHILDOF 184 OFFSET 40 LOCALVAR var_10 
-    401f3c      8 DATAREF STACK 190 esp + 48 CHILDOF 184 OFFSET 48 LOCALVAR var_8 
+    401f3c     56 DATAREF STACK 179 esp + 0 PARENT LocalFrame LOCALFRAME
+    401f3c      8 DATAREF STACK 180 esp + 8 CHILDOF 179 OFFSET 8 LOCALVAR var_30 
+    401f3c      8 DATAREF STACK 181 esp + 16 CHILDOF 179 OFFSET 16 LOCALVAR var_28 
+    401f3c      8 DATAREF STACK 182 esp + 24 CHILDOF 179 OFFSET 24 LOCALVAR var_20 
+    401f3c      8 DATAREF STACK 183 esp + 32 CHILDOF 179 OFFSET 32 LOCALVAR var_18 
+    401f3c      8 DATAREF STACK 184 esp + 40 CHILDOF 179 OFFSET 40 LOCALVAR var_10 
+    401f3c      8 DATAREF STACK 185 esp + 48 CHILDOF 179 OFFSET 48 LOCALVAR var_8 
     401f3c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     401f40     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
     401f40      3 INSTR BELONGTO 401f10 
@@ -2067,7 +2058,7 @@
     401fb5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     401fb5      4 INSTR BELONGTO 401fb0 
     401fb5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    401fb5      8 DATAREF STACK 191 esp + 0 PARENT LocalFrame LOCALFRAME
+    401fb5      8 DATAREF STACK 186 esp + 0 PARENT LocalFrame LOCALFRAME
     401fb5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     401fb9      7 INSTR BELONGTO 401fb0 
     401fb9      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_602DB8 
@@ -2102,7 +2093,7 @@
     401fe8     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     401ff5 
     401fe8      4 INSTR BELONGTO 401fe8 
     401fe8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    401fe8      8 DATAREF STACK 192 esp + 0 PARENT LocalFrame LOCALFRAME
+    401fe8      8 DATAREF STACK 187 esp + 0 PARENT LocalFrame LOCALFRAME
     401fe8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401fec     -1 INSTR LOCAL NoMetaUpdate call    sub_4014B0 
     401fec      5 INSTR BELONGTO 401fe8 
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 dae493a4..30134433 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 @@
-83b63c11b789c8eba851172646a08b4e783d3be6
\ No newline at end of file
+c7a4f839ec98ea5c0825844946942304946a6763
\ 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 145a03e5..6ea70cb4 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot
@@ -588,12 +588,11 @@
     401465      2 INSTR BELONGTO 401380 
     401467     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_401420 
     401467      2 INSTR BELONGTO 401380 
-    40146c      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
-    40146c      0 FUNC MMSAFENESS UNSAFE
+    40146c      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    40146c      0 FUNC MMSAFENESS SAFE
     40146c     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     40146c      2 INSTR BELONGTO 40146c 
     40146c     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     401495 
-    40146c      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     40146e      3 INSTR BELONGTO 40146c 
     40146e      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     401471      1 INSTR BELONGTO 40146c 
@@ -605,8 +604,11 @@
     401475      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     401479      1 INSTR BELONGTO 40146c 
     401479      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    401479     -3 INSTR LOCAL NoWarn push    rax 
+    40147a     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40147a      1 INSTR BELONGTO 40146c 
     40147a      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    40147a      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     40147b     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     40147b      7 INSTR BELONGTO 40146c 
     40147b      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -701,14 +703,14 @@
     401512      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     401513      1 INSTR BELONGTO 4014b0 
     401513      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    401520      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
+    401520      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     401520      0 FUNC MMSAFENESS UNSAFE
     401520     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_602DD8, 0 
     401520     34 FUNC GLOBAL sub_401520 FUNC_UNSAFE USEFP RET     401541 
     401520      8 INSTR BELONGTO 401520 
-    401520      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    401520      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401528      1 INSTR BELONGTO 401520 
+    401528      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    401528      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401529      3 INSTR BELONGTO 401520 
     40152c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401540 
     40152c      2 INSTR BELONGTO 401520 
@@ -1768,26 +1770,14 @@
     401d18     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
     401d1a     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401B20 
     401d20      2 INSTR BELONGTO 401f00 
-    401d20     -3 INSTR LOCAL NoWarn push    r15 
     401d22      2 INSTR BELONGTO 401f00 
-    401d22     -3 INSTR LOCAL NoWarn push    r14 
     401d24      2 INSTR BELONGTO 401f00 
-    401d24     -3 INSTR LOCAL NoWarn push    r13 
     401d26      2 INSTR BELONGTO 401f00 
-    401d26     -3 INSTR LOCAL NoWarn push    r12 
     401d28      1 INSTR BELONGTO 401f00 
-    401d28     -3 INSTR LOCAL NoWarn push    rbp 
     401d29      3 INSTR BELONGTO 401f00 
     401d2c      1 INSTR BELONGTO 401f00 
-    401d2c     -3 INSTR LOCAL NoWarn push    rbx 
     401d2d      3 INSTR BELONGTO 401f00 
-    401d30      1 DATAREF STACK 182 esp + 11 CHILDOF 179 OFFSET 11 LOCALVAR var_3D 
-    401d30      4 DATAREF STACK 180 esp + 0 CHILDOF 179 OFFSET 0 LOCALVAR SMP_IDA_FixVar0 
     401d30      4 INSTR BELONGTO 401f00 
-    401d30     56 DATAREF STACK 183 esp + 12 CHILDOF 179 OFFSET 12 LOCALVAR var_3C 
-    401d30     68 DATAREF STACK 179 esp + 0 PARENT LocalFrame LOCALFRAME
-    401d30      7 DATAREF STACK 181 esp + 4 CHILDOF 179 OFFSET 4 LOCALVAR var_44 
-    401d30      8 MEMORYHOLE STACK esp + 68 ReturnAddress 
     401d34     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
     401d34      3 INSTR BELONGTO 401f00 
     401d37      5 INSTR BELONGTO 401f00 
@@ -1909,8 +1899,8 @@
     401e78      5 INSTR BELONGTO 401f00 
     401e80     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 18h 
     401e80      4 INSTR BELONGTO 401f00 
+    401e84      0 DEALLOC STACK esp - 0 mov     rdi, r12
     401e84      3 INSTR BELONGTO 401f00 
-    401e84     68 DEALLOC STACK esp - 68 mov     rdi, r12
     401e87      2 INSTR BELONGTO 401f00 
     401e87     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
     401e89      1 INSTR BELONGTO 401f00 
@@ -1951,6 +1941,7 @@
     401f00     15 FUNC GLOBAL sub_401F00 FUNC_UNSAFE NOFP RET     401f0e 
     401f00     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
     401f00      3 INSTR BELONGTO 401f00 
+    401f00      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     401f03      2 INSTR BELONGTO 401f00 
     401f03     -2 INSTR LOCAL n ECX ZZ  AlwaysNUM xor     ecx, ecx 
     401f05     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
@@ -1984,13 +1975,13 @@
     401f37      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
     401f3c      4 INSTR BELONGTO 401f10 
     401f3c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-    401f3c     56 DATAREF STACK 184 esp + 0 PARENT LocalFrame LOCALFRAME
-    401f3c      8 DATAREF STACK 185 esp + 8 CHILDOF 184 OFFSET 8 LOCALVAR var_30 
-    401f3c      8 DATAREF STACK 186 esp + 16 CHILDOF 184 OFFSET 16 LOCALVAR var_28 
-    401f3c      8 DATAREF STACK 187 esp + 24 CHILDOF 184 OFFSET 24 LOCALVAR var_20 
-    401f3c      8 DATAREF STACK 188 esp + 32 CHILDOF 184 OFFSET 32 LOCALVAR var_18 
-    401f3c      8 DATAREF STACK 189 esp + 40 CHILDOF 184 OFFSET 40 LOCALVAR var_10 
-    401f3c      8 DATAREF STACK 190 esp + 48 CHILDOF 184 OFFSET 48 LOCALVAR var_8 
+    401f3c     56 DATAREF STACK 179 esp + 0 PARENT LocalFrame LOCALFRAME
+    401f3c      8 DATAREF STACK 180 esp + 8 CHILDOF 179 OFFSET 8 LOCALVAR var_30 
+    401f3c      8 DATAREF STACK 181 esp + 16 CHILDOF 179 OFFSET 16 LOCALVAR var_28 
+    401f3c      8 DATAREF STACK 182 esp + 24 CHILDOF 179 OFFSET 24 LOCALVAR var_20 
+    401f3c      8 DATAREF STACK 183 esp + 32 CHILDOF 179 OFFSET 32 LOCALVAR var_18 
+    401f3c      8 DATAREF STACK 184 esp + 40 CHILDOF 179 OFFSET 40 LOCALVAR var_10 
+    401f3c      8 DATAREF STACK 185 esp + 48 CHILDOF 179 OFFSET 48 LOCALVAR var_8 
     401f3c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     401f40     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
     401f40      3 INSTR BELONGTO 401f10 
@@ -2067,7 +2058,7 @@
     401fb5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     401fb5      4 INSTR BELONGTO 401fb0 
     401fb5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    401fb5      8 DATAREF STACK 191 esp + 0 PARENT LocalFrame LOCALFRAME
+    401fb5      8 DATAREF STACK 186 esp + 0 PARENT LocalFrame LOCALFRAME
     401fb5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     401fb9      7 INSTR BELONGTO 401fb0 
     401fb9      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_602DB8 
@@ -2102,7 +2093,7 @@
     401fe8     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     401ff5 
     401fe8      4 INSTR BELONGTO 401fe8 
     401fe8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    401fe8      8 DATAREF STACK 192 esp + 0 PARENT LocalFrame LOCALFRAME
+    401fe8      8 DATAREF STACK 187 esp + 0 PARENT LocalFrame LOCALFRAME
     401fe8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401fec     -1 INSTR LOCAL NoMetaUpdate call    sub_4014B0 
     401fec      5 INSTR BELONGTO 401fe8 
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 bff86f7d..46f6c3ca 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 @@
-d2f2a506a8a814fba9e5165954b25f98d7e23458
\ No newline at end of file
+7fc1f890021216b760e56a3bd4b644c4fdbd9b72
\ 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 9c05a7d0..17920087 100644
--- a/tests/commit/trimmed-sorted-save-gnome-open.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-open.psexe.annot
@@ -348,12 +348,11 @@
     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 
     400c1b      2 INSTR BELONGTO 400af0 
-    400c20      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
-    400c20      0 FUNC MMSAFENESS UNSAFE
+    400c20      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    400c20      0 FUNC MMSAFENESS SAFE
     400c20     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     400c20      2 INSTR BELONGTO 400c20 
     400c20     42 FUNC GLOBAL _start FUNC_UNSAFE NOFP NORET     400c49 
-    400c20      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     400c22      3 INSTR BELONGTO 400c20 
     400c22      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     400c25      1 INSTR BELONGTO 400c20 
@@ -365,8 +364,11 @@
     400c29      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     400c2d      1 INSTR BELONGTO 400c20 
     400c2d      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    400c2d     -3 INSTR LOCAL NoWarn push    rax 
+    400c2e     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     400c2e      1 INSTR BELONGTO 400c20 
     400c2e      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    400c2e      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     400c2f     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset __libc_csu_fini; fini 
     400c2f      7 INSTR BELONGTO 400c20 
     400c2f      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset __libc_csu_fini; fini 
@@ -461,14 +463,14 @@
     400cd2      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     400cd3      1 INSTR BELONGTO 400c70 
     400cd3      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    400ce0      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
+    400ce0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     400ce0      0 FUNC MMSAFENESS UNSAFE
     400ce0     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_601DF8, 0 
     400ce0     34 FUNC GLOBAL sub_400CE0 FUNC_UNSAFE USEFP RET     400d01 
     400ce0      8 INSTR BELONGTO 400ce0 
-    400ce0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    400ce0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     400ce8      1 INSTR BELONGTO 400ce0 
+    400ce8      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    400ce8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     400ce9      3 INSTR BELONGTO 400ce0 
     400cec     -1 INSTR LOCAL NoMetaUpdate jz      short loc_400D00 
     400cec      2 INSTR BELONGTO 400ce0 
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 d7807940..97a6724e 100644
--- a/tests/commit/trimmed-sorted-save-gnome-power-statistics.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-power-statistics.psexe.annot
@@ -2073,12 +2073,11 @@
     404ae5     -1 INSTR LOCAL NoMetaUpdate jmp     _g_static_resource_init 
     404ae5      5 INSTR BELONGTO 404ae0 
     404ae5      5 INSTR DEADREGS  EFLAGS RDI ZZ jmp     _g_static_resource_init 
-    404aec      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
-    404aec      0 FUNC MMSAFENESS UNSAFE
+    404aec      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    404aec      0 FUNC MMSAFENESS SAFE
     404aec     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     404aec      2 INSTR BELONGTO 404aec 
     404aec     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     404b15 
-    404aec      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     404aee      3 INSTR BELONGTO 404aec 
     404aee      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     404af1      1 INSTR BELONGTO 404aec 
@@ -2090,8 +2089,11 @@
     404af5      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     404af9      1 INSTR BELONGTO 404aec 
     404af9      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    404af9     -3 INSTR LOCAL NoWarn push    rax 
+    404afa     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     404afa      1 INSTR BELONGTO 404aec 
     404afa      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    404afa      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     404afb     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     404afb      7 INSTR BELONGTO 404aec 
     404afb      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -2186,14 +2188,14 @@
     404b92      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     404b93      1 INSTR BELONGTO 404b30 
     404b93      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    404ba0      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
+    404ba0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     404ba0      0 FUNC MMSAFENESS UNSAFE
     404ba0     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_60ED78, 0 
     404ba0     34 FUNC GLOBAL sub_404BA0 FUNC_UNSAFE USEFP RET     404bc1 
     404ba0      8 INSTR BELONGTO 404ba0 
-    404ba0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    404ba0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     404ba8      1 INSTR BELONGTO 404ba0 
+    404ba8      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    404ba8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     404ba9      3 INSTR BELONGTO 404ba0 
     404bac     -1 INSTR LOCAL NoMetaUpdate jz      short loc_404BC0 
     404bac      2 INSTR BELONGTO 404ba0 
@@ -5657,15 +5659,15 @@
     4065ef     -1 INSTR LOCAL NoMetaUpdate jmp     _dcgettext 
     4065ef      5 INSTR BELONGTO 4065d0 
     4065ef      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ jmp     _dcgettext 
-    406600      0 FUNC FRAMERESTORE 0 0 0 1 0 1 2 0 16 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
+    406600      0 FUNC FRAMERESTORE 0 0 0 1 0 1 2 0 16 3 -4 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
     406600      0 FUNC MMSAFENESS SAFE
     406600     -1 INSTR LOCAL NoMetaUpdate cmp     edi, 0Bh        ; switch 12 cases  
     406600      3 INSTR BELONGTO 406600 
     406600    413 FUNC GLOBAL sub_406600 FUNC_UNSAFE NOFP RET     40679c 
-    406600      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    406600      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     406603      1 INSTR BELONGTO 406600 
     406603      1 INSTR DEADREGS  RAX ZZ push    rbx 
+    406603      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    406603      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     406604      2 INSTR BELONGTO 406600 
     406604      2 INSTR DEADREGS  RAX RBX ZZ mov     ebx, edi 
     406606     -1 INSTR LOCAL NoMetaUpdate jbe     short loc_406630 
@@ -12536,7 +12538,7 @@
     40baed     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, esi 
     40baef      1 INSTR BELONGTO 40bae0 
     40baef      1 INSTR DEADREGS  R12 R14 ZZ push    rbx 
-    40baef     40 DATAREF STACK 815 esp + 0 PARENT LocalFrame LOCALFRAME
+    40baef     40 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40baef      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40baf0      3 INSTR BELONGTO 40bae0 
     40baf0      3 INSTR DEADREGS  RBX R12 R14 ZZ mov     rbx, rdi 
@@ -12713,7 +12715,7 @@
     40bbf0     25 FUNC GLOBAL sub_40BBF0 FUNC_UNSAFE NOFP RET     40bc08 
     40bbf0      4 INSTR BELONGTO 40bbf0 
     40bbf0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40bbf0      8 DATAREF STACK 816 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bbf0      8 DATAREF STACK 815 esp + 0 PARENT LocalFrame LOCALFRAME
     40bbf0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40bbf4     -1 INSTR LOCAL NoMetaUpdate call    sub_40A0E0 
     40bbf4      5 INSTR BELONGTO 40bbf0 
@@ -12758,13 +12760,13 @@
     40bc37      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
     40bc3c      4 INSTR BELONGTO 40bc10 
     40bc3c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-    40bc3c     56 DATAREF STACK 817 esp + 0 PARENT LocalFrame LOCALFRAME
-    40bc3c      8 DATAREF STACK 818 esp + 8 CHILDOF 817 OFFSET 8 LOCALVAR var_30 
-    40bc3c      8 DATAREF STACK 819 esp + 16 CHILDOF 817 OFFSET 16 LOCALVAR var_28 
-    40bc3c      8 DATAREF STACK 820 esp + 24 CHILDOF 817 OFFSET 24 LOCALVAR var_20 
-    40bc3c      8 DATAREF STACK 821 esp + 32 CHILDOF 817 OFFSET 32 LOCALVAR var_18 
-    40bc3c      8 DATAREF STACK 822 esp + 40 CHILDOF 817 OFFSET 40 LOCALVAR var_10 
-    40bc3c      8 DATAREF STACK 823 esp + 48 CHILDOF 817 OFFSET 48 LOCALVAR var_8 
+    40bc3c     56 DATAREF STACK 816 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bc3c      8 DATAREF STACK 817 esp + 8 CHILDOF 816 OFFSET 8 LOCALVAR var_30 
+    40bc3c      8 DATAREF STACK 818 esp + 16 CHILDOF 816 OFFSET 16 LOCALVAR var_28 
+    40bc3c      8 DATAREF STACK 819 esp + 24 CHILDOF 816 OFFSET 24 LOCALVAR var_20 
+    40bc3c      8 DATAREF STACK 820 esp + 32 CHILDOF 816 OFFSET 32 LOCALVAR var_18 
+    40bc3c      8 DATAREF STACK 821 esp + 40 CHILDOF 816 OFFSET 40 LOCALVAR var_10 
+    40bc3c      8 DATAREF STACK 822 esp + 48 CHILDOF 816 OFFSET 48 LOCALVAR var_8 
     40bc3c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40bc40     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
     40bc40      3 INSTR BELONGTO 40bc10 
@@ -12841,7 +12843,7 @@
     40bcb5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40bcb5      4 INSTR BELONGTO 40bcb0 
     40bcb5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    40bcb5      8 DATAREF STACK 824 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bcb5      8 DATAREF STACK 823 esp + 0 PARENT LocalFrame LOCALFRAME
     40bcb5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40bcb9      7 INSTR BELONGTO 40bcb0 
     40bcb9      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_60ED58 
@@ -12876,7 +12878,7 @@
     40bce8     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     40bcf5 
     40bce8      4 INSTR BELONGTO 40bce8 
     40bce8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    40bce8      8 DATAREF STACK 825 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bce8      8 DATAREF STACK 824 esp + 0 PARENT LocalFrame LOCALFRAME
     40bce8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40bcec     -1 INSTR LOCAL NoMetaUpdate call    sub_404B30 
     40bcec      5 INSTR BELONGTO 40bce8 
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 f49a6a75..e0c207e5 100644
--- a/tests/commit/trimmed-sorted-save-gnome-screensaver-command.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-screensaver-command.psexe.annot
@@ -631,12 +631,11 @@
     401151      4 INSTR DEADREGS  EFLAGS RCX RBX RDI ZZ mov     rcx, [rax+8] 
     401155     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_401112 
     401155      2 INSTR BELONGTO 400fe0 
-    401158      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
-    401158      0 FUNC MMSAFENESS UNSAFE
+    401158      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    401158      0 FUNC MMSAFENESS SAFE
     401158     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     401158      2 INSTR BELONGTO 401158 
     401158     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     401181 
-    401158      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     40115a      3 INSTR BELONGTO 401158 
     40115a      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     40115d      1 INSTR BELONGTO 401158 
@@ -648,8 +647,11 @@
     401161      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     401165      1 INSTR BELONGTO 401158 
     401165      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    401165     -3 INSTR LOCAL NoWarn push    rax 
+    401166     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     401166      1 INSTR BELONGTO 401158 
     401166      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    401166      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     401167     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     401167      7 INSTR BELONGTO 401158 
     401167      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -744,14 +746,14 @@
     401202      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     401203      1 INSTR BELONGTO 4011a0 
     401203      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    401210      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
+    401210      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     401210      0 FUNC MMSAFENESS UNSAFE
     401210     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_602E18, 0 
     401210     34 FUNC GLOBAL sub_401210 FUNC_UNSAFE USEFP RET     401231 
     401210      8 INSTR BELONGTO 401210 
-    401210      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    401210      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401218      1 INSTR BELONGTO 401210 
+    401218      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    401218      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401219      3 INSTR BELONGTO 401210 
     40121c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401230 
     40121c      2 INSTR BELONGTO 401210 
diff --git a/tests/commit/trimmed-sorted-save-gnome-screensaver.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-screensaver.psexe.annot
index 4d7ef055..8d6fb24a 100644
--- a/tests/commit/trimmed-sorted-save-gnome-screensaver.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-screensaver.psexe.annot
@@ -3740,12 +3740,11 @@
     409396      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
     40939b     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_409337 
     40939b      2 INSTR BELONGTO 409220 
-    4093a0      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
-    4093a0      0 FUNC MMSAFENESS UNSAFE
+    4093a0      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    4093a0      0 FUNC MMSAFENESS SAFE
     4093a0     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     4093a0      2 INSTR BELONGTO 4093a0 
     4093a0     42 FUNC GLOBAL _start FUNC_UNSAFE NOFP NORET     4093c9 
-    4093a0      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     4093a2      3 INSTR BELONGTO 4093a0 
     4093a2      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     4093a5      1 INSTR BELONGTO 4093a0 
@@ -3757,8 +3756,11 @@
     4093a9      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     4093ad      1 INSTR BELONGTO 4093a0 
     4093ad      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    4093ad     -3 INSTR LOCAL NoWarn push    rax 
+    4093ae     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     4093ae      1 INSTR BELONGTO 4093a0 
     4093ae      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    4093ae      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     4093af     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset __libc_csu_fini; fini 
     4093af      7 INSTR BELONGTO 4093a0 
     4093af      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset __libc_csu_fini; fini 
@@ -3853,14 +3855,14 @@
     409452      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     409453      1 INSTR BELONGTO 4093f0 
     409453      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    409460      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
+    409460      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     409460      0 FUNC MMSAFENESS UNSAFE
     409460     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_61ED78, 0 
     409460     34 FUNC GLOBAL sub_409460 FUNC_UNSAFE USEFP RET     409481 
     409460      8 INSTR BELONGTO 409460 
-    409460      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    409460      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     409468      1 INSTR BELONGTO 409460 
+    409468      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    409468      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     409469      3 INSTR BELONGTO 409460 
     40946c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409480 
     40946c      2 INSTR BELONGTO 409460 
@@ -9917,7 +9919,7 @@
     40c2e9      3 INSTR DEADREGS  RDX ZZ mov     rbp, rdi 
     40c2ec      1 INSTR BELONGTO 40c2e0 
     40c2ec      1 INSTR DEADREGS  RDX RDI ZZ push    rbx 
-    40c2ec     24 DATAREF STACK 1366 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c2ec     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40c2ec      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40c2ed      3 INSTR BELONGTO 40c2e0 
     40c2ed      3 INSTR DEADREGS  RDX RBX RDI ZZ mov     rbx, rsi 
@@ -10160,14 +10162,14 @@
     40c537      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 R13 ZZ mov     ebp, esi 
     40c539     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
     40c539      5 INSTR BELONGTO 40c520 
-    40c53e     40 DATAREF STACK 1367 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c53e     40 DATAREF STACK 1366 esp + 0 PARENT LocalFrame LOCALFRAME
     40c53e      4 INSTR BELONGTO 40c520 
     40c53e      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R14 ZZ sub     rsp, 28h 
-    40c53e      8 DATAREF STACK 1368 esp + 0 CHILDOF 1367 OFFSET 0 LOCALVAR var_28 
-    40c53e      8 DATAREF STACK 1369 esp + 8 CHILDOF 1367 OFFSET 8 LOCALVAR var_20 
-    40c53e      8 DATAREF STACK 1370 esp + 16 CHILDOF 1367 OFFSET 16 LOCALVAR var_18 
-    40c53e      8 DATAREF STACK 1371 esp + 24 CHILDOF 1367 OFFSET 24 LOCALVAR var_10 
-    40c53e      8 DATAREF STACK 1372 esp + 32 CHILDOF 1367 OFFSET 32 LOCALVAR var_8 
+    40c53e      8 DATAREF STACK 1367 esp + 0 CHILDOF 1366 OFFSET 0 LOCALVAR var_28 
+    40c53e      8 DATAREF STACK 1368 esp + 8 CHILDOF 1366 OFFSET 8 LOCALVAR var_20 
+    40c53e      8 DATAREF STACK 1369 esp + 16 CHILDOF 1366 OFFSET 16 LOCALVAR var_18 
+    40c53e      8 DATAREF STACK 1370 esp + 24 CHILDOF 1366 OFFSET 24 LOCALVAR var_10 
+    40c53e      8 DATAREF STACK 1371 esp + 32 CHILDOF 1366 OFFSET 32 LOCALVAR var_8 
     40c53e      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40c542     -1 INSTR LOCAL NoMetaUpdate call    gs_listener_get_type 
     40c542      5 INSTR BELONGTO 40c520 
@@ -10507,7 +10509,7 @@
     40c757     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40c757      4 INSTR BELONGTO 40c750 
     40c757      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40c757      8 DATAREF STACK 1373 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c757      8 DATAREF STACK 1372 esp + 0 PARENT LocalFrame LOCALFRAME
     40c757      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40c75b     -1 INSTR LOCAL NoMetaUpdate call    gs_listener_get_type 
     40c75b      5 INSTR BELONGTO 40c750 
@@ -10658,15 +10660,15 @@
     40c92d      5 INSTR BELONGTO 40c920 
     40c932     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     40c932      5 INSTR BELONGTO 40c920 
-    40c937    104 DATAREF STACK 1374 esp + 0 PARENT LocalFrame LOCALFRAME
-    40c937     24 DATAREF STACK 1375 esp + 8 CHILDOF 1374 OFFSET 8 LOCALVAR var_60 
-    40c937     40 DATAREF STACK 1376 esp + 32 CHILDOF 1374 OFFSET 32 LOCALVAR var_48 
+    40c937    104 DATAREF STACK 1373 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c937     24 DATAREF STACK 1374 esp + 8 CHILDOF 1373 OFFSET 8 LOCALVAR var_60 
+    40c937     40 DATAREF STACK 1375 esp + 32 CHILDOF 1373 OFFSET 32 LOCALVAR var_48 
     40c937      4 INSTR BELONGTO 40c920 
     40c937      4 INSTR DEADREGS  EFLAGS RDX R12 R13 ZZ sub     rsp, 68h 
-    40c937      8 DATAREF STACK 1377 esp + 72 CHILDOF 1374 OFFSET 72 LOCALVAR var_20 
-    40c937      8 DATAREF STACK 1378 esp + 80 CHILDOF 1374 OFFSET 80 LOCALVAR var_18 
-    40c937      8 DATAREF STACK 1379 esp + 88 CHILDOF 1374 OFFSET 88 LOCALVAR var_10 
-    40c937      8 DATAREF STACK 1380 esp + 96 CHILDOF 1374 OFFSET 96 LOCALVAR var_8 
+    40c937      8 DATAREF STACK 1376 esp + 72 CHILDOF 1373 OFFSET 72 LOCALVAR var_20 
+    40c937      8 DATAREF STACK 1377 esp + 80 CHILDOF 1373 OFFSET 80 LOCALVAR var_18 
+    40c937      8 DATAREF STACK 1378 esp + 88 CHILDOF 1373 OFFSET 88 LOCALVAR var_10 
+    40c937      8 DATAREF STACK 1379 esp + 96 CHILDOF 1373 OFFSET 96 LOCALVAR var_8 
     40c937      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
     40c93b     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40c93b      3 INSTR BELONGTO 40c920 
@@ -11093,13 +11095,13 @@
     40cc4c      1 INSTR BELONGTO 40cc40 
     40cc4c      1 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ push    rbx 
     40cc4c     -3 INSTR LOCAL NoWarn push    rbx 
-    40cc4d     12 DATAREF STACK 1384 esp + 12 CHILDOF 1381 OFFSET 12 LOCALVAR var_3C 
-    40cc4d     24 DATAREF STACK 1381 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cc4d     12 DATAREF STACK 1383 esp + 12 CHILDOF 1380 OFFSET 12 LOCALVAR var_3C 
+    40cc4d     24 DATAREF STACK 1380 esp + 0 PARENT LocalFrame LOCALFRAME
     40cc4d     48 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    40cc4d      4 DATAREF STACK 1383 esp + 8 CHILDOF 1381 OFFSET 8 LOCALVAR var_40 
+    40cc4d      4 DATAREF STACK 1382 esp + 8 CHILDOF 1380 OFFSET 8 LOCALVAR var_40 
     40cc4d      4 INSTR BELONGTO 40cc40 
     40cc4d      4 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ sub     rsp, 18h 
-    40cc4d      8 DATAREF STACK 1382 esp + 0 CHILDOF 1381 OFFSET 0 LOCALVAR var_48 
+    40cc4d      8 DATAREF STACK 1381 esp + 0 CHILDOF 1380 OFFSET 0 LOCALVAR var_48 
     40cc4d      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     40cc51     -1 INSTR LOCAL NoMetaUpdate call    _gdk_display_get_default 
     40cc51      5 INSTR BELONGTO 40cc40 
@@ -11280,17 +11282,17 @@
     40cd5b      3 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     rbx, rdi 
     40cd5e      3 INSTR BELONGTO 40cd50 
     40cd5e      3 INSTR DEADREGS  EFLAGS RDX RDI ZZ mov     rdi, r12 
-    40cd61     16 DATAREF STACK 1388 esp + 16 CHILDOF 1385 OFFSET 16 LOCALVAR var_38 
+    40cd61     16 DATAREF STACK 1387 esp + 16 CHILDOF 1384 OFFSET 16 LOCALVAR var_38 
     40cd61     24 MEMORYHOLE STACK esp + 48 CalleeSavedRegs 
-    40cd61     48 DATAREF STACK 1385 esp + 0 PARENT LocalFrame LOCALFRAME
-    40cd61      4 DATAREF STACK 1386 esp + 0 CHILDOF 1385 OFFSET 0 OutArgsRegion OUTARGS
-    40cd61      4 DATAREF STACK 1389 esp + 32 CHILDOF 1385 OFFSET 32 LOCALVAR var_28 
-    40cd61      4 DATAREF STACK 1390 esp + 36 CHILDOF 1385 OFFSET 36 LOCALVAR var_24 
-    40cd61      4 DATAREF STACK 1391 esp + 40 CHILDOF 1385 OFFSET 40 LOCALVAR var_20 
-    40cd61      4 DATAREF STACK 1392 esp + 44 CHILDOF 1385 OFFSET 44 LOCALVAR var_1C 
+    40cd61     48 DATAREF STACK 1384 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cd61      4 DATAREF STACK 1385 esp + 0 CHILDOF 1384 OFFSET 0 OutArgsRegion OUTARGS
+    40cd61      4 DATAREF STACK 1388 esp + 32 CHILDOF 1384 OFFSET 32 LOCALVAR var_28 
+    40cd61      4 DATAREF STACK 1389 esp + 36 CHILDOF 1384 OFFSET 36 LOCALVAR var_24 
+    40cd61      4 DATAREF STACK 1390 esp + 40 CHILDOF 1384 OFFSET 40 LOCALVAR var_20 
+    40cd61      4 DATAREF STACK 1391 esp + 44 CHILDOF 1384 OFFSET 44 LOCALVAR var_1C 
     40cd61      4 INSTR BELONGTO 40cd50 
     40cd61      4 INSTR DEADREGS  EFLAGS RDX ZZ sub     rsp, 30h 
-    40cd61      8 DATAREF STACK 1387 esp + 8 CHILDOF 1385 OFFSET 8 LOCALVAR var_40 
+    40cd61      8 DATAREF STACK 1386 esp + 8 CHILDOF 1384 OFFSET 8 LOCALVAR var_40 
     40cd61      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     40cd65      5 INSTR BELONGTO 40cd50 
     40cd65      5 INSTR DEADREGS  EFLAGS RDX ZZ lea     rdx, [rsp+48h+var_28] 
@@ -11706,10 +11708,10 @@
     40d0c5      3 INSTR BELONGTO 40d0c0 
     40d0c5      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 ZZ mov     rbx, rsi 
     40d0c8     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    40d0c8     24 DATAREF STACK 1393 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d0c8     24 DATAREF STACK 1392 esp + 0 PARENT LocalFrame LOCALFRAME
     40d0c8      4 INSTR BELONGTO 40d0c0 
     40d0c8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-    40d0c8      8 DATAREF STACK 1394 esp + 0 CHILDOF 1393 OFFSET 0 OutArgsRegion OUTARGS
+    40d0c8      8 DATAREF STACK 1393 esp + 0 CHILDOF 1392 OFFSET 0 OutArgsRegion OUTARGS
     40d0c8      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40d0cc     -1 INSTR LOCAL NoMetaUpdate call    gs_window_get_type 
     40d0cc      5 INSTR BELONGTO 40d0c0 
@@ -11907,8 +11909,8 @@
     40d1e4      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
     40d1e4     -3 INSTR LOCAL NoWarn push    rbx 
     40d1e5     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-    40d1e5     20 DATAREF STACK 1396 esp + 0 CHILDOF 1395 OFFSET 0 OutArgsRegion OUTARGS
-    40d1e5     40 DATAREF STACK 1395 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d1e5     20 DATAREF STACK 1395 esp + 0 CHILDOF 1394 OFFSET 0 OutArgsRegion OUTARGS
+    40d1e5     40 DATAREF STACK 1394 esp + 0 PARENT LocalFrame LOCALFRAME
     40d1e5      4 INSTR BELONGTO 40d1e0 
     40d1e5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 28h 
     40d1e5      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
@@ -12255,7 +12257,7 @@
     40d460     28 FUNC GLOBAL sub_40D460 FUNC_UNSAFE NOFP RET     40d47b 
     40d460      4 INSTR BELONGTO 40d460 
     40d460      4 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ sub     rsp, 8 
-    40d460      8 DATAREF STACK 1397 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d460      8 DATAREF STACK 1396 esp + 0 PARENT LocalFrame LOCALFRAME
     40d460      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40d464      4 INSTR BELONGTO 40d460 
     40d464      4 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ mov     rax, [rcx+18h] 
@@ -12293,8 +12295,8 @@
     40d4f0      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
     40d4f0      0 FUNC MMSAFENESS SAFE
     40d4f0    113 FUNC GLOBAL gs_manager_get_type FUNC_UNSAFE NOFP RET     40d560 
-    40d4f0     24 DATAREF STACK 1398 esp + 0 PARENT LocalFrame LOCALFRAME
-    40d4f0      4 DATAREF STACK 1399 esp + 0 CHILDOF 1398 OFFSET 0 OutArgsRegion OUTARGS
+    40d4f0     24 DATAREF STACK 1397 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d4f0      4 DATAREF STACK 1398 esp + 0 CHILDOF 1397 OFFSET 0 OutArgsRegion OUTARGS
     40d4f0      4 INSTR BELONGTO 40d4f0 
     40d4f0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
     40d4f0      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -12599,11 +12601,11 @@
     40db38      1 INSTR BELONGTO 40db30 
     40db38      1 INSTR DEADREGS  EFLAGS R12 R13 ZZ push    rbx 
     40db38     -3 INSTR LOCAL NoWarn push    rbx 
-    40db39     24 DATAREF STACK 1400 esp + 0 PARENT LocalFrame LOCALFRAME
+    40db39     24 DATAREF STACK 1399 esp + 0 PARENT LocalFrame LOCALFRAME
     40db39     32 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
     40db39      4 INSTR BELONGTO 40db30 
     40db39      4 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ sub     rsp, 18h 
-    40db39      8 DATAREF STACK 1401 esp + 0 CHILDOF 1400 OFFSET 0 OutArgsRegion OUTARGS
+    40db39      8 DATAREF STACK 1400 esp + 0 CHILDOF 1399 OFFSET 0 OutArgsRegion OUTARGS
     40db39      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40db3d     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40db3d      3 INSTR BELONGTO 40db30 
@@ -12829,7 +12831,7 @@
     40ddf2      3 INSTR BELONGTO 40ddf0 
     40ddf5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40ddf5      4 INSTR BELONGTO 40ddf0 
-    40ddf5      8 DATAREF STACK 1402 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ddf5      8 DATAREF STACK 1401 esp + 0 PARENT LocalFrame LOCALFRAME
     40ddf5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40ddf9     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40ddf9      3 INSTR BELONGTO 40ddf0 
@@ -12984,7 +12986,7 @@
     40df85     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40df85      4 INSTR BELONGTO 40df80 
     40df85      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40df85      8 DATAREF STACK 1403 esp + 0 PARENT LocalFrame LOCALFRAME
+    40df85      8 DATAREF STACK 1402 esp + 0 PARENT LocalFrame LOCALFRAME
     40df85      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40df89     -1 INSTR LOCAL NoMetaUpdate call    gs_manager_get_type 
     40df89      5 INSTR BELONGTO 40df80 
@@ -13098,7 +13100,7 @@
     40e038     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40e038      4 INSTR BELONGTO 40e030 
     40e038      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    40e038      8 DATAREF STACK 1404 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e038      8 DATAREF STACK 1403 esp + 0 PARENT LocalFrame LOCALFRAME
     40e038      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40e03c     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
     40e03c      3 INSTR BELONGTO 40e030 
@@ -13186,7 +13188,7 @@
     40e0a7     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40e0a7      4 INSTR BELONGTO 40e0a0 
     40e0a7      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40e0a7      8 DATAREF STACK 1405 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e0a7      8 DATAREF STACK 1404 esp + 0 PARENT LocalFrame LOCALFRAME
     40e0a7      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40e0ab     -1 INSTR LOCAL NoMetaUpdate call    gs_manager_get_type 
     40e0ab      5 INSTR BELONGTO 40e0a0 
@@ -13309,16 +13311,17 @@
     40e159      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     40e15a      1 INSTR BELONGTO 40e0a0 
     40e15a      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    40e160      0 FUNC FRAMERESTORE 0 0 1 1 0 1 2 0 4 3 0 0 4 0 8 5 0 0 6 0 16 7 0 4 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
+    40e160      0 FUNC FRAMERESTORE 0 0 1 1 0 1 2 0 4 3 -4 0 4 0 8 5 0 0 6 0 16 7 0 4 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
     40e160      0 FUNC MMSAFENESS SAFE
     40e160     39 FUNC GLOBAL sub_40E160 FUNC_UNSAFE NOFP RET     40e186 
     40e160      4 INSTR BELONGTO 40e160 
     40e160      4 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, [rdi+18h] 
-    40e160      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    40e160      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40e164      1 INSTR BELONGTO 40e160 
     40e164      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
     40e164     -3 INSTR LOCAL NoWarn push    rbx 
+    40e164     -3 INSTR LOCAL NoWarn push    rbx 
+    40e164      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    40e164      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40e165     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
     40e165      3 INSTR BELONGTO 40e160 
     40e168     -1 INSTR LOCAL NoMetaUpdate test    byte ptr [rax+28h], 1 
@@ -13351,11 +13354,11 @@
     40e195      5 INSTR BELONGTO 40e190 
     40e195      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+var_8], rbp 
     40e195      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
-    40e19a     24 DATAREF STACK 1406 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e19a     24 DATAREF STACK 1405 esp + 0 PARENT LocalFrame LOCALFRAME
     40e19a      4 INSTR BELONGTO 40e190 
     40e19a      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-    40e19a      8 DATAREF STACK 1407 esp + 8 CHILDOF 1406 OFFSET 8 LOCALVAR var_10 
-    40e19a      8 DATAREF STACK 1408 esp + 16 CHILDOF 1406 OFFSET 16 LOCALVAR var_8 
+    40e19a      8 DATAREF STACK 1406 esp + 8 CHILDOF 1405 OFFSET 8 LOCALVAR var_10 
+    40e19a      8 DATAREF STACK 1407 esp + 16 CHILDOF 1405 OFFSET 16 LOCALVAR var_8 
     40e19a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40e19e     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
     40e19e      3 INSTR BELONGTO 40e190 
@@ -13446,7 +13449,7 @@
     40e227     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40e227      4 INSTR BELONGTO 40e220 
     40e227      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40e227      8 DATAREF STACK 1409 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e227      8 DATAREF STACK 1408 esp + 0 PARENT LocalFrame LOCALFRAME
     40e227      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40e22b     -1 INSTR LOCAL NoMetaUpdate call    gs_manager_get_type 
     40e22b      5 INSTR BELONGTO 40e220 
@@ -13563,7 +13566,7 @@
     40e2c7     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40e2c7      4 INSTR BELONGTO 40e2c0 
     40e2c7      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40e2c7      8 DATAREF STACK 1410 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e2c7      8 DATAREF STACK 1409 esp + 0 PARENT LocalFrame LOCALFRAME
     40e2c7      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40e2cb     -1 INSTR LOCAL NoMetaUpdate call    gs_manager_get_type 
     40e2cb      5 INSTR BELONGTO 40e2c0 
@@ -13686,7 +13689,7 @@
     40e367     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40e367      4 INSTR BELONGTO 40e360 
     40e367      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40e367      8 DATAREF STACK 1411 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e367      8 DATAREF STACK 1410 esp + 0 PARENT LocalFrame LOCALFRAME
     40e367      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40e36b     -1 INSTR LOCAL NoMetaUpdate call    gs_manager_get_type 
     40e36b      5 INSTR BELONGTO 40e360 
@@ -13807,7 +13810,7 @@
     40e407     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40e407      4 INSTR BELONGTO 40e400 
     40e407      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40e407      8 DATAREF STACK 1412 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e407      8 DATAREF STACK 1411 esp + 0 PARENT LocalFrame LOCALFRAME
     40e407      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40e40b     -1 INSTR LOCAL NoMetaUpdate call    gs_manager_get_type 
     40e40b      5 INSTR BELONGTO 40e400 
@@ -13926,13 +13929,13 @@
     40e4ad      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], rbx
     40e4b2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     40e4b2      5 INSTR BELONGTO 40e4a0 
-    40e4b7     40 DATAREF STACK 1413 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e4b7     40 DATAREF STACK 1412 esp + 0 PARENT LocalFrame LOCALFRAME
     40e4b7      4 INSTR BELONGTO 40e4a0 
     40e4b7      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 28h 
-    40e4b7      8 DATAREF STACK 1414 esp + 8 CHILDOF 1413 OFFSET 8 LOCALVAR var_20 
-    40e4b7      8 DATAREF STACK 1415 esp + 16 CHILDOF 1413 OFFSET 16 LOCALVAR var_18 
-    40e4b7      8 DATAREF STACK 1416 esp + 24 CHILDOF 1413 OFFSET 24 LOCALVAR var_10 
-    40e4b7      8 DATAREF STACK 1417 esp + 32 CHILDOF 1413 OFFSET 32 LOCALVAR var_8 
+    40e4b7      8 DATAREF STACK 1413 esp + 8 CHILDOF 1412 OFFSET 8 LOCALVAR var_20 
+    40e4b7      8 DATAREF STACK 1414 esp + 16 CHILDOF 1412 OFFSET 16 LOCALVAR var_18 
+    40e4b7      8 DATAREF STACK 1415 esp + 24 CHILDOF 1412 OFFSET 24 LOCALVAR var_10 
+    40e4b7      8 DATAREF STACK 1416 esp + 32 CHILDOF 1412 OFFSET 32 LOCALVAR var_8 
     40e4b7      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40e4bb      3 INSTR BELONGTO 40e4a0 
     40e4bb      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 R12 ZZ mov     r12, rsi 
@@ -14098,7 +14101,7 @@
     40e5d8     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40e5d8      4 INSTR BELONGTO 40e5d0 
     40e5d8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40e5d8      8 DATAREF STACK 1418 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e5d8      8 DATAREF STACK 1417 esp + 0 PARENT LocalFrame LOCALFRAME
     40e5d8      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40e5dc     -1 INSTR LOCAL NoMetaUpdate call    gs_manager_get_type 
     40e5dc      5 INSTR BELONGTO 40e5d0 
@@ -14193,7 +14196,7 @@
     40e663      3 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
     40e666      1 INSTR BELONGTO 40e660 
     40e666      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 R12 ZZ push    rbx 
-    40e666     24 DATAREF STACK 1419 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e666     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40e666      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40e667      3 INSTR BELONGTO 40e660 
     40e667      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 ZZ mov     rbx, rdi 
@@ -14312,7 +14315,7 @@
     40e713      3 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
     40e716      1 INSTR BELONGTO 40e710 
     40e716      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 R12 ZZ push    rbx 
-    40e716     24 DATAREF STACK 1420 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e716     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40e716      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40e717      3 INSTR BELONGTO 40e710 
     40e717      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 ZZ mov     rbx, rdi 
@@ -14432,7 +14435,7 @@
     40e7c3      3 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
     40e7c6      1 INSTR BELONGTO 40e7c0 
     40e7c6      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 R12 ZZ push    rbx 
-    40e7c6     24 DATAREF STACK 1421 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e7c6     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40e7c6      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40e7c7      3 INSTR BELONGTO 40e7c0 
     40e7c7      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 ZZ mov     rbx, rdi 
@@ -14682,17 +14685,17 @@
     40eb17      5 INSTR BELONGTO 40eb00 
     40eb1c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
     40eb1c      5 INSTR BELONGTO 40eb00 
-    40eb21     12 DATAREF STACK 1423 esp + 0 CHILDOF 1422 OFFSET 0 LOCALVAR var_48 
-    40eb21     12 DATAREF STACK 1424 esp + 12 CHILDOF 1422 OFFSET 12 LOCALVAR var_3C 
+    40eb21     12 DATAREF STACK 1419 esp + 0 CHILDOF 1418 OFFSET 0 LOCALVAR var_48 
+    40eb21     12 DATAREF STACK 1420 esp + 12 CHILDOF 1418 OFFSET 12 LOCALVAR var_3C 
     40eb21      4 INSTR BELONGTO 40eb00 
     40eb21      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 48h 
-    40eb21     72 DATAREF STACK 1422 esp + 0 PARENT LocalFrame LOCALFRAME
-    40eb21      8 DATAREF STACK 1425 esp + 24 CHILDOF 1422 OFFSET 24 LOCALVAR var_30 
-    40eb21      8 DATAREF STACK 1426 esp + 32 CHILDOF 1422 OFFSET 32 LOCALVAR var_28 
-    40eb21      8 DATAREF STACK 1427 esp + 40 CHILDOF 1422 OFFSET 40 LOCALVAR var_20 
-    40eb21      8 DATAREF STACK 1428 esp + 48 CHILDOF 1422 OFFSET 48 LOCALVAR var_18 
-    40eb21      8 DATAREF STACK 1429 esp + 56 CHILDOF 1422 OFFSET 56 LOCALVAR var_10 
-    40eb21      8 DATAREF STACK 1430 esp + 64 CHILDOF 1422 OFFSET 64 LOCALVAR var_8 
+    40eb21     72 DATAREF STACK 1418 esp + 0 PARENT LocalFrame LOCALFRAME
+    40eb21      8 DATAREF STACK 1421 esp + 24 CHILDOF 1418 OFFSET 24 LOCALVAR var_30 
+    40eb21      8 DATAREF STACK 1422 esp + 32 CHILDOF 1418 OFFSET 32 LOCALVAR var_28 
+    40eb21      8 DATAREF STACK 1423 esp + 40 CHILDOF 1418 OFFSET 40 LOCALVAR var_20 
+    40eb21      8 DATAREF STACK 1424 esp + 48 CHILDOF 1418 OFFSET 48 LOCALVAR var_18 
+    40eb21      8 DATAREF STACK 1425 esp + 56 CHILDOF 1418 OFFSET 56 LOCALVAR var_10 
+    40eb21      8 DATAREF STACK 1426 esp + 64 CHILDOF 1418 OFFSET 64 LOCALVAR var_8 
     40eb21      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     40eb25     -1 INSTR LOCAL NoMetaUpdate test    esi, esi 
     40eb25      2 INSTR BELONGTO 40eb00 
@@ -15308,14 +15311,14 @@
     40ef5c      3 INSTR BELONGTO 40eb00 
     40ef5f     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40EDB2 
     40ef5f      5 INSTR BELONGTO 40eb00 
-    40ef70      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
+    40ef70      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 4 3 -4 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
     40ef70      0 FUNC MMSAFENESS SAFE
     40ef70    101 FUNC GLOBAL gs_manager_get_active FUNC_UNSAFE NOFP RET     40efd4 
     40ef70     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40ef70      3 INSTR BELONGTO 40ef70 
-    40ef70      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    40ef70      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40ef73      1 INSTR BELONGTO 40ef70 
+    40ef73      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    40ef73      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40ef74      3 INSTR BELONGTO 40ef70 
     40ef74      3 INSTR DEADREGS  RBX ZZ mov     rbx, rdi 
     40ef77     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40EFC0 
@@ -15389,14 +15392,14 @@
     40efd3      1 INSTR DEADREGS  EFLAGS RBX R8 R9 R10 R11 ZZ pop     rbx 
     40efd4      1 INSTR BELONGTO 40ef70 
     40efd4      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    40efe0      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 96 3 0 0 4 0 8 5 0 0 6 0 16 7 0 16 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
+    40efe0      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 96 3 -4 0 4 0 8 5 0 0 6 0 16 7 0 16 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
     40efe0      0 FUNC MMSAFENESS SAFE
     40efe0     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40efe0    263 FUNC GLOBAL gs_manager_request_unlock FUNC_UNSAFE NOFP RET     40f0e6 
     40efe0      3 INSTR BELONGTO 40efe0 
-    40efe0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    40efe0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40efe3      1 INSTR BELONGTO 40efe0 
+    40efe3      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    40efe3      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40efe4      3 INSTR BELONGTO 40efe0 
     40efe4      3 INSTR DEADREGS  RBX ZZ mov     rbx, rdi 
     40efe7     -1 INSTR LOCAL NoMetaUpdate jz      loc_40F0C0 
@@ -15632,13 +15635,13 @@
     40f29d      5 INSTR BELONGTO 40f290 
     40f2a2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     40f2a2      5 INSTR BELONGTO 40f290 
-    40f2a7     40 DATAREF STACK 1431 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f2a7     40 DATAREF STACK 1427 esp + 0 PARENT LocalFrame LOCALFRAME
     40f2a7      4 INSTR BELONGTO 40f290 
     40f2a7      4 INSTR DEADREGS  EFLAGS RAX RDI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 28h 
-    40f2a7      8 DATAREF STACK 1432 esp + 8 CHILDOF 1431 OFFSET 8 LOCALVAR var_20 
-    40f2a7      8 DATAREF STACK 1433 esp + 16 CHILDOF 1431 OFFSET 16 LOCALVAR var_18 
-    40f2a7      8 DATAREF STACK 1434 esp + 24 CHILDOF 1431 OFFSET 24 LOCALVAR var_10 
-    40f2a7      8 DATAREF STACK 1435 esp + 32 CHILDOF 1431 OFFSET 32 LOCALVAR var_8 
+    40f2a7      8 DATAREF STACK 1428 esp + 8 CHILDOF 1427 OFFSET 8 LOCALVAR var_20 
+    40f2a7      8 DATAREF STACK 1429 esp + 16 CHILDOF 1427 OFFSET 16 LOCALVAR var_18 
+    40f2a7      8 DATAREF STACK 1430 esp + 24 CHILDOF 1427 OFFSET 24 LOCALVAR var_10 
+    40f2a7      8 DATAREF STACK 1431 esp + 32 CHILDOF 1427 OFFSET 32 LOCALVAR var_8 
     40f2a7      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40f2ab      3 INSTR BELONGTO 40f290 
     40f2ab      3 INSTR DEADREGS  EFLAGS RAX RDI R8 R9 R10 R11 R12 R13 ZZ mov     rbp, rsi 
@@ -15827,7 +15830,7 @@
     40f3e5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40f3e5      4 INSTR BELONGTO 40f3e0 
     40f3e5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-    40f3e5      8 DATAREF STACK 1436 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f3e5      8 DATAREF STACK 1432 esp + 0 PARENT LocalFrame LOCALFRAME
     40f3e5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40f3e9      4 INSTR BELONGTO 40f3e0 
     40f3e9      4 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, [rdi+38h] 
@@ -15880,11 +15883,11 @@
     40f445      5 INSTR BELONGTO 40f440 
     40f445      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+var_8], rbp 
     40f445      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
-    40f44a     24 DATAREF STACK 1437 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f44a     24 DATAREF STACK 1433 esp + 0 PARENT LocalFrame LOCALFRAME
     40f44a      4 INSTR BELONGTO 40f440 
     40f44a      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-    40f44a      8 DATAREF STACK 1438 esp + 8 CHILDOF 1437 OFFSET 8 LOCALVAR var_10 
-    40f44a      8 DATAREF STACK 1439 esp + 16 CHILDOF 1437 OFFSET 16 LOCALVAR var_8 
+    40f44a      8 DATAREF STACK 1434 esp + 8 CHILDOF 1433 OFFSET 8 LOCALVAR var_10 
+    40f44a      8 DATAREF STACK 1435 esp + 16 CHILDOF 1433 OFFSET 16 LOCALVAR var_8 
     40f44a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40f44e     -1 INSTR LOCAL NoMetaUpdate test    esi, esi 
     40f44e      2 INSTR BELONGTO 40f440 
@@ -15949,7 +15952,7 @@
     40f4c0     26 FUNC GLOBAL sub_40F4C0 FUNC_UNSAFE NOFP RET     40f4d9 
     40f4c0      4 INSTR BELONGTO 40f4c0 
     40f4c0      4 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ sub     rsp, 8 
-    40f4c0      8 DATAREF STACK 1440 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f4c0      8 DATAREF STACK 1436 esp + 0 PARENT LocalFrame LOCALFRAME
     40f4c0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40f4c4      6 INSTR BELONGTO 40f4c0 
     40f4c4      6 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     esi, cs:dword_61FC94 
@@ -15984,7 +15987,7 @@
     40f4e5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40f4e5      4 INSTR BELONGTO 40f4e0 
     40f4e5      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    40f4e5      8 DATAREF STACK 1441 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f4e5      8 DATAREF STACK 1437 esp + 0 PARENT LocalFrame LOCALFRAME
     40f4e5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40f4e9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_hide 
     40f4e9      5 INSTR BELONGTO 40f4e0 
@@ -16048,7 +16051,7 @@
     40f545     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40f545      4 INSTR BELONGTO 40f540 
     40f545      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    40f545      8 DATAREF STACK 1442 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f545      8 DATAREF STACK 1438 esp + 0 PARENT LocalFrame LOCALFRAME
     40f545      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40f549     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_hide 
     40f549      5 INSTR BELONGTO 40f540 
@@ -16107,7 +16110,7 @@
     40f5a0     34 FUNC GLOBAL sub_40F5A0 FUNC_UNSAFE NOFP RET     40f5c1 
     40f5a0      4 INSTR BELONGTO 40f5a0 
     40f5a0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-    40f5a0      8 DATAREF STACK 1443 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f5a0      8 DATAREF STACK 1439 esp + 0 PARENT LocalFrame LOCALFRAME
     40f5a0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40f5a4      4 INSTR BELONGTO 40f5a0 
     40f5a4      4 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, [rdi+38h] 
@@ -16137,12 +16140,12 @@
     40f5da      3 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rbx, rdi 
     40f5dd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40f5dd      5 INSTR BELONGTO 40f5d0 
-    40f5e2     24 DATAREF STACK 1444 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f5e2     24 DATAREF STACK 1440 esp + 0 PARENT LocalFrame LOCALFRAME
     40f5e2      4 INSTR BELONGTO 40f5d0 
     40f5e2      4 INSTR DEADREGS  EFLAGS RAX R12 ZZ sub     rsp, 18h 
-    40f5e2      8 DATAREF STACK 1445 esp + 0 CHILDOF 1444 OFFSET 0 LOCALVAR var_18 
-    40f5e2      8 DATAREF STACK 1446 esp + 8 CHILDOF 1444 OFFSET 8 LOCALVAR var_10 
-    40f5e2      8 DATAREF STACK 1447 esp + 16 CHILDOF 1444 OFFSET 16 LOCALVAR var_8 
+    40f5e2      8 DATAREF STACK 1441 esp + 0 CHILDOF 1440 OFFSET 0 LOCALVAR var_18 
+    40f5e2      8 DATAREF STACK 1442 esp + 8 CHILDOF 1440 OFFSET 8 LOCALVAR var_10 
+    40f5e2      8 DATAREF STACK 1443 esp + 16 CHILDOF 1440 OFFSET 16 LOCALVAR var_8 
     40f5e2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40f5e6      4 INSTR BELONGTO 40f5d0 
     40f5e6      4 INSTR DEADREGS  EFLAGS RAX R12 ZZ mov     rax, [rdi+38h] 
@@ -16208,11 +16211,11 @@
     40f650     -1 INSTR LOCAL MetadataUnused xor     eax, eax 
     40f650    241 FUNC GLOBAL sub_40F650 FUNC_UNSAFE NOFP RET     40f740 
     40f650      2 INSTR BELONGTO 40f650 
-    40f652     16 DATAREF STACK 1450 esp + 8 CHILDOF 1448 OFFSET 8 LOCALVAR var_10 
-    40f652     24 DATAREF STACK 1448 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f652     16 DATAREF STACK 1446 esp + 8 CHILDOF 1444 OFFSET 8 LOCALVAR var_10 
+    40f652     24 DATAREF STACK 1444 esp + 0 PARENT LocalFrame LOCALFRAME
     40f652      4 INSTR BELONGTO 40f650 
     40f652      4 INSTR DEADREGS  EFLAGS RAX R8 ZZ sub     rsp, 18h 
-    40f652      8 DATAREF STACK 1449 esp + 0 CHILDOF 1448 OFFSET 0 LOCALVAR var_18 
+    40f652      8 DATAREF STACK 1445 esp + 0 CHILDOF 1444 OFFSET 0 LOCALVAR var_18 
     40f652      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40f656     -1 INSTR LOCAL NoMetaUpdate test    sil, 10h 
     40f656      4 INSTR BELONGTO 40f650 
@@ -16371,10 +16374,10 @@
     40f762      3 INSTR BELONGTO 40f750 
     40f762      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rsi 
     40f765     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    40f765     24 DATAREF STACK 1451 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f765     24 DATAREF STACK 1447 esp + 0 PARENT LocalFrame LOCALFRAME
     40f765      4 INSTR BELONGTO 40f750 
     40f765      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
-    40f765      8 DATAREF STACK 1452 esp + 0 CHILDOF 1451 OFFSET 0 OutArgsRegion OUTARGS
+    40f765      8 DATAREF STACK 1448 esp + 0 CHILDOF 1447 OFFSET 0 OutArgsRegion OUTARGS
     40f765      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40f769      4 INSTR BELONGTO 40f750 
     40f769      4 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+28h+var_28], rsi 
@@ -16464,10 +16467,10 @@
     40f7e2      3 INSTR BELONGTO 40f7d0 
     40f7e2      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rsi 
     40f7e5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    40f7e5     24 DATAREF STACK 1453 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f7e5     24 DATAREF STACK 1449 esp + 0 PARENT LocalFrame LOCALFRAME
     40f7e5      4 INSTR BELONGTO 40f7d0 
     40f7e5      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
-    40f7e5      8 DATAREF STACK 1454 esp + 0 CHILDOF 1453 OFFSET 0 OutArgsRegion OUTARGS
+    40f7e5      8 DATAREF STACK 1450 esp + 0 CHILDOF 1449 OFFSET 0 OutArgsRegion OUTARGS
     40f7e5      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40f7e9      4 INSTR BELONGTO 40f7d0 
     40f7e9      4 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+28h+var_28], rsi 
@@ -16562,7 +16565,7 @@
     40f872     -3 INSTR LOCAL NoWarn push    rbp 
     40f873      1 INSTR BELONGTO 40f870 
     40f873      1 INSTR DEADREGS  EFLAGS RAX RDI R12 ZZ push    rbx 
-    40f873     24 DATAREF STACK 1455 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f873     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40f873      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40f874      4 INSTR BELONGTO 40f870 
     40f874      4 INSTR DEADREGS  EFLAGS RAX RBX RDI R12 ZZ mov     rax, [rsi+38h] 
@@ -16658,8 +16661,8 @@
     40f911     -2 INSTR LOCAL n RAX ZZ  NUMVia2ndSrcIMMEDNUM mov     rax, 3FF0000000000000h 
     40f91b      3 INSTR BELONGTO 40f910 
     40f91b      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    40f91e     32 DATAREF STACK 1456 esp + 0 PARENT LocalFrame LOCALFRAME
-    40f91e     32 DATAREF STACK 1457 esp + 0 CHILDOF 1456 OFFSET 0 OutArgsRegion OUTARGS
+    40f91e     32 DATAREF STACK 1451 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f91e     32 DATAREF STACK 1452 esp + 0 CHILDOF 1451 OFFSET 0 OutArgsRegion OUTARGS
     40f91e      4 INSTR BELONGTO 40f910 
     40f91e      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 20h 
     40f91e      8 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
@@ -16725,9 +16728,9 @@
     40f981     -3 INSTR LOCAL NoWarn push    rbx 
     40f982      3 INSTR BELONGTO 40f980 
     40f985     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    40f985     24 DATAREF STACK 1458 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f985     24 DATAREF STACK 1453 esp + 0 PARENT LocalFrame LOCALFRAME
     40f985      4 INSTR BELONGTO 40f980 
-    40f985      8 DATAREF STACK 1459 esp + 0 CHILDOF 1458 OFFSET 0 OutArgsRegion OUTARGS
+    40f985      8 DATAREF STACK 1454 esp + 0 CHILDOF 1453 OFFSET 0 OutArgsRegion OUTARGS
     40f985      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40f989     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
     40f989      5 INSTR BELONGTO 40f980 
@@ -16793,8 +16796,8 @@
     40fa14      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
     40fa14     -3 INSTR LOCAL NoWarn push    rbx 
     40fa15     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-    40fa15     20 DATAREF STACK 1461 esp + 0 CHILDOF 1460 OFFSET 0 OutArgsRegion OUTARGS
-    40fa15     40 DATAREF STACK 1460 esp + 0 PARENT LocalFrame LOCALFRAME
+    40fa15     20 DATAREF STACK 1456 esp + 0 CHILDOF 1455 OFFSET 0 OutArgsRegion OUTARGS
+    40fa15     40 DATAREF STACK 1455 esp + 0 PARENT LocalFrame LOCALFRAME
     40fa15      4 INSTR BELONGTO 40fa10 
     40fa15      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 28h 
     40fa15      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
@@ -17208,17 +17211,17 @@
     40fd27      3 INSTR BELONGTO 40fd10 
     40fd2a     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
     40fd2a      5 INSTR BELONGTO 40fd10 
-    40fd2f     16 DATAREF STACK 1465 esp + 16 CHILDOF 1462 OFFSET 16 LOCALVAR var_38 
-    40fd2f      4 DATAREF STACK 1463 esp + 0 CHILDOF 1462 OFFSET 0 OutArgsRegion OUTARGS
+    40fd2f     16 DATAREF STACK 1460 esp + 16 CHILDOF 1457 OFFSET 16 LOCALVAR var_38 
+    40fd2f      4 DATAREF STACK 1458 esp + 0 CHILDOF 1457 OFFSET 0 OutArgsRegion OUTARGS
     40fd2f      4 INSTR BELONGTO 40fd10 
     40fd2f      4 INSTR DEADREGS  EFLAGS R13 R14 ZZ sub     rsp, 48h 
-    40fd2f     72 DATAREF STACK 1462 esp + 0 PARENT LocalFrame LOCALFRAME
-    40fd2f      8 DATAREF STACK 1464 esp + 8 CHILDOF 1462 OFFSET 8 LOCALVAR var_40 
-    40fd2f      8 DATAREF STACK 1466 esp + 32 CHILDOF 1462 OFFSET 32 LOCALVAR var_28 
-    40fd2f      8 DATAREF STACK 1467 esp + 40 CHILDOF 1462 OFFSET 40 LOCALVAR var_20 
-    40fd2f      8 DATAREF STACK 1468 esp + 48 CHILDOF 1462 OFFSET 48 LOCALVAR var_18 
-    40fd2f      8 DATAREF STACK 1469 esp + 56 CHILDOF 1462 OFFSET 56 LOCALVAR var_10 
-    40fd2f      8 DATAREF STACK 1470 esp + 64 CHILDOF 1462 OFFSET 64 LOCALVAR var_8 
+    40fd2f     72 DATAREF STACK 1457 esp + 0 PARENT LocalFrame LOCALFRAME
+    40fd2f      8 DATAREF STACK 1459 esp + 8 CHILDOF 1457 OFFSET 8 LOCALVAR var_40 
+    40fd2f      8 DATAREF STACK 1461 esp + 32 CHILDOF 1457 OFFSET 32 LOCALVAR var_28 
+    40fd2f      8 DATAREF STACK 1462 esp + 40 CHILDOF 1457 OFFSET 40 LOCALVAR var_20 
+    40fd2f      8 DATAREF STACK 1463 esp + 48 CHILDOF 1457 OFFSET 48 LOCALVAR var_18 
+    40fd2f      8 DATAREF STACK 1464 esp + 56 CHILDOF 1457 OFFSET 56 LOCALVAR var_10 
+    40fd2f      8 DATAREF STACK 1465 esp + 64 CHILDOF 1457 OFFSET 64 LOCALVAR var_8 
     40fd2f      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     40fd33     -1 INSTR LOCAL MetadataUnused mov     r13d, edx 
     40fd33      3 INSTR BELONGTO 40fd10 
@@ -17439,8 +17442,8 @@
     40feb1     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
     40feb3      3 INSTR BELONGTO 40feb0 
     40feb3      3 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     rbx, rdi 
-    40feb6     16 DATAREF STACK 1471 esp + 0 PARENT LocalFrame LOCALFRAME
-    40feb6      4 DATAREF STACK 1472 esp + 12 CHILDOF 1471 OFFSET 12 LOCALVAR var_C 
+    40feb6     16 DATAREF STACK 1466 esp + 0 PARENT LocalFrame LOCALFRAME
+    40feb6      4 DATAREF STACK 1467 esp + 12 CHILDOF 1466 OFFSET 12 LOCALVAR var_C 
     40feb6      4 INSTR BELONGTO 40feb0 
     40feb6      4 INSTR DEADREGS  EFLAGS RDX ZZ sub     rsp, 10h 
     40feb6      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -17610,7 +17613,7 @@
     40ffb5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40ffb5      4 INSTR BELONGTO 40ffb0 
     40ffb5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    40ffb5      8 DATAREF STACK 1473 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ffb5      8 DATAREF STACK 1468 esp + 0 PARENT LocalFrame LOCALFRAME
     40ffb5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40ffb9      4 INSTR BELONGTO 40ffb0 
     40ffb9      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, [rdi+38h] 
@@ -17670,8 +17673,8 @@
     410010     88 FUNC GLOBAL sub_410010 FUNC_UNSAFE NOFP RET     410067 
     410011      2 INSTR BELONGTO 410010 
     410011      2 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     ebx, edi 
-    410013     16 DATAREF STACK 1474 esp + 0 PARENT LocalFrame LOCALFRAME
-    410013      4 DATAREF STACK 1475 esp + 12 CHILDOF 1474 OFFSET 12 LOCALVAR stat_loc 
+    410013     16 DATAREF STACK 1469 esp + 0 PARENT LocalFrame LOCALFRAME
+    410013      4 DATAREF STACK 1470 esp + 12 CHILDOF 1469 OFFSET 12 LOCALVAR stat_loc 
     410013      4 INSTR BELONGTO 410010 
     410013      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ sub     rsp, 10h 
     410013      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -17856,23 +17859,23 @@
     4101c9     -3 INSTR LOCAL NoWarn push    rbx 
     4101ca      3 INSTR BELONGTO 4101c0 
     4101ca      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     rbx, rdi 
-    4101cd     12 DATAREF STACK 1489 esp + 124 CHILDOF 1476 OFFSET 124 LOCALVAR var_3C 
-    4101cd    136 DATAREF STACK 1476 esp + 0 PARENT LocalFrame LOCALFRAME
-    4101cd     40 DATAREF STACK 1477 esp + 0 CHILDOF 1476 OFFSET 0 OutArgsRegion OUTARGS
+    4101cd     12 DATAREF STACK 1484 esp + 124 CHILDOF 1471 OFFSET 124 LOCALVAR var_3C 
+    4101cd    136 DATAREF STACK 1471 esp + 0 PARENT LocalFrame LOCALFRAME
+    4101cd     40 DATAREF STACK 1472 esp + 0 CHILDOF 1471 OFFSET 0 OutArgsRegion OUTARGS
     4101cd     48 MEMORYHOLE STACK esp + 136 CalleeSavedRegs 
-    4101cd      4 DATAREF STACK 1486 esp + 112 CHILDOF 1476 OFFSET 112 LOCALVAR var_48 
-    4101cd      4 DATAREF STACK 1487 esp + 116 CHILDOF 1476 OFFSET 116 LOCALVAR var_44 
-    4101cd      4 DATAREF STACK 1488 esp + 120 CHILDOF 1476 OFFSET 120 LOCALVAR var_40 
+    4101cd      4 DATAREF STACK 1481 esp + 112 CHILDOF 1471 OFFSET 112 LOCALVAR var_48 
+    4101cd      4 DATAREF STACK 1482 esp + 116 CHILDOF 1471 OFFSET 116 LOCALVAR var_44 
+    4101cd      4 DATAREF STACK 1483 esp + 120 CHILDOF 1471 OFFSET 120 LOCALVAR var_40 
     4101cd      7 INSTR BELONGTO 4101c0 
     4101cd      7 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ sub     rsp, 88h 
-    4101cd      8 DATAREF STACK 1478 esp + 48 CHILDOF 1476 OFFSET 48 LOCALVAR var_88 
-    4101cd      8 DATAREF STACK 1479 esp + 56 CHILDOF 1476 OFFSET 56 LOCALVAR var_80 
-    4101cd      8 DATAREF STACK 1480 esp + 64 CHILDOF 1476 OFFSET 64 LOCALVAR var_78 
-    4101cd      8 DATAREF STACK 1481 esp + 72 CHILDOF 1476 OFFSET 72 LOCALVAR var_70 
-    4101cd      8 DATAREF STACK 1482 esp + 80 CHILDOF 1476 OFFSET 80 LOCALVAR var_68 
-    4101cd      8 DATAREF STACK 1483 esp + 88 CHILDOF 1476 OFFSET 88 LOCALVAR var_60 
-    4101cd      8 DATAREF STACK 1484 esp + 96 CHILDOF 1476 OFFSET 96 LOCALVAR var_58 
-    4101cd      8 DATAREF STACK 1485 esp + 104 CHILDOF 1476 OFFSET 104 LOCALVAR var_50 
+    4101cd      8 DATAREF STACK 1473 esp + 48 CHILDOF 1471 OFFSET 48 LOCALVAR var_88 
+    4101cd      8 DATAREF STACK 1474 esp + 56 CHILDOF 1471 OFFSET 56 LOCALVAR var_80 
+    4101cd      8 DATAREF STACK 1475 esp + 64 CHILDOF 1471 OFFSET 64 LOCALVAR var_78 
+    4101cd      8 DATAREF STACK 1476 esp + 72 CHILDOF 1471 OFFSET 72 LOCALVAR var_70 
+    4101cd      8 DATAREF STACK 1477 esp + 80 CHILDOF 1471 OFFSET 80 LOCALVAR var_68 
+    4101cd      8 DATAREF STACK 1478 esp + 88 CHILDOF 1471 OFFSET 88 LOCALVAR var_60 
+    4101cd      8 DATAREF STACK 1479 esp + 96 CHILDOF 1471 OFFSET 96 LOCALVAR var_58 
+    4101cd      8 DATAREF STACK 1480 esp + 104 CHILDOF 1471 OFFSET 104 LOCALVAR var_50 
     4101cd      8 MEMORYHOLE STACK esp + 184 ReturnAddress 
     4101d4      5 INSTR BELONGTO 4101c0 
     4101d4      5 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ mov     [rsp+0B8h+var_80], rsi 
@@ -18413,8 +18416,8 @@
     410560      1 INSTR BELONGTO 410560 
     410560      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     410560     -3 INSTR LOCAL NoWarn push    rbx 
-    410561     16 DATAREF STACK 1490 esp + 0 PARENT LocalFrame LOCALFRAME
-    410561      4 DATAREF STACK 1491 esp + 0 CHILDOF 1490 OFFSET 0 OutArgsRegion OUTARGS
+    410561     16 DATAREF STACK 1485 esp + 0 PARENT LocalFrame LOCALFRAME
+    410561      4 DATAREF STACK 1486 esp + 0 CHILDOF 1485 OFFSET 0 OutArgsRegion OUTARGS
     410561      4 INSTR BELONGTO 410560 
     410561      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
     410561      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -19011,30 +19014,30 @@
     410d3f      1 INSTR BELONGTO 410d30 
     410d3f      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R14 R15 ZZ push    rbx 
     410d3f     -3 INSTR LOCAL NoWarn push    rbx 
-    410d40    120 DATAREF STACK 1492 esp + 0 PARENT LocalFrame LOCALFRAME
-    410d40     12 DATAREF STACK 1512 esp + 108 CHILDOF 1492 OFFSET 108 LOCALVAR var_3C 
-    410d40     24 DATAREF STACK 1495 esp + 16 CHILDOF 1492 OFFSET 16 LOCALVAR var_98 
+    410d40    120 DATAREF STACK 1487 esp + 0 PARENT LocalFrame LOCALFRAME
+    410d40     12 DATAREF STACK 1507 esp + 108 CHILDOF 1487 OFFSET 108 LOCALVAR var_3C 
+    410d40     24 DATAREF STACK 1490 esp + 16 CHILDOF 1487 OFFSET 16 LOCALVAR var_98 
     410d40     48 MEMORYHOLE STACK esp + 120 CalleeSavedRegs 
-    410d40      4 DATAREF STACK 1493 esp + 0 CHILDOF 1492 OFFSET 0 OutArgsRegion OUTARGS
-    410d40      4 DATAREF STACK 1497 esp + 48 CHILDOF 1492 OFFSET 48 LOCALVAR var_78 
-    410d40      4 DATAREF STACK 1498 esp + 52 CHILDOF 1492 OFFSET 52 LOCALVAR var_74 
-    410d40      4 DATAREF STACK 1499 esp + 56 CHILDOF 1492 OFFSET 56 LOCALVAR var_70 
-    410d40      4 DATAREF STACK 1500 esp + 60 CHILDOF 1492 OFFSET 60 LOCALVAR var_6C 
-    410d40      4 DATAREF STACK 1501 esp + 64 CHILDOF 1492 OFFSET 64 LOCALVAR var_68 
-    410d40      4 DATAREF STACK 1502 esp + 68 CHILDOF 1492 OFFSET 68 LOCALVAR var_64 
-    410d40      4 DATAREF STACK 1503 esp + 72 CHILDOF 1492 OFFSET 72 LOCALVAR var_60 
-    410d40      4 DATAREF STACK 1504 esp + 76 CHILDOF 1492 OFFSET 76 LOCALVAR var_5C 
-    410d40      4 DATAREF STACK 1505 esp + 80 CHILDOF 1492 OFFSET 80 LOCALVAR var_58 
-    410d40      4 DATAREF STACK 1506 esp + 84 CHILDOF 1492 OFFSET 84 LOCALVAR var_54 
-    410d40      4 DATAREF STACK 1507 esp + 88 CHILDOF 1492 OFFSET 88 LOCALVAR var_50 
-    410d40      4 DATAREF STACK 1508 esp + 92 CHILDOF 1492 OFFSET 92 LOCALVAR var_4C 
-    410d40      4 DATAREF STACK 1509 esp + 96 CHILDOF 1492 OFFSET 96 LOCALVAR var_48 
-    410d40      4 DATAREF STACK 1510 esp + 100 CHILDOF 1492 OFFSET 100 LOCALVAR var_44 
-    410d40      4 DATAREF STACK 1511 esp + 104 CHILDOF 1492 OFFSET 104 LOCALVAR var_40 
+    410d40      4 DATAREF STACK 1488 esp + 0 CHILDOF 1487 OFFSET 0 OutArgsRegion OUTARGS
+    410d40      4 DATAREF STACK 1492 esp + 48 CHILDOF 1487 OFFSET 48 LOCALVAR var_78 
+    410d40      4 DATAREF STACK 1493 esp + 52 CHILDOF 1487 OFFSET 52 LOCALVAR var_74 
+    410d40      4 DATAREF STACK 1494 esp + 56 CHILDOF 1487 OFFSET 56 LOCALVAR var_70 
+    410d40      4 DATAREF STACK 1495 esp + 60 CHILDOF 1487 OFFSET 60 LOCALVAR var_6C 
+    410d40      4 DATAREF STACK 1496 esp + 64 CHILDOF 1487 OFFSET 64 LOCALVAR var_68 
+    410d40      4 DATAREF STACK 1497 esp + 68 CHILDOF 1487 OFFSET 68 LOCALVAR var_64 
+    410d40      4 DATAREF STACK 1498 esp + 72 CHILDOF 1487 OFFSET 72 LOCALVAR var_60 
+    410d40      4 DATAREF STACK 1499 esp + 76 CHILDOF 1487 OFFSET 76 LOCALVAR var_5C 
+    410d40      4 DATAREF STACK 1500 esp + 80 CHILDOF 1487 OFFSET 80 LOCALVAR var_58 
+    410d40      4 DATAREF STACK 1501 esp + 84 CHILDOF 1487 OFFSET 84 LOCALVAR var_54 
+    410d40      4 DATAREF STACK 1502 esp + 88 CHILDOF 1487 OFFSET 88 LOCALVAR var_50 
+    410d40      4 DATAREF STACK 1503 esp + 92 CHILDOF 1487 OFFSET 92 LOCALVAR var_4C 
+    410d40      4 DATAREF STACK 1504 esp + 96 CHILDOF 1487 OFFSET 96 LOCALVAR var_48 
+    410d40      4 DATAREF STACK 1505 esp + 100 CHILDOF 1487 OFFSET 100 LOCALVAR var_44 
+    410d40      4 DATAREF STACK 1506 esp + 104 CHILDOF 1487 OFFSET 104 LOCALVAR var_40 
     410d40      4 INSTR BELONGTO 410d30 
     410d40      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R14 R15 ZZ sub     rsp, 78h 
-    410d40      8 DATAREF STACK 1494 esp + 8 CHILDOF 1492 OFFSET 8 LOCALVAR var_A0 
-    410d40      8 DATAREF STACK 1496 esp + 40 CHILDOF 1492 OFFSET 40 LOCALVAR var_80 
+    410d40      8 DATAREF STACK 1489 esp + 8 CHILDOF 1487 OFFSET 8 LOCALVAR var_A0 
+    410d40      8 DATAREF STACK 1491 esp + 40 CHILDOF 1487 OFFSET 40 LOCALVAR var_80 
     410d40      8 MEMORYHOLE STACK esp + 168 ReturnAddress 
     410d44     -1 INSTR LOCAL NoMetaUpdate call    gs_window_get_type 
     410d44      5 INSTR BELONGTO 410d30 
@@ -19633,7 +19636,7 @@
     411364     -3 INSTR LOCAL NoWarn push    rbx 
     411365     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     411365      4 INSTR BELONGTO 411360 
-    411365      8 DATAREF STACK 1513 esp + 0 PARENT LocalFrame LOCALFRAME
+    411365      8 DATAREF STACK 1508 esp + 0 PARENT LocalFrame LOCALFRAME
     411365      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     411369     -1 INSTR LOCAL NoMetaUpdate call    gs_window_get_type 
     411369      5 INSTR BELONGTO 411360 
@@ -19993,7 +19996,7 @@
     411732      3 INSTR BELONGTO 411730 
     411735     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     411735      4 INSTR BELONGTO 411730 
-    411735      8 DATAREF STACK 1514 esp + 0 PARENT LocalFrame LOCALFRAME
+    411735      8 DATAREF STACK 1509 esp + 0 PARENT LocalFrame LOCALFRAME
     411735      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     411739     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     411739      3 INSTR BELONGTO 411730 
@@ -20395,12 +20398,12 @@
     411f7a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
     411f7d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     411f7d      5 INSTR BELONGTO 411f70 
-    411f82     24 DATAREF STACK 1515 esp + 0 PARENT LocalFrame LOCALFRAME
+    411f82     24 DATAREF STACK 1510 esp + 0 PARENT LocalFrame LOCALFRAME
     411f82      4 INSTR BELONGTO 411f70 
     411f82      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-    411f82      8 DATAREF STACK 1516 esp + 0 CHILDOF 1515 OFFSET 0 LOCALVAR var_18 
-    411f82      8 DATAREF STACK 1517 esp + 8 CHILDOF 1515 OFFSET 8 LOCALVAR var_10 
-    411f82      8 DATAREF STACK 1518 esp + 16 CHILDOF 1515 OFFSET 16 LOCALVAR var_8 
+    411f82      8 DATAREF STACK 1511 esp + 0 CHILDOF 1510 OFFSET 0 LOCALVAR var_18 
+    411f82      8 DATAREF STACK 1512 esp + 8 CHILDOF 1510 OFFSET 8 LOCALVAR var_10 
+    411f82      8 DATAREF STACK 1513 esp + 16 CHILDOF 1510 OFFSET 16 LOCALVAR var_8 
     411f82      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     411f86      3 INSTR BELONGTO 411f70 
     411f86      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
@@ -20585,7 +20588,7 @@
     4120b5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4120b5      4 INSTR BELONGTO 4120b0 
     4120b5      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    4120b5      8 DATAREF STACK 1519 esp + 0 PARENT LocalFrame LOCALFRAME
+    4120b5      8 DATAREF STACK 1514 esp + 0 PARENT LocalFrame LOCALFRAME
     4120b5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4120b9     -1 INSTR LOCAL NoMetaUpdate call    sub_410690 
     4120b9      5 INSTR BELONGTO 4120b0 
@@ -21019,12 +21022,12 @@
     412962     -3 INSTR LOCAL NoWarn push    rbx 
     412963      3 INSTR BELONGTO 412950 
     412963      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 R15 ZZ mov     rbx, rdi 
-    412966     16 DATAREF STACK 1522 esp + 8 CHILDOF 1520 OFFSET 8 LOCALVAR var_40 
-    412966     24 DATAREF STACK 1520 esp + 0 PARENT LocalFrame LOCALFRAME
+    412966     16 DATAREF STACK 1517 esp + 8 CHILDOF 1515 OFFSET 8 LOCALVAR var_40 
+    412966     24 DATAREF STACK 1515 esp + 0 PARENT LocalFrame LOCALFRAME
     412966     48 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
     412966      4 INSTR BELONGTO 412950 
     412966      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R15 ZZ sub     rsp, 18h 
-    412966      8 DATAREF STACK 1521 esp + 0 CHILDOF 1520 OFFSET 0 LOCALVAR var_48 
+    412966      8 DATAREF STACK 1516 esp + 0 CHILDOF 1515 OFFSET 0 LOCALVAR var_48 
     412966      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     41296a     -1 INSTR LOCAL NoMetaUpdate call    gs_window_get_type 
     41296a      5 INSTR BELONGTO 412950 
@@ -21741,7 +21744,7 @@
     412d95     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     412d95      4 INSTR BELONGTO 412d90 
     412d95      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    412d95      8 DATAREF STACK 1523 esp + 0 PARENT LocalFrame LOCALFRAME
+    412d95      8 DATAREF STACK 1518 esp + 0 PARENT LocalFrame LOCALFRAME
     412d95      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     412d99     -1 INSTR LOCAL NoMetaUpdate call    gs_window_get_type 
     412d99      5 INSTR BELONGTO 412d90 
@@ -22070,7 +22073,7 @@
     412f97     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     412f97      4 INSTR BELONGTO 412f90 
     412f97      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    412f97      8 DATAREF STACK 1524 esp + 0 PARENT LocalFrame LOCALFRAME
+    412f97      8 DATAREF STACK 1519 esp + 0 PARENT LocalFrame LOCALFRAME
     412f97      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     412f9b     -1 INSTR LOCAL NoMetaUpdate call    gs_window_get_type 
     412f9b      5 INSTR BELONGTO 412f90 
@@ -22189,7 +22192,7 @@
     413038     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     413038      4 INSTR BELONGTO 413030 
     413038      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    413038      8 DATAREF STACK 1525 esp + 0 PARENT LocalFrame LOCALFRAME
+    413038      8 DATAREF STACK 1520 esp + 0 PARENT LocalFrame LOCALFRAME
     413038      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     41303c     -1 INSTR LOCAL NoMetaUpdate call    gs_window_get_type 
     41303c      5 INSTR BELONGTO 413030 
@@ -22377,7 +22380,7 @@
     413148     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     413148      4 INSTR BELONGTO 413140 
     413148      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 XMM3 ZZ sub     rsp, 8 
-    413148      8 DATAREF STACK 1526 esp + 0 PARENT LocalFrame LOCALFRAME
+    413148      8 DATAREF STACK 1521 esp + 0 PARENT LocalFrame LOCALFRAME
     413148      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     41314c     -1 INSTR LOCAL NoMetaUpdate call    gs_window_get_type 
     41314c      5 INSTR BELONGTO 413140 
@@ -22539,11 +22542,11 @@
     413275      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
     41327a      3 INSTR BELONGTO 413270 
     41327a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    41327d     24 DATAREF STACK 1527 esp + 0 PARENT LocalFrame LOCALFRAME
+    41327d     24 DATAREF STACK 1522 esp + 0 PARENT LocalFrame LOCALFRAME
     41327d      4 INSTR BELONGTO 413270 
     41327d      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-    41327d      8 DATAREF STACK 1528 esp + 8 CHILDOF 1527 OFFSET 8 LOCALVAR var_10 
-    41327d      8 DATAREF STACK 1529 esp + 16 CHILDOF 1527 OFFSET 16 LOCALVAR var_8 
+    41327d      8 DATAREF STACK 1523 esp + 8 CHILDOF 1522 OFFSET 8 LOCALVAR var_10 
+    41327d      8 DATAREF STACK 1524 esp + 16 CHILDOF 1522 OFFSET 16 LOCALVAR var_8 
     41327d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     413281      2 INSTR BELONGTO 413270 
     413281      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ mov     ebp, esi 
@@ -22634,7 +22637,7 @@
     413308     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     413308      4 INSTR BELONGTO 413300 
     413308      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    413308      8 DATAREF STACK 1530 esp + 0 PARENT LocalFrame LOCALFRAME
+    413308      8 DATAREF STACK 1525 esp + 0 PARENT LocalFrame LOCALFRAME
     413308      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     41330c     -1 INSTR LOCAL NoMetaUpdate call    gs_window_get_type 
     41330c      5 INSTR BELONGTO 413300 
@@ -22731,11 +22734,11 @@
     4133a5      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
     4133aa      3 INSTR BELONGTO 4133a0 
     4133aa      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    4133ad     24 DATAREF STACK 1531 esp + 0 PARENT LocalFrame LOCALFRAME
+    4133ad     24 DATAREF STACK 1526 esp + 0 PARENT LocalFrame LOCALFRAME
     4133ad      4 INSTR BELONGTO 4133a0 
     4133ad      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-    4133ad      8 DATAREF STACK 1532 esp + 8 CHILDOF 1531 OFFSET 8 LOCALVAR var_10 
-    4133ad      8 DATAREF STACK 1533 esp + 16 CHILDOF 1531 OFFSET 16 LOCALVAR var_8 
+    4133ad      8 DATAREF STACK 1527 esp + 8 CHILDOF 1526 OFFSET 8 LOCALVAR var_10 
+    4133ad      8 DATAREF STACK 1528 esp + 16 CHILDOF 1526 OFFSET 16 LOCALVAR var_8 
     4133ad      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4133b1      2 INSTR BELONGTO 4133a0 
     4133b1      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ mov     ebp, esi 
@@ -22821,11 +22824,11 @@
     413435      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
     41343a      3 INSTR BELONGTO 413430 
     41343a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    41343d     24 DATAREF STACK 1534 esp + 0 PARENT LocalFrame LOCALFRAME
+    41343d     24 DATAREF STACK 1529 esp + 0 PARENT LocalFrame LOCALFRAME
     41343d      4 INSTR BELONGTO 413430 
     41343d      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-    41343d      8 DATAREF STACK 1535 esp + 8 CHILDOF 1534 OFFSET 8 LOCALVAR var_10 
-    41343d      8 DATAREF STACK 1536 esp + 16 CHILDOF 1534 OFFSET 16 LOCALVAR var_8 
+    41343d      8 DATAREF STACK 1530 esp + 8 CHILDOF 1529 OFFSET 8 LOCALVAR var_10 
+    41343d      8 DATAREF STACK 1531 esp + 16 CHILDOF 1529 OFFSET 16 LOCALVAR var_8 
     41343d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     413441      2 INSTR BELONGTO 413430 
     413441      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ mov     ebp, esi 
@@ -22911,11 +22914,11 @@
     4134c5      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
     4134ca      3 INSTR BELONGTO 4134c0 
     4134ca      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    4134cd     24 DATAREF STACK 1537 esp + 0 PARENT LocalFrame LOCALFRAME
+    4134cd     24 DATAREF STACK 1532 esp + 0 PARENT LocalFrame LOCALFRAME
     4134cd      4 INSTR BELONGTO 4134c0 
     4134cd      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-    4134cd      8 DATAREF STACK 1538 esp + 8 CHILDOF 1537 OFFSET 8 LOCALVAR var_10 
-    4134cd      8 DATAREF STACK 1539 esp + 16 CHILDOF 1537 OFFSET 16 LOCALVAR var_8 
+    4134cd      8 DATAREF STACK 1533 esp + 8 CHILDOF 1532 OFFSET 8 LOCALVAR var_10 
+    4134cd      8 DATAREF STACK 1534 esp + 16 CHILDOF 1532 OFFSET 16 LOCALVAR var_8 
     4134cd      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4134d1      3 INSTR BELONGTO 4134c0 
     4134d1      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ mov     rbp, rsi 
@@ -23009,7 +23012,7 @@
     413568     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     413568      4 INSTR BELONGTO 413560 
     413568      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    413568      8 DATAREF STACK 1540 esp + 0 PARENT LocalFrame LOCALFRAME
+    413568      8 DATAREF STACK 1535 esp + 0 PARENT LocalFrame LOCALFRAME
     413568      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     41356c     -1 INSTR LOCAL NoMetaUpdate call    gs_window_get_type 
     41356c      5 INSTR BELONGTO 413560 
@@ -23106,11 +23109,11 @@
     413605      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
     41360a      3 INSTR BELONGTO 413600 
     41360a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    41360d     24 DATAREF STACK 1541 esp + 0 PARENT LocalFrame LOCALFRAME
+    41360d     24 DATAREF STACK 1536 esp + 0 PARENT LocalFrame LOCALFRAME
     41360d      4 INSTR BELONGTO 413600 
     41360d      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-    41360d      8 DATAREF STACK 1542 esp + 8 CHILDOF 1541 OFFSET 8 LOCALVAR var_10 
-    41360d      8 DATAREF STACK 1543 esp + 16 CHILDOF 1541 OFFSET 16 LOCALVAR var_8 
+    41360d      8 DATAREF STACK 1537 esp + 8 CHILDOF 1536 OFFSET 8 LOCALVAR var_10 
+    41360d      8 DATAREF STACK 1538 esp + 16 CHILDOF 1536 OFFSET 16 LOCALVAR var_8 
     41360d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     413611      3 INSTR BELONGTO 413600 
     413611      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ mov     rbp, rsi 
@@ -23200,7 +23203,7 @@
     413697     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     413697      4 INSTR BELONGTO 413690 
     413697      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    413697      8 DATAREF STACK 1544 esp + 0 PARENT LocalFrame LOCALFRAME
+    413697      8 DATAREF STACK 1539 esp + 0 PARENT LocalFrame LOCALFRAME
     413697      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     41369b     -1 INSTR LOCAL NoMetaUpdate call    gs_window_get_type 
     41369b      5 INSTR BELONGTO 413690 
@@ -23594,18 +23597,18 @@
     413a6a      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
     413a6d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     413a6d      5 INSTR BELONGTO 413a60 
-    413a72      4 DATAREF STACK 1546 esp + 0 CHILDOF 1545 OFFSET 0 OutArgsRegion OUTARGS
+    413a72      4 DATAREF STACK 1541 esp + 0 CHILDOF 1540 OFFSET 0 OutArgsRegion OUTARGS
     413a72      4 INSTR BELONGTO 413a60 
     413a72      4 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 48h 
-    413a72     72 DATAREF STACK 1545 esp + 0 PARENT LocalFrame LOCALFRAME
-    413a72      8 DATAREF STACK 1547 esp + 8 CHILDOF 1545 OFFSET 8 LOCALVAR var_40 
-    413a72      8 DATAREF STACK 1548 esp + 16 CHILDOF 1545 OFFSET 16 LOCALVAR var_38 
-    413a72      8 DATAREF STACK 1549 esp + 24 CHILDOF 1545 OFFSET 24 LOCALVAR var_30 
-    413a72      8 DATAREF STACK 1550 esp + 32 CHILDOF 1545 OFFSET 32 LOCALVAR var_28 
-    413a72      8 DATAREF STACK 1551 esp + 40 CHILDOF 1545 OFFSET 40 LOCALVAR var_20 
-    413a72      8 DATAREF STACK 1552 esp + 48 CHILDOF 1545 OFFSET 48 LOCALVAR var_18 
-    413a72      8 DATAREF STACK 1553 esp + 56 CHILDOF 1545 OFFSET 56 LOCALVAR var_10 
-    413a72      8 DATAREF STACK 1554 esp + 64 CHILDOF 1545 OFFSET 64 LOCALVAR var_8 
+    413a72     72 DATAREF STACK 1540 esp + 0 PARENT LocalFrame LOCALFRAME
+    413a72      8 DATAREF STACK 1542 esp + 8 CHILDOF 1540 OFFSET 8 LOCALVAR var_40 
+    413a72      8 DATAREF STACK 1543 esp + 16 CHILDOF 1540 OFFSET 16 LOCALVAR var_38 
+    413a72      8 DATAREF STACK 1544 esp + 24 CHILDOF 1540 OFFSET 24 LOCALVAR var_30 
+    413a72      8 DATAREF STACK 1545 esp + 32 CHILDOF 1540 OFFSET 32 LOCALVAR var_28 
+    413a72      8 DATAREF STACK 1546 esp + 40 CHILDOF 1540 OFFSET 40 LOCALVAR var_20 
+    413a72      8 DATAREF STACK 1547 esp + 48 CHILDOF 1540 OFFSET 48 LOCALVAR var_18 
+    413a72      8 DATAREF STACK 1548 esp + 56 CHILDOF 1540 OFFSET 56 LOCALVAR var_10 
+    413a72      8 DATAREF STACK 1549 esp + 64 CHILDOF 1540 OFFSET 64 LOCALVAR var_8 
     413a72      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     413a76      2 INSTR BELONGTO 413a60 
     413a76      2 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ mov     ebp, esi 
@@ -23675,8 +23678,8 @@
     413b00     -3 INSTR LOCAL NoWarn push    rbx 
     413b01      3 INSTR BELONGTO 413b00 
     413b01      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    413b04     20 DATAREF STACK 1556 esp + 0 CHILDOF 1555 OFFSET 0 OutArgsRegion OUTARGS
-    413b04     32 DATAREF STACK 1555 esp + 0 PARENT LocalFrame LOCALFRAME
+    413b04     20 DATAREF STACK 1551 esp + 0 CHILDOF 1550 OFFSET 0 OutArgsRegion OUTARGS
+    413b04     32 DATAREF STACK 1550 esp + 0 PARENT LocalFrame LOCALFRAME
     413b04      4 INSTR BELONGTO 413b00 
     413b04      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 20h 
     413b04      8 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
@@ -23800,9 +23803,9 @@
     413ca1     -3 INSTR LOCAL NoWarn push    rbx 
     413ca2      3 INSTR BELONGTO 413c90 
     413ca2      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdx 
-    413ca5     12 DATAREF STACK 1558 esp + 12 CHILDOF 1557 OFFSET 12 LOCALVAR var_1C 
+    413ca5     12 DATAREF STACK 1553 esp + 12 CHILDOF 1552 OFFSET 12 LOCALVAR var_1C 
     413ca5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    413ca5     24 DATAREF STACK 1557 esp + 0 PARENT LocalFrame LOCALFRAME
+    413ca5     24 DATAREF STACK 1552 esp + 0 PARENT LocalFrame LOCALFRAME
     413ca5      4 INSTR BELONGTO 413c90 
     413ca5      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
     413ca5      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -24279,8 +24282,8 @@
     414000      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
     414000      0 FUNC MMSAFENESS SAFE
     414000    113 FUNC GLOBAL gs_prefs_get_type FUNC_UNSAFE NOFP RET     414070 
-    414000     24 DATAREF STACK 1559 esp + 0 PARENT LocalFrame LOCALFRAME
-    414000      4 DATAREF STACK 1560 esp + 0 CHILDOF 1559 OFFSET 0 OutArgsRegion OUTARGS
+    414000     24 DATAREF STACK 1554 esp + 0 PARENT LocalFrame LOCALFRAME
+    414000      4 DATAREF STACK 1555 esp + 0 CHILDOF 1554 OFFSET 0 OutArgsRegion OUTARGS
     414000      4 INSTR BELONGTO 414000 
     414000      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
     414000      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -24355,7 +24358,7 @@
     414082      3 INSTR BELONGTO 414080 
     414085     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     414085      4 INSTR BELONGTO 414080 
-    414085      8 DATAREF STACK 1561 esp + 0 PARENT LocalFrame LOCALFRAME
+    414085      8 DATAREF STACK 1556 esp + 0 PARENT LocalFrame LOCALFRAME
     414085      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     414089     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     414089      3 INSTR BELONGTO 414080 
@@ -24457,9 +24460,9 @@
     414171     -3 INSTR LOCAL NoWarn push    rbx 
     414172      3 INSTR BELONGTO 414170 
     414172      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    414175     12 DATAREF STACK 1563 esp + 12 CHILDOF 1562 OFFSET 12 LOCALVAR var_1C 
+    414175     12 DATAREF STACK 1558 esp + 12 CHILDOF 1557 OFFSET 12 LOCALVAR var_1C 
     414175     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    414175     24 DATAREF STACK 1562 esp + 0 PARENT LocalFrame LOCALFRAME
+    414175     24 DATAREF STACK 1557 esp + 0 PARENT LocalFrame LOCALFRAME
     414175      4 INSTR BELONGTO 414170 
     414175      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
     414175      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -24909,29 +24912,29 @@
     414456      3 INSTR DEADREGS  EFLAGS RDX RBX R12 R13 ZZ mov     r13, rdi 
     414459     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
     414459      5 INSTR BELONGTO 414440 
-    41445e   1032 DATAREF STACK 1567 esp + 48 CHILDOF 1564 OFFSET 48 LOCALVAR var_4E8 
-    41445e   1304 DATAREF STACK 1564 esp + 0 PARENT LocalFrame LOCALFRAME
-    41445e     16 DATAREF STACK 1572 esp + 1136 CHILDOF 1564 OFFSET 1136 LOCALVAR var_A8 
-    41445e     16 DATAREF STACK 1573 esp + 1152 CHILDOF 1564 OFFSET 1152 LOCALVAR var_98 
-    41445e     16 DATAREF STACK 1574 esp + 1168 CHILDOF 1564 OFFSET 1168 LOCALVAR var_88 
-    41445e     16 DATAREF STACK 1575 esp + 1184 CHILDOF 1564 OFFSET 1184 LOCALVAR var_78 
-    41445e     16 DATAREF STACK 1576 esp + 1200 CHILDOF 1564 OFFSET 1200 LOCALVAR var_68 
-    41445e     16 DATAREF STACK 1577 esp + 1216 CHILDOF 1564 OFFSET 1216 LOCALVAR var_58 
-    41445e     16 DATAREF STACK 1578 esp + 1232 CHILDOF 1564 OFFSET 1232 LOCALVAR var_48 
-    41445e     16 DATAREF STACK 1579 esp + 1248 CHILDOF 1564 OFFSET 1248 LOCALVAR var_38 
-    41445e     32 DATAREF STACK 1569 esp + 1088 CHILDOF 1564 OFFSET 1088 LOCALVAR var_D8 
-    41445e     40 DATAREF STACK 1565 esp + 0 CHILDOF 1564 OFFSET 0 OutArgsRegion OUTARGS
+    41445e   1032 DATAREF STACK 1562 esp + 48 CHILDOF 1559 OFFSET 48 LOCALVAR var_4E8 
+    41445e   1304 DATAREF STACK 1559 esp + 0 PARENT LocalFrame LOCALFRAME
+    41445e     16 DATAREF STACK 1567 esp + 1136 CHILDOF 1559 OFFSET 1136 LOCALVAR var_A8 
+    41445e     16 DATAREF STACK 1568 esp + 1152 CHILDOF 1559 OFFSET 1152 LOCALVAR var_98 
+    41445e     16 DATAREF STACK 1569 esp + 1168 CHILDOF 1559 OFFSET 1168 LOCALVAR var_88 
+    41445e     16 DATAREF STACK 1570 esp + 1184 CHILDOF 1559 OFFSET 1184 LOCALVAR var_78 
+    41445e     16 DATAREF STACK 1571 esp + 1200 CHILDOF 1559 OFFSET 1200 LOCALVAR var_68 
+    41445e     16 DATAREF STACK 1572 esp + 1216 CHILDOF 1559 OFFSET 1216 LOCALVAR var_58 
+    41445e     16 DATAREF STACK 1573 esp + 1232 CHILDOF 1559 OFFSET 1232 LOCALVAR var_48 
+    41445e     16 DATAREF STACK 1574 esp + 1248 CHILDOF 1559 OFFSET 1248 LOCALVAR var_38 
+    41445e     32 DATAREF STACK 1564 esp + 1088 CHILDOF 1559 OFFSET 1088 LOCALVAR var_D8 
+    41445e     40 DATAREF STACK 1560 esp + 0 CHILDOF 1559 OFFSET 0 OutArgsRegion OUTARGS
     41445e      7 INSTR BELONGTO 414440 
     41445e      7 INSTR DEADREGS  EFLAGS RDX RBX R12 R14 ZZ sub     rsp, 518h 
-    41445e      8 DATAREF STACK 1566 esp + 40 CHILDOF 1564 OFFSET 40 LOCALVAR timer 
-    41445e      8 DATAREF STACK 1568 esp + 1080 CHILDOF 1564 OFFSET 1080 LOCALVAR var_E0 
-    41445e      8 DATAREF STACK 1570 esp + 1120 CHILDOF 1564 OFFSET 1120 LOCALVAR var_B8 
-    41445e      8 DATAREF STACK 1571 esp + 1128 CHILDOF 1564 OFFSET 1128 LOCALVAR var_B0 
-    41445e      8 DATAREF STACK 1580 esp + 1264 CHILDOF 1564 OFFSET 1264 LOCALVAR var_28 
-    41445e      8 DATAREF STACK 1581 esp + 1272 CHILDOF 1564 OFFSET 1272 LOCALVAR var_20 
-    41445e      8 DATAREF STACK 1582 esp + 1280 CHILDOF 1564 OFFSET 1280 LOCALVAR var_18 
-    41445e      8 DATAREF STACK 1583 esp + 1288 CHILDOF 1564 OFFSET 1288 LOCALVAR var_10 
-    41445e      8 DATAREF STACK 1584 esp + 1296 CHILDOF 1564 OFFSET 1296 LOCALVAR var_8 
+    41445e      8 DATAREF STACK 1561 esp + 40 CHILDOF 1559 OFFSET 40 LOCALVAR timer 
+    41445e      8 DATAREF STACK 1563 esp + 1080 CHILDOF 1559 OFFSET 1080 LOCALVAR var_E0 
+    41445e      8 DATAREF STACK 1565 esp + 1120 CHILDOF 1559 OFFSET 1120 LOCALVAR var_B8 
+    41445e      8 DATAREF STACK 1566 esp + 1128 CHILDOF 1559 OFFSET 1128 LOCALVAR var_B0 
+    41445e      8 DATAREF STACK 1575 esp + 1264 CHILDOF 1559 OFFSET 1264 LOCALVAR var_28 
+    41445e      8 DATAREF STACK 1576 esp + 1272 CHILDOF 1559 OFFSET 1272 LOCALVAR var_20 
+    41445e      8 DATAREF STACK 1577 esp + 1280 CHILDOF 1559 OFFSET 1280 LOCALVAR var_18 
+    41445e      8 DATAREF STACK 1578 esp + 1288 CHILDOF 1559 OFFSET 1288 LOCALVAR var_10 
+    41445e      8 DATAREF STACK 1579 esp + 1296 CHILDOF 1559 OFFSET 1296 LOCALVAR var_8 
     41445e      8 MEMORYHOLE STACK esp + 1304 ReturnAddress 
     414465     -1 INSTR LOCAL NoMetaUpdate test    al, al 
     414465      2 INSTR BELONGTO 414440 
@@ -25122,12 +25125,12 @@
     414606     -4 INSTR LOCAL SafeReturn retn
     414610      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 16 7 0 16 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
     414610      0 FUNC MMSAFENESS SAFE
-    414610     16 DATAREF STACK 1587 esp + 56 CHILDOF 1585 OFFSET 56 LOCALVAR var_10 
+    414610     16 DATAREF STACK 1582 esp + 56 CHILDOF 1580 OFFSET 56 LOCALVAR var_10 
     414610    251 FUNC GLOBAL gs_debug_init FUNC_UNSAFE NOFP RET     41470a 
     414610      4 INSTR BELONGTO 414610 
     414610      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 48h 
-    414610     50 DATAREF STACK 1586 esp + 0 CHILDOF 1585 OFFSET 0 OutArgsRegion OUTARGS
-    414610     72 DATAREF STACK 1585 esp + 0 PARENT LocalFrame LOCALFRAME
+    414610     50 DATAREF STACK 1581 esp + 0 CHILDOF 1580 OFFSET 0 OutArgsRegion OUTARGS
+    414610     72 DATAREF STACK 1580 esp + 0 PARENT LocalFrame LOCALFRAME
     414610      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     414614     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, fs:28h 
     414614      9 INSTR BELONGTO 414610 
@@ -25257,7 +25260,7 @@
     414710      0 FUNC MMSAFENESS SAFE
     414710      4 INSTR BELONGTO 414710 
     414710      4 INSTR DEADREGS  EFLAGS R8 ZZ sub     rsp, 8 
-    414710      8 DATAREF STACK 1588 esp + 0 PARENT LocalFrame LOCALFRAME
+    414710      8 DATAREF STACK 1583 esp + 0 PARENT LocalFrame LOCALFRAME
     414710      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     414710     94 FUNC GLOBAL gs_debug_shutdown FUNC_UNSAFE NOFP RET     41476d 
     414714      7 INSTR BELONGTO 414710 
@@ -25319,23 +25322,23 @@
     414776     -3 INSTR LOCAL NoWarn push    rbx 
     414777      3 INSTR BELONGTO 414770 
     414777      3 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     rbx, rsi 
-    41477a     16 DATAREF STACK 1595 esp + 80 CHILDOF 1589 OFFSET 80 LOCALVAR var_98 
-    41477a     16 DATAREF STACK 1596 esp + 96 CHILDOF 1589 OFFSET 96 LOCALVAR var_88 
-    41477a     16 DATAREF STACK 1597 esp + 112 CHILDOF 1589 OFFSET 112 LOCALVAR var_78 
-    41477a     16 DATAREF STACK 1598 esp + 128 CHILDOF 1589 OFFSET 128 LOCALVAR var_68 
-    41477a     16 DATAREF STACK 1599 esp + 144 CHILDOF 1589 OFFSET 144 LOCALVAR var_58 
-    41477a     16 DATAREF STACK 1600 esp + 160 CHILDOF 1589 OFFSET 160 LOCALVAR var_48 
-    41477a     16 DATAREF STACK 1601 esp + 176 CHILDOF 1589 OFFSET 176 LOCALVAR var_38 
-    41477a     16 DATAREF STACK 1602 esp + 192 CHILDOF 1589 OFFSET 192 LOCALVAR var_28 
-    41477a    208 DATAREF STACK 1589 esp + 0 PARENT LocalFrame LOCALFRAME
-    41477a     24 DATAREF STACK 1591 esp + 32 CHILDOF 1589 OFFSET 32 LOCALVAR var_C8 
+    41477a     16 DATAREF STACK 1590 esp + 80 CHILDOF 1584 OFFSET 80 LOCALVAR var_98 
+    41477a     16 DATAREF STACK 1591 esp + 96 CHILDOF 1584 OFFSET 96 LOCALVAR var_88 
+    41477a     16 DATAREF STACK 1592 esp + 112 CHILDOF 1584 OFFSET 112 LOCALVAR var_78 
+    41477a     16 DATAREF STACK 1593 esp + 128 CHILDOF 1584 OFFSET 128 LOCALVAR var_68 
+    41477a     16 DATAREF STACK 1594 esp + 144 CHILDOF 1584 OFFSET 144 LOCALVAR var_58 
+    41477a     16 DATAREF STACK 1595 esp + 160 CHILDOF 1584 OFFSET 160 LOCALVAR var_48 
+    41477a     16 DATAREF STACK 1596 esp + 176 CHILDOF 1584 OFFSET 176 LOCALVAR var_38 
+    41477a     16 DATAREF STACK 1597 esp + 192 CHILDOF 1584 OFFSET 192 LOCALVAR var_28 
+    41477a    208 DATAREF STACK 1584 esp + 0 PARENT LocalFrame LOCALFRAME
+    41477a     24 DATAREF STACK 1586 esp + 32 CHILDOF 1584 OFFSET 32 LOCALVAR var_C8 
     41477a     24 MEMORYHOLE STACK esp + 208 CalleeSavedRegs 
-    41477a     32 DATAREF STACK 1590 esp + 0 CHILDOF 1589 OFFSET 0 OutArgsRegion OUTARGS
+    41477a     32 DATAREF STACK 1585 esp + 0 CHILDOF 1584 OFFSET 0 OutArgsRegion OUTARGS
     41477a      7 INSTR BELONGTO 414770 
     41477a      7 INSTR DEADREGS  EFLAGS RDI R12 ZZ sub     rsp, 0D0h 
-    41477a      8 DATAREF STACK 1592 esp + 56 CHILDOF 1589 OFFSET 56 LOCALVAR var_B0 
-    41477a      8 DATAREF STACK 1593 esp + 64 CHILDOF 1589 OFFSET 64 LOCALVAR var_A8 
-    41477a      8 DATAREF STACK 1594 esp + 72 CHILDOF 1589 OFFSET 72 LOCALVAR var_A0 
+    41477a      8 DATAREF STACK 1587 esp + 56 CHILDOF 1584 OFFSET 56 LOCALVAR var_B0 
+    41477a      8 DATAREF STACK 1588 esp + 64 CHILDOF 1584 OFFSET 64 LOCALVAR var_A8 
+    41477a      8 DATAREF STACK 1589 esp + 72 CHILDOF 1584 OFFSET 72 LOCALVAR var_A0 
     41477a      8 MEMORYHOLE STACK esp + 232 ReturnAddress 
     414781     -1 INSTR LOCAL NoMetaUpdate test    al, al 
     414781      2 INSTR BELONGTO 414770 
@@ -25493,25 +25496,25 @@
     4148a0     -3 INSTR LOCAL NoWarn push    rbx 
     4148a1      3 INSTR BELONGTO 4148a0 
     4148a1      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    4148a4    128 DATAREF STACK 1603 esp + 0 PARENT LocalFrame LOCALFRAME
+    4148a4    128 DATAREF STACK 1598 esp + 0 PARENT LocalFrame LOCALFRAME
     4148a4      4 INSTR BELONGTO 4148a0 
     4148a4      4 INSTR DEADREGS  EFLAGS RDI ZZ add     rsp, 0FFFFFFFFFFFFFF80h 
-    4148a4      8 DATAREF STACK 1604 esp + 0 CHILDOF 1603 OFFSET 0 LOCALVAR var_88 
-    4148a4      8 DATAREF STACK 1605 esp + 8 CHILDOF 1603 OFFSET 8 LOCALVAR var_80 
-    4148a4      8 DATAREF STACK 1606 esp + 16 CHILDOF 1603 OFFSET 16 LOCALVAR var_78 
-    4148a4      8 DATAREF STACK 1607 esp + 24 CHILDOF 1603 OFFSET 24 LOCALVAR var_70 
-    4148a4      8 DATAREF STACK 1608 esp + 32 CHILDOF 1603 OFFSET 32 LOCALVAR var_68 
-    4148a4      8 DATAREF STACK 1609 esp + 40 CHILDOF 1603 OFFSET 40 LOCALVAR var_60 
-    4148a4      8 DATAREF STACK 1610 esp + 48 CHILDOF 1603 OFFSET 48 LOCALVAR var_58 
-    4148a4      8 DATAREF STACK 1611 esp + 56 CHILDOF 1603 OFFSET 56 LOCALVAR var_50 
-    4148a4      8 DATAREF STACK 1612 esp + 64 CHILDOF 1603 OFFSET 64 LOCALVAR var_48 
-    4148a4      8 DATAREF STACK 1613 esp + 72 CHILDOF 1603 OFFSET 72 LOCALVAR var_40 
-    4148a4      8 DATAREF STACK 1614 esp + 80 CHILDOF 1603 OFFSET 80 LOCALVAR var_38 
-    4148a4      8 DATAREF STACK 1615 esp + 88 CHILDOF 1603 OFFSET 88 LOCALVAR var_30 
-    4148a4      8 DATAREF STACK 1616 esp + 96 CHILDOF 1603 OFFSET 96 LOCALVAR var_28 
-    4148a4      8 DATAREF STACK 1617 esp + 104 CHILDOF 1603 OFFSET 104 LOCALVAR var_20 
-    4148a4      8 DATAREF STACK 1618 esp + 112 CHILDOF 1603 OFFSET 112 LOCALVAR var_18 
-    4148a4      8 DATAREF STACK 1619 esp + 120 CHILDOF 1603 OFFSET 120 LOCALVAR var_10 
+    4148a4      8 DATAREF STACK 1599 esp + 0 CHILDOF 1598 OFFSET 0 LOCALVAR var_88 
+    4148a4      8 DATAREF STACK 1600 esp + 8 CHILDOF 1598 OFFSET 8 LOCALVAR var_80 
+    4148a4      8 DATAREF STACK 1601 esp + 16 CHILDOF 1598 OFFSET 16 LOCALVAR var_78 
+    4148a4      8 DATAREF STACK 1602 esp + 24 CHILDOF 1598 OFFSET 24 LOCALVAR var_70 
+    4148a4      8 DATAREF STACK 1603 esp + 32 CHILDOF 1598 OFFSET 32 LOCALVAR var_68 
+    4148a4      8 DATAREF STACK 1604 esp + 40 CHILDOF 1598 OFFSET 40 LOCALVAR var_60 
+    4148a4      8 DATAREF STACK 1605 esp + 48 CHILDOF 1598 OFFSET 48 LOCALVAR var_58 
+    4148a4      8 DATAREF STACK 1606 esp + 56 CHILDOF 1598 OFFSET 56 LOCALVAR var_50 
+    4148a4      8 DATAREF STACK 1607 esp + 64 CHILDOF 1598 OFFSET 64 LOCALVAR var_48 
+    4148a4      8 DATAREF STACK 1608 esp + 72 CHILDOF 1598 OFFSET 72 LOCALVAR var_40 
+    4148a4      8 DATAREF STACK 1609 esp + 80 CHILDOF 1598 OFFSET 80 LOCALVAR var_38 
+    4148a4      8 DATAREF STACK 1610 esp + 88 CHILDOF 1598 OFFSET 88 LOCALVAR var_30 
+    4148a4      8 DATAREF STACK 1611 esp + 96 CHILDOF 1598 OFFSET 96 LOCALVAR var_28 
+    4148a4      8 DATAREF STACK 1612 esp + 104 CHILDOF 1598 OFFSET 104 LOCALVAR var_20 
+    4148a4      8 DATAREF STACK 1613 esp + 112 CHILDOF 1598 OFFSET 112 LOCALVAR var_18 
+    4148a4      8 DATAREF STACK 1614 esp + 120 CHILDOF 1598 OFFSET 120 LOCALVAR var_10 
     4148a4      8 MEMORYHOLE STACK esp + 128 CalleeSavedRegs 
     4148a4      8 MEMORYHOLE STACK esp + 136 ReturnAddress 
     4148a8      3 INSTR BELONGTO 4148a0 
@@ -25641,7 +25644,7 @@
     414973      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
     414980      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
     414980      0 FUNC MMSAFENESS SAFE
-    414980    136 DATAREF STACK 1620 esp + 0 PARENT LocalFrame LOCALFRAME
+    414980    136 DATAREF STACK 1615 esp + 0 PARENT LocalFrame LOCALFRAME
     414980     71 FUNC GLOBAL unblock_sigchld FUNC_UNSAFE NOFP RET     4149c6 
     414980      7 INSTR BELONGTO 414980 
     414980      7 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 88h 
@@ -25702,9 +25705,9 @@
     4149d4      2 INSTR BELONGTO 4149d0 
     4149d4      2 INSTR DEADREGS  EFLAGS RAX RDX RBX ZZ mov     ebx, esi 
     4149d4     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, esi 
-    4149d6   1032 DATAREF STACK 1622 esp + 128 CHILDOF 1621 OFFSET 128 LOCALVAR s 
-    4149d6   1176 DATAREF STACK 1621 esp + 0 PARENT LocalFrame LOCALFRAME
-    4149d6     16 DATAREF STACK 1623 esp + 1160 CHILDOF 1621 OFFSET 1160 LOCALVAR var_20 
+    4149d6   1032 DATAREF STACK 1617 esp + 128 CHILDOF 1616 OFFSET 128 LOCALVAR s 
+    4149d6   1176 DATAREF STACK 1616 esp + 0 PARENT LocalFrame LOCALFRAME
+    4149d6     16 DATAREF STACK 1618 esp + 1160 CHILDOF 1616 OFFSET 1160 LOCALVAR var_20 
     4149d6     16 MEMORYHOLE STACK esp + 1176 CalleeSavedRegs 
     4149d6      7 INSTR BELONGTO 4149d0 
     4149d6      7 INSTR DEADREGS  EFLAGS RAX RDX ZZ sub     rsp, 498h 
@@ -25853,8 +25856,8 @@
     414acb      1 INSTR BELONGTO 414ac0 
     414acb      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
     414acb     -3 INSTR LOCAL NoWarn push    rbx 
-    414acc     16 DATAREF STACK 1625 esp + 0 CHILDOF 1624 OFFSET 0 OutArgsRegion OUTARGS
-    414acc     24 DATAREF STACK 1624 esp + 0 PARENT LocalFrame LOCALFRAME
+    414acc     16 DATAREF STACK 1620 esp + 0 CHILDOF 1619 OFFSET 0 OutArgsRegion OUTARGS
+    414acc     24 DATAREF STACK 1619 esp + 0 PARENT LocalFrame LOCALFRAME
     414acc     32 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
     414acc      4 INSTR BELONGTO 414ac0 
     414acc      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
@@ -25988,16 +25991,16 @@
     414b8a      5 INSTR BELONGTO 414b70 
     414b8f     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
     414b8f      5 INSTR BELONGTO 414b70 
-    414b94     16 DATAREF STACK 1627 esp + 8 CHILDOF 1626 OFFSET 8 LOCALVAR var_40 
+    414b94     16 DATAREF STACK 1622 esp + 8 CHILDOF 1621 OFFSET 8 LOCALVAR var_40 
     414b94      4 INSTR BELONGTO 414b70 
     414b94      4 INSTR DEADREGS  EFLAGS RDI R13 R14 R15 ZZ sub     rsp, 48h 
-    414b94     72 DATAREF STACK 1626 esp + 0 PARENT LocalFrame LOCALFRAME
-    414b94      8 DATAREF STACK 1628 esp + 24 CHILDOF 1626 OFFSET 24 LOCALVAR var_30 
-    414b94      8 DATAREF STACK 1629 esp + 32 CHILDOF 1626 OFFSET 32 LOCALVAR var_28 
-    414b94      8 DATAREF STACK 1630 esp + 40 CHILDOF 1626 OFFSET 40 LOCALVAR var_20 
-    414b94      8 DATAREF STACK 1631 esp + 48 CHILDOF 1626 OFFSET 48 LOCALVAR var_18 
-    414b94      8 DATAREF STACK 1632 esp + 56 CHILDOF 1626 OFFSET 56 LOCALVAR var_10 
-    414b94      8 DATAREF STACK 1633 esp + 64 CHILDOF 1626 OFFSET 64 LOCALVAR var_8 
+    414b94     72 DATAREF STACK 1621 esp + 0 PARENT LocalFrame LOCALFRAME
+    414b94      8 DATAREF STACK 1623 esp + 24 CHILDOF 1621 OFFSET 24 LOCALVAR var_30 
+    414b94      8 DATAREF STACK 1624 esp + 32 CHILDOF 1621 OFFSET 32 LOCALVAR var_28 
+    414b94      8 DATAREF STACK 1625 esp + 40 CHILDOF 1621 OFFSET 40 LOCALVAR var_20 
+    414b94      8 DATAREF STACK 1626 esp + 48 CHILDOF 1621 OFFSET 48 LOCALVAR var_18 
+    414b94      8 DATAREF STACK 1627 esp + 56 CHILDOF 1621 OFFSET 56 LOCALVAR var_10 
+    414b94      8 DATAREF STACK 1628 esp + 64 CHILDOF 1621 OFFSET 64 LOCALVAR var_8 
     414b94      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     414b98     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
     414b98      3 INSTR BELONGTO 414b70 
@@ -26235,7 +26238,7 @@
     414d20    146 FUNC GLOBAL sub_414D20 FUNC_UNSAFE NOFP RET     414db1 
     414d20      4 INSTR BELONGTO 414d20 
     414d20      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    414d20      8 DATAREF STACK 1634 esp + 0 PARENT LocalFrame LOCALFRAME
+    414d20      8 DATAREF STACK 1629 esp + 0 PARENT LocalFrame LOCALFRAME
     414d20      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     414d24     -1 INSTR LOCAL NoMetaUpdate cmp     edi, 4          ; switch 5 cases  
     414d24      3 INSTR BELONGTO 414d20 
@@ -26316,13 +26319,13 @@
     414dcd      5 INSTR BELONGTO 414dc0 
     414dd2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     414dd2      5 INSTR BELONGTO 414dc0 
-    414dd7     40 DATAREF STACK 1635 esp + 0 PARENT LocalFrame LOCALFRAME
+    414dd7     40 DATAREF STACK 1630 esp + 0 PARENT LocalFrame LOCALFRAME
     414dd7      4 INSTR BELONGTO 414dc0 
     414dd7      4 INSTR DEADREGS  EFLAGS R12 R13 ZZ sub     rsp, 28h 
-    414dd7      8 DATAREF STACK 1636 esp + 8 CHILDOF 1635 OFFSET 8 LOCALVAR var_20 
-    414dd7      8 DATAREF STACK 1637 esp + 16 CHILDOF 1635 OFFSET 16 LOCALVAR var_18 
-    414dd7      8 DATAREF STACK 1638 esp + 24 CHILDOF 1635 OFFSET 24 LOCALVAR var_10 
-    414dd7      8 DATAREF STACK 1639 esp + 32 CHILDOF 1635 OFFSET 32 LOCALVAR var_8 
+    414dd7      8 DATAREF STACK 1631 esp + 8 CHILDOF 1630 OFFSET 8 LOCALVAR var_20 
+    414dd7      8 DATAREF STACK 1632 esp + 16 CHILDOF 1630 OFFSET 16 LOCALVAR var_18 
+    414dd7      8 DATAREF STACK 1633 esp + 24 CHILDOF 1630 OFFSET 24 LOCALVAR var_10 
+    414dd7      8 DATAREF STACK 1634 esp + 32 CHILDOF 1630 OFFSET 32 LOCALVAR var_8 
     414dd7      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     414ddb     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
     414ddb      3 INSTR BELONGTO 414dc0 
@@ -26496,8 +26499,8 @@
     414f00      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
     414f00      0 FUNC MMSAFENESS SAFE
     414f00    113 FUNC GLOBAL gs_grab_get_type FUNC_UNSAFE NOFP RET     414f70 
-    414f00     24 DATAREF STACK 1640 esp + 0 PARENT LocalFrame LOCALFRAME
-    414f00      4 DATAREF STACK 1641 esp + 0 CHILDOF 1640 OFFSET 0 OutArgsRegion OUTARGS
+    414f00     24 DATAREF STACK 1635 esp + 0 PARENT LocalFrame LOCALFRAME
+    414f00      4 DATAREF STACK 1636 esp + 0 CHILDOF 1635 OFFSET 0 OutArgsRegion OUTARGS
     414f00      4 INSTR BELONGTO 414f00 
     414f00      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
     414f00      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -26572,7 +26575,7 @@
     414f82      3 INSTR BELONGTO 414f80 
     414f85     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     414f85      4 INSTR BELONGTO 414f80 
-    414f85      8 DATAREF STACK 1642 esp + 0 PARENT LocalFrame LOCALFRAME
+    414f85      8 DATAREF STACK 1637 esp + 0 PARENT LocalFrame LOCALFRAME
     414f85      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     414f89     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     414f89      3 INSTR BELONGTO 414f80 
@@ -26660,7 +26663,7 @@
     415045     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     415045      4 INSTR BELONGTO 415040 
     415045      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    415045      8 DATAREF STACK 1643 esp + 0 PARENT LocalFrame LOCALFRAME
+    415045      8 DATAREF STACK 1638 esp + 0 PARENT LocalFrame LOCALFRAME
     415045      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     415049     -1 INSTR LOCAL NoMetaUpdate call    gs_grab_get_type 
     415049      5 INSTR BELONGTO 415040 
@@ -26722,11 +26725,11 @@
     4150a5      5 INSTR BELONGTO 4150a0 
     4150a5      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+var_8], rbp 
     4150a5      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
-    4150aa     24 DATAREF STACK 1644 esp + 0 PARENT LocalFrame LOCALFRAME
+    4150aa     24 DATAREF STACK 1639 esp + 0 PARENT LocalFrame LOCALFRAME
     4150aa      4 INSTR BELONGTO 4150a0 
     4150aa      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-    4150aa      8 DATAREF STACK 1645 esp + 8 CHILDOF 1644 OFFSET 8 LOCALVAR var_10 
-    4150aa      8 DATAREF STACK 1646 esp + 16 CHILDOF 1644 OFFSET 16 LOCALVAR var_8 
+    4150aa      8 DATAREF STACK 1640 esp + 8 CHILDOF 1639 OFFSET 8 LOCALVAR var_10 
+    4150aa      8 DATAREF STACK 1641 esp + 16 CHILDOF 1639 OFFSET 16 LOCALVAR var_8 
     4150aa      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4150ae      4 INSTR BELONGTO 4150a0 
     4150ae      4 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, [rdi+18h] 
@@ -26819,11 +26822,11 @@
     415145      5 INSTR BELONGTO 415140 
     415145      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+var_8], rbp 
     415145      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
-    41514a     24 DATAREF STACK 1647 esp + 0 PARENT LocalFrame LOCALFRAME
+    41514a     24 DATAREF STACK 1642 esp + 0 PARENT LocalFrame LOCALFRAME
     41514a      4 INSTR BELONGTO 415140 
     41514a      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-    41514a      8 DATAREF STACK 1648 esp + 8 CHILDOF 1647 OFFSET 8 LOCALVAR var_10 
-    41514a      8 DATAREF STACK 1649 esp + 16 CHILDOF 1647 OFFSET 16 LOCALVAR var_8 
+    41514a      8 DATAREF STACK 1643 esp + 8 CHILDOF 1642 OFFSET 8 LOCALVAR var_10 
+    41514a      8 DATAREF STACK 1644 esp + 16 CHILDOF 1642 OFFSET 16 LOCALVAR var_8 
     41514a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     41514e      4 INSTR BELONGTO 415140 
     41514e      4 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, [rdi+18h] 
@@ -26981,11 +26984,11 @@
     415242      1 INSTR BELONGTO 415230 
     415242      1 INSTR DEADREGS  EFLAGS RAX RDX RSI R14 R15 ZZ push    rbx 
     415242     -3 INSTR LOCAL NoWarn push    rbx 
-    415243     12 DATAREF STACK 1652 esp + 16 CHILDOF 1650 OFFSET 16 LOCALVAR var_48 
-    415243     12 DATAREF STACK 1653 esp + 28 CHILDOF 1650 OFFSET 28 LOCALVAR var_3C 
-    415243     40 DATAREF STACK 1650 esp + 0 PARENT LocalFrame LOCALFRAME
+    415243     12 DATAREF STACK 1647 esp + 16 CHILDOF 1645 OFFSET 16 LOCALVAR var_48 
+    415243     12 DATAREF STACK 1648 esp + 28 CHILDOF 1645 OFFSET 28 LOCALVAR var_3C 
+    415243     40 DATAREF STACK 1645 esp + 0 PARENT LocalFrame LOCALFRAME
     415243     48 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-    415243      4 DATAREF STACK 1651 esp + 12 CHILDOF 1650 OFFSET 12 LOCALVAR var_4C 
+    415243      4 DATAREF STACK 1646 esp + 12 CHILDOF 1645 OFFSET 12 LOCALVAR var_4C 
     415243      4 INSTR BELONGTO 415230 
     415243      4 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R14 R15 ZZ sub     rsp, 28h 
     415243      8 MEMORYHOLE STACK esp + 88 ReturnAddress 
@@ -27310,9 +27313,9 @@
     415435      3 INSTR DEADREGS  EFLAGS RCX RBX R10 R11 ZZ mov     rbx, rdi 
     415438      5 INSTR BELONGTO 415420 
     415438      5 INSTR DEADREGS  EFLAGS RCX RDI R10 R11 ZZ mov     edi, offset aGs_grab_grab_r; "gs_grab_grab_root" 
-    41543d     16 DATAREF STACK 1655 esp + 8 CHILDOF 1654 OFFSET 8 LOCALVAR var_20 
+    41543d     16 DATAREF STACK 1650 esp + 8 CHILDOF 1649 OFFSET 8 LOCALVAR var_20 
     41543d     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    41543d     24 DATAREF STACK 1654 esp + 0 PARENT LocalFrame LOCALFRAME
+    41543d     24 DATAREF STACK 1649 esp + 0 PARENT LocalFrame LOCALFRAME
     41543d      4 INSTR BELONGTO 415420 
     41543d      4 INSTR DEADREGS  EFLAGS RCX R10 R11 ZZ sub     rsp, 18h 
     41543d      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -27383,12 +27386,12 @@
     4154a7      2 INSTR BELONGTO 415490 
     4154a7      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R10 R11 R12 ZZ mov     ebp, esi 
     4154a7     -2 INSTR LOCAL n EBP ZZ  NumericDEFs mov     ebp, esi 
-    4154a9     24 DATAREF STACK 1656 esp + 0 PARENT LocalFrame LOCALFRAME
+    4154a9     24 DATAREF STACK 1651 esp + 0 PARENT LocalFrame LOCALFRAME
     4154a9      4 INSTR BELONGTO 415490 
     4154a9      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R10 R11 R12 ZZ sub     rsp, 18h 
-    4154a9      8 DATAREF STACK 1657 esp + 0 CHILDOF 1656 OFFSET 0 LOCALVAR var_18 
-    4154a9      8 DATAREF STACK 1658 esp + 8 CHILDOF 1656 OFFSET 8 LOCALVAR var_10 
-    4154a9      8 DATAREF STACK 1659 esp + 16 CHILDOF 1656 OFFSET 16 LOCALVAR var_8 
+    4154a9      8 DATAREF STACK 1652 esp + 0 CHILDOF 1651 OFFSET 0 LOCALVAR var_18 
+    4154a9      8 DATAREF STACK 1653 esp + 8 CHILDOF 1651 OFFSET 8 LOCALVAR var_10 
+    4154a9      8 DATAREF STACK 1654 esp + 16 CHILDOF 1651 OFFSET 16 LOCALVAR var_8 
     4154a9      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4154ad     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 22Bh 
     4154ad      5 INSTR BELONGTO 415490 
@@ -27477,9 +27480,9 @@
     41552f     -3 INSTR LOCAL NoWarn push    rbx 
     415530      3 INSTR BELONGTO 415520 
     415530      3 INSTR DEADREGS  EFLAGS RAX RDX RBX RSI R8 R9 R10 R11 R13 R14 R15 ZZ mov     rbx, rdi 
-    415533     12 DATAREF STACK 1661 esp + 0 CHILDOF 1660 OFFSET 0 LOCALVAR var_48 
-    415533     12 DATAREF STACK 1662 esp + 12 CHILDOF 1660 OFFSET 12 LOCALVAR var_3C 
-    415533     24 DATAREF STACK 1660 esp + 0 PARENT LocalFrame LOCALFRAME
+    415533     12 DATAREF STACK 1656 esp + 0 CHILDOF 1655 OFFSET 0 LOCALVAR var_48 
+    415533     12 DATAREF STACK 1657 esp + 12 CHILDOF 1655 OFFSET 12 LOCALVAR var_3C 
+    415533     24 DATAREF STACK 1655 esp + 0 PARENT LocalFrame LOCALFRAME
     415533     48 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
     415533      4 INSTR BELONGTO 415520 
     415533      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R8 R9 R10 R11 R13 R14 R15 ZZ sub     rsp, 18h 
@@ -28135,7 +28138,7 @@
     4159c0      4 INSTR BELONGTO 4159c0 
     4159c0      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 8 
     4159c0     87 FUNC GLOBAL gs_grab_new FUNC_UNSAFE NOFP RET     415a16 
-    4159c0      8 DATAREF STACK 1663 esp + 0 PARENT LocalFrame LOCALFRAME
+    4159c0      8 DATAREF STACK 1658 esp + 0 PARENT LocalFrame LOCALFRAME
     4159c0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4159c4      7 INSTR BELONGTO 4159c0 
     4159c4      7 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, cs:qword_61FE00 
@@ -28248,11 +28251,11 @@
     415a68      1 INSTR BELONGTO 415a60 
     415a68      1 INSTR DEADREGS  EFLAGS RCX RDX ZZ push    rbx 
     415a68     -3 INSTR LOCAL NoWarn push    rbx 
-    415a69     16 DATAREF STACK 1664 esp + 0 PARENT LocalFrame LOCALFRAME
+    415a69     16 DATAREF STACK 1659 esp + 0 PARENT LocalFrame LOCALFRAME
     415a69     24 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
     415a69      4 INSTR BELONGTO 415a60 
     415a69      4 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ sub     rsp, 10h 
-    415a69      8 DATAREF STACK 1665 esp + 8 CHILDOF 1664 OFFSET 8 LOCALVAR var_20 
+    415a69      8 DATAREF STACK 1660 esp + 8 CHILDOF 1659 OFFSET 8 LOCALVAR var_20 
     415a69      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     415a6d      4 INSTR BELONGTO 415a60 
     415a6d      4 INSTR DEADREGS  EFLAGS RCX RDX RBX ZZ mov     rcx, [rdi+18h] 
@@ -28350,11 +28353,11 @@
     415aec      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 XMM0 ZZ retn 
     415af0      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
     415af0      0 FUNC MMSAFENESS SAFE
-    415af0     24 DATAREF STACK 1666 esp + 0 PARENT LocalFrame LOCALFRAME
+    415af0     24 DATAREF STACK 1661 esp + 0 PARENT LocalFrame LOCALFRAME
     415af0     42 FUNC GLOBAL sub_415AF0 FUNC_UNSAFE NOFP RET     415b19 
     415af0      4 INSTR BELONGTO 415af0 
     415af0      4 INSTR DEADREGS  EFLAGS RCX RDX R8 R9 ZZ sub     rsp, 18h 
-    415af0      8 DATAREF STACK 1667 esp + 0 CHILDOF 1666 OFFSET 0 OutArgsRegion OUTARGS
+    415af0      8 DATAREF STACK 1662 esp + 0 CHILDOF 1661 OFFSET 0 OutArgsRegion OUTARGS
     415af0      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     415af4     -2 INSTR LOCAL n R9 ZZ  NumericDEFs mov     r9d, offset sub_415AF0 
     415af4      6 INSTR BELONGTO 415af0 
@@ -28393,12 +28396,12 @@
     415b25      5 INSTR BELONGTO 415b20 
     415b25      5 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 R9 ZZ mov     [rsp+var_8], rbp 
     415b25      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
-    415b2a     40 DATAREF STACK 1668 esp + 0 PARENT LocalFrame LOCALFRAME
+    415b2a     40 DATAREF STACK 1663 esp + 0 PARENT LocalFrame LOCALFRAME
     415b2a      4 INSTR BELONGTO 415b20 
     415b2a      4 INSTR DEADREGS  EFLAGS RCX RDX RBX R8 R9 ZZ sub     rsp, 28h 
-    415b2a      8 DATAREF STACK 1669 esp + 0 CHILDOF 1668 OFFSET 0 OutArgsRegion OUTARGS
-    415b2a      8 DATAREF STACK 1670 esp + 24 CHILDOF 1668 OFFSET 24 LOCALVAR var_10 
-    415b2a      8 DATAREF STACK 1671 esp + 32 CHILDOF 1668 OFFSET 32 LOCALVAR var_8 
+    415b2a      8 DATAREF STACK 1664 esp + 0 CHILDOF 1663 OFFSET 0 OutArgsRegion OUTARGS
+    415b2a      8 DATAREF STACK 1665 esp + 24 CHILDOF 1663 OFFSET 24 LOCALVAR var_10 
+    415b2a      8 DATAREF STACK 1666 esp + 32 CHILDOF 1663 OFFSET 32 LOCALVAR var_8 
     415b2a      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     415b2e     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
     415b2e      3 INSTR BELONGTO 415b20 
@@ -28465,7 +28468,7 @@
     415b86      4 INSTR BELONGTO 415b80 
     415b8a      1 INSTR BELONGTO 415b80 
     415b8a      1 INSTR DEADREGS  EFLAGS RAX RDX R12 ZZ push    rbx 
-    415b8a     24 DATAREF STACK 1672 esp + 0 PARENT LocalFrame LOCALFRAME
+    415b8a     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     415b8a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     415b8b      4 INSTR BELONGTO 415b80 
     415b8b      4 INSTR DEADREGS  EFLAGS RAX RDX RBX R12 ZZ mov     rax, [rdi+18h] 
@@ -28561,11 +28564,11 @@
     415c20     -3 INSTR LOCAL NoWarn push    rbx 
     415c21      3 INSTR BELONGTO 415c20 
     415c21      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    415c24     20 DATAREF STACK 1674 esp + 0 CHILDOF 1673 OFFSET 0 OutArgsRegion OUTARGS
-    415c24     32 DATAREF STACK 1673 esp + 0 PARENT LocalFrame LOCALFRAME
+    415c24     20 DATAREF STACK 1668 esp + 0 CHILDOF 1667 OFFSET 0 OutArgsRegion OUTARGS
+    415c24     32 DATAREF STACK 1667 esp + 0 PARENT LocalFrame LOCALFRAME
     415c24      4 INSTR BELONGTO 415c20 
     415c24      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 20h 
-    415c24      8 DATAREF STACK 1675 esp + 24 CHILDOF 1673 OFFSET 24 LOCALVAR var_10 
+    415c24      8 DATAREF STACK 1669 esp + 24 CHILDOF 1667 OFFSET 24 LOCALVAR var_10 
     415c24      8 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
     415c24      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     415c28     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
@@ -28654,14 +28657,14 @@
     415cbc      1 INSTR BELONGTO 415cb0 
     415cbc      1 INSTR DEADREGS  EFLAGS RAX RDX R12 R13 R14 R15 ZZ push    rbx 
     415cbc     -3 INSTR LOCAL NoWarn push    rbx 
-    415cbd     12 DATAREF STACK 1679 esp + 32 CHILDOF 1676 OFFSET 32 LOCALVAR var_48 
-    415cbd     12 DATAREF STACK 1680 esp + 44 CHILDOF 1676 OFFSET 44 LOCALVAR var_3C 
-    415cbd     16 DATAREF STACK 1677 esp + 0 CHILDOF 1676 OFFSET 0 LOCALVAR var_68 
-    415cbd     16 DATAREF STACK 1678 esp + 16 CHILDOF 1676 OFFSET 16 LOCALVAR var_58 
+    415cbd     12 DATAREF STACK 1673 esp + 32 CHILDOF 1670 OFFSET 32 LOCALVAR var_48 
+    415cbd     12 DATAREF STACK 1674 esp + 44 CHILDOF 1670 OFFSET 44 LOCALVAR var_3C 
+    415cbd     16 DATAREF STACK 1671 esp + 0 CHILDOF 1670 OFFSET 0 LOCALVAR var_68 
+    415cbd     16 DATAREF STACK 1672 esp + 16 CHILDOF 1670 OFFSET 16 LOCALVAR var_58 
     415cbd     48 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
     415cbd      4 INSTR BELONGTO 415cb0 
     415cbd      4 INSTR DEADREGS  EFLAGS RAX RDX RBX R12 R13 R14 R15 ZZ sub     rsp, 38h 
-    415cbd     56 DATAREF STACK 1676 esp + 0 PARENT LocalFrame LOCALFRAME
+    415cbd     56 DATAREF STACK 1670 esp + 0 PARENT LocalFrame LOCALFRAME
     415cbd      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
     415cc1     -1 INSTR LOCAL MetadataUnused mov     rax, [rdi+18h] 
     415cc1      4 INSTR BELONGTO 415cb0 
@@ -29145,8 +29148,8 @@
     416400      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
     416400      0 FUNC MMSAFENESS SAFE
     416400    113 FUNC GLOBAL gs_fade_get_type FUNC_UNSAFE NOFP RET     416470 
-    416400     24 DATAREF STACK 1681 esp + 0 PARENT LocalFrame LOCALFRAME
-    416400      4 DATAREF STACK 1682 esp + 0 CHILDOF 1681 OFFSET 0 OutArgsRegion OUTARGS
+    416400     24 DATAREF STACK 1675 esp + 0 PARENT LocalFrame LOCALFRAME
+    416400      4 DATAREF STACK 1676 esp + 0 CHILDOF 1675 OFFSET 0 OutArgsRegion OUTARGS
     416400      4 INSTR BELONGTO 416400 
     416400      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
     416400      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -29442,7 +29445,7 @@
     4168e7     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4168e7      4 INSTR BELONGTO 4168e0 
     4168e7      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    4168e7      8 DATAREF STACK 1683 esp + 0 PARENT LocalFrame LOCALFRAME
+    4168e7      8 DATAREF STACK 1677 esp + 0 PARENT LocalFrame LOCALFRAME
     4168e7      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4168eb     -1 INSTR LOCAL NoMetaUpdate call    gs_fade_get_type 
     4168eb      5 INSTR BELONGTO 4168e0 
@@ -29624,7 +29627,7 @@
     4169ec     32 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4169ec      4 INSTR BELONGTO 4169e0 
     4169ec      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 8 
-    4169ec      8 DATAREF STACK 1684 esp + 0 PARENT LocalFrame LOCALFRAME
+    4169ec      8 DATAREF STACK 1678 esp + 0 PARENT LocalFrame LOCALFRAME
     4169ec      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     4169f0     -1 INSTR LOCAL NoMetaUpdate call    gs_fade_get_type 
     4169f0      5 INSTR BELONGTO 4169e0 
@@ -30017,13 +30020,13 @@
     416c4d      5 INSTR BELONGTO 416c40 
     416c52     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     416c52      5 INSTR BELONGTO 416c40 
-    416c57     40 DATAREF STACK 1685 esp + 0 PARENT LocalFrame LOCALFRAME
+    416c57     40 DATAREF STACK 1679 esp + 0 PARENT LocalFrame LOCALFRAME
     416c57      4 INSTR BELONGTO 416c40 
     416c57      4 INSTR DEADREGS  EFLAGS RAX RDI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 28h 
-    416c57      8 DATAREF STACK 1686 esp + 8 CHILDOF 1685 OFFSET 8 LOCALVAR var_20 
-    416c57      8 DATAREF STACK 1687 esp + 16 CHILDOF 1685 OFFSET 16 LOCALVAR var_18 
-    416c57      8 DATAREF STACK 1688 esp + 24 CHILDOF 1685 OFFSET 24 LOCALVAR var_10 
-    416c57      8 DATAREF STACK 1689 esp + 32 CHILDOF 1685 OFFSET 32 LOCALVAR var_8 
+    416c57      8 DATAREF STACK 1680 esp + 8 CHILDOF 1679 OFFSET 8 LOCALVAR var_20 
+    416c57      8 DATAREF STACK 1681 esp + 16 CHILDOF 1679 OFFSET 16 LOCALVAR var_18 
+    416c57      8 DATAREF STACK 1682 esp + 24 CHILDOF 1679 OFFSET 24 LOCALVAR var_10 
+    416c57      8 DATAREF STACK 1683 esp + 32 CHILDOF 1679 OFFSET 32 LOCALVAR var_8 
     416c57      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     416c5b     -1 INSTR LOCAL MetadataUnused mov     ebp, esi 
     416c5b      2 INSTR BELONGTO 416c40 
@@ -30154,9 +30157,9 @@
     416d23     -3 INSTR LOCAL NoWarn push    rbx 
     416d24      3 INSTR BELONGTO 416d20 
     416d24      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    416d27     12 DATAREF STACK 1691 esp + 12 CHILDOF 1690 OFFSET 12 LOCALVAR var_1C 
+    416d27     12 DATAREF STACK 1685 esp + 12 CHILDOF 1684 OFFSET 12 LOCALVAR var_1C 
     416d27     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    416d27     24 DATAREF STACK 1690 esp + 0 PARENT LocalFrame LOCALFRAME
+    416d27     24 DATAREF STACK 1684 esp + 0 PARENT LocalFrame LOCALFRAME
     416d27      4 INSTR BELONGTO 416d20 
     416d27      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
     416d27      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -30285,7 +30288,7 @@
     416de2     -3 INSTR LOCAL NoWarn push    rbp 
     416de3      1 INSTR BELONGTO 416de0 
     416de3      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 R12 ZZ push    rbx 
-    416de3     24 DATAREF STACK 1692 esp + 0 PARENT LocalFrame LOCALFRAME
+    416de3     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     416de3      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     416de4      3 INSTR BELONGTO 416de0 
     416de4      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 ZZ mov     rbx, rdi 
@@ -30432,7 +30435,7 @@
     416ec0      4 INSTR BELONGTO 416ec0 
     416ec0      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 8 
     416ec0     87 FUNC GLOBAL gs_fade_new FUNC_UNSAFE NOFP RET     416f16 
-    416ec0      8 DATAREF STACK 1693 esp + 0 PARENT LocalFrame LOCALFRAME
+    416ec0      8 DATAREF STACK 1686 esp + 0 PARENT LocalFrame LOCALFRAME
     416ec0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     416ec4      7 INSTR BELONGTO 416ec0 
     416ec4      7 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, cs:qword_61FE20 
@@ -30498,13 +30501,13 @@
     416f32      5 INSTR BELONGTO 416f20 
     416f32      5 INSTR DEADREGS  EFLAGS R12 ZZ mov     [rsp+var_8], r13 
     416f32      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r13
-    416f37     40 DATAREF STACK 1694 esp + 0 PARENT LocalFrame LOCALFRAME
+    416f37     40 DATAREF STACK 1687 esp + 0 PARENT LocalFrame LOCALFRAME
     416f37      4 INSTR BELONGTO 416f20 
     416f37      4 INSTR DEADREGS  EFLAGS R12 R13 ZZ sub     rsp, 28h 
-    416f37      8 DATAREF STACK 1695 esp + 8 CHILDOF 1694 OFFSET 8 LOCALVAR var_20 
-    416f37      8 DATAREF STACK 1696 esp + 16 CHILDOF 1694 OFFSET 16 LOCALVAR var_18 
-    416f37      8 DATAREF STACK 1697 esp + 24 CHILDOF 1694 OFFSET 24 LOCALVAR var_10 
-    416f37      8 DATAREF STACK 1698 esp + 32 CHILDOF 1694 OFFSET 32 LOCALVAR var_8 
+    416f37      8 DATAREF STACK 1688 esp + 8 CHILDOF 1687 OFFSET 8 LOCALVAR var_20 
+    416f37      8 DATAREF STACK 1689 esp + 16 CHILDOF 1687 OFFSET 16 LOCALVAR var_18 
+    416f37      8 DATAREF STACK 1690 esp + 24 CHILDOF 1687 OFFSET 24 LOCALVAR var_10 
+    416f37      8 DATAREF STACK 1691 esp + 32 CHILDOF 1687 OFFSET 32 LOCALVAR var_8 
     416f37      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     416f3b     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
     416f3b      3 INSTR BELONGTO 416f20 
@@ -30628,13 +30631,13 @@
     41701f      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
     417024      4 INSTR BELONGTO 417000 
     417024      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 38h 
-    417024     56 DATAREF STACK 1699 esp + 0 PARENT LocalFrame LOCALFRAME
-    417024      8 DATAREF STACK 1700 esp + 8 CHILDOF 1699 OFFSET 8 LOCALVAR var_30 
-    417024      8 DATAREF STACK 1701 esp + 16 CHILDOF 1699 OFFSET 16 LOCALVAR var_28 
-    417024      8 DATAREF STACK 1702 esp + 24 CHILDOF 1699 OFFSET 24 LOCALVAR var_20 
-    417024      8 DATAREF STACK 1703 esp + 32 CHILDOF 1699 OFFSET 32 LOCALVAR var_18 
-    417024      8 DATAREF STACK 1704 esp + 40 CHILDOF 1699 OFFSET 40 LOCALVAR var_10 
-    417024      8 DATAREF STACK 1705 esp + 48 CHILDOF 1699 OFFSET 48 LOCALVAR var_8 
+    417024     56 DATAREF STACK 1692 esp + 0 PARENT LocalFrame LOCALFRAME
+    417024      8 DATAREF STACK 1693 esp + 8 CHILDOF 1692 OFFSET 8 LOCALVAR var_30 
+    417024      8 DATAREF STACK 1694 esp + 16 CHILDOF 1692 OFFSET 16 LOCALVAR var_28 
+    417024      8 DATAREF STACK 1695 esp + 24 CHILDOF 1692 OFFSET 24 LOCALVAR var_20 
+    417024      8 DATAREF STACK 1696 esp + 32 CHILDOF 1692 OFFSET 32 LOCALVAR var_18 
+    417024      8 DATAREF STACK 1697 esp + 40 CHILDOF 1692 OFFSET 40 LOCALVAR var_10 
+    417024      8 DATAREF STACK 1698 esp + 48 CHILDOF 1692 OFFSET 48 LOCALVAR var_8 
     417024      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     417028     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
     417028      3 INSTR BELONGTO 417000 
@@ -30775,13 +30778,13 @@
     41711f      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
     417124      4 INSTR BELONGTO 417100 
     417124      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 38h 
-    417124     56 DATAREF STACK 1706 esp + 0 PARENT LocalFrame LOCALFRAME
-    417124      8 DATAREF STACK 1707 esp + 8 CHILDOF 1706 OFFSET 8 LOCALVAR var_30 
-    417124      8 DATAREF STACK 1708 esp + 16 CHILDOF 1706 OFFSET 16 LOCALVAR var_28 
-    417124      8 DATAREF STACK 1709 esp + 24 CHILDOF 1706 OFFSET 24 LOCALVAR var_20 
-    417124      8 DATAREF STACK 1710 esp + 32 CHILDOF 1706 OFFSET 32 LOCALVAR var_18 
-    417124      8 DATAREF STACK 1711 esp + 40 CHILDOF 1706 OFFSET 40 LOCALVAR var_10 
-    417124      8 DATAREF STACK 1712 esp + 48 CHILDOF 1706 OFFSET 48 LOCALVAR var_8 
+    417124     56 DATAREF STACK 1699 esp + 0 PARENT LocalFrame LOCALFRAME
+    417124      8 DATAREF STACK 1700 esp + 8 CHILDOF 1699 OFFSET 8 LOCALVAR var_30 
+    417124      8 DATAREF STACK 1701 esp + 16 CHILDOF 1699 OFFSET 16 LOCALVAR var_28 
+    417124      8 DATAREF STACK 1702 esp + 24 CHILDOF 1699 OFFSET 24 LOCALVAR var_20 
+    417124      8 DATAREF STACK 1703 esp + 32 CHILDOF 1699 OFFSET 32 LOCALVAR var_18 
+    417124      8 DATAREF STACK 1704 esp + 40 CHILDOF 1699 OFFSET 40 LOCALVAR var_10 
+    417124      8 DATAREF STACK 1705 esp + 48 CHILDOF 1699 OFFSET 48 LOCALVAR var_8 
     417124      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     417128     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
     417128      3 INSTR BELONGTO 417100 
@@ -30913,13 +30916,13 @@
     41721f      5 INSTR BELONGTO 417200 
     41721f      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r15
     417224      4 INSTR BELONGTO 417200 
-    417224     56 DATAREF STACK 1713 esp + 0 PARENT LocalFrame LOCALFRAME
-    417224      8 DATAREF STACK 1714 esp + 8 CHILDOF 1713 OFFSET 8 LOCALVAR var_30 
-    417224      8 DATAREF STACK 1715 esp + 16 CHILDOF 1713 OFFSET 16 LOCALVAR var_28 
-    417224      8 DATAREF STACK 1716 esp + 24 CHILDOF 1713 OFFSET 24 LOCALVAR var_20 
-    417224      8 DATAREF STACK 1717 esp + 32 CHILDOF 1713 OFFSET 32 LOCALVAR var_18 
-    417224      8 DATAREF STACK 1718 esp + 40 CHILDOF 1713 OFFSET 40 LOCALVAR var_10 
-    417224      8 DATAREF STACK 1719 esp + 48 CHILDOF 1713 OFFSET 48 LOCALVAR var_8 
+    417224     56 DATAREF STACK 1706 esp + 0 PARENT LocalFrame LOCALFRAME
+    417224      8 DATAREF STACK 1707 esp + 8 CHILDOF 1706 OFFSET 8 LOCALVAR var_30 
+    417224      8 DATAREF STACK 1708 esp + 16 CHILDOF 1706 OFFSET 16 LOCALVAR var_28 
+    417224      8 DATAREF STACK 1709 esp + 24 CHILDOF 1706 OFFSET 24 LOCALVAR var_20 
+    417224      8 DATAREF STACK 1710 esp + 32 CHILDOF 1706 OFFSET 32 LOCALVAR var_18 
+    417224      8 DATAREF STACK 1711 esp + 40 CHILDOF 1706 OFFSET 40 LOCALVAR var_10 
+    417224      8 DATAREF STACK 1712 esp + 48 CHILDOF 1706 OFFSET 48 LOCALVAR var_8 
     417224      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     417228     -1 INSTR LOCAL NoMetaUpdate cmp     edx, 4 
     417228      3 INSTR BELONGTO 417200 
@@ -31033,13 +31036,13 @@
     417327      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
     41732c      4 INSTR BELONGTO 417300 
     41732c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-    41732c     56 DATAREF STACK 1720 esp + 0 PARENT LocalFrame LOCALFRAME
-    41732c      8 DATAREF STACK 1721 esp + 8 CHILDOF 1720 OFFSET 8 LOCALVAR var_30 
-    41732c      8 DATAREF STACK 1722 esp + 16 CHILDOF 1720 OFFSET 16 LOCALVAR var_28 
-    41732c      8 DATAREF STACK 1723 esp + 24 CHILDOF 1720 OFFSET 24 LOCALVAR var_20 
-    41732c      8 DATAREF STACK 1724 esp + 32 CHILDOF 1720 OFFSET 32 LOCALVAR var_18 
-    41732c      8 DATAREF STACK 1725 esp + 40 CHILDOF 1720 OFFSET 40 LOCALVAR var_10 
-    41732c      8 DATAREF STACK 1726 esp + 48 CHILDOF 1720 OFFSET 48 LOCALVAR var_8 
+    41732c     56 DATAREF STACK 1713 esp + 0 PARENT LocalFrame LOCALFRAME
+    41732c      8 DATAREF STACK 1714 esp + 8 CHILDOF 1713 OFFSET 8 LOCALVAR var_30 
+    41732c      8 DATAREF STACK 1715 esp + 16 CHILDOF 1713 OFFSET 16 LOCALVAR var_28 
+    41732c      8 DATAREF STACK 1716 esp + 24 CHILDOF 1713 OFFSET 24 LOCALVAR var_20 
+    41732c      8 DATAREF STACK 1717 esp + 32 CHILDOF 1713 OFFSET 32 LOCALVAR var_18 
+    41732c      8 DATAREF STACK 1718 esp + 40 CHILDOF 1713 OFFSET 40 LOCALVAR var_10 
+    41732c      8 DATAREF STACK 1719 esp + 48 CHILDOF 1713 OFFSET 48 LOCALVAR var_8 
     41732c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     417330     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
     417330      3 INSTR BELONGTO 417300 
@@ -31116,7 +31119,7 @@
     4173a5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4173a5      4 INSTR BELONGTO 4173a0 
     4173a5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    4173a5      8 DATAREF STACK 1727 esp + 0 PARENT LocalFrame LOCALFRAME
+    4173a5      8 DATAREF STACK 1720 esp + 0 PARENT LocalFrame LOCALFRAME
     4173a5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4173a9      7 INSTR BELONGTO 4173a0 
     4173a9      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_61ED58 
@@ -31151,7 +31154,7 @@
     4173d8     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     4173e5 
     4173d8      4 INSTR BELONGTO 4173d8 
     4173d8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    4173d8      8 DATAREF STACK 1728 esp + 0 PARENT LocalFrame LOCALFRAME
+    4173d8      8 DATAREF STACK 1721 esp + 0 PARENT LocalFrame LOCALFRAME
     4173d8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4173dc     -1 INSTR LOCAL NoMetaUpdate call    sub_4093F0 
     4173dc      5 INSTR BELONGTO 4173d8 
diff --git a/tests/commit/trimmed-sorted-save-gnome-screenshot.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-screenshot.psexe.annot
index fbe89916..61eb39db 100644
--- a/tests/commit/trimmed-sorted-save-gnome-screenshot.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-screenshot.psexe.annot
@@ -2527,7 +2527,7 @@
     407576      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, edi 
     407578      1 INSTR BELONGTO 407570 
     407578      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
-    407578     24 DATAREF STACK 555 esp + 0 PARENT LocalFrame LOCALFRAME
+    407578     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     407578      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     407579     -1 INSTR LOCAL NoMetaUpdate call    _g_type_init 
     407579      5 INSTR BELONGTO 407570 
@@ -2600,12 +2600,11 @@
     4075e8      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ pop     r12 
     4075ea      1 INSTR BELONGTO 407570 
     4075ea      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ retn 
-    4075ec      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
-    4075ec      0 FUNC MMSAFENESS UNSAFE
+    4075ec      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    4075ec      0 FUNC MMSAFENESS SAFE
     4075ec     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     4075ec      2 INSTR BELONGTO 4075ec 
     4075ec     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     407615 
-    4075ec      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     4075ee      3 INSTR BELONGTO 4075ec 
     4075ee      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     4075f1      1 INSTR BELONGTO 4075ec 
@@ -2617,8 +2616,11 @@
     4075f5      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     4075f9      1 INSTR BELONGTO 4075ec 
     4075f9      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    4075f9     -3 INSTR LOCAL NoWarn push    rax 
+    4075fa     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     4075fa      1 INSTR BELONGTO 4075ec 
     4075fa      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    4075fa      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     4075fb     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     4075fb      7 INSTR BELONGTO 4075ec 
     4075fb      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -2639,7 +2641,7 @@
     407618     23 FUNC GLOBAL sub_407618 FUNC_SAFE NOFP RET     40762e 
     407618      4 INSTR BELONGTO 407618 
     407618      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-    407618      8 DATAREF STACK 556 esp + 0 PARENT LocalFrame LOCALFRAME
+    407618      8 DATAREF STACK 555 esp + 0 PARENT LocalFrame LOCALFRAME
     407618      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40761c      7 INSTR BELONGTO 407618 
     40761c      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -2669,7 +2671,7 @@
     407635     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     407635      4 INSTR BELONGTO 407630 
     407635      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-    407635      8 DATAREF STACK 557 esp + 0 PARENT LocalFrame LOCALFRAME
+    407635      8 DATAREF STACK 556 esp + 0 PARENT LocalFrame LOCALFRAME
     407635      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     407639     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_60FA60, 0 
     407639      7 INSTR BELONGTO 407630 
@@ -2713,14 +2715,14 @@
     407692      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     407693      1 INSTR BELONGTO 407630 
     407693      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    4076a0      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
+    4076a0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     4076a0      0 FUNC MMSAFENESS UNSAFE
     4076a0     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_60ED78, 0 
     4076a0     34 FUNC GLOBAL sub_4076A0 FUNC_UNSAFE USEFP RET     4076c1 
     4076a0      8 INSTR BELONGTO 4076a0 
-    4076a0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    4076a0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4076a8      1 INSTR BELONGTO 4076a0 
+    4076a8      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    4076a8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4076a9      3 INSTR BELONGTO 4076a0 
     4076ac     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4076C0 
     4076ac      2 INSTR BELONGTO 4076a0 
@@ -2775,11 +2777,11 @@
     407725      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
     40772a      3 INSTR BELONGTO 407720 
     40772a      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    40772d     24 DATAREF STACK 558 esp + 0 PARENT LocalFrame LOCALFRAME
+    40772d     24 DATAREF STACK 557 esp + 0 PARENT LocalFrame LOCALFRAME
     40772d      4 INSTR BELONGTO 407720 
     40772d      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
-    40772d      8 DATAREF STACK 559 esp + 8 CHILDOF 558 OFFSET 8 LOCALVAR var_10 
-    40772d      8 DATAREF STACK 560 esp + 16 CHILDOF 558 OFFSET 16 LOCALVAR var_8 
+    40772d      8 DATAREF STACK 558 esp + 8 CHILDOF 557 OFFSET 8 LOCALVAR var_10 
+    40772d      8 DATAREF STACK 559 esp + 16 CHILDOF 557 OFFSET 16 LOCALVAR var_8 
     40772d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     407731     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
     407731      5 INSTR BELONGTO 407720 
@@ -2823,7 +2825,7 @@
     407780     22 FUNC GLOBAL sub_407780 FUNC_UNSAFE NOFP RET     407795 
     407780      4 INSTR BELONGTO 407780 
     407780      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 8 
-    407780      8 DATAREF STACK 561 esp + 0 PARENT LocalFrame LOCALFRAME
+    407780      8 DATAREF STACK 560 esp + 0 PARENT LocalFrame LOCALFRAME
     407780      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     407784      3 INSTR BELONGTO 407780 
     407784      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rsi 
@@ -2841,8 +2843,8 @@
     4077a0      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
     4077a0      0 FUNC MMSAFENESS SAFE
     4077a0    113 FUNC GLOBAL sub_4077A0 FUNC_UNSAFE NOFP RET     407810 
-    4077a0     24 DATAREF STACK 562 esp + 0 PARENT LocalFrame LOCALFRAME
-    4077a0      4 DATAREF STACK 563 esp + 0 CHILDOF 562 OFFSET 0 OutArgsRegion OUTARGS
+    4077a0     24 DATAREF STACK 561 esp + 0 PARENT LocalFrame LOCALFRAME
+    4077a0      4 DATAREF STACK 562 esp + 0 CHILDOF 561 OFFSET 0 OutArgsRegion OUTARGS
     4077a0      4 INSTR BELONGTO 4077a0 
     4077a0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
     4077a0      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -2920,12 +2922,12 @@
     40782a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbp, rdi 
     40782d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40782d      5 INSTR BELONGTO 407820 
-    407832     24 DATAREF STACK 564 esp + 0 PARENT LocalFrame LOCALFRAME
+    407832     24 DATAREF STACK 563 esp + 0 PARENT LocalFrame LOCALFRAME
     407832      4 INSTR BELONGTO 407820 
     407832      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-    407832      8 DATAREF STACK 565 esp + 0 CHILDOF 564 OFFSET 0 LOCALVAR var_18 
-    407832      8 DATAREF STACK 566 esp + 8 CHILDOF 564 OFFSET 8 LOCALVAR var_10 
-    407832      8 DATAREF STACK 567 esp + 16 CHILDOF 564 OFFSET 16 LOCALVAR var_8 
+    407832      8 DATAREF STACK 564 esp + 0 CHILDOF 563 OFFSET 0 LOCALVAR var_18 
+    407832      8 DATAREF STACK 565 esp + 8 CHILDOF 563 OFFSET 8 LOCALVAR var_10 
+    407832      8 DATAREF STACK 566 esp + 16 CHILDOF 563 OFFSET 16 LOCALVAR var_8 
     407832      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     407836     -1 INSTR LOCAL NoMetaUpdate call    sub_4077A0 
     407836      5 INSTR BELONGTO 407820 
@@ -3020,8 +3022,8 @@
     4078c0     -3 INSTR LOCAL NoWarn push    rbx 
     4078c1      3 INSTR BELONGTO 4078c0 
     4078c1      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 XMM1 ZZ mov     rbx, rdi 
-    4078c4     16 DATAREF STACK 568 esp + 0 PARENT LocalFrame LOCALFRAME
-    4078c4     16 DATAREF STACK 569 esp + 0 CHILDOF 568 OFFSET 0 LOCALVAR var_18 
+    4078c4     16 DATAREF STACK 567 esp + 0 PARENT LocalFrame LOCALFRAME
+    4078c4     16 DATAREF STACK 568 esp + 0 CHILDOF 567 OFFSET 0 LOCALVAR var_18 
     4078c4      4 INSTR BELONGTO 4078c0 
     4078c4      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 XMM1 ZZ sub     rsp, 10h 
     4078c4      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -3182,13 +3184,13 @@
     407b6a      5 INSTR BELONGTO 407b60 
     407b6f     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     407b6f      5 INSTR BELONGTO 407b60 
-    407b74     40 DATAREF STACK 570 esp + 0 PARENT LocalFrame LOCALFRAME
+    407b74     40 DATAREF STACK 569 esp + 0 PARENT LocalFrame LOCALFRAME
     407b74      4 INSTR BELONGTO 407b60 
     407b74      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 28h 
-    407b74      8 DATAREF STACK 571 esp + 8 CHILDOF 570 OFFSET 8 LOCALVAR var_20 
-    407b74      8 DATAREF STACK 572 esp + 16 CHILDOF 570 OFFSET 16 LOCALVAR var_18 
-    407b74      8 DATAREF STACK 573 esp + 24 CHILDOF 570 OFFSET 24 LOCALVAR var_10 
-    407b74      8 DATAREF STACK 574 esp + 32 CHILDOF 570 OFFSET 32 LOCALVAR var_8 
+    407b74      8 DATAREF STACK 570 esp + 8 CHILDOF 569 OFFSET 8 LOCALVAR var_20 
+    407b74      8 DATAREF STACK 571 esp + 16 CHILDOF 569 OFFSET 16 LOCALVAR var_18 
+    407b74      8 DATAREF STACK 572 esp + 24 CHILDOF 569 OFFSET 24 LOCALVAR var_10 
+    407b74      8 DATAREF STACK 573 esp + 32 CHILDOF 569 OFFSET 32 LOCALVAR var_8 
     407b74      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     407b78     -2 INSTR LOCAL n R13 ZZ  NumericDEFs mov     r13, rdi 
     407b78      3 INSTR BELONGTO 407b60 
@@ -3315,7 +3317,7 @@
     407c50     25 FUNC GLOBAL sub_407C50 FUNC_UNSAFE NOFP RET     407c68 
     407c50      4 INSTR BELONGTO 407c50 
     407c50      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    407c50      8 DATAREF STACK 575 esp + 0 PARENT LocalFrame LOCALFRAME
+    407c50      8 DATAREF STACK 574 esp + 0 PARENT LocalFrame LOCALFRAME
     407c50      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     407c54     -1 INSTR LOCAL NoMetaUpdate call    sub_4077A0 
     407c54      5 INSTR BELONGTO 407c50 
@@ -3347,7 +3349,7 @@
     407c75     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     407c75      4 INSTR BELONGTO 407c70 
     407c75      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    407c75      8 DATAREF STACK 576 esp + 0 PARENT LocalFrame LOCALFRAME
+    407c75      8 DATAREF STACK 575 esp + 0 PARENT LocalFrame LOCALFRAME
     407c75      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     407c79     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
     407c79      5 INSTR BELONGTO 407c70 
@@ -3439,9 +3441,9 @@
     407d15     -2 INSTR LOCAL n RDI ZZ  NumericDEFs mov     rdi, rsi 
     407d15      3 INSTR BELONGTO 407d10 
     407d15      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, rsi 
-    407d18     16 DATAREF STACK 578 esp + 8 CHILDOF 577 OFFSET 8 LOCALVAR var_20 
+    407d18     16 DATAREF STACK 577 esp + 8 CHILDOF 576 OFFSET 8 LOCALVAR var_20 
     407d18     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    407d18     24 DATAREF STACK 577 esp + 0 PARENT LocalFrame LOCALFRAME
+    407d18     24 DATAREF STACK 576 esp + 0 PARENT LocalFrame LOCALFRAME
     407d18      4 INSTR BELONGTO 407d10 
     407d18      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
     407d18      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -3664,7 +3666,7 @@
     407e90      4 INSTR BELONGTO 407e90 
     407e90      4 INSTR DEADREGS  EFLAGS RAX R8 ZZ sub     rsp, 8 
     407e90     73 FUNC GLOBAL sub_407E90 FUNC_UNSAFE NOFP RET     407ed8 
-    407e90      8 DATAREF STACK 579 esp + 0 PARENT LocalFrame LOCALFRAME
+    407e90      8 DATAREF STACK 578 esp + 0 PARENT LocalFrame LOCALFRAME
     407e90      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     407e94      7 INSTR BELONGTO 407e90 
     407e94      7 INSTR DEADREGS  EFLAGS RAX R8 ZZ mov     rax, cs:qword_60FAD8 
@@ -3720,9 +3722,9 @@
     407ee4      1 INSTR BELONGTO 407ee0 
     407ee4      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     407ee4     -3 INSTR LOCAL NoWarn push    rbx 
-    407ee5     16 DATAREF STACK 581 esp + 0 CHILDOF 580 OFFSET 0 OutArgsRegion OUTARGS
+    407ee5     16 DATAREF STACK 580 esp + 0 CHILDOF 579 OFFSET 0 OutArgsRegion OUTARGS
     407ee5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    407ee5     24 DATAREF STACK 580 esp + 0 PARENT LocalFrame LOCALFRAME
+    407ee5     24 DATAREF STACK 579 esp + 0 PARENT LocalFrame LOCALFRAME
     407ee5      4 INSTR BELONGTO 407ee0 
     407ee5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 18h 
     407ee5      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -3912,18 +3914,18 @@
     40817c      5 INSTR BELONGTO 408160 
     408181     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
     408181      5 INSTR BELONGTO 408160 
-    408186     16 DATAREF STACK 585 esp + 24 CHILDOF 582 OFFSET 24 LOCALVAR var_40 
+    408186     16 DATAREF STACK 584 esp + 24 CHILDOF 581 OFFSET 24 LOCALVAR var_40 
     408186      4 INSTR BELONGTO 408160 
     408186      4 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ sub     rsp, 58h 
-    408186     88 DATAREF STACK 582 esp + 0 PARENT LocalFrame LOCALFRAME
-    408186      8 DATAREF STACK 583 esp + 8 CHILDOF 582 OFFSET 8 LOCALVAR var_50 
-    408186      8 DATAREF STACK 584 esp + 16 CHILDOF 582 OFFSET 16 LOCALVAR var_48 
-    408186      8 DATAREF STACK 586 esp + 40 CHILDOF 582 OFFSET 40 LOCALVAR var_30 
-    408186      8 DATAREF STACK 587 esp + 48 CHILDOF 582 OFFSET 48 LOCALVAR var_28 
-    408186      8 DATAREF STACK 588 esp + 56 CHILDOF 582 OFFSET 56 LOCALVAR var_20 
-    408186      8 DATAREF STACK 589 esp + 64 CHILDOF 582 OFFSET 64 LOCALVAR var_18 
-    408186      8 DATAREF STACK 590 esp + 72 CHILDOF 582 OFFSET 72 LOCALVAR var_10 
-    408186      8 DATAREF STACK 591 esp + 80 CHILDOF 582 OFFSET 80 LOCALVAR var_8 
+    408186     88 DATAREF STACK 581 esp + 0 PARENT LocalFrame LOCALFRAME
+    408186      8 DATAREF STACK 582 esp + 8 CHILDOF 581 OFFSET 8 LOCALVAR var_50 
+    408186      8 DATAREF STACK 583 esp + 16 CHILDOF 581 OFFSET 16 LOCALVAR var_48 
+    408186      8 DATAREF STACK 585 esp + 40 CHILDOF 581 OFFSET 40 LOCALVAR var_30 
+    408186      8 DATAREF STACK 586 esp + 48 CHILDOF 581 OFFSET 48 LOCALVAR var_28 
+    408186      8 DATAREF STACK 587 esp + 56 CHILDOF 581 OFFSET 56 LOCALVAR var_20 
+    408186      8 DATAREF STACK 588 esp + 64 CHILDOF 581 OFFSET 64 LOCALVAR var_18 
+    408186      8 DATAREF STACK 589 esp + 72 CHILDOF 581 OFFSET 72 LOCALVAR var_10 
+    408186      8 DATAREF STACK 590 esp + 80 CHILDOF 581 OFFSET 80 LOCALVAR var_8 
     408186      8 MEMORYHOLE STACK esp + 88 ReturnAddress 
     40818a      3 INSTR BELONGTO 408160 
     40818a      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     r12, rsi 
@@ -4502,11 +4504,11 @@
     408aa0      5 INSTR BELONGTO 408aa0 
     408aa5     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], rbp 
     408aa5      5 INSTR BELONGTO 408aa0 
-    408aaa     24 DATAREF STACK 592 esp + 0 PARENT LocalFrame LOCALFRAME
+    408aaa     24 DATAREF STACK 591 esp + 0 PARENT LocalFrame LOCALFRAME
     408aaa      4 INSTR BELONGTO 408aa0 
     408aaa      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 18h 
-    408aaa      8 DATAREF STACK 593 esp + 8 CHILDOF 592 OFFSET 8 LOCALVAR var_10 
-    408aaa      8 DATAREF STACK 594 esp + 16 CHILDOF 592 OFFSET 16 LOCALVAR var_8 
+    408aaa      8 DATAREF STACK 592 esp + 8 CHILDOF 591 OFFSET 8 LOCALVAR var_10 
+    408aaa      8 DATAREF STACK 593 esp + 16 CHILDOF 591 OFFSET 16 LOCALVAR var_8 
     408aaa      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     408aae      7 INSTR BELONGTO 408aa0 
     408aae      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_60FAD8 
@@ -4646,8 +4648,8 @@
     408cd0      1 INSTR BELONGTO 408cd0 
     408cd0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     408cd0     -3 INSTR LOCAL NoWarn push    rbx 
-    408cd1     16 DATAREF STACK 595 esp + 0 PARENT LocalFrame LOCALFRAME
-    408cd1      4 DATAREF STACK 596 esp + 0 CHILDOF 595 OFFSET 0 OutArgsRegion OUTARGS
+    408cd1     16 DATAREF STACK 594 esp + 0 PARENT LocalFrame LOCALFRAME
+    408cd1      4 DATAREF STACK 595 esp + 0 CHILDOF 594 OFFSET 0 OutArgsRegion OUTARGS
     408cd1      4 INSTR BELONGTO 408cd0 
     408cd1      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
     408cd1      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -4724,7 +4726,7 @@
     408d50      4 INSTR BELONGTO 408d50 
     408d50      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
     408d50     63 FUNC GLOBAL sub_408D50 FUNC_UNSAFE NOFP RET     408d8e 
-    408d50      8 DATAREF STACK 597 esp + 0 PARENT LocalFrame LOCALFRAME
+    408d50      8 DATAREF STACK 596 esp + 0 PARENT LocalFrame LOCALFRAME
     408d50      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     408d54      7 INSTR BELONGTO 408d50 
     408d54      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_60FA90 
@@ -4830,7 +4832,7 @@
     408f32      3 INSTR BELONGTO 408f30 
     408f35     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     408f35      4 INSTR BELONGTO 408f30 
-    408f35      8 DATAREF STACK 598 esp + 0 PARENT LocalFrame LOCALFRAME
+    408f35      8 DATAREF STACK 597 esp + 0 PARENT LocalFrame LOCALFRAME
     408f35      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     408f39     -1 INSTR LOCAL NoMetaUpdate call    sub_408CD0 
     408f39      5 INSTR BELONGTO 408f30 
@@ -4925,7 +4927,7 @@
     408ff0     21 FUNC GLOBAL sub_408FF0 FUNC_UNSAFE NOFP RET     409004 
     408ff0      4 INSTR BELONGTO 408ff0 
     408ff0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    408ff0      8 DATAREF STACK 599 esp + 0 PARENT LocalFrame LOCALFRAME
+    408ff0      8 DATAREF STACK 598 esp + 0 PARENT LocalFrame LOCALFRAME
     408ff0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     408ff4     -1 INSTR LOCAL NoMetaUpdate call    sub_408D50 
     408ff4      5 INSTR BELONGTO 408ff0 
@@ -4945,6 +4947,7 @@
     409010      5 FUNC GLOBAL sub_409010 FUNC_UNSAFE NOFP RET     409014 
     409010      5 INSTR BELONGTO 409010 
     409010      5 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ jmp     sub_408D50 
+    409010      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     409020      5 PTRIMMEDESP STACK -32 displ mov     [rsp-20h], rbx
     409025      5 PTRIMMEDESP STACK -24 displ mov     [rsp-18h], rbp
     40902d      5 PTRIMMEDESP STACK -16 displ mov     [rsp-10h], r12
@@ -5144,7 +5147,7 @@
     4093d0    182 FUNC GLOBAL sub_4093D0 FUNC_UNSAFE NOFP RET     409485 
     4093d0      4 INSTR BELONGTO 4093d0 
     4093d0      4 INSTR DEADREGS  EFLAGS RAX XMM0 XMM4 ZZ sub     rsp, 8 
-    4093d0      8 DATAREF STACK 600 esp + 0 PARENT LocalFrame LOCALFRAME
+    4093d0      8 DATAREF STACK 599 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      3 INSTR BELONGTO 4093d0 
@@ -5243,7 +5246,7 @@
     409490      4 INSTR BELONGTO 409490 
     409490      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
     409490     81 FUNC GLOBAL sub_409490 FUNC_UNSAFE NOFP RET     4094e0 
-    409490      8 DATAREF STACK 601 esp + 0 PARENT LocalFrame LOCALFRAME
+    409490      8 DATAREF STACK 600 esp + 0 PARENT LocalFrame LOCALFRAME
     409490      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     409494     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rsi+1Ch], 0FF1Bh 
     409494      7 INSTR BELONGTO 409490 
@@ -5300,16 +5303,16 @@
     4094fd      1 INSTR BELONGTO 4094f0 
     4094fd      1 INSTR DEADREGS  EFLAGS R13 R14 ZZ push    rbx 
     4094fd     -3 INSTR LOCAL NoWarn push    rbx 
-    4094fe     16 DATAREF STACK 608 esp + 48 CHILDOF 602 OFFSET 48 LOCALVAR var_38 
+    4094fe     16 DATAREF STACK 607 esp + 48 CHILDOF 601 OFFSET 48 LOCALVAR var_38 
     4094fe     40 MEMORYHOLE STACK esp + 64 CalleeSavedRegs 
-    4094fe      4 DATAREF STACK 603 esp + 0 CHILDOF 602 OFFSET 0 OutArgsRegion OUTARGS
+    4094fe      4 DATAREF STACK 602 esp + 0 CHILDOF 601 OFFSET 0 OutArgsRegion OUTARGS
     4094fe      4 INSTR BELONGTO 4094f0 
     4094fe      4 INSTR DEADREGS  EFLAGS RBX R13 R14 ZZ sub     rsp, 40h 
-    4094fe     64 DATAREF STACK 602 esp + 0 PARENT LocalFrame LOCALFRAME
-    4094fe      8 DATAREF STACK 604 esp + 16 CHILDOF 602 OFFSET 16 LOCALVAR var_58 
-    4094fe      8 DATAREF STACK 605 esp + 24 CHILDOF 602 OFFSET 24 LOCALVAR var_50 
-    4094fe      8 DATAREF STACK 606 esp + 32 CHILDOF 602 OFFSET 32 LOCALVAR var_48 
-    4094fe      8 DATAREF STACK 607 esp + 40 CHILDOF 602 OFFSET 40 LOCALVAR var_40 
+    4094fe     64 DATAREF STACK 601 esp + 0 PARENT LocalFrame LOCALFRAME
+    4094fe      8 DATAREF STACK 603 esp + 16 CHILDOF 601 OFFSET 16 LOCALVAR var_58 
+    4094fe      8 DATAREF STACK 604 esp + 24 CHILDOF 601 OFFSET 24 LOCALVAR var_50 
+    4094fe      8 DATAREF STACK 605 esp + 32 CHILDOF 601 OFFSET 32 LOCALVAR var_48 
+    4094fe      8 DATAREF STACK 606 esp + 40 CHILDOF 601 OFFSET 40 LOCALVAR var_40 
     4094fe      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
     409502     -1 INSTR LOCAL MetadataUnused mov     dword ptr [rsp+68h+var_58], 0 
     409502      8 INSTR BELONGTO 4094f0 
@@ -5729,18 +5732,18 @@
     409798      5 INSTR BELONGTO 409780 
     40979d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
     40979d      5 INSTR BELONGTO 409780 
-    4097a2     15 DATAREF STACK 610 esp + 0 CHILDOF 609 OFFSET 0 LOCALVAR var_48 
+    4097a2     15 DATAREF STACK 609 esp + 0 CHILDOF 608 OFFSET 0 LOCALVAR var_48 
     4097a2      4 INSTR BELONGTO 409780 
     4097a2      4 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 R14 R15 ZZ sub     rsp, 48h 
-    4097a2     72 DATAREF STACK 609 esp + 0 PARENT LocalFrame LOCALFRAME
-    4097a2      8 DATAREF STACK 612 esp + 24 CHILDOF 609 OFFSET 24 LOCALVAR var_30 
-    4097a2      8 DATAREF STACK 613 esp + 32 CHILDOF 609 OFFSET 32 LOCALVAR var_28 
-    4097a2      8 DATAREF STACK 614 esp + 40 CHILDOF 609 OFFSET 40 LOCALVAR var_20 
-    4097a2      8 DATAREF STACK 615 esp + 48 CHILDOF 609 OFFSET 48 LOCALVAR var_18 
-    4097a2      8 DATAREF STACK 616 esp + 56 CHILDOF 609 OFFSET 56 LOCALVAR var_10 
-    4097a2      8 DATAREF STACK 617 esp + 64 CHILDOF 609 OFFSET 64 LOCALVAR var_8 
+    4097a2     72 DATAREF STACK 608 esp + 0 PARENT LocalFrame LOCALFRAME
+    4097a2      8 DATAREF STACK 611 esp + 24 CHILDOF 608 OFFSET 24 LOCALVAR var_30 
+    4097a2      8 DATAREF STACK 612 esp + 32 CHILDOF 608 OFFSET 32 LOCALVAR var_28 
+    4097a2      8 DATAREF STACK 613 esp + 40 CHILDOF 608 OFFSET 40 LOCALVAR var_20 
+    4097a2      8 DATAREF STACK 614 esp + 48 CHILDOF 608 OFFSET 48 LOCALVAR var_18 
+    4097a2      8 DATAREF STACK 615 esp + 56 CHILDOF 608 OFFSET 56 LOCALVAR var_10 
+    4097a2      8 DATAREF STACK 616 esp + 64 CHILDOF 608 OFFSET 64 LOCALVAR var_8 
     4097a2      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
-    4097a2      9 DATAREF STACK 611 esp + 15 CHILDOF 609 OFFSET 15 LOCALVAR var_39 
+    4097a2      9 DATAREF STACK 610 esp + 15 CHILDOF 608 OFFSET 15 LOCALVAR var_39 
     4097a6      6 INSTR BELONGTO 409780 
     4097a6      6 INSTR DEADREGS  EFLAGS RAX RSI R12 R13 R14 R15 ZZ mov     esi, cs:dword_60FA98 
     4097ac     -2 INSTR LOCAL n R14 ZZ  AlwaysNUM xor     r14d, r14d 
@@ -6173,16 +6176,16 @@
     409bdf      1 INSTR BELONGTO 409bd0 
     409bdf      1 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ push    rbx 
     409bdf     -3 INSTR LOCAL NoWarn push    rbx 
-    409be0     16 DATAREF STACK 624 esp + 56 CHILDOF 618 OFFSET 56 LOCALVAR var_40 
-    409be0     24 DATAREF STACK 619 esp + 0 CHILDOF 618 OFFSET 0 LOCALVAR var_78 
+    409be0     16 DATAREF STACK 623 esp + 56 CHILDOF 617 OFFSET 56 LOCALVAR var_40 
+    409be0     24 DATAREF STACK 618 esp + 0 CHILDOF 617 OFFSET 0 LOCALVAR var_78 
     409be0     48 MEMORYHOLE STACK esp + 72 CalleeSavedRegs 
     409be0      4 INSTR BELONGTO 409bd0 
     409be0      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 48h 
-    409be0     72 DATAREF STACK 618 esp + 0 PARENT LocalFrame LOCALFRAME
-    409be0      8 DATAREF STACK 620 esp + 24 CHILDOF 618 OFFSET 24 LOCALVAR var_60 
-    409be0      8 DATAREF STACK 621 esp + 32 CHILDOF 618 OFFSET 32 LOCALVAR var_58 
-    409be0      8 DATAREF STACK 622 esp + 40 CHILDOF 618 OFFSET 40 LOCALVAR var_50 
-    409be0      8 DATAREF STACK 623 esp + 48 CHILDOF 618 OFFSET 48 LOCALVAR var_48 
+    409be0     72 DATAREF STACK 617 esp + 0 PARENT LocalFrame LOCALFRAME
+    409be0      8 DATAREF STACK 619 esp + 24 CHILDOF 617 OFFSET 24 LOCALVAR var_60 
+    409be0      8 DATAREF STACK 620 esp + 32 CHILDOF 617 OFFSET 32 LOCALVAR var_58 
+    409be0      8 DATAREF STACK 621 esp + 40 CHILDOF 617 OFFSET 40 LOCALVAR var_50 
+    409be0      8 DATAREF STACK 622 esp + 48 CHILDOF 617 OFFSET 48 LOCALVAR var_48 
     409be0      8 MEMORYHOLE STACK esp + 120 ReturnAddress 
     409be4     -1 INSTR LOCAL NoMetaUpdate call    _g_file_new_for_uri 
     409be4      5 INSTR BELONGTO 409bd0 
@@ -6914,11 +6917,11 @@
     40a070     64 FUNC GLOBAL sub_40A070 FUNC_UNSAFE NOFP RET     40a0af 
     40a075     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], rbp 
     40a075      5 INSTR BELONGTO 40a070 
-    40a07a     24 DATAREF STACK 625 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a07a     24 DATAREF STACK 624 esp + 0 PARENT LocalFrame LOCALFRAME
     40a07a      4 INSTR BELONGTO 40a070 
     40a07a      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-    40a07a      8 DATAREF STACK 626 esp + 8 CHILDOF 625 OFFSET 8 LOCALVAR var_10 
-    40a07a      8 DATAREF STACK 627 esp + 16 CHILDOF 625 OFFSET 16 LOCALVAR var_8 
+    40a07a      8 DATAREF STACK 625 esp + 8 CHILDOF 624 OFFSET 8 LOCALVAR var_10 
+    40a07a      8 DATAREF STACK 626 esp + 16 CHILDOF 624 OFFSET 16 LOCALVAR var_8 
     40a07a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40a07e     -1 INSTR LOCAL MetadataUnused mov     rbp, rdi 
     40a07e      3 INSTR BELONGTO 40a070 
@@ -6982,10 +6985,10 @@
     40a0d0     -3 INSTR LOCAL NoWarn push    rbx 
     40a0d1     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
     40a0d1      3 INSTR BELONGTO 40a0d0 
-    40a0d4     16 DATAREF STACK 628 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a0d4     16 DATAREF STACK 627 esp + 0 PARENT LocalFrame LOCALFRAME
     40a0d4      4 INSTR BELONGTO 40a0d0 
     40a0d4      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 10h 
-    40a0d4      8 DATAREF STACK 629 esp + 8 CHILDOF 628 OFFSET 8 LOCALVAR var_10 
+    40a0d4      8 DATAREF STACK 628 esp + 8 CHILDOF 627 OFFSET 8 LOCALVAR var_10 
     40a0d4      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
     40a0d4      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40a0d8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_entry_get_type 
@@ -7091,12 +7094,12 @@
     40a17a      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
     40a17d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40a17d      5 INSTR BELONGTO 40a170 
-    40a182     24 DATAREF STACK 630 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a182     24 DATAREF STACK 629 esp + 0 PARENT LocalFrame LOCALFRAME
     40a182      4 INSTR BELONGTO 40a170 
     40a182      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-    40a182      8 DATAREF STACK 631 esp + 0 CHILDOF 630 OFFSET 0 LOCALVAR var_18 
-    40a182      8 DATAREF STACK 632 esp + 8 CHILDOF 630 OFFSET 8 LOCALVAR var_10 
-    40a182      8 DATAREF STACK 633 esp + 16 CHILDOF 630 OFFSET 16 LOCALVAR var_8 
+    40a182      8 DATAREF STACK 630 esp + 0 CHILDOF 629 OFFSET 0 LOCALVAR var_18 
+    40a182      8 DATAREF STACK 631 esp + 8 CHILDOF 629 OFFSET 8 LOCALVAR var_10 
+    40a182      8 DATAREF STACK 632 esp + 16 CHILDOF 629 OFFSET 16 LOCALVAR var_8 
     40a182      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40a186     -1 INSTR LOCAL NoMetaUpdate call    _gtk_file_chooser_get_type 
     40a186      5 INSTR BELONGTO 40a170 
@@ -7192,13 +7195,13 @@
     40a20c      5 INSTR BELONGTO 40a200 
     40a211     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     40a211      5 INSTR BELONGTO 40a200 
-    40a216     40 DATAREF STACK 634 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a216     40 DATAREF STACK 633 esp + 0 PARENT LocalFrame LOCALFRAME
     40a216      4 INSTR BELONGTO 40a200 
     40a216      4 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ sub     rsp, 28h 
-    40a216      8 DATAREF STACK 635 esp + 8 CHILDOF 634 OFFSET 8 LOCALVAR var_20 
-    40a216      8 DATAREF STACK 636 esp + 16 CHILDOF 634 OFFSET 16 LOCALVAR var_18 
-    40a216      8 DATAREF STACK 637 esp + 24 CHILDOF 634 OFFSET 24 LOCALVAR var_10 
-    40a216      8 DATAREF STACK 638 esp + 32 CHILDOF 634 OFFSET 32 LOCALVAR var_8 
+    40a216      8 DATAREF STACK 634 esp + 8 CHILDOF 633 OFFSET 8 LOCALVAR var_20 
+    40a216      8 DATAREF STACK 635 esp + 16 CHILDOF 633 OFFSET 16 LOCALVAR var_18 
+    40a216      8 DATAREF STACK 636 esp + 24 CHILDOF 633 OFFSET 24 LOCALVAR var_10 
+    40a216      8 DATAREF STACK 637 esp + 32 CHILDOF 633 OFFSET 32 LOCALVAR var_8 
     40a216      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40a21a     -1 INSTR LOCAL NoMetaUpdate call    sub_40A070 
     40a21a      5 INSTR BELONGTO 40a200 
@@ -7293,16 +7296,16 @@
     40a2bc      5 INSTR BELONGTO 40a2a0 
     40a2c1     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_10], r14 
     40a2c1      5 INSTR BELONGTO 40a2a0 
-    40a2c6     16 DATAREF STACK 640 esp + 8 CHILDOF 639 OFFSET 8 LOCALVAR var_40 
+    40a2c6     16 DATAREF STACK 639 esp + 8 CHILDOF 638 OFFSET 8 LOCALVAR var_40 
     40a2c6      4 INSTR BELONGTO 40a2a0 
     40a2c6      4 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ sub     rsp, 48h 
-    40a2c6     72 DATAREF STACK 639 esp + 0 PARENT LocalFrame LOCALFRAME
-    40a2c6      8 DATAREF STACK 641 esp + 24 CHILDOF 639 OFFSET 24 LOCALVAR var_30 
-    40a2c6      8 DATAREF STACK 642 esp + 32 CHILDOF 639 OFFSET 32 LOCALVAR var_28 
-    40a2c6      8 DATAREF STACK 643 esp + 40 CHILDOF 639 OFFSET 40 LOCALVAR var_20 
-    40a2c6      8 DATAREF STACK 644 esp + 48 CHILDOF 639 OFFSET 48 LOCALVAR var_18 
-    40a2c6      8 DATAREF STACK 645 esp + 56 CHILDOF 639 OFFSET 56 LOCALVAR var_10 
-    40a2c6      8 DATAREF STACK 646 esp + 64 CHILDOF 639 OFFSET 64 LOCALVAR var_8 
+    40a2c6     72 DATAREF STACK 638 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a2c6      8 DATAREF STACK 640 esp + 24 CHILDOF 638 OFFSET 24 LOCALVAR var_30 
+    40a2c6      8 DATAREF STACK 641 esp + 32 CHILDOF 638 OFFSET 32 LOCALVAR var_28 
+    40a2c6      8 DATAREF STACK 642 esp + 40 CHILDOF 638 OFFSET 40 LOCALVAR var_20 
+    40a2c6      8 DATAREF STACK 643 esp + 48 CHILDOF 638 OFFSET 48 LOCALVAR var_18 
+    40a2c6      8 DATAREF STACK 644 esp + 56 CHILDOF 638 OFFSET 56 LOCALVAR var_10 
+    40a2c6      8 DATAREF STACK 645 esp + 64 CHILDOF 638 OFFSET 64 LOCALVAR var_8 
     40a2c6      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     40a2ca      3 INSTR BELONGTO 40a2a0 
     40a2ca      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     r12, rsi 
@@ -7575,11 +7578,11 @@
     40a47a     -3 INSTR LOCAL NoWarn push    rbx 
     40a47b      3 INSTR BELONGTO 40a470 
     40a47b      3 INSTR DEADREGS  EFLAGS RAX RBX R12 R14 ZZ mov     rbx, rdx 
-    40a47e     16 DATAREF STACK 647 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a47e     16 DATAREF STACK 646 esp + 0 PARENT LocalFrame LOCALFRAME
     40a47e     40 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
     40a47e      4 INSTR BELONGTO 40a470 
     40a47e      4 INSTR DEADREGS  EFLAGS RAX R12 R14 ZZ sub     rsp, 10h 
-    40a47e      8 DATAREF STACK 648 esp + 8 CHILDOF 647 OFFSET 8 LOCALVAR var_30 
+    40a47e      8 DATAREF STACK 647 esp + 8 CHILDOF 646 OFFSET 8 LOCALVAR var_30 
     40a47e      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40a482      3 INSTR BELONGTO 40a470 
     40a482      3 INSTR DEADREGS  EFLAGS RAX R12 R14 ZZ mov     eax, [rdx+1Ch] 
@@ -8001,12 +8004,12 @@
     40a72a      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
     40a72d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40a72d      5 INSTR BELONGTO 40a720 
-    40a732     24 DATAREF STACK 649 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a732     24 DATAREF STACK 648 esp + 0 PARENT LocalFrame LOCALFRAME
     40a732      4 INSTR BELONGTO 40a720 
     40a732      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-    40a732      8 DATAREF STACK 650 esp + 0 CHILDOF 649 OFFSET 0 LOCALVAR var_18 
-    40a732      8 DATAREF STACK 651 esp + 8 CHILDOF 649 OFFSET 8 LOCALVAR var_10 
-    40a732      8 DATAREF STACK 652 esp + 16 CHILDOF 649 OFFSET 16 LOCALVAR var_8 
+    40a732      8 DATAREF STACK 649 esp + 0 CHILDOF 648 OFFSET 0 LOCALVAR var_18 
+    40a732      8 DATAREF STACK 650 esp + 8 CHILDOF 648 OFFSET 8 LOCALVAR var_10 
+    40a732      8 DATAREF STACK 651 esp + 16 CHILDOF 648 OFFSET 16 LOCALVAR var_8 
     40a732      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40a736      3 INSTR BELONGTO 40a720 
     40a736      3 INSTR DEADREGS  EFLAGS R12 ZZ mov     r12, rsi 
@@ -8269,21 +8272,21 @@
     40a9e9      1 INSTR BELONGTO 40a9e0 
     40a9e9      1 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM2 ZZ push    rbx 
     40a9e9     -3 INSTR LOCAL NoWarn push    rbx 
-    40a9ea    136 DATAREF STACK 653 esp + 0 PARENT LocalFrame LOCALFRAME
-    40a9ea     24 DATAREF STACK 656 esp + 16 CHILDOF 653 OFFSET 16 LOCALVAR var_A8 
-    40a9ea     40 DATAREF STACK 664 esp + 96 CHILDOF 653 OFFSET 96 LOCALVAR var_58 
+    40a9ea    136 DATAREF STACK 652 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a9ea     24 DATAREF STACK 655 esp + 16 CHILDOF 652 OFFSET 16 LOCALVAR var_A8 
+    40a9ea     40 DATAREF STACK 663 esp + 96 CHILDOF 652 OFFSET 96 LOCALVAR var_58 
     40a9ea     48 MEMORYHOLE STACK esp + 136 CalleeSavedRegs 
-    40a9ea      4 DATAREF STACK 654 esp + 0 CHILDOF 653 OFFSET 0 OutArgsRegion OUTARGS
+    40a9ea      4 DATAREF STACK 653 esp + 0 CHILDOF 652 OFFSET 0 OutArgsRegion OUTARGS
     40a9ea      7 INSTR BELONGTO 40a9e0 
     40a9ea      7 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 XMM2 ZZ sub     rsp, 88h 
-    40a9ea      8 DATAREF STACK 655 esp + 8 CHILDOF 653 OFFSET 8 LOCALVAR var_B0 
-    40a9ea      8 DATAREF STACK 657 esp + 40 CHILDOF 653 OFFSET 40 LOCALVAR var_90 
-    40a9ea      8 DATAREF STACK 658 esp + 48 CHILDOF 653 OFFSET 48 LOCALVAR var_88 
-    40a9ea      8 DATAREF STACK 659 esp + 56 CHILDOF 653 OFFSET 56 LOCALVAR var_80 
-    40a9ea      8 DATAREF STACK 660 esp + 64 CHILDOF 653 OFFSET 64 LOCALVAR var_78 
-    40a9ea      8 DATAREF STACK 661 esp + 72 CHILDOF 653 OFFSET 72 LOCALVAR var_70 
-    40a9ea      8 DATAREF STACK 662 esp + 80 CHILDOF 653 OFFSET 80 LOCALVAR var_68 
-    40a9ea      8 DATAREF STACK 663 esp + 88 CHILDOF 653 OFFSET 88 LOCALVAR var_60 
+    40a9ea      8 DATAREF STACK 654 esp + 8 CHILDOF 652 OFFSET 8 LOCALVAR var_B0 
+    40a9ea      8 DATAREF STACK 656 esp + 40 CHILDOF 652 OFFSET 40 LOCALVAR var_90 
+    40a9ea      8 DATAREF STACK 657 esp + 48 CHILDOF 652 OFFSET 48 LOCALVAR var_88 
+    40a9ea      8 DATAREF STACK 658 esp + 56 CHILDOF 652 OFFSET 56 LOCALVAR var_80 
+    40a9ea      8 DATAREF STACK 659 esp + 64 CHILDOF 652 OFFSET 64 LOCALVAR var_78 
+    40a9ea      8 DATAREF STACK 660 esp + 72 CHILDOF 652 OFFSET 72 LOCALVAR var_70 
+    40a9ea      8 DATAREF STACK 661 esp + 80 CHILDOF 652 OFFSET 80 LOCALVAR var_68 
+    40a9ea      8 DATAREF STACK 662 esp + 88 CHILDOF 652 OFFSET 88 LOCALVAR var_60 
     40a9ea      8 MEMORYHOLE STACK esp + 184 ReturnAddress 
     40a9f1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_dialog_new 
     40a9f1      5 INSTR BELONGTO 40a9e0 
@@ -10436,32 +10439,32 @@
     40b702      1 INSTR BELONGTO 40b6f0 
     40b702      1 INSTR DEADREGS  EFLAGS R12 R15 ZZ push    rbx 
     40b702     -3 INSTR LOCAL NoWarn push    rbx 
-    40b703    168 DATAREF STACK 665 esp + 0 PARENT LocalFrame LOCALFRAME
-    40b703     16 DATAREF STACK 667 esp + 16 CHILDOF 665 OFFSET 16 LOCALVAR var_C8 
-    40b703     16 DATAREF STACK 685 esp + 128 CHILDOF 665 OFFSET 128 LOCALVAR var_58 
-    40b703     16 DATAREF STACK 687 esp + 152 CHILDOF 665 OFFSET 152 LOCALVAR var_40 
+    40b703    168 DATAREF STACK 664 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b703     16 DATAREF STACK 666 esp + 16 CHILDOF 664 OFFSET 16 LOCALVAR var_C8 
+    40b703     16 DATAREF STACK 684 esp + 128 CHILDOF 664 OFFSET 128 LOCALVAR var_58 
+    40b703     16 DATAREF STACK 686 esp + 152 CHILDOF 664 OFFSET 152 LOCALVAR var_40 
     40b703     48 MEMORYHOLE STACK esp + 168 CalleeSavedRegs 
-    40b703      4 DATAREF STACK 668 esp + 32 CHILDOF 665 OFFSET 32 LOCALVAR var_B8 
-    40b703      4 DATAREF STACK 669 esp + 36 CHILDOF 665 OFFSET 36 LOCALVAR var_B4 
-    40b703      4 DATAREF STACK 673 esp + 64 CHILDOF 665 OFFSET 64 LOCALVAR var_98 
-    40b703      4 DATAREF STACK 674 esp + 68 CHILDOF 665 OFFSET 68 LOCALVAR var_94 
-    40b703      4 DATAREF STACK 675 esp + 72 CHILDOF 665 OFFSET 72 LOCALVAR var_90 
-    40b703      4 DATAREF STACK 676 esp + 76 CHILDOF 665 OFFSET 76 LOCALVAR var_8C 
-    40b703      4 DATAREF STACK 679 esp + 96 CHILDOF 665 OFFSET 96 LOCALVAR var_78 
-    40b703      4 DATAREF STACK 680 esp + 100 CHILDOF 665 OFFSET 100 LOCALVAR var_74 
-    40b703      4 DATAREF STACK 683 esp + 120 CHILDOF 665 OFFSET 120 LOCALVAR var_60 
-    40b703      4 DATAREF STACK 684 esp + 124 CHILDOF 665 OFFSET 124 LOCALVAR var_5C 
+    40b703      4 DATAREF STACK 667 esp + 32 CHILDOF 664 OFFSET 32 LOCALVAR var_B8 
+    40b703      4 DATAREF STACK 668 esp + 36 CHILDOF 664 OFFSET 36 LOCALVAR var_B4 
+    40b703      4 DATAREF STACK 672 esp + 64 CHILDOF 664 OFFSET 64 LOCALVAR var_98 
+    40b703      4 DATAREF STACK 673 esp + 68 CHILDOF 664 OFFSET 68 LOCALVAR var_94 
+    40b703      4 DATAREF STACK 674 esp + 72 CHILDOF 664 OFFSET 72 LOCALVAR var_90 
+    40b703      4 DATAREF STACK 675 esp + 76 CHILDOF 664 OFFSET 76 LOCALVAR var_8C 
+    40b703      4 DATAREF STACK 678 esp + 96 CHILDOF 664 OFFSET 96 LOCALVAR var_78 
+    40b703      4 DATAREF STACK 679 esp + 100 CHILDOF 664 OFFSET 100 LOCALVAR var_74 
+    40b703      4 DATAREF STACK 682 esp + 120 CHILDOF 664 OFFSET 120 LOCALVAR var_60 
+    40b703      4 DATAREF STACK 683 esp + 124 CHILDOF 664 OFFSET 124 LOCALVAR var_5C 
     40b703      7 INSTR BELONGTO 40b6f0 
     40b703      7 INSTR DEADREGS  EFLAGS RBX R12 R15 ZZ sub     rsp, 0A8h 
-    40b703      8 DATAREF STACK 666 esp + 8 CHILDOF 665 OFFSET 8 LOCALVAR var_D0 
-    40b703      8 DATAREF STACK 670 esp + 40 CHILDOF 665 OFFSET 40 LOCALVAR var_B0 
-    40b703      8 DATAREF STACK 671 esp + 48 CHILDOF 665 OFFSET 48 LOCALVAR var_A8 
-    40b703      8 DATAREF STACK 672 esp + 56 CHILDOF 665 OFFSET 56 LOCALVAR var_A0 
-    40b703      8 DATAREF STACK 677 esp + 80 CHILDOF 665 OFFSET 80 LOCALVAR var_88 
-    40b703      8 DATAREF STACK 678 esp + 88 CHILDOF 665 OFFSET 88 LOCALVAR var_80 
-    40b703      8 DATAREF STACK 681 esp + 104 CHILDOF 665 OFFSET 104 LOCALVAR var_70 
-    40b703      8 DATAREF STACK 682 esp + 112 CHILDOF 665 OFFSET 112 LOCALVAR var_68 
-    40b703      8 DATAREF STACK 686 esp + 144 CHILDOF 665 OFFSET 144 LOCALVAR var_48 
+    40b703      8 DATAREF STACK 665 esp + 8 CHILDOF 664 OFFSET 8 LOCALVAR var_D0 
+    40b703      8 DATAREF STACK 669 esp + 40 CHILDOF 664 OFFSET 40 LOCALVAR var_B0 
+    40b703      8 DATAREF STACK 670 esp + 48 CHILDOF 664 OFFSET 48 LOCALVAR var_A8 
+    40b703      8 DATAREF STACK 671 esp + 56 CHILDOF 664 OFFSET 56 LOCALVAR var_A0 
+    40b703      8 DATAREF STACK 676 esp + 80 CHILDOF 664 OFFSET 80 LOCALVAR var_88 
+    40b703      8 DATAREF STACK 677 esp + 88 CHILDOF 664 OFFSET 88 LOCALVAR var_80 
+    40b703      8 DATAREF STACK 680 esp + 104 CHILDOF 664 OFFSET 104 LOCALVAR var_70 
+    40b703      8 DATAREF STACK 681 esp + 112 CHILDOF 664 OFFSET 112 LOCALVAR var_68 
+    40b703      8 DATAREF STACK 685 esp + 144 CHILDOF 664 OFFSET 144 LOCALVAR var_48 
     40b703      8 MEMORYHOLE STACK esp + 216 ReturnAddress 
     40b70a      6 INSTR BELONGTO 40b6f0 
     40b70a      6 INSTR DEADREGS  EFLAGS RBX R12 R15 ZZ movsd   [rsp+0D8h+var_C8], xmm0 
@@ -10947,13 +10950,13 @@
     40ba57     -3 INSTR LOCAL NoWarn push    rbx 
     40ba58      3 INSTR BELONGTO 40ba50 
     40ba58      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ mov     rbx, rdi 
-    40ba5b     16 DATAREF STACK 691 esp + 16 CHILDOF 688 OFFSET 16 LOCALVAR var_38 
-    40ba5b     32 DATAREF STACK 688 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ba5b     16 DATAREF STACK 690 esp + 16 CHILDOF 687 OFFSET 16 LOCALVAR var_38 
+    40ba5b     32 DATAREF STACK 687 esp + 0 PARENT LocalFrame LOCALFRAME
     40ba5b     40 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
-    40ba5b      4 DATAREF STACK 689 esp + 0 CHILDOF 688 OFFSET 0 OutArgsRegion OUTARGS
+    40ba5b      4 DATAREF STACK 688 esp + 0 CHILDOF 687 OFFSET 0 OutArgsRegion OUTARGS
     40ba5b      4 INSTR BELONGTO 40ba50 
     40ba5b      4 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 ZZ sub     rsp, 20h 
-    40ba5b      8 DATAREF STACK 690 esp + 8 CHILDOF 688 OFFSET 8 LOCALVAR var_40 
+    40ba5b      8 DATAREF STACK 689 esp + 8 CHILDOF 687 OFFSET 8 LOCALVAR var_40 
     40ba5b      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     40ba5f      7 INSTR BELONGTO 40ba50 
     40ba5f      7 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 ZZ mov     rbp, cs:qword_60FAC8 
@@ -11206,15 +11209,15 @@
     40bc2a      3 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     rbx, rdi 
     40bc2d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40bc2d      5 INSTR BELONGTO 40bc20 
-    40bc32     16 DATAREF STACK 694 esp + 8 CHILDOF 692 OFFSET 8 LOCALVAR var_30 
-    40bc32      4 DATAREF STACK 693 esp + 0 CHILDOF 692 OFFSET 0 OutArgsRegion OUTARGS
+    40bc32     16 DATAREF STACK 693 esp + 8 CHILDOF 691 OFFSET 8 LOCALVAR var_30 
+    40bc32      4 DATAREF STACK 692 esp + 0 CHILDOF 691 OFFSET 0 OutArgsRegion OUTARGS
     40bc32      4 INSTR BELONGTO 40bc20 
     40bc32      4 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ sub     rsp, 38h 
-    40bc32     56 DATAREF STACK 692 esp + 0 PARENT LocalFrame LOCALFRAME
-    40bc32      8 DATAREF STACK 695 esp + 24 CHILDOF 692 OFFSET 24 LOCALVAR var_20 
-    40bc32      8 DATAREF STACK 696 esp + 32 CHILDOF 692 OFFSET 32 LOCALVAR var_18 
-    40bc32      8 DATAREF STACK 697 esp + 40 CHILDOF 692 OFFSET 40 LOCALVAR var_10 
-    40bc32      8 DATAREF STACK 698 esp + 48 CHILDOF 692 OFFSET 48 LOCALVAR var_8 
+    40bc32     56 DATAREF STACK 691 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bc32      8 DATAREF STACK 694 esp + 24 CHILDOF 691 OFFSET 24 LOCALVAR var_20 
+    40bc32      8 DATAREF STACK 695 esp + 32 CHILDOF 691 OFFSET 32 LOCALVAR var_18 
+    40bc32      8 DATAREF STACK 696 esp + 40 CHILDOF 691 OFFSET 40 LOCALVAR var_10 
+    40bc32      8 DATAREF STACK 697 esp + 48 CHILDOF 691 OFFSET 48 LOCALVAR var_8 
     40bc32      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40bc36      7 INSTR BELONGTO 40bc20 
     40bc36      7 INSTR DEADREGS  EFLAGS RSI RDI R12 ZZ mov     rsi, cs:qword_60FAD0 
@@ -11373,17 +11376,17 @@
     40bd5a      5 INSTR BELONGTO 40bd40 
     40bd5f     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
     40bd5f      5 INSTR BELONGTO 40bd40 
-    40bd64     16 DATAREF STACK 701 esp + 8 CHILDOF 699 OFFSET 8 LOCALVAR var_40 
+    40bd64     16 DATAREF STACK 700 esp + 8 CHILDOF 698 OFFSET 8 LOCALVAR var_40 
     40bd64      4 INSTR BELONGTO 40bd40 
     40bd64      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 48h 
-    40bd64     72 DATAREF STACK 699 esp + 0 PARENT LocalFrame LOCALFRAME
-    40bd64      8 DATAREF STACK 700 esp + 0 CHILDOF 699 OFFSET 0 LOCALVAR var_48 
-    40bd64      8 DATAREF STACK 702 esp + 24 CHILDOF 699 OFFSET 24 LOCALVAR var_30 
-    40bd64      8 DATAREF STACK 703 esp + 32 CHILDOF 699 OFFSET 32 LOCALVAR var_28 
-    40bd64      8 DATAREF STACK 704 esp + 40 CHILDOF 699 OFFSET 40 LOCALVAR var_20 
-    40bd64      8 DATAREF STACK 705 esp + 48 CHILDOF 699 OFFSET 48 LOCALVAR var_18 
-    40bd64      8 DATAREF STACK 706 esp + 56 CHILDOF 699 OFFSET 56 LOCALVAR var_10 
-    40bd64      8 DATAREF STACK 707 esp + 64 CHILDOF 699 OFFSET 64 LOCALVAR var_8 
+    40bd64     72 DATAREF STACK 698 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bd64      8 DATAREF STACK 699 esp + 0 CHILDOF 698 OFFSET 0 LOCALVAR var_48 
+    40bd64      8 DATAREF STACK 701 esp + 24 CHILDOF 698 OFFSET 24 LOCALVAR var_30 
+    40bd64      8 DATAREF STACK 702 esp + 32 CHILDOF 698 OFFSET 32 LOCALVAR var_28 
+    40bd64      8 DATAREF STACK 703 esp + 40 CHILDOF 698 OFFSET 40 LOCALVAR var_20 
+    40bd64      8 DATAREF STACK 704 esp + 48 CHILDOF 698 OFFSET 48 LOCALVAR var_18 
+    40bd64      8 DATAREF STACK 705 esp + 56 CHILDOF 698 OFFSET 56 LOCALVAR var_10 
+    40bd64      8 DATAREF STACK 706 esp + 64 CHILDOF 698 OFFSET 64 LOCALVAR var_8 
     40bd64      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     40bd68     -1 INSTR LOCAL NoMetaUpdate test    esi, esi 
     40bd68      2 INSTR BELONGTO 40bd40 
@@ -11541,13 +11544,13 @@
     40be7a      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbp, rsi 
     40be7d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40be7d      5 INSTR BELONGTO 40be70 
-    40be82     40 DATAREF STACK 708 esp + 0 PARENT LocalFrame LOCALFRAME
+    40be82     40 DATAREF STACK 707 esp + 0 PARENT LocalFrame LOCALFRAME
     40be82      4 INSTR BELONGTO 40be70 
     40be82      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 28h 
-    40be82      8 DATAREF STACK 709 esp + 8 CHILDOF 708 OFFSET 8 LOCALVAR var_20 
-    40be82      8 DATAREF STACK 710 esp + 16 CHILDOF 708 OFFSET 16 LOCALVAR var_18 
-    40be82      8 DATAREF STACK 711 esp + 24 CHILDOF 708 OFFSET 24 LOCALVAR var_10 
-    40be82      8 DATAREF STACK 712 esp + 32 CHILDOF 708 OFFSET 32 LOCALVAR var_8 
+    40be82      8 DATAREF STACK 708 esp + 8 CHILDOF 707 OFFSET 8 LOCALVAR var_20 
+    40be82      8 DATAREF STACK 709 esp + 16 CHILDOF 707 OFFSET 16 LOCALVAR var_18 
+    40be82      8 DATAREF STACK 710 esp + 24 CHILDOF 707 OFFSET 24 LOCALVAR var_10 
+    40be82      8 DATAREF STACK 711 esp + 32 CHILDOF 707 OFFSET 32 LOCALVAR var_8 
     40be82      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40be86      3 INSTR BELONGTO 40be70 
     40be86      3 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     r12, rdi 
@@ -11762,60 +11765,60 @@
     40bfb9      1 INSTR BELONGTO 40bfb0 
     40bfb9      1 INSTR DEADREGS  EFLAGS RAX R9 R12 R13 R14 R15 ZZ push    rbx 
     40bfb9     -3 INSTR LOCAL NoWarn push    rbx 
-    40bfba     12 DATAREF STACK 727 esp + 120 CHILDOF 713 OFFSET 120 LOCALVAR var_120 
-    40bfba     12 DATAREF STACK 756 esp + 300 CHILDOF 713 OFFSET 300 LOCALVAR var_6C 
-    40bfba     12 DATAREF STACK 763 esp + 348 CHILDOF 713 OFFSET 348 LOCALVAR var_3C 
-    40bfba     16 DATAREF STACK 715 esp + 8 CHILDOF 713 OFFSET 8 LOCALVAR var_190 
-    40bfba     16 DATAREF STACK 721 esp + 64 CHILDOF 713 OFFSET 64 LOCALVAR var_158 
-    40bfba     16 DATAREF STACK 733 esp + 160 CHILDOF 713 OFFSET 160 LOCALVAR var_F8 
-    40bfba     16 DATAREF STACK 734 esp + 176 CHILDOF 713 OFFSET 176 LOCALVAR var_E8 
-    40bfba     16 DATAREF STACK 752 esp + 272 CHILDOF 713 OFFSET 272 LOCALVAR var_88 
-    40bfba    360 DATAREF STACK 713 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bfba     12 DATAREF STACK 726 esp + 120 CHILDOF 712 OFFSET 120 LOCALVAR var_120 
+    40bfba     12 DATAREF STACK 755 esp + 300 CHILDOF 712 OFFSET 300 LOCALVAR var_6C 
+    40bfba     12 DATAREF STACK 762 esp + 348 CHILDOF 712 OFFSET 348 LOCALVAR var_3C 
+    40bfba     16 DATAREF STACK 714 esp + 8 CHILDOF 712 OFFSET 8 LOCALVAR var_190 
+    40bfba     16 DATAREF STACK 720 esp + 64 CHILDOF 712 OFFSET 64 LOCALVAR var_158 
+    40bfba     16 DATAREF STACK 732 esp + 160 CHILDOF 712 OFFSET 160 LOCALVAR var_F8 
+    40bfba     16 DATAREF STACK 733 esp + 176 CHILDOF 712 OFFSET 176 LOCALVAR var_E8 
+    40bfba     16 DATAREF STACK 751 esp + 272 CHILDOF 712 OFFSET 272 LOCALVAR var_88 
+    40bfba    360 DATAREF STACK 712 esp + 0 PARENT LocalFrame LOCALFRAME
     40bfba     48 MEMORYHOLE STACK esp + 360 CalleeSavedRegs 
-    40bfba      4 DATAREF STACK 714 esp + 0 CHILDOF 713 OFFSET 0 OutArgsRegion OUTARGS
-    40bfba      4 DATAREF STACK 728 esp + 132 CHILDOF 713 OFFSET 132 LOCALVAR var_114 
-    40bfba      4 DATAREF STACK 730 esp + 144 CHILDOF 713 OFFSET 144 LOCALVAR var_108 
-    40bfba      4 DATAREF STACK 731 esp + 148 CHILDOF 713 OFFSET 148 LOCALVAR var_104 
-    40bfba      4 DATAREF STACK 735 esp + 192 CHILDOF 713 OFFSET 192 LOCALVAR var_D8 
-    40bfba      4 DATAREF STACK 736 esp + 196 CHILDOF 713 OFFSET 196 LOCALVAR var_D4 
-    40bfba      4 DATAREF STACK 738 esp + 208 CHILDOF 713 OFFSET 208 LOCALVAR var_C8 
-    40bfba      4 DATAREF STACK 739 esp + 212 CHILDOF 713 OFFSET 212 LOCALVAR var_C4 
-    40bfba      4 DATAREF STACK 740 esp + 216 CHILDOF 713 OFFSET 216 LOCALVAR var_C0 
-    40bfba      4 DATAREF STACK 741 esp + 220 CHILDOF 713 OFFSET 220 LOCALVAR var_BC 
-    40bfba      4 DATAREF STACK 742 esp + 224 CHILDOF 713 OFFSET 224 LOCALVAR var_B8 
-    40bfba      4 DATAREF STACK 743 esp + 228 CHILDOF 713 OFFSET 228 LOCALVAR var_B4 
-    40bfba      4 DATAREF STACK 744 esp + 232 CHILDOF 713 OFFSET 232 LOCALVAR var_B0 
-    40bfba      4 DATAREF STACK 745 esp + 236 CHILDOF 713 OFFSET 236 LOCALVAR var_AC 
-    40bfba      4 DATAREF STACK 748 esp + 256 CHILDOF 713 OFFSET 256 LOCALVAR var_98 
-    40bfba      4 DATAREF STACK 749 esp + 260 CHILDOF 713 OFFSET 260 LOCALVAR var_94 
-    40bfba      4 DATAREF STACK 750 esp + 264 CHILDOF 713 OFFSET 264 LOCALVAR var_90 
-    40bfba      4 DATAREF STACK 751 esp + 268 CHILDOF 713 OFFSET 268 LOCALVAR var_8C 
-    40bfba      4 DATAREF STACK 753 esp + 288 CHILDOF 713 OFFSET 288 LOCALVAR var_78 
-    40bfba      4 DATAREF STACK 754 esp + 292 CHILDOF 713 OFFSET 292 LOCALVAR var_74 
-    40bfba      4 DATAREF STACK 755 esp + 296 CHILDOF 713 OFFSET 296 LOCALVAR var_70 
-    40bfba      4 DATAREF STACK 760 esp + 336 CHILDOF 713 OFFSET 336 LOCALVAR var_48 
-    40bfba      4 DATAREF STACK 761 esp + 340 CHILDOF 713 OFFSET 340 LOCALVAR var_44 
-    40bfba      4 DATAREF STACK 762 esp + 344 CHILDOF 713 OFFSET 344 LOCALVAR var_40 
+    40bfba      4 DATAREF STACK 713 esp + 0 CHILDOF 712 OFFSET 0 OutArgsRegion OUTARGS
+    40bfba      4 DATAREF STACK 727 esp + 132 CHILDOF 712 OFFSET 132 LOCALVAR var_114 
+    40bfba      4 DATAREF STACK 729 esp + 144 CHILDOF 712 OFFSET 144 LOCALVAR var_108 
+    40bfba      4 DATAREF STACK 730 esp + 148 CHILDOF 712 OFFSET 148 LOCALVAR var_104 
+    40bfba      4 DATAREF STACK 734 esp + 192 CHILDOF 712 OFFSET 192 LOCALVAR var_D8 
+    40bfba      4 DATAREF STACK 735 esp + 196 CHILDOF 712 OFFSET 196 LOCALVAR var_D4 
+    40bfba      4 DATAREF STACK 737 esp + 208 CHILDOF 712 OFFSET 208 LOCALVAR var_C8 
+    40bfba      4 DATAREF STACK 738 esp + 212 CHILDOF 712 OFFSET 212 LOCALVAR var_C4 
+    40bfba      4 DATAREF STACK 739 esp + 216 CHILDOF 712 OFFSET 216 LOCALVAR var_C0 
+    40bfba      4 DATAREF STACK 740 esp + 220 CHILDOF 712 OFFSET 220 LOCALVAR var_BC 
+    40bfba      4 DATAREF STACK 741 esp + 224 CHILDOF 712 OFFSET 224 LOCALVAR var_B8 
+    40bfba      4 DATAREF STACK 742 esp + 228 CHILDOF 712 OFFSET 228 LOCALVAR var_B4 
+    40bfba      4 DATAREF STACK 743 esp + 232 CHILDOF 712 OFFSET 232 LOCALVAR var_B0 
+    40bfba      4 DATAREF STACK 744 esp + 236 CHILDOF 712 OFFSET 236 LOCALVAR var_AC 
+    40bfba      4 DATAREF STACK 747 esp + 256 CHILDOF 712 OFFSET 256 LOCALVAR var_98 
+    40bfba      4 DATAREF STACK 748 esp + 260 CHILDOF 712 OFFSET 260 LOCALVAR var_94 
+    40bfba      4 DATAREF STACK 749 esp + 264 CHILDOF 712 OFFSET 264 LOCALVAR var_90 
+    40bfba      4 DATAREF STACK 750 esp + 268 CHILDOF 712 OFFSET 268 LOCALVAR var_8C 
+    40bfba      4 DATAREF STACK 752 esp + 288 CHILDOF 712 OFFSET 288 LOCALVAR var_78 
+    40bfba      4 DATAREF STACK 753 esp + 292 CHILDOF 712 OFFSET 292 LOCALVAR var_74 
+    40bfba      4 DATAREF STACK 754 esp + 296 CHILDOF 712 OFFSET 296 LOCALVAR var_70 
+    40bfba      4 DATAREF STACK 759 esp + 336 CHILDOF 712 OFFSET 336 LOCALVAR var_48 
+    40bfba      4 DATAREF STACK 760 esp + 340 CHILDOF 712 OFFSET 340 LOCALVAR var_44 
+    40bfba      4 DATAREF STACK 761 esp + 344 CHILDOF 712 OFFSET 344 LOCALVAR var_40 
     40bfba      7 INSTR BELONGTO 40bfb0 
     40bfba      7 INSTR DEADREGS  EFLAGS RAX RBX R9 R12 R13 R14 R15 ZZ sub     rsp, 168h 
-    40bfba      8 DATAREF STACK 716 esp + 24 CHILDOF 713 OFFSET 24 LOCALVAR var_180 
-    40bfba      8 DATAREF STACK 717 esp + 32 CHILDOF 713 OFFSET 32 LOCALVAR var_178 
-    40bfba      8 DATAREF STACK 718 esp + 40 CHILDOF 713 OFFSET 40 LOCALVAR var_170 
-    40bfba      8 DATAREF STACK 719 esp + 48 CHILDOF 713 OFFSET 48 LOCALVAR var_168 
-    40bfba      8 DATAREF STACK 720 esp + 56 CHILDOF 713 OFFSET 56 LOCALVAR var_160 
-    40bfba      8 DATAREF STACK 722 esp + 80 CHILDOF 713 OFFSET 80 LOCALVAR var_148 
-    40bfba      8 DATAREF STACK 723 esp + 88 CHILDOF 713 OFFSET 88 LOCALVAR var_140 
-    40bfba      8 DATAREF STACK 724 esp + 96 CHILDOF 713 OFFSET 96 LOCALVAR var_138 
-    40bfba      8 DATAREF STACK 725 esp + 104 CHILDOF 713 OFFSET 104 LOCALVAR var_130 
-    40bfba      8 DATAREF STACK 726 esp + 112 CHILDOF 713 OFFSET 112 LOCALVAR var_128 
-    40bfba      8 DATAREF STACK 729 esp + 136 CHILDOF 713 OFFSET 136 LOCALVAR var_110 
-    40bfba      8 DATAREF STACK 732 esp + 152 CHILDOF 713 OFFSET 152 LOCALVAR var_100 
-    40bfba      8 DATAREF STACK 737 esp + 200 CHILDOF 713 OFFSET 200 LOCALVAR var_D0 
-    40bfba      8 DATAREF STACK 746 esp + 240 CHILDOF 713 OFFSET 240 LOCALVAR var_A8 
-    40bfba      8 DATAREF STACK 747 esp + 248 CHILDOF 713 OFFSET 248 LOCALVAR var_A0 
-    40bfba      8 DATAREF STACK 757 esp + 312 CHILDOF 713 OFFSET 312 LOCALVAR var_60 
-    40bfba      8 DATAREF STACK 758 esp + 320 CHILDOF 713 OFFSET 320 LOCALVAR var_58 
-    40bfba      8 DATAREF STACK 759 esp + 328 CHILDOF 713 OFFSET 328 LOCALVAR var_50 
+    40bfba      8 DATAREF STACK 715 esp + 24 CHILDOF 712 OFFSET 24 LOCALVAR var_180 
+    40bfba      8 DATAREF STACK 716 esp + 32 CHILDOF 712 OFFSET 32 LOCALVAR var_178 
+    40bfba      8 DATAREF STACK 717 esp + 40 CHILDOF 712 OFFSET 40 LOCALVAR var_170 
+    40bfba      8 DATAREF STACK 718 esp + 48 CHILDOF 712 OFFSET 48 LOCALVAR var_168 
+    40bfba      8 DATAREF STACK 719 esp + 56 CHILDOF 712 OFFSET 56 LOCALVAR var_160 
+    40bfba      8 DATAREF STACK 721 esp + 80 CHILDOF 712 OFFSET 80 LOCALVAR var_148 
+    40bfba      8 DATAREF STACK 722 esp + 88 CHILDOF 712 OFFSET 88 LOCALVAR var_140 
+    40bfba      8 DATAREF STACK 723 esp + 96 CHILDOF 712 OFFSET 96 LOCALVAR var_138 
+    40bfba      8 DATAREF STACK 724 esp + 104 CHILDOF 712 OFFSET 104 LOCALVAR var_130 
+    40bfba      8 DATAREF STACK 725 esp + 112 CHILDOF 712 OFFSET 112 LOCALVAR var_128 
+    40bfba      8 DATAREF STACK 728 esp + 136 CHILDOF 712 OFFSET 136 LOCALVAR var_110 
+    40bfba      8 DATAREF STACK 731 esp + 152 CHILDOF 712 OFFSET 152 LOCALVAR var_100 
+    40bfba      8 DATAREF STACK 736 esp + 200 CHILDOF 712 OFFSET 200 LOCALVAR var_D0 
+    40bfba      8 DATAREF STACK 745 esp + 240 CHILDOF 712 OFFSET 240 LOCALVAR var_A8 
+    40bfba      8 DATAREF STACK 746 esp + 248 CHILDOF 712 OFFSET 248 LOCALVAR var_A0 
+    40bfba      8 DATAREF STACK 756 esp + 312 CHILDOF 712 OFFSET 312 LOCALVAR var_60 
+    40bfba      8 DATAREF STACK 757 esp + 320 CHILDOF 712 OFFSET 320 LOCALVAR var_58 
+    40bfba      8 DATAREF STACK 758 esp + 328 CHILDOF 712 OFFSET 328 LOCALVAR var_50 
     40bfba      8 MEMORYHOLE STACK esp + 408 ReturnAddress 
     40bfc1      7 INSTR BELONGTO 40bfb0 
     40bfc1      7 INSTR DEADREGS  EFLAGS RAX RBX R9 R12 R13 R14 R15 ZZ mov     rax, cs:qword_60FAD8 
@@ -13184,21 +13187,21 @@
     40ca47      5 INSTR BELONGTO 40ca30 
     40ca4c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
     40ca4c      5 INSTR BELONGTO 40ca30 
-    40ca51     12 DATAREF STACK 765 esp + 0 CHILDOF 764 OFFSET 0 OutArgsRegion OUTARGS
-    40ca51    136 DATAREF STACK 764 esp + 0 PARENT LocalFrame LOCALFRAME
-    40ca51     16 DATAREF STACK 769 esp + 56 CHILDOF 764 OFFSET 56 LOCALVAR var_50 
-    40ca51     16 DATAREF STACK 770 esp + 72 CHILDOF 764 OFFSET 72 LOCALVAR var_40 
-    40ca51     24 DATAREF STACK 768 esp + 32 CHILDOF 764 OFFSET 32 LOCALVAR var_68 
+    40ca51     12 DATAREF STACK 764 esp + 0 CHILDOF 763 OFFSET 0 OutArgsRegion OUTARGS
+    40ca51    136 DATAREF STACK 763 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ca51     16 DATAREF STACK 768 esp + 56 CHILDOF 763 OFFSET 56 LOCALVAR var_50 
+    40ca51     16 DATAREF STACK 769 esp + 72 CHILDOF 763 OFFSET 72 LOCALVAR var_40 
+    40ca51     24 DATAREF STACK 767 esp + 32 CHILDOF 763 OFFSET 32 LOCALVAR var_68 
     40ca51      7 INSTR BELONGTO 40ca30 
     40ca51      7 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 88h 
-    40ca51      8 DATAREF STACK 766 esp + 16 CHILDOF 764 OFFSET 16 LOCALVAR var_78 
-    40ca51      8 DATAREF STACK 767 esp + 24 CHILDOF 764 OFFSET 24 LOCALVAR var_70 
-    40ca51      8 DATAREF STACK 771 esp + 88 CHILDOF 764 OFFSET 88 LOCALVAR var_30 
-    40ca51      8 DATAREF STACK 772 esp + 96 CHILDOF 764 OFFSET 96 LOCALVAR var_28 
-    40ca51      8 DATAREF STACK 773 esp + 104 CHILDOF 764 OFFSET 104 LOCALVAR var_20 
-    40ca51      8 DATAREF STACK 774 esp + 112 CHILDOF 764 OFFSET 112 LOCALVAR var_18 
-    40ca51      8 DATAREF STACK 775 esp + 120 CHILDOF 764 OFFSET 120 LOCALVAR var_10 
-    40ca51      8 DATAREF STACK 776 esp + 128 CHILDOF 764 OFFSET 128 LOCALVAR var_8 
+    40ca51      8 DATAREF STACK 765 esp + 16 CHILDOF 763 OFFSET 16 LOCALVAR var_78 
+    40ca51      8 DATAREF STACK 766 esp + 24 CHILDOF 763 OFFSET 24 LOCALVAR var_70 
+    40ca51      8 DATAREF STACK 770 esp + 88 CHILDOF 763 OFFSET 88 LOCALVAR var_30 
+    40ca51      8 DATAREF STACK 771 esp + 96 CHILDOF 763 OFFSET 96 LOCALVAR var_28 
+    40ca51      8 DATAREF STACK 772 esp + 104 CHILDOF 763 OFFSET 104 LOCALVAR var_20 
+    40ca51      8 DATAREF STACK 773 esp + 112 CHILDOF 763 OFFSET 112 LOCALVAR var_18 
+    40ca51      8 DATAREF STACK 774 esp + 120 CHILDOF 763 OFFSET 120 LOCALVAR var_10 
+    40ca51      8 DATAREF STACK 775 esp + 128 CHILDOF 763 OFFSET 128 LOCALVAR var_8 
     40ca51      8 MEMORYHOLE STACK esp + 136 ReturnAddress 
     40ca58      9 INSTR BELONGTO 40ca30 
     40ca58      9 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ mov     [rsp+88h+var_40], 0 
@@ -13507,14 +13510,14 @@
     40cc87      3 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     r12d, edx 
     40cc8a     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
     40cc8a      5 INSTR BELONGTO 40cc70 
-    40cc8f     40 DATAREF STACK 777 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cc8f     40 DATAREF STACK 776 esp + 0 PARENT LocalFrame LOCALFRAME
     40cc8f      4 INSTR BELONGTO 40cc70 
     40cc8f      4 INSTR DEADREGS  EFLAGS R13 R14 ZZ sub     rsp, 28h 
-    40cc8f      8 DATAREF STACK 778 esp + 0 CHILDOF 777 OFFSET 0 LOCALVAR var_28 
-    40cc8f      8 DATAREF STACK 779 esp + 8 CHILDOF 777 OFFSET 8 LOCALVAR var_20 
-    40cc8f      8 DATAREF STACK 780 esp + 16 CHILDOF 777 OFFSET 16 LOCALVAR var_18 
-    40cc8f      8 DATAREF STACK 781 esp + 24 CHILDOF 777 OFFSET 24 LOCALVAR var_10 
-    40cc8f      8 DATAREF STACK 782 esp + 32 CHILDOF 777 OFFSET 32 LOCALVAR var_8 
+    40cc8f      8 DATAREF STACK 777 esp + 0 CHILDOF 776 OFFSET 0 LOCALVAR var_28 
+    40cc8f      8 DATAREF STACK 778 esp + 8 CHILDOF 776 OFFSET 8 LOCALVAR var_20 
+    40cc8f      8 DATAREF STACK 779 esp + 16 CHILDOF 776 OFFSET 16 LOCALVAR var_18 
+    40cc8f      8 DATAREF STACK 780 esp + 24 CHILDOF 776 OFFSET 24 LOCALVAR var_10 
+    40cc8f      8 DATAREF STACK 781 esp + 32 CHILDOF 776 OFFSET 32 LOCALVAR var_8 
     40cc8f      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40cc93     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40cc93      3 INSTR BELONGTO 40cc70 
@@ -13734,9 +13737,9 @@
     40cdf1     -3 INSTR LOCAL NoWarn push    rbx 
     40cdf2      3 INSTR BELONGTO 40cdf0 
     40cdf2      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    40cdf5     16 DATAREF STACK 784 esp + 8 CHILDOF 783 OFFSET 8 LOCALVAR var_20 
+    40cdf5     16 DATAREF STACK 783 esp + 8 CHILDOF 782 OFFSET 8 LOCALVAR var_20 
     40cdf5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    40cdf5     24 DATAREF STACK 783 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cdf5     24 DATAREF STACK 782 esp + 0 PARENT LocalFrame LOCALFRAME
     40cdf5      4 INSTR BELONGTO 40cdf0 
     40cdf5      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
     40cdf5      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -13844,13 +13847,13 @@
     40ce97      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
     40ce9c      4 INSTR BELONGTO 40ce70 
     40ce9c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-    40ce9c     56 DATAREF STACK 785 esp + 0 PARENT LocalFrame LOCALFRAME
-    40ce9c      8 DATAREF STACK 786 esp + 8 CHILDOF 785 OFFSET 8 LOCALVAR var_30 
-    40ce9c      8 DATAREF STACK 787 esp + 16 CHILDOF 785 OFFSET 16 LOCALVAR var_28 
-    40ce9c      8 DATAREF STACK 788 esp + 24 CHILDOF 785 OFFSET 24 LOCALVAR var_20 
-    40ce9c      8 DATAREF STACK 789 esp + 32 CHILDOF 785 OFFSET 32 LOCALVAR var_18 
-    40ce9c      8 DATAREF STACK 790 esp + 40 CHILDOF 785 OFFSET 40 LOCALVAR var_10 
-    40ce9c      8 DATAREF STACK 791 esp + 48 CHILDOF 785 OFFSET 48 LOCALVAR var_8 
+    40ce9c     56 DATAREF STACK 784 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ce9c      8 DATAREF STACK 785 esp + 8 CHILDOF 784 OFFSET 8 LOCALVAR var_30 
+    40ce9c      8 DATAREF STACK 786 esp + 16 CHILDOF 784 OFFSET 16 LOCALVAR var_28 
+    40ce9c      8 DATAREF STACK 787 esp + 24 CHILDOF 784 OFFSET 24 LOCALVAR var_20 
+    40ce9c      8 DATAREF STACK 788 esp + 32 CHILDOF 784 OFFSET 32 LOCALVAR var_18 
+    40ce9c      8 DATAREF STACK 789 esp + 40 CHILDOF 784 OFFSET 40 LOCALVAR var_10 
+    40ce9c      8 DATAREF STACK 790 esp + 48 CHILDOF 784 OFFSET 48 LOCALVAR var_8 
     40ce9c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40cea0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
     40cea0      3 INSTR BELONGTO 40ce70 
@@ -13927,7 +13930,7 @@
     40cf15     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40cf15      4 INSTR BELONGTO 40cf10 
     40cf15      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    40cf15      8 DATAREF STACK 792 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cf15      8 DATAREF STACK 791 esp + 0 PARENT LocalFrame LOCALFRAME
     40cf15      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40cf19      7 INSTR BELONGTO 40cf10 
     40cf19      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_60ED58 
@@ -13962,7 +13965,7 @@
     40cf48     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     40cf55 
     40cf48      4 INSTR BELONGTO 40cf48 
     40cf48      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    40cf48      8 DATAREF STACK 793 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cf48      8 DATAREF STACK 792 esp + 0 PARENT LocalFrame LOCALFRAME
     40cf48      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40cf4c     -1 INSTR LOCAL NoMetaUpdate call    sub_407630 
     40cf4c      5 INSTR BELONGTO 40cf48 
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 989acf4d..384617e1 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 @@
-5c211f41dfd17f640816f5e7f1b595f81bf3ef22
\ No newline at end of file
+fb461cb1fb815ae8456b96f324d8f9420b9afdab
\ 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 a9878d73..515f93f4 100644
--- a/tests/commit/trimmed-sorted-save-gnome-session-properties.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-session-properties.psexe.annot
@@ -2072,12 +2072,11 @@
     4054f7      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
     4054fc     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4054AF 
     4054fc      2 INSTR BELONGTO 405410 
-    405500      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
-    405500      0 FUNC MMSAFENESS UNSAFE
+    405500      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    405500      0 FUNC MMSAFENESS SAFE
     405500     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     405500      2 INSTR BELONGTO 405500 
     405500     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     405529 
-    405500      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     405502      3 INSTR BELONGTO 405500 
     405502      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     405505      1 INSTR BELONGTO 405500 
@@ -2089,8 +2088,11 @@
     405509      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     40550d      1 INSTR BELONGTO 405500 
     40550d      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    40550d     -3 INSTR LOCAL NoWarn push    rax 
+    40550e     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40550e      1 INSTR BELONGTO 405500 
     40550e      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    40550e      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     40550f     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     40550f      7 INSTR BELONGTO 405500 
     40550f      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -2185,14 +2187,14 @@
     4055b2      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     4055b3      1 INSTR BELONGTO 405550 
     4055b3      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    4055c0      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
+    4055c0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     4055c0      0 FUNC MMSAFENESS UNSAFE
     4055c0     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_60EDC8, 0 
     4055c0     34 FUNC GLOBAL sub_4055C0 FUNC_UNSAFE USEFP RET     4055e1 
     4055c0      8 INSTR BELONGTO 4055c0 
-    4055c0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    4055c0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4055c8      1 INSTR BELONGTO 4055c0 
+    4055c8      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    4055c8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4055c9      3 INSTR BELONGTO 4055c0 
     4055cc     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4055E0 
     4055cc      2 INSTR BELONGTO 4055c0 
@@ -2833,6 +2835,7 @@
     405a10      2 FUNC GLOBAL sub_405A10 FUNC_UNSAFE NOFP RET     405a11 
     405a10      2 INSTR BELONGTO 405a10 
     405a10      2 INSTR DEADREGS  EFLAGS RAX ZZ jmp     short sub_4059B0 
+    405a10      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     405a20      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 1 3 -20 0 4 0 8 5 -12 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 -4 0 13 0 0 14 0 0 15 0 0 ZZ
     405a20      0 FUNC MMSAFENESS SAFE
     405a20    136 FUNC GLOBAL sub_405A20 FUNC_UNSAFE NOFP RET     405aa7 
@@ -5910,7 +5913,7 @@
     407e9b     -3 INSTR LOCAL NoWarn push    rbp 
     407e9c      1 INSTR BELONGTO 407e90 
     407e9c      1 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ push    rbx 
-    407e9c     40 DATAREF STACK 600 esp + 0 PARENT LocalFrame LOCALFRAME
+    407e9c     40 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     407e9c      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     407e9d      3 INSTR BELONGTO 407e90 
     407e9d      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ mov     rbx, rdi 
@@ -6184,12 +6187,12 @@
     40802a      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbp, rdi 
     40802d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40802d      5 INSTR BELONGTO 408020 
-    408032     24 DATAREF STACK 601 esp + 0 PARENT LocalFrame LOCALFRAME
+    408032     24 DATAREF STACK 600 esp + 0 PARENT LocalFrame LOCALFRAME
     408032      4 INSTR BELONGTO 408020 
     408032      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 18h 
-    408032      8 DATAREF STACK 602 esp + 0 CHILDOF 601 OFFSET 0 LOCALVAR var_18 
-    408032      8 DATAREF STACK 603 esp + 8 CHILDOF 601 OFFSET 8 LOCALVAR var_10 
-    408032      8 DATAREF STACK 604 esp + 16 CHILDOF 601 OFFSET 16 LOCALVAR var_8 
+    408032      8 DATAREF STACK 601 esp + 0 CHILDOF 600 OFFSET 0 LOCALVAR var_18 
+    408032      8 DATAREF STACK 602 esp + 8 CHILDOF 600 OFFSET 8 LOCALVAR var_10 
+    408032      8 DATAREF STACK 603 esp + 16 CHILDOF 600 OFFSET 16 LOCALVAR var_8 
     408032      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     408036      4 INSTR BELONGTO 408020 
     408036      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     rbx, [rdi+18h] 
@@ -6289,12 +6292,12 @@
     4080da      3 INSTR BELONGTO 4080d0 
     4080dd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     4080dd      5 INSTR BELONGTO 4080d0 
-    4080e2     24 DATAREF STACK 605 esp + 0 PARENT LocalFrame LOCALFRAME
+    4080e2     24 DATAREF STACK 604 esp + 0 PARENT LocalFrame LOCALFRAME
     4080e2      4 INSTR BELONGTO 4080d0 
     4080e2      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-    4080e2      8 DATAREF STACK 606 esp + 0 CHILDOF 605 OFFSET 0 LOCALVAR var_18 
-    4080e2      8 DATAREF STACK 607 esp + 8 CHILDOF 605 OFFSET 8 LOCALVAR var_10 
-    4080e2      8 DATAREF STACK 608 esp + 16 CHILDOF 605 OFFSET 16 LOCALVAR var_8 
+    4080e2      8 DATAREF STACK 605 esp + 0 CHILDOF 604 OFFSET 0 LOCALVAR var_18 
+    4080e2      8 DATAREF STACK 606 esp + 8 CHILDOF 604 OFFSET 8 LOCALVAR var_10 
+    4080e2      8 DATAREF STACK 607 esp + 16 CHILDOF 604 OFFSET 16 LOCALVAR var_8 
     4080e2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4080e6     -1 INSTR LOCAL MetadataUnused mov     rax, [rdi+18h] 
     4080e6      4 INSTR BELONGTO 4080d0 
@@ -6449,8 +6452,8 @@
     4081d4      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
     4081d4     -3 INSTR LOCAL NoWarn push    rbx 
     4081d5     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-    4081d5     20 DATAREF STACK 610 esp + 0 CHILDOF 609 OFFSET 0 OutArgsRegion OUTARGS
-    4081d5     40 DATAREF STACK 609 esp + 0 PARENT LocalFrame LOCALFRAME
+    4081d5     20 DATAREF STACK 609 esp + 0 CHILDOF 608 OFFSET 0 OutArgsRegion OUTARGS
+    4081d5     40 DATAREF STACK 608 esp + 0 PARENT LocalFrame LOCALFRAME
     4081d5      4 INSTR BELONGTO 4081d0 
     4081d5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 28h 
     4081d5      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
@@ -6557,11 +6560,11 @@
     4082a5      5 INSTR BELONGTO 4082a0 
     4082a5      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+var_8], rbp 
     4082a5      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
-    4082aa     24 DATAREF STACK 611 esp + 0 PARENT LocalFrame LOCALFRAME
+    4082aa     24 DATAREF STACK 610 esp + 0 PARENT LocalFrame LOCALFRAME
     4082aa      4 INSTR BELONGTO 4082a0 
     4082aa      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-    4082aa      8 DATAREF STACK 612 esp + 8 CHILDOF 611 OFFSET 8 LOCALVAR var_10 
-    4082aa      8 DATAREF STACK 613 esp + 16 CHILDOF 611 OFFSET 16 LOCALVAR var_8 
+    4082aa      8 DATAREF STACK 611 esp + 8 CHILDOF 610 OFFSET 8 LOCALVAR var_10 
+    4082aa      8 DATAREF STACK 612 esp + 16 CHILDOF 610 OFFSET 16 LOCALVAR var_8 
     4082aa      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4082ae     -1 INSTR LOCAL MetadataUnused mov     rbp, rdi 
     4082ae      3 INSTR BELONGTO 4082a0 
@@ -6631,8 +6634,8 @@
     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
     408310      0 FUNC MMSAFENESS SAFE
     408310    113 FUNC GLOBAL sub_408310 FUNC_UNSAFE NOFP RET     408380 
-    408310     24 DATAREF STACK 614 esp + 0 PARENT LocalFrame LOCALFRAME
-    408310      4 DATAREF STACK 615 esp + 0 CHILDOF 614 OFFSET 0 OutArgsRegion OUTARGS
+    408310     24 DATAREF STACK 613 esp + 0 PARENT LocalFrame LOCALFRAME
+    408310      4 DATAREF STACK 614 esp + 0 CHILDOF 613 OFFSET 0 OutArgsRegion OUTARGS
     408310      4 INSTR BELONGTO 408310 
     408310      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
     408310      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -6714,8 +6717,8 @@
     408395     -3 INSTR LOCAL NoWarn push    rbx 
     408396      3 INSTR BELONGTO 408390 
     408396      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 R13 ZZ mov     rbx, rdi 
-    408399     16 DATAREF STACK 617 esp + 8 CHILDOF 616 OFFSET 8 LOCALVAR var_30 
-    408399     24 DATAREF STACK 616 esp + 0 PARENT LocalFrame LOCALFRAME
+    408399     16 DATAREF STACK 616 esp + 8 CHILDOF 615 OFFSET 8 LOCALVAR var_30 
+    408399     24 DATAREF STACK 615 esp + 0 PARENT LocalFrame LOCALFRAME
     408399     32 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
     408399      4 INSTR BELONGTO 408390 
     408399      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 18h 
@@ -7380,7 +7383,7 @@
     408842      3 INSTR BELONGTO 408840 
     408845     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     408845      4 INSTR BELONGTO 408840 
-    408845      8 DATAREF STACK 618 esp + 0 PARENT LocalFrame LOCALFRAME
+    408845      8 DATAREF STACK 617 esp + 0 PARENT LocalFrame LOCALFRAME
     408845      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     408849     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     408849      3 INSTR BELONGTO 408840 
@@ -7462,7 +7465,7 @@
     408902      3 INSTR BELONGTO 408900 
     408905     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     408905      4 INSTR BELONGTO 408900 
-    408905      8 DATAREF STACK 619 esp + 0 PARENT LocalFrame LOCALFRAME
+    408905      8 DATAREF STACK 618 esp + 0 PARENT LocalFrame LOCALFRAME
     408905      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     408909     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     408909      3 INSTR BELONGTO 408900 
@@ -7979,7 +7982,7 @@
     408c17     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     408c17      4 INSTR BELONGTO 408c10 
     408c17      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    408c17      8 DATAREF STACK 620 esp + 0 PARENT LocalFrame LOCALFRAME
+    408c17      8 DATAREF STACK 619 esp + 0 PARENT LocalFrame LOCALFRAME
     408c17      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     408c1b     -1 INSTR LOCAL NoMetaUpdate call    sub_408310 
     408c1b      5 INSTR BELONGTO 408c10 
@@ -8509,11 +8512,11 @@
     408ef5      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
     408efa      3 INSTR BELONGTO 408ef0 
     408efa      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    408efd     24 DATAREF STACK 621 esp + 0 PARENT LocalFrame LOCALFRAME
+    408efd     24 DATAREF STACK 620 esp + 0 PARENT LocalFrame LOCALFRAME
     408efd      4 INSTR BELONGTO 408ef0 
     408efd      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-    408efd      8 DATAREF STACK 622 esp + 8 CHILDOF 621 OFFSET 8 LOCALVAR var_10 
-    408efd      8 DATAREF STACK 623 esp + 16 CHILDOF 621 OFFSET 16 LOCALVAR var_8 
+    408efd      8 DATAREF STACK 621 esp + 8 CHILDOF 620 OFFSET 8 LOCALVAR var_10 
+    408efd      8 DATAREF STACK 622 esp + 16 CHILDOF 620 OFFSET 16 LOCALVAR var_8 
     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 
@@ -8657,14 +8660,14 @@
     408fd7      3 INSTR DEADREGS  EFLAGS RAX RDI R8 R9 R10 R11 R12 R13 ZZ mov     rbp, rsi 
     408fda     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
     408fda      5 INSTR BELONGTO 408fc0 
-    408fdf     40 DATAREF STACK 624 esp + 0 PARENT LocalFrame LOCALFRAME
+    408fdf     40 DATAREF STACK 623 esp + 0 PARENT LocalFrame LOCALFRAME
     408fdf      4 INSTR BELONGTO 408fc0 
     408fdf      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 R12 R13 R14 ZZ sub     rsp, 28h 
-    408fdf      8 DATAREF STACK 625 esp + 0 CHILDOF 624 OFFSET 0 LOCALVAR var_28 
-    408fdf      8 DATAREF STACK 626 esp + 8 CHILDOF 624 OFFSET 8 LOCALVAR var_20 
-    408fdf      8 DATAREF STACK 627 esp + 16 CHILDOF 624 OFFSET 16 LOCALVAR var_18 
-    408fdf      8 DATAREF STACK 628 esp + 24 CHILDOF 624 OFFSET 24 LOCALVAR var_10 
-    408fdf      8 DATAREF STACK 629 esp + 32 CHILDOF 624 OFFSET 32 LOCALVAR var_8 
+    408fdf      8 DATAREF STACK 624 esp + 0 CHILDOF 623 OFFSET 0 LOCALVAR var_28 
+    408fdf      8 DATAREF STACK 625 esp + 8 CHILDOF 623 OFFSET 8 LOCALVAR var_20 
+    408fdf      8 DATAREF STACK 626 esp + 16 CHILDOF 623 OFFSET 16 LOCALVAR var_18 
+    408fdf      8 DATAREF STACK 627 esp + 24 CHILDOF 623 OFFSET 24 LOCALVAR var_10 
+    408fdf      8 DATAREF STACK 628 esp + 32 CHILDOF 623 OFFSET 32 LOCALVAR var_8 
     408fdf      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     408fe3      3 INSTR BELONGTO 408fc0 
     408fe3      3 INSTR DEADREGS  EFLAGS RAX RSI RDI R8 R9 R10 R11 R12 R13 R14 ZZ mov     r12, rdx 
@@ -8892,7 +8895,7 @@
     409175     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     409175      4 INSTR BELONGTO 409170 
     409175      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    409175      8 DATAREF STACK 630 esp + 0 PARENT LocalFrame LOCALFRAME
+    409175      8 DATAREF STACK 629 esp + 0 PARENT LocalFrame LOCALFRAME
     409175      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     409179     -1 INSTR LOCAL NoMetaUpdate call    sub_408310 
     409179      5 INSTR BELONGTO 409170 
@@ -9064,8 +9067,8 @@
     409282      1 INSTR BELONGTO 409270 
     409282      1 INSTR DEADREGS  EFLAGS R14 R15 ZZ push    rbx 
     409282     -3 INSTR LOCAL NoWarn push    rbx 
-    409283     16 DATAREF STACK 632 esp + 8 CHILDOF 631 OFFSET 8 LOCALVAR var_40 
-    409283     24 DATAREF STACK 631 esp + 0 PARENT LocalFrame LOCALFRAME
+    409283     16 DATAREF STACK 631 esp + 8 CHILDOF 630 OFFSET 8 LOCALVAR var_40 
+    409283     24 DATAREF STACK 630 esp + 0 PARENT LocalFrame LOCALFRAME
     409283     48 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
     409283      4 INSTR BELONGTO 409270 
     409283      4 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ sub     rsp, 18h 
@@ -9554,12 +9557,12 @@
     4095fa      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
     4095fd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     4095fd      5 INSTR BELONGTO 4095f0 
-    409602     24 DATAREF STACK 633 esp + 0 PARENT LocalFrame LOCALFRAME
+    409602     24 DATAREF STACK 632 esp + 0 PARENT LocalFrame LOCALFRAME
     409602      4 INSTR BELONGTO 4095f0 
     409602      4 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-    409602      8 DATAREF STACK 634 esp + 0 CHILDOF 633 OFFSET 0 LOCALVAR var_18 
-    409602      8 DATAREF STACK 635 esp + 8 CHILDOF 633 OFFSET 8 LOCALVAR var_10 
-    409602      8 DATAREF STACK 636 esp + 16 CHILDOF 633 OFFSET 16 LOCALVAR var_8 
+    409602      8 DATAREF STACK 633 esp + 0 CHILDOF 632 OFFSET 0 LOCALVAR var_18 
+    409602      8 DATAREF STACK 634 esp + 8 CHILDOF 632 OFFSET 8 LOCALVAR var_10 
+    409602      8 DATAREF STACK 635 esp + 16 CHILDOF 632 OFFSET 16 LOCALVAR var_8 
     409602      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     409606     -1 INSTR LOCAL MetadataUnused mov     rbp, rsi 
     409606      3 INSTR BELONGTO 4095f0 
@@ -9651,17 +9654,17 @@
     40969a      5 INSTR BELONGTO 409680 
     40969f     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
     40969f      5 INSTR BELONGTO 409680 
-    4096a4     12 DATAREF STACK 638 esp + 0 CHILDOF 637 OFFSET 0 LOCALVAR var_48 
-    4096a4     12 DATAREF STACK 639 esp + 12 CHILDOF 637 OFFSET 12 LOCALVAR var_3C 
+    4096a4     12 DATAREF STACK 637 esp + 0 CHILDOF 636 OFFSET 0 LOCALVAR var_48 
+    4096a4     12 DATAREF STACK 638 esp + 12 CHILDOF 636 OFFSET 12 LOCALVAR var_3C 
     4096a4      4 INSTR BELONGTO 409680 
     4096a4      4 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 R9 R10 R11 R13 R14 R15 ZZ sub     rsp, 48h 
-    4096a4     72 DATAREF STACK 637 esp + 0 PARENT LocalFrame LOCALFRAME
-    4096a4      8 DATAREF STACK 640 esp + 24 CHILDOF 637 OFFSET 24 LOCALVAR var_30 
-    4096a4      8 DATAREF STACK 641 esp + 32 CHILDOF 637 OFFSET 32 LOCALVAR var_28 
-    4096a4      8 DATAREF STACK 642 esp + 40 CHILDOF 637 OFFSET 40 LOCALVAR var_20 
-    4096a4      8 DATAREF STACK 643 esp + 48 CHILDOF 637 OFFSET 48 LOCALVAR var_18 
-    4096a4      8 DATAREF STACK 644 esp + 56 CHILDOF 637 OFFSET 56 LOCALVAR var_10 
-    4096a4      8 DATAREF STACK 645 esp + 64 CHILDOF 637 OFFSET 64 LOCALVAR var_8 
+    4096a4     72 DATAREF STACK 636 esp + 0 PARENT LocalFrame LOCALFRAME
+    4096a4      8 DATAREF STACK 639 esp + 24 CHILDOF 636 OFFSET 24 LOCALVAR var_30 
+    4096a4      8 DATAREF STACK 640 esp + 32 CHILDOF 636 OFFSET 32 LOCALVAR var_28 
+    4096a4      8 DATAREF STACK 641 esp + 40 CHILDOF 636 OFFSET 40 LOCALVAR var_20 
+    4096a4      8 DATAREF STACK 642 esp + 48 CHILDOF 636 OFFSET 48 LOCALVAR var_18 
+    4096a4      8 DATAREF STACK 643 esp + 56 CHILDOF 636 OFFSET 56 LOCALVAR var_10 
+    4096a4      8 DATAREF STACK 644 esp + 64 CHILDOF 636 OFFSET 64 LOCALVAR var_8 
     4096a4      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     4096a8      3 INSTR BELONGTO 409680 
     4096a8      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 R9 R10 R11 R13 R14 R15 ZZ mov     r13, rsi 
@@ -9906,11 +9909,11 @@
     409863      1 INSTR BELONGTO 409860 
     409863      1 INSTR DEADREGS  EFLAGS R12 ZZ push    rbx 
     409863     -3 INSTR LOCAL NoWarn push    rbx 
-    409864     16 DATAREF STACK 646 esp + 0 PARENT LocalFrame LOCALFRAME
+    409864     16 DATAREF STACK 645 esp + 0 PARENT LocalFrame LOCALFRAME
     409864     24 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
     409864      4 INSTR BELONGTO 409860 
     409864      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 10h 
-    409864      8 DATAREF STACK 647 esp + 0 CHILDOF 646 OFFSET 0 OutArgsRegion OUTARGS
+    409864      8 DATAREF STACK 646 esp + 0 CHILDOF 645 OFFSET 0 OutArgsRegion OUTARGS
     409864      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     409868     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     409868      3 INSTR BELONGTO 409860 
@@ -10223,10 +10226,10 @@
     409a4c     -2 INSTR LOCAL n EDX ZZ  AlwaysNUM xor     edx, edx 
     409a4e     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
     409a4e      3 INSTR BELONGTO 409a40 
-    409a51     16 DATAREF STACK 648 esp + 0 PARENT LocalFrame LOCALFRAME
+    409a51     16 DATAREF STACK 647 esp + 0 PARENT LocalFrame LOCALFRAME
     409a51      4 INSTR BELONGTO 409a40 
     409a51      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 10h 
-    409a51      8 DATAREF STACK 649 esp + 0 CHILDOF 648 OFFSET 0 OutArgsRegion OUTARGS
+    409a51      8 DATAREF STACK 648 esp + 0 CHILDOF 647 OFFSET 0 OutArgsRegion OUTARGS
     409a51      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
     409a51      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     409a55      4 INSTR BELONGTO 409a40 
@@ -10260,12 +10263,12 @@
     409a7a      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rsi 
     409a7d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     409a7d      5 INSTR BELONGTO 409a70 
-    409a82     24 DATAREF STACK 650 esp + 0 PARENT LocalFrame LOCALFRAME
+    409a82     24 DATAREF STACK 649 esp + 0 PARENT LocalFrame LOCALFRAME
     409a82      4 INSTR BELONGTO 409a70 
     409a82      4 INSTR DEADREGS  EFLAGS RSI R12 ZZ sub     rsp, 18h 
-    409a82      8 DATAREF STACK 651 esp + 0 CHILDOF 650 OFFSET 0 LOCALVAR var_18 
-    409a82      8 DATAREF STACK 652 esp + 8 CHILDOF 650 OFFSET 8 LOCALVAR var_10 
-    409a82      8 DATAREF STACK 653 esp + 16 CHILDOF 650 OFFSET 16 LOCALVAR var_8 
+    409a82      8 DATAREF STACK 650 esp + 0 CHILDOF 649 OFFSET 0 LOCALVAR var_18 
+    409a82      8 DATAREF STACK 651 esp + 8 CHILDOF 649 OFFSET 8 LOCALVAR var_10 
+    409a82      8 DATAREF STACK 652 esp + 16 CHILDOF 649 OFFSET 16 LOCALVAR var_8 
     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 
@@ -10332,10 +10335,10 @@
     409ae4      1 INSTR BELONGTO 409ae0 
     409ae4      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
     409ae4     -3 INSTR LOCAL NoWarn push    rbx 
-    409ae5     16 DATAREF STACK 656 esp + 24 CHILDOF 654 OFFSET 24 LOCALVAR var_20 
+    409ae5     16 DATAREF STACK 655 esp + 24 CHILDOF 653 OFFSET 24 LOCALVAR var_20 
     409ae5     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-    409ae5     20 DATAREF STACK 655 esp + 0 CHILDOF 654 OFFSET 0 OutArgsRegion OUTARGS
-    409ae5     40 DATAREF STACK 654 esp + 0 PARENT LocalFrame LOCALFRAME
+    409ae5     20 DATAREF STACK 654 esp + 0 CHILDOF 653 OFFSET 0 OutArgsRegion OUTARGS
+    409ae5     40 DATAREF STACK 653 esp + 0 PARENT LocalFrame LOCALFRAME
     409ae5      4 INSTR BELONGTO 409ae0 
     409ae5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 28h 
     409ae5      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
@@ -10485,8 +10488,8 @@
     409c10      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
     409c10      0 FUNC MMSAFENESS SAFE
     409c10    113 FUNC GLOBAL sub_409C10 FUNC_UNSAFE NOFP RET     409c80 
-    409c10     24 DATAREF STACK 657 esp + 0 PARENT LocalFrame LOCALFRAME
-    409c10      4 DATAREF STACK 658 esp + 0 CHILDOF 657 OFFSET 0 OutArgsRegion OUTARGS
+    409c10     24 DATAREF STACK 656 esp + 0 PARENT LocalFrame LOCALFRAME
+    409c10      4 DATAREF STACK 657 esp + 0 CHILDOF 656 OFFSET 0 OutArgsRegion OUTARGS
     409c10      4 INSTR BELONGTO 409c10 
     409c10      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
     409c10      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -10564,7 +10567,7 @@
     409c95     -3 INSTR LOCAL NoWarn push    rbp 
     409c96      1 INSTR BELONGTO 409c90 
     409c96      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ push    rbx 
-    409c96     24 DATAREF STACK 659 esp + 0 PARENT LocalFrame LOCALFRAME
+    409c96     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     409c96      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     409c97      3 INSTR BELONGTO 409c90 
     409c97      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbx, rdi 
@@ -10705,7 +10708,7 @@
     409d52      3 INSTR BELONGTO 409d50 
     409d55     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     409d55      4 INSTR BELONGTO 409d50 
-    409d55      8 DATAREF STACK 660 esp + 0 PARENT LocalFrame LOCALFRAME
+    409d55      8 DATAREF STACK 658 esp + 0 PARENT LocalFrame LOCALFRAME
     409d55      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     409d59     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     409d59      3 INSTR BELONGTO 409d50 
@@ -10787,7 +10790,7 @@
     409e12      3 INSTR BELONGTO 409e10 
     409e15     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     409e15      4 INSTR BELONGTO 409e10 
-    409e15      8 DATAREF STACK 661 esp + 0 PARENT LocalFrame LOCALFRAME
+    409e15      8 DATAREF STACK 659 esp + 0 PARENT LocalFrame LOCALFRAME
     409e15      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     409e19     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     409e19      3 INSTR BELONGTO 409e10 
@@ -10903,7 +10906,7 @@
     409f07     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     409f07      4 INSTR BELONGTO 409f00 
     409f07      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    409f07      8 DATAREF STACK 662 esp + 0 PARENT LocalFrame LOCALFRAME
+    409f07      8 DATAREF STACK 660 esp + 0 PARENT LocalFrame LOCALFRAME
     409f07      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     409f0b     -1 INSTR LOCAL NoMetaUpdate call    sub_409C10 
     409f0b      5 INSTR BELONGTO 409f00 
@@ -11012,12 +11015,12 @@
     409faa      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
     409fad     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     409fad      5 INSTR BELONGTO 409fa0 
-    409fb2     24 DATAREF STACK 663 esp + 0 PARENT LocalFrame LOCALFRAME
+    409fb2     24 DATAREF STACK 661 esp + 0 PARENT LocalFrame LOCALFRAME
     409fb2      4 INSTR BELONGTO 409fa0 
     409fb2      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-    409fb2      8 DATAREF STACK 664 esp + 0 CHILDOF 663 OFFSET 0 LOCALVAR var_18 
-    409fb2      8 DATAREF STACK 665 esp + 8 CHILDOF 663 OFFSET 8 LOCALVAR var_10 
-    409fb2      8 DATAREF STACK 666 esp + 16 CHILDOF 663 OFFSET 16 LOCALVAR var_8 
+    409fb2      8 DATAREF STACK 662 esp + 0 CHILDOF 661 OFFSET 0 LOCALVAR var_18 
+    409fb2      8 DATAREF STACK 663 esp + 8 CHILDOF 661 OFFSET 8 LOCALVAR var_10 
+    409fb2      8 DATAREF STACK 664 esp + 16 CHILDOF 661 OFFSET 16 LOCALVAR var_8 
     409fb2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     409fb6      3 INSTR BELONGTO 409fa0 
     409fb6      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
@@ -11185,17 +11188,17 @@
     40a0d7      5 INSTR BELONGTO 40a0c0 
     40a0dc     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
     40a0dc      5 INSTR BELONGTO 40a0c0 
-    40a0e1     16 DATAREF STACK 669 esp + 8 CHILDOF 667 OFFSET 8 LOCALVAR var_40 
+    40a0e1     16 DATAREF STACK 667 esp + 8 CHILDOF 665 OFFSET 8 LOCALVAR var_40 
     40a0e1      4 INSTR BELONGTO 40a0c0 
     40a0e1      4 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 ZZ sub     rsp, 48h 
-    40a0e1     72 DATAREF STACK 667 esp + 0 PARENT LocalFrame LOCALFRAME
-    40a0e1      8 DATAREF STACK 668 esp + 0 CHILDOF 667 OFFSET 0 LOCALVAR var_48 
-    40a0e1      8 DATAREF STACK 670 esp + 24 CHILDOF 667 OFFSET 24 LOCALVAR var_30 
-    40a0e1      8 DATAREF STACK 671 esp + 32 CHILDOF 667 OFFSET 32 LOCALVAR var_28 
-    40a0e1      8 DATAREF STACK 672 esp + 40 CHILDOF 667 OFFSET 40 LOCALVAR var_20 
-    40a0e1      8 DATAREF STACK 673 esp + 48 CHILDOF 667 OFFSET 48 LOCALVAR var_18 
-    40a0e1      8 DATAREF STACK 674 esp + 56 CHILDOF 667 OFFSET 56 LOCALVAR var_10 
-    40a0e1      8 DATAREF STACK 675 esp + 64 CHILDOF 667 OFFSET 64 LOCALVAR var_8 
+    40a0e1     72 DATAREF STACK 665 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a0e1      8 DATAREF STACK 666 esp + 0 CHILDOF 665 OFFSET 0 LOCALVAR var_48 
+    40a0e1      8 DATAREF STACK 668 esp + 24 CHILDOF 665 OFFSET 24 LOCALVAR var_30 
+    40a0e1      8 DATAREF STACK 669 esp + 32 CHILDOF 665 OFFSET 32 LOCALVAR var_28 
+    40a0e1      8 DATAREF STACK 670 esp + 40 CHILDOF 665 OFFSET 40 LOCALVAR var_20 
+    40a0e1      8 DATAREF STACK 671 esp + 48 CHILDOF 665 OFFSET 48 LOCALVAR var_18 
+    40a0e1      8 DATAREF STACK 672 esp + 56 CHILDOF 665 OFFSET 56 LOCALVAR var_10 
+    40a0e1      8 DATAREF STACK 673 esp + 64 CHILDOF 665 OFFSET 64 LOCALVAR var_8 
     40a0e1      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     40a0e5      4 INSTR BELONGTO 40a0c0 
     40a0e5      4 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 ZZ mov     rax, [rdi+18h] 
@@ -11507,7 +11510,7 @@
     40a2f5     -3 INSTR LOCAL NoWarn push    rbp 
     40a2f6      1 INSTR BELONGTO 40a2f0 
     40a2f6      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ push    rbx 
-    40a2f6     24 DATAREF STACK 676 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a2f6     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40a2f6      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40a2f7      3 INSTR BELONGTO 40a2f0 
     40a2f7      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbx, rdi 
@@ -11671,19 +11674,19 @@
     40a3ca      5 INSTR BELONGTO 40a3b0 
     40a3cf     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_10], r14 
     40a3cf      5 INSTR BELONGTO 40a3b0 
-    40a3d4     16 DATAREF STACK 681 esp + 24 CHILDOF 677 OFFSET 24 LOCALVAR var_40 
+    40a3d4     16 DATAREF STACK 678 esp + 24 CHILDOF 674 OFFSET 24 LOCALVAR var_40 
     40a3d4      4 INSTR BELONGTO 40a3b0 
     40a3d4      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 R13 R14 ZZ sub     rsp, 58h 
-    40a3d4     88 DATAREF STACK 677 esp + 0 PARENT LocalFrame LOCALFRAME
-    40a3d4      8 DATAREF STACK 678 esp + 0 CHILDOF 677 OFFSET 0 LOCALVAR var_58 
-    40a3d4      8 DATAREF STACK 679 esp + 8 CHILDOF 677 OFFSET 8 LOCALVAR var_50 
-    40a3d4      8 DATAREF STACK 680 esp + 16 CHILDOF 677 OFFSET 16 LOCALVAR var_48 
-    40a3d4      8 DATAREF STACK 682 esp + 40 CHILDOF 677 OFFSET 40 LOCALVAR var_30 
-    40a3d4      8 DATAREF STACK 683 esp + 48 CHILDOF 677 OFFSET 48 LOCALVAR var_28 
-    40a3d4      8 DATAREF STACK 684 esp + 56 CHILDOF 677 OFFSET 56 LOCALVAR var_20 
-    40a3d4      8 DATAREF STACK 685 esp + 64 CHILDOF 677 OFFSET 64 LOCALVAR var_18 
-    40a3d4      8 DATAREF STACK 686 esp + 72 CHILDOF 677 OFFSET 72 LOCALVAR var_10 
-    40a3d4      8 DATAREF STACK 687 esp + 80 CHILDOF 677 OFFSET 80 LOCALVAR var_8 
+    40a3d4     88 DATAREF STACK 674 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a3d4      8 DATAREF STACK 675 esp + 0 CHILDOF 674 OFFSET 0 LOCALVAR var_58 
+    40a3d4      8 DATAREF STACK 676 esp + 8 CHILDOF 674 OFFSET 8 LOCALVAR var_50 
+    40a3d4      8 DATAREF STACK 677 esp + 16 CHILDOF 674 OFFSET 16 LOCALVAR var_48 
+    40a3d4      8 DATAREF STACK 679 esp + 40 CHILDOF 674 OFFSET 40 LOCALVAR var_30 
+    40a3d4      8 DATAREF STACK 680 esp + 48 CHILDOF 674 OFFSET 48 LOCALVAR var_28 
+    40a3d4      8 DATAREF STACK 681 esp + 56 CHILDOF 674 OFFSET 56 LOCALVAR var_20 
+    40a3d4      8 DATAREF STACK 682 esp + 64 CHILDOF 674 OFFSET 64 LOCALVAR var_18 
+    40a3d4      8 DATAREF STACK 683 esp + 72 CHILDOF 674 OFFSET 72 LOCALVAR var_10 
+    40a3d4      8 DATAREF STACK 684 esp + 80 CHILDOF 674 OFFSET 80 LOCALVAR var_8 
     40a3d4      8 MEMORYHOLE STACK esp + 88 ReturnAddress 
     40a3d8      3 INSTR BELONGTO 40a3b0 
     40a3d8      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 R13 R14 ZZ mov     r13, rsi 
@@ -12197,7 +12200,7 @@
     40a720      4 INSTR BELONGTO 40a720 
     40a720      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 8 
     40a720     61 FUNC GLOBAL sub_40A720 FUNC_UNSAFE NOFP RET     40a75c 
-    40a720      8 DATAREF STACK 688 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a720      8 DATAREF STACK 685 esp + 0 PARENT LocalFrame LOCALFRAME
     40a720      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40a724     -1 INSTR LOCAL MetadataUnused mov     rdi, cs:qword_60F830 
     40a724      7 INSTR BELONGTO 40a720 
@@ -12340,13 +12343,13 @@
     40a7ed      5 INSTR BELONGTO 40a7e0 
     40a7f2      4 INSTR BELONGTO 40a7e0 
     40a7f2      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 38h 
-    40a7f2     56 DATAREF STACK 689 esp + 0 PARENT LocalFrame LOCALFRAME
-    40a7f2      8 DATAREF STACK 690 esp + 8 CHILDOF 689 OFFSET 8 LOCALVAR var_30 
-    40a7f2      8 DATAREF STACK 691 esp + 16 CHILDOF 689 OFFSET 16 LOCALVAR var_28 
-    40a7f2      8 DATAREF STACK 692 esp + 24 CHILDOF 689 OFFSET 24 LOCALVAR var_20 
-    40a7f2      8 DATAREF STACK 693 esp + 32 CHILDOF 689 OFFSET 32 LOCALVAR var_18 
-    40a7f2      8 DATAREF STACK 694 esp + 40 CHILDOF 689 OFFSET 40 LOCALVAR var_10 
-    40a7f2      8 DATAREF STACK 695 esp + 48 CHILDOF 689 OFFSET 48 LOCALVAR var_8 
+    40a7f2     56 DATAREF STACK 686 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a7f2      8 DATAREF STACK 687 esp + 8 CHILDOF 686 OFFSET 8 LOCALVAR var_30 
+    40a7f2      8 DATAREF STACK 688 esp + 16 CHILDOF 686 OFFSET 16 LOCALVAR var_28 
+    40a7f2      8 DATAREF STACK 689 esp + 24 CHILDOF 686 OFFSET 24 LOCALVAR var_20 
+    40a7f2      8 DATAREF STACK 690 esp + 32 CHILDOF 686 OFFSET 32 LOCALVAR var_18 
+    40a7f2      8 DATAREF STACK 691 esp + 40 CHILDOF 686 OFFSET 40 LOCALVAR var_10 
+    40a7f2      8 DATAREF STACK 692 esp + 48 CHILDOF 686 OFFSET 48 LOCALVAR var_8 
     40a7f2      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40a7f6     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40a7f6      3 INSTR BELONGTO 40a7e0 
@@ -12480,10 +12483,10 @@
     40a8c3      3 INSTR DEADREGS  EFLAGS RCX RDX ZZ mov     rdx, rsi 
     40a8c6      5 INSTR BELONGTO 40a8c0 
     40a8c6      5 INSTR DEADREGS  EFLAGS RCX RSI ZZ mov     esi, offset aDesktopEntry; "Desktop Entry" 
-    40a8cb     16 DATAREF STACK 696 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a8cb     16 DATAREF STACK 693 esp + 0 PARENT LocalFrame LOCALFRAME
     40a8cb      4 INSTR BELONGTO 40a8c0 
     40a8cb      4 INSTR DEADREGS  EFLAGS RCX ZZ sub     rsp, 10h 
-    40a8cb      8 DATAREF STACK 697 esp + 8 CHILDOF 696 OFFSET 8 LOCALVAR var_10 
+    40a8cb      8 DATAREF STACK 694 esp + 8 CHILDOF 693 OFFSET 8 LOCALVAR var_10 
     40a8cb      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
     40a8cb      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40a8cf      5 INSTR BELONGTO 40a8c0 
@@ -12541,7 +12544,7 @@
     40a911     32 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40a911      4 INSTR BELONGTO 40a900 
     40a911      4 INSTR DEADREGS  EFLAGS R8 R12 R13 ZZ sub     rsp, 8 
-    40a911      8 DATAREF STACK 698 esp + 0 PARENT LocalFrame LOCALFRAME
+    40a911      8 DATAREF STACK 695 esp + 0 PARENT LocalFrame LOCALFRAME
     40a911      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40a915     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
     40a915      3 INSTR BELONGTO 40a900 
@@ -12710,13 +12713,12 @@
     40aa0d      2 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 ZZ pop     r13 
     40aa0f      1 INSTR BELONGTO 40a900 
     40aa0f      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 R13 ZZ retn 
-    40aa10      0 FUNC FRAMERESTORE 0 0 4 1 0 4 2 0 16 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 -4 0 15 0 0 ZZ
+    40aa10      0 FUNC FRAMERESTORE 0 0 4 1 0 4 2 0 16 3 -36 0 4 0 0 5 -28 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 -20 0 13 -12 0 14 -4 0 15 0 0 ZZ
     40aa10      0 FUNC MMSAFENESS SAFE
     40aa10    147 FUNC GLOBAL sub_40AA10 FUNC_UNSAFE NOFP RET     40aaa2 
-    40aa10     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40aa10      2 INSTR BELONGTO 40aa10 
     40aa10      2 INSTR DEADREGS  EFLAGS RAX ZZ push    r14 
-    40aa10      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
+    40aa10     -3 INSTR LOCAL NoWarn push    r14 
     40aa12     -1 INSTR LOCAL NoMetaUpdate test    rdx, rdx 
     40aa12      3 INSTR BELONGTO 40aa10 
     40aa15      3 INSTR BELONGTO 40aa10 
@@ -12724,16 +12726,21 @@
     40aa18      5 INSTR BELONGTO 40aa10 
     40aa18      5 INSTR DEADREGS  RAX ZZ mov     eax, 40B936h 
     40aa1d      2 INSTR BELONGTO 40aa10 
+    40aa1d     -3 INSTR LOCAL NoWarn push    r13 
     40aa1f      4 INSTR BELONGTO 40aa10 
     40aa1f      4 INSTR DEADREGS  R13 ZZ cmovz   r14, rax 
     40aa23      2 INSTR BELONGTO 40aa10 
     40aa23      2 INSTR DEADREGS  EFLAGS R13 ZZ push    r12 
+    40aa23     -3 INSTR LOCAL NoWarn push    r12 
     40aa25      1 INSTR BELONGTO 40aa10 
     40aa25      1 INSTR DEADREGS  EFLAGS R12 R13 ZZ push    rbp 
+    40aa25     -3 INSTR LOCAL NoWarn push    rbp 
     40aa26      3 INSTR BELONGTO 40aa10 
     40aa26      3 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     rbp, rsi 
     40aa29      1 INSTR BELONGTO 40aa10 
     40aa29      1 INSTR DEADREGS  EFLAGS R12 R13 ZZ push    rbx 
+    40aa29     40 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    40aa29      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40aa2a     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
     40aa2a      3 INSTR BELONGTO 40aa10 
     40aa2d     -1 INSTR LOCAL NoMetaUpdate call    _g_get_language_names 
@@ -12833,13 +12840,13 @@
     40aac1      5 INSTR BELONGTO 40aab0 
     40aac6      3 INSTR BELONGTO 40aab0 
     40aac6      3 INSTR DEADREGS  EFLAGS RDX RBX R12 R13 ZZ mov     rdx, rsi 
-    40aac9     40 DATAREF STACK 699 esp + 0 PARENT LocalFrame LOCALFRAME
+    40aac9     40 DATAREF STACK 696 esp + 0 PARENT LocalFrame LOCALFRAME
     40aac9      4 INSTR BELONGTO 40aab0 
     40aac9      4 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ sub     rsp, 28h 
-    40aac9      8 DATAREF STACK 700 esp + 8 CHILDOF 699 OFFSET 8 LOCALVAR var_20 
-    40aac9      8 DATAREF STACK 701 esp + 16 CHILDOF 699 OFFSET 16 LOCALVAR var_18 
-    40aac9      8 DATAREF STACK 702 esp + 24 CHILDOF 699 OFFSET 24 LOCALVAR var_10 
-    40aac9      8 DATAREF STACK 703 esp + 32 CHILDOF 699 OFFSET 32 LOCALVAR var_8 
+    40aac9      8 DATAREF STACK 697 esp + 8 CHILDOF 696 OFFSET 8 LOCALVAR var_20 
+    40aac9      8 DATAREF STACK 698 esp + 16 CHILDOF 696 OFFSET 16 LOCALVAR var_18 
+    40aac9      8 DATAREF STACK 699 esp + 24 CHILDOF 696 OFFSET 24 LOCALVAR var_10 
+    40aac9      8 DATAREF STACK 700 esp + 32 CHILDOF 696 OFFSET 32 LOCALVAR var_8 
     40aac9      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40aacd      3 INSTR BELONGTO 40aab0 
     40aacd      3 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ mov     r12, rsi 
@@ -12925,11 +12932,11 @@
     40ab5a     -2 INSTR LOCAL n ESI 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 704 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ab5f     24 DATAREF STACK 701 esp + 0 PARENT LocalFrame LOCALFRAME
     40ab5f      4 INSTR BELONGTO 40ab50 
     40ab5f      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-    40ab5f      8 DATAREF STACK 705 esp + 8 CHILDOF 704 OFFSET 8 LOCALVAR var_10 
-    40ab5f      8 DATAREF STACK 706 esp + 16 CHILDOF 704 OFFSET 16 LOCALVAR var_8 
+    40ab5f      8 DATAREF STACK 702 esp + 8 CHILDOF 701 OFFSET 8 LOCALVAR var_10 
+    40ab5f      8 DATAREF STACK 703 esp + 16 CHILDOF 701 OFFSET 16 LOCALVAR var_8 
     40ab5f      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40ab63      3 INSTR BELONGTO 40ab50 
     40ab63      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
@@ -13146,7 +13153,7 @@
     40ad52     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40ad52      4 INSTR BELONGTO 40ad50 
     40ad52      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-    40ad52      8 DATAREF STACK 707 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ad52      8 DATAREF STACK 704 esp + 0 PARENT LocalFrame LOCALFRAME
     40ad52      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40ad56     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_new 
     40ad56      5 INSTR BELONGTO 40ad50 
@@ -13288,7 +13295,7 @@
     40ae32     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40ae32      4 INSTR BELONGTO 40ae30 
     40ae32      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-    40ae32      8 DATAREF STACK 708 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ae32      8 DATAREF STACK 705 esp + 0 PARENT LocalFrame LOCALFRAME
     40ae32      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40ae36     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_new 
     40ae36      5 INSTR BELONGTO 40ae30 
@@ -13406,7 +13413,7 @@
     40aed0     48 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40aed0      4 INSTR BELONGTO 40aec0 
     40aed0      4 INSTR DEADREGS  EFLAGS RBX R14 R15 ZZ sub     rsp, 8 
-    40aed0      8 DATAREF STACK 709 esp + 0 PARENT LocalFrame LOCALFRAME
+    40aed0      8 DATAREF STACK 706 esp + 0 PARENT LocalFrame LOCALFRAME
     40aed0      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40aed4     -1 INSTR LOCAL NoMetaUpdate call    sub_40AE30 
     40aed4      5 INSTR BELONGTO 40aec0 
@@ -13759,7 +13766,7 @@
     40b210    116 FUNC GLOBAL sub_40B210 FUNC_UNSAFE NOFP RET     40b283 
     40b210      4 INSTR BELONGTO 40b210 
     40b210      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 8 
-    40b210      8 DATAREF STACK 710 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b210      8 DATAREF STACK 707 esp + 0 PARENT LocalFrame LOCALFRAME
     40b210      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40b214      7 INSTR BELONGTO 40b210 
     40b214      7 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, cs:qword_60F848 
@@ -13838,7 +13845,7 @@
     40b29a     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40b29a      4 INSTR BELONGTO 40b290 
     40b29a      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    40b29a      8 DATAREF STACK 711 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b29a      8 DATAREF STACK 708 esp + 0 PARENT LocalFrame LOCALFRAME
     40b29a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40b29e     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40b29e      3 INSTR BELONGTO 40b290 
@@ -14106,13 +14113,13 @@
     40b7b7      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
     40b7bc      4 INSTR BELONGTO 40b790 
     40b7bc      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-    40b7bc     56 DATAREF STACK 712 esp + 0 PARENT LocalFrame LOCALFRAME
-    40b7bc      8 DATAREF STACK 713 esp + 8 CHILDOF 712 OFFSET 8 LOCALVAR var_30 
-    40b7bc      8 DATAREF STACK 714 esp + 16 CHILDOF 712 OFFSET 16 LOCALVAR var_28 
-    40b7bc      8 DATAREF STACK 715 esp + 24 CHILDOF 712 OFFSET 24 LOCALVAR var_20 
-    40b7bc      8 DATAREF STACK 716 esp + 32 CHILDOF 712 OFFSET 32 LOCALVAR var_18 
-    40b7bc      8 DATAREF STACK 717 esp + 40 CHILDOF 712 OFFSET 40 LOCALVAR var_10 
-    40b7bc      8 DATAREF STACK 718 esp + 48 CHILDOF 712 OFFSET 48 LOCALVAR var_8 
+    40b7bc     56 DATAREF STACK 709 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b7bc      8 DATAREF STACK 710 esp + 8 CHILDOF 709 OFFSET 8 LOCALVAR var_30 
+    40b7bc      8 DATAREF STACK 711 esp + 16 CHILDOF 709 OFFSET 16 LOCALVAR var_28 
+    40b7bc      8 DATAREF STACK 712 esp + 24 CHILDOF 709 OFFSET 24 LOCALVAR var_20 
+    40b7bc      8 DATAREF STACK 713 esp + 32 CHILDOF 709 OFFSET 32 LOCALVAR var_18 
+    40b7bc      8 DATAREF STACK 714 esp + 40 CHILDOF 709 OFFSET 40 LOCALVAR var_10 
+    40b7bc      8 DATAREF STACK 715 esp + 48 CHILDOF 709 OFFSET 48 LOCALVAR var_8 
     40b7bc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40b7c0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
     40b7c0      3 INSTR BELONGTO 40b790 
@@ -14189,7 +14196,7 @@
     40b835     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40b835      4 INSTR BELONGTO 40b830 
     40b835      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    40b835      8 DATAREF STACK 719 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b835      8 DATAREF STACK 716 esp + 0 PARENT LocalFrame LOCALFRAME
     40b835      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40b839      7 INSTR BELONGTO 40b830 
     40b839      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_60EDA8 
@@ -14224,7 +14231,7 @@
     40b868     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     40b875 
     40b868      4 INSTR BELONGTO 40b868 
     40b868      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    40b868      8 DATAREF STACK 720 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b868      8 DATAREF STACK 717 esp + 0 PARENT LocalFrame LOCALFRAME
     40b868      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40b86c     -1 INSTR LOCAL NoMetaUpdate call    sub_405550 
     40b86c      5 INSTR BELONGTO 40b868 
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 e53bd8c1..46010e98 100644
--- a/tests/commit/trimmed-sorted-save-gnome-session-quit.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-session-quit.psexe.annot
@@ -444,12 +444,11 @@
     400aba     -1 INSTR LOCAL NoMetaUpdate call    _exit 
     400aba      5 INSTR BELONGTO 400930 
     400aba      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _exit 
-    400ac0      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
-    400ac0      0 FUNC MMSAFENESS UNSAFE
+    400ac0      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    400ac0      0 FUNC MMSAFENESS SAFE
     400ac0     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     400ac0      2 INSTR BELONGTO 400ac0 
     400ac0     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     400ae9 
-    400ac0      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     400ac2      3 INSTR BELONGTO 400ac0 
     400ac2      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     400ac5      1 INSTR BELONGTO 400ac0 
@@ -461,8 +460,11 @@
     400ac9      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     400acd      1 INSTR BELONGTO 400ac0 
     400acd      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    400acd     -3 INSTR LOCAL NoWarn push    rax 
+    400ace     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     400ace      1 INSTR BELONGTO 400ac0 
     400ace      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    400ace      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     400acf     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     400acf      7 INSTR BELONGTO 400ac0 
     400acf      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -557,14 +559,14 @@
     400b72      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     400b73      1 INSTR BELONGTO 400b10 
     400b73      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    400b80      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
+    400b80      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     400b80      0 FUNC MMSAFENESS UNSAFE
     400b80     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_601DF8, 0 
     400b80     34 FUNC GLOBAL sub_400B80 FUNC_UNSAFE USEFP RET     400ba1 
     400b80      8 INSTR BELONGTO 400b80 
-    400b80      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    400b80      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     400b88      1 INSTR BELONGTO 400b80 
+    400b88      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    400b88      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     400b89      3 INSTR BELONGTO 400b80 
     400b8c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_400BA0 
     400b8c      2 INSTR BELONGTO 400b80 
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 3fa14b12..addcec84 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 @@
-187e62d29289d96ec02cc4ee4ab599aa05b3e948
\ No newline at end of file
+8994b8d092e6ad383e335c549f832e8a30c064d6
\ 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 c3f98dd4..0638b14a 100644
--- a/tests/commit/trimmed-sorted-save-gnome-settings-daemon.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-settings-daemon.psexe.annot
@@ -1621,12 +1621,11 @@
     403950      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_log 
     403955     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40390B 
     403955      2 INSTR BELONGTO 403610 
-    403958      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
-    403958      0 FUNC MMSAFENESS UNSAFE
+    403958      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    403958      0 FUNC MMSAFENESS SAFE
     403958     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     403958      2 INSTR BELONGTO 403958 
     403958     42 FUNC GLOBAL _start FUNC_UNSAFE NOFP NORET     403981 
-    403958      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     40395a      3 INSTR BELONGTO 403958 
     40395a      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     40395d      1 INSTR BELONGTO 403958 
@@ -1638,8 +1637,11 @@
     403961      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     403965      1 INSTR BELONGTO 403958 
     403965      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    403965     -3 INSTR LOCAL NoWarn push    rax 
+    403966     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     403966      1 INSTR BELONGTO 403958 
     403966      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    403966      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     403967     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset __libc_csu_fini; fini 
     403967      7 INSTR BELONGTO 403958 
     403967      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset __libc_csu_fini; fini 
@@ -1734,14 +1736,14 @@
     403a02      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     403a03      1 INSTR BELONGTO 4039a0 
     403a03      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    403a10      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
+    403a10      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     403a10      0 FUNC MMSAFENESS UNSAFE
     403a10     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_607DB8, 0 
     403a10     34 FUNC GLOBAL sub_403A10 FUNC_UNSAFE USEFP RET     403a31 
     403a10      8 INSTR BELONGTO 403a10 
-    403a10      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    403a10      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     403a18      1 INSTR BELONGTO 403a10 
+    403a18      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    403a18      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     403a19      3 INSTR BELONGTO 403a10 
     403a1c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_403A30 
     403a1c      2 INSTR BELONGTO 403a10 
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 31d36507..95eb1828 100644
--- a/tests/commit/trimmed-sorted-save-gnome-sound-applet.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-sound-applet.psexe.annot
@@ -1267,8 +1267,8 @@
      10190      1 INSTR BELONGTO 10190 
      10190      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
      10190     -3 INSTR LOCAL NoWarn push    rbx 
-     10191     16 DATAREF STACK 1246 esp + 0 PARENT LocalFrame LOCALFRAME
-     10191      4 DATAREF STACK 1247 esp + 0 CHILDOF 1246 OFFSET 0 OutArgsRegion OUTARGS
+     10191     16 DATAREF STACK 1242 esp + 0 PARENT LocalFrame LOCALFRAME
+     10191      4 DATAREF STACK 1243 esp + 0 CHILDOF 1242 OFFSET 0 OutArgsRegion OUTARGS
      10191      4 INSTR BELONGTO 10190 
      10191      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
      10191      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -1350,7 +1350,7 @@
      10222      3 INSTR BELONGTO 10220 
      10225     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
      10225      4 INSTR BELONGTO 10220 
-     10225      8 DATAREF STACK 1248 esp + 0 PARENT LocalFrame LOCALFRAME
+     10225      8 DATAREF STACK 1244 esp + 0 PARENT LocalFrame LOCALFRAME
      10225      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
      10229     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
      10229      3 INSTR BELONGTO 10220 
@@ -1799,13 +1799,13 @@
      10c9e      5 INSTR BELONGTO 10c80 
      10ca3      4 INSTR BELONGTO 10c80 
      10ca3      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ sub     rsp, 38h 
-     10ca3     56 DATAREF STACK 1249 esp + 0 PARENT LocalFrame LOCALFRAME
-     10ca3      8 DATAREF STACK 1250 esp + 8 CHILDOF 1249 OFFSET 8 LOCALVAR var_30 
-     10ca3      8 DATAREF STACK 1251 esp + 16 CHILDOF 1249 OFFSET 16 LOCALVAR var_28 
-     10ca3      8 DATAREF STACK 1252 esp + 24 CHILDOF 1249 OFFSET 24 LOCALVAR var_20 
-     10ca3      8 DATAREF STACK 1253 esp + 32 CHILDOF 1249 OFFSET 32 LOCALVAR var_18 
-     10ca3      8 DATAREF STACK 1254 esp + 40 CHILDOF 1249 OFFSET 40 LOCALVAR var_10 
-     10ca3      8 DATAREF STACK 1255 esp + 48 CHILDOF 1249 OFFSET 48 LOCALVAR var_8 
+     10ca3     56 DATAREF STACK 1245 esp + 0 PARENT LocalFrame LOCALFRAME
+     10ca3      8 DATAREF STACK 1246 esp + 8 CHILDOF 1245 OFFSET 8 LOCALVAR var_30 
+     10ca3      8 DATAREF STACK 1247 esp + 16 CHILDOF 1245 OFFSET 16 LOCALVAR var_28 
+     10ca3      8 DATAREF STACK 1248 esp + 24 CHILDOF 1245 OFFSET 24 LOCALVAR var_20 
+     10ca3      8 DATAREF STACK 1249 esp + 32 CHILDOF 1245 OFFSET 32 LOCALVAR var_18 
+     10ca3      8 DATAREF STACK 1250 esp + 40 CHILDOF 1245 OFFSET 40 LOCALVAR var_10 
+     10ca3      8 DATAREF STACK 1251 esp + 48 CHILDOF 1245 OFFSET 48 LOCALVAR var_8 
      10ca3      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
      10ca7     -1 INSTR LOCAL NoMetaUpdate call    sub_10190 
      10ca7      5 INSTR BELONGTO 10c80 
@@ -2296,7 +2296,7 @@
      11007     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
      11007      4 INSTR BELONGTO 11000 
      11007      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-     11007      8 DATAREF STACK 1256 esp + 0 PARENT LocalFrame LOCALFRAME
+     11007      8 DATAREF STACK 1252 esp + 0 PARENT LocalFrame LOCALFRAME
      11007      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
      1100b     -1 INSTR LOCAL NoMetaUpdate call    sub_10190 
      1100b      5 INSTR BELONGTO 11000 
@@ -2392,8 +2392,8 @@
      110a0     -3 INSTR LOCAL NoWarn push    rbx 
      110a1     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
      110a1      3 INSTR BELONGTO 110a0 
-     110a4     16 DATAREF STACK 1257 esp + 0 PARENT LocalFrame LOCALFRAME
-     110a4     16 DATAREF STACK 1258 esp + 0 CHILDOF 1257 OFFSET 0 LOCALVAR var_18 
+     110a4     16 DATAREF STACK 1253 esp + 0 PARENT LocalFrame LOCALFRAME
+     110a4     16 DATAREF STACK 1254 esp + 0 CHILDOF 1253 OFFSET 0 LOCALVAR var_18 
      110a4      4 INSTR BELONGTO 110a0 
      110a4      4 INSTR DEADREGS  EFLAGS RAX R10 XMM1 ZZ sub     rsp, 10h 
      110a4      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -2473,15 +2473,15 @@
      11117     -3 INSTR LOCAL NoWarn push    rbx 
      11118      3 INSTR BELONGTO 11110 
      11118      3 INSTR DEADREGS  EFLAGS RBX R12 R13 XMM1 ZZ mov     rbx, rdi 
-     1111b     16 DATAREF STACK 1260 esp + 0 CHILDOF 1259 OFFSET 0 LOCALVAR var_68 
-     1111b     16 DATAREF STACK 1264 esp + 56 CHILDOF 1259 OFFSET 56 LOCALVAR var_30 
-     1111b     24 DATAREF STACK 1261 esp + 16 CHILDOF 1259 OFFSET 16 LOCALVAR var_58 
+     1111b     16 DATAREF STACK 1256 esp + 0 CHILDOF 1255 OFFSET 0 LOCALVAR var_68 
+     1111b     16 DATAREF STACK 1260 esp + 56 CHILDOF 1255 OFFSET 56 LOCALVAR var_30 
+     1111b     24 DATAREF STACK 1257 esp + 16 CHILDOF 1255 OFFSET 16 LOCALVAR var_58 
      1111b     32 MEMORYHOLE STACK esp + 72 CalleeSavedRegs 
      1111b      4 INSTR BELONGTO 11110 
      1111b      4 INSTR DEADREGS  EFLAGS R12 R13 XMM1 ZZ sub     rsp, 48h 
-     1111b     72 DATAREF STACK 1259 esp + 0 PARENT LocalFrame LOCALFRAME
-     1111b      8 DATAREF STACK 1262 esp + 40 CHILDOF 1259 OFFSET 40 LOCALVAR var_40 
-     1111b      8 DATAREF STACK 1263 esp + 48 CHILDOF 1259 OFFSET 48 LOCALVAR var_38 
+     1111b     72 DATAREF STACK 1255 esp + 0 PARENT LocalFrame LOCALFRAME
+     1111b      8 DATAREF STACK 1258 esp + 40 CHILDOF 1255 OFFSET 40 LOCALVAR var_40 
+     1111b      8 DATAREF STACK 1259 esp + 48 CHILDOF 1255 OFFSET 48 LOCALVAR var_38 
      1111b      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
      1111f     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
      1111f      3 INSTR BELONGTO 11110 
@@ -3017,8 +3017,8 @@
      11565      3 INSTR BELONGTO 11560 
      11565      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdx 
      11568     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-     11568     24 DATAREF STACK 1266 esp + 0 CHILDOF 1265 OFFSET 0 OutArgsRegion OUTARGS
-     11568     40 DATAREF STACK 1265 esp + 0 PARENT LocalFrame LOCALFRAME
+     11568     24 DATAREF STACK 1262 esp + 0 CHILDOF 1261 OFFSET 0 OutArgsRegion OUTARGS
+     11568     40 DATAREF STACK 1261 esp + 0 PARENT LocalFrame LOCALFRAME
      11568      4 INSTR BELONGTO 11560 
      11568      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 28h 
      11568      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
@@ -3781,8 +3781,8 @@
      122e4      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
      122e4     -3 INSTR LOCAL NoWarn push    rbx 
      122e5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-     122e5     24 DATAREF STACK 1267 esp + 0 PARENT LocalFrame LOCALFRAME
-     122e5      4 DATAREF STACK 1268 esp + 0 CHILDOF 1267 OFFSET 0 OutArgsRegion OUTARGS
+     122e5     24 DATAREF STACK 1263 esp + 0 PARENT LocalFrame LOCALFRAME
+     122e5      4 DATAREF STACK 1264 esp + 0 CHILDOF 1263 OFFSET 0 OutArgsRegion OUTARGS
      122e5      4 INSTR BELONGTO 122e0 
      122e5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
      122e5      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -4018,8 +4018,8 @@
      124c0      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
      124c0      0 FUNC MMSAFENESS SAFE
      124c0    122 FUNC GLOBAL sub_124C0 FUNC_UNSAFE NOFP RET      12539 
-     124c0     24 DATAREF STACK 1269 esp + 0 PARENT LocalFrame LOCALFRAME
-     124c0      4 DATAREF STACK 1270 esp + 0 CHILDOF 1269 OFFSET 0 OutArgsRegion OUTARGS
+     124c0     24 DATAREF STACK 1265 esp + 0 PARENT LocalFrame LOCALFRAME
+     124c0      4 DATAREF STACK 1266 esp + 0 CHILDOF 1265 OFFSET 0 OutArgsRegion OUTARGS
      124c0      4 INSTR BELONGTO 124c0 
      124c0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
      124c0      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -4141,7 +4141,7 @@
      126d2      3 INSTR BELONGTO 126d0 
      126d5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
      126d5      4 INSTR BELONGTO 126d0 
-     126d5      8 DATAREF STACK 1271 esp + 0 PARENT LocalFrame LOCALFRAME
+     126d5      8 DATAREF STACK 1267 esp + 0 PARENT LocalFrame LOCALFRAME
      126d5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
      126d9     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
      126d9      3 INSTR BELONGTO 126d0 
@@ -4397,12 +4397,12 @@
      12a4a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
      12a4d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
      12a4d      5 INSTR BELONGTO 12a40 
-     12a52     24 DATAREF STACK 1272 esp + 0 PARENT LocalFrame LOCALFRAME
+     12a52     24 DATAREF STACK 1268 esp + 0 PARENT LocalFrame LOCALFRAME
      12a52      4 INSTR BELONGTO 12a40 
      12a52      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-     12a52      8 DATAREF STACK 1273 esp + 0 CHILDOF 1272 OFFSET 0 LOCALVAR var_18 
-     12a52      8 DATAREF STACK 1274 esp + 8 CHILDOF 1272 OFFSET 8 LOCALVAR var_10 
-     12a52      8 DATAREF STACK 1275 esp + 16 CHILDOF 1272 OFFSET 16 LOCALVAR var_8 
+     12a52      8 DATAREF STACK 1269 esp + 0 CHILDOF 1268 OFFSET 0 LOCALVAR var_18 
+     12a52      8 DATAREF STACK 1270 esp + 8 CHILDOF 1268 OFFSET 8 LOCALVAR var_10 
+     12a52      8 DATAREF STACK 1271 esp + 16 CHILDOF 1268 OFFSET 16 LOCALVAR var_8 
      12a52      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
      12a56      3 INSTR BELONGTO 12a40 
      12a56      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
@@ -4521,12 +4521,12 @@
      12b6a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
      12b6d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
      12b6d      5 INSTR BELONGTO 12b60 
-     12b72     24 DATAREF STACK 1276 esp + 0 PARENT LocalFrame LOCALFRAME
+     12b72     24 DATAREF STACK 1272 esp + 0 PARENT LocalFrame LOCALFRAME
      12b72      4 INSTR BELONGTO 12b60 
      12b72      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-     12b72      8 DATAREF STACK 1277 esp + 0 CHILDOF 1276 OFFSET 0 LOCALVAR var_18 
-     12b72      8 DATAREF STACK 1278 esp + 8 CHILDOF 1276 OFFSET 8 LOCALVAR var_10 
-     12b72      8 DATAREF STACK 1279 esp + 16 CHILDOF 1276 OFFSET 16 LOCALVAR var_8 
+     12b72      8 DATAREF STACK 1273 esp + 0 CHILDOF 1272 OFFSET 0 LOCALVAR var_18 
+     12b72      8 DATAREF STACK 1274 esp + 8 CHILDOF 1272 OFFSET 8 LOCALVAR var_10 
+     12b72      8 DATAREF STACK 1275 esp + 16 CHILDOF 1272 OFFSET 16 LOCALVAR var_8 
      12b72      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
      12b76      3 INSTR BELONGTO 12b60 
      12b76      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
@@ -4663,7 +4663,7 @@
      12d05     -3 INSTR LOCAL NoWarn push    rbp 
      12d06      1 INSTR BELONGTO 12d00 
      12d06      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ push    rbx 
-     12d06     24 DATAREF STACK 1280 esp + 0 PARENT LocalFrame LOCALFRAME
+     12d06     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
      12d06      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
      12d07      3 INSTR BELONGTO 12d00 
      12d07      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 ZZ mov     rbx, rsi 
@@ -5142,7 +5142,7 @@
      132d8     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
      132d8      4 INSTR BELONGTO 132d0 
      132d8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-     132d8      8 DATAREF STACK 1281 esp + 0 PARENT LocalFrame LOCALFRAME
+     132d8      8 DATAREF STACK 1276 esp + 0 PARENT LocalFrame LOCALFRAME
      132d8      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
      132dc     -1 INSTR LOCAL NoMetaUpdate call    sub_124C0 
      132dc      5 INSTR BELONGTO 132d0 
@@ -5247,11 +5247,11 @@
      13380     89 FUNC GLOBAL sub_13380 FUNC_UNSAFE NOFP RET      133d8 
      13385     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], rbp 
      13385      5 INSTR BELONGTO 13380 
-     1338a     24 DATAREF STACK 1282 esp + 0 PARENT LocalFrame LOCALFRAME
+     1338a     24 DATAREF STACK 1277 esp + 0 PARENT LocalFrame LOCALFRAME
      1338a      4 INSTR BELONGTO 13380 
      1338a      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ sub     rsp, 18h 
-     1338a      8 DATAREF STACK 1283 esp + 8 CHILDOF 1282 OFFSET 8 LOCALVAR var_10 
-     1338a      8 DATAREF STACK 1284 esp + 16 CHILDOF 1282 OFFSET 16 LOCALVAR var_8 
+     1338a      8 DATAREF STACK 1278 esp + 8 CHILDOF 1277 OFFSET 8 LOCALVAR var_10 
+     1338a      8 DATAREF STACK 1279 esp + 16 CHILDOF 1277 OFFSET 16 LOCALVAR var_8 
      1338a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
      1338e      3 INSTR BELONGTO 13380 
      1338e      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbp, rdi 
@@ -5312,7 +5312,7 @@
      133e5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
      133e5      4 INSTR BELONGTO 133e0 
      133e5      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-     133e5      8 DATAREF STACK 1285 esp + 0 PARENT LocalFrame LOCALFRAME
+     133e5      8 DATAREF STACK 1280 esp + 0 PARENT LocalFrame LOCALFRAME
      133e5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
      133e9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
      133e9      5 INSTR BELONGTO 133e0 
@@ -5451,8 +5451,8 @@
      13650      1 INSTR BELONGTO 13650 
      13650      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
      13650     -3 INSTR LOCAL NoWarn push    rbx 
-     13651     16 DATAREF STACK 1286 esp + 0 PARENT LocalFrame LOCALFRAME
-     13651      4 DATAREF STACK 1287 esp + 0 CHILDOF 1286 OFFSET 0 OutArgsRegion OUTARGS
+     13651     16 DATAREF STACK 1281 esp + 0 PARENT LocalFrame LOCALFRAME
+     13651      4 DATAREF STACK 1282 esp + 0 CHILDOF 1281 OFFSET 0 OutArgsRegion OUTARGS
      13651      4 INSTR BELONGTO 13650 
      13651      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
      13651      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -5581,13 +5581,13 @@
      137ca      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
      137cd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
      137cd      5 INSTR BELONGTO 137c0 
-     137d2     16 DATAREF STACK 1289 esp + 0 CHILDOF 1288 OFFSET 0 OutArgsRegion OUTARGS
-     137d2     40 DATAREF STACK 1288 esp + 0 PARENT LocalFrame LOCALFRAME
+     137d2     16 DATAREF STACK 1284 esp + 0 CHILDOF 1283 OFFSET 0 OutArgsRegion OUTARGS
+     137d2     40 DATAREF STACK 1283 esp + 0 PARENT LocalFrame LOCALFRAME
      137d2      4 INSTR BELONGTO 137c0 
      137d2      4 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 28h 
-     137d2      8 DATAREF STACK 1290 esp + 16 CHILDOF 1288 OFFSET 16 LOCALVAR var_18 
-     137d2      8 DATAREF STACK 1291 esp + 24 CHILDOF 1288 OFFSET 24 LOCALVAR var_10 
-     137d2      8 DATAREF STACK 1292 esp + 32 CHILDOF 1288 OFFSET 32 LOCALVAR var_8 
+     137d2      8 DATAREF STACK 1285 esp + 16 CHILDOF 1283 OFFSET 16 LOCALVAR var_18 
+     137d2      8 DATAREF STACK 1286 esp + 24 CHILDOF 1283 OFFSET 24 LOCALVAR var_10 
+     137d2      8 DATAREF STACK 1287 esp + 32 CHILDOF 1283 OFFSET 32 LOCALVAR var_8 
      137d2      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
      137d6      2 INSTR BELONGTO 137c0 
      137d6      2 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ mov     ebp, esi 
@@ -5655,7 +5655,7 @@
      13845     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
      13845      4 INSTR BELONGTO 13840 
      13845      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-     13845      8 DATAREF STACK 1293 esp + 0 PARENT LocalFrame LOCALFRAME
+     13845      8 DATAREF STACK 1288 esp + 0 PARENT LocalFrame LOCALFRAME
      13845      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
      13849     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
      13849      5 INSTR BELONGTO 13840 
@@ -5794,8 +5794,8 @@
      13ab0      1 INSTR BELONGTO 13ab0 
      13ab0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
      13ab0     -3 INSTR LOCAL NoWarn push    rbx 
-     13ab1     16 DATAREF STACK 1294 esp + 0 PARENT LocalFrame LOCALFRAME
-     13ab1      4 DATAREF STACK 1295 esp + 0 CHILDOF 1294 OFFSET 0 OutArgsRegion OUTARGS
+     13ab1     16 DATAREF STACK 1289 esp + 0 PARENT LocalFrame LOCALFRAME
+     13ab1      4 DATAREF STACK 1290 esp + 0 CHILDOF 1289 OFFSET 0 OutArgsRegion OUTARGS
      13ab1      4 INSTR BELONGTO 13ab0 
      13ab1      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
      13ab1      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -5924,13 +5924,13 @@
      13c2a      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
      13c2d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
      13c2d      5 INSTR BELONGTO 13c20 
-     13c32     16 DATAREF STACK 1297 esp + 0 CHILDOF 1296 OFFSET 0 OutArgsRegion OUTARGS
-     13c32     40 DATAREF STACK 1296 esp + 0 PARENT LocalFrame LOCALFRAME
+     13c32     16 DATAREF STACK 1292 esp + 0 CHILDOF 1291 OFFSET 0 OutArgsRegion OUTARGS
+     13c32     40 DATAREF STACK 1291 esp + 0 PARENT LocalFrame LOCALFRAME
      13c32      4 INSTR BELONGTO 13c20 
      13c32      4 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 28h 
-     13c32      8 DATAREF STACK 1298 esp + 16 CHILDOF 1296 OFFSET 16 LOCALVAR var_18 
-     13c32      8 DATAREF STACK 1299 esp + 24 CHILDOF 1296 OFFSET 24 LOCALVAR var_10 
-     13c32      8 DATAREF STACK 1300 esp + 32 CHILDOF 1296 OFFSET 32 LOCALVAR var_8 
+     13c32      8 DATAREF STACK 1293 esp + 16 CHILDOF 1291 OFFSET 16 LOCALVAR var_18 
+     13c32      8 DATAREF STACK 1294 esp + 24 CHILDOF 1291 OFFSET 24 LOCALVAR var_10 
+     13c32      8 DATAREF STACK 1295 esp + 32 CHILDOF 1291 OFFSET 32 LOCALVAR var_8 
      13c32      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
      13c36      2 INSTR BELONGTO 13c20 
      13c36      2 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ mov     ebp, esi 
@@ -5998,7 +5998,7 @@
      13ca5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
      13ca5      4 INSTR BELONGTO 13ca0 
      13ca5      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-     13ca5      8 DATAREF STACK 1301 esp + 0 PARENT LocalFrame LOCALFRAME
+     13ca5      8 DATAREF STACK 1296 esp + 0 PARENT LocalFrame LOCALFRAME
      13ca5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
      13ca9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
      13ca9      5 INSTR BELONGTO 13ca0 
@@ -6103,8 +6103,8 @@
      13e30      1 INSTR BELONGTO 13e30 
      13e30      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
      13e30     -3 INSTR LOCAL NoWarn push    rbx 
-     13e31     16 DATAREF STACK 1302 esp + 0 PARENT LocalFrame LOCALFRAME
-     13e31      4 DATAREF STACK 1303 esp + 0 CHILDOF 1302 OFFSET 0 OutArgsRegion OUTARGS
+     13e31     16 DATAREF STACK 1297 esp + 0 PARENT LocalFrame LOCALFRAME
+     13e31      4 DATAREF STACK 1298 esp + 0 CHILDOF 1297 OFFSET 0 OutArgsRegion OUTARGS
      13e31      4 INSTR BELONGTO 13e30 
      13e31      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
      13e31      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -6233,13 +6233,13 @@
      13faa      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
      13fad     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
      13fad      5 INSTR BELONGTO 13fa0 
-     13fb2     16 DATAREF STACK 1305 esp + 0 CHILDOF 1304 OFFSET 0 OutArgsRegion OUTARGS
-     13fb2     40 DATAREF STACK 1304 esp + 0 PARENT LocalFrame LOCALFRAME
+     13fb2     16 DATAREF STACK 1300 esp + 0 CHILDOF 1299 OFFSET 0 OutArgsRegion OUTARGS
+     13fb2     40 DATAREF STACK 1299 esp + 0 PARENT LocalFrame LOCALFRAME
      13fb2      4 INSTR BELONGTO 13fa0 
      13fb2      4 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 28h 
-     13fb2      8 DATAREF STACK 1306 esp + 16 CHILDOF 1304 OFFSET 16 LOCALVAR var_18 
-     13fb2      8 DATAREF STACK 1307 esp + 24 CHILDOF 1304 OFFSET 24 LOCALVAR var_10 
-     13fb2      8 DATAREF STACK 1308 esp + 32 CHILDOF 1304 OFFSET 32 LOCALVAR var_8 
+     13fb2      8 DATAREF STACK 1301 esp + 16 CHILDOF 1299 OFFSET 16 LOCALVAR var_18 
+     13fb2      8 DATAREF STACK 1302 esp + 24 CHILDOF 1299 OFFSET 24 LOCALVAR var_10 
+     13fb2      8 DATAREF STACK 1303 esp + 32 CHILDOF 1299 OFFSET 32 LOCALVAR var_8 
      13fb2      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
      13fb6      2 INSTR BELONGTO 13fa0 
      13fb6      2 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ mov     ebp, esi 
@@ -6309,7 +6309,7 @@
      14045     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
      14045      4 INSTR BELONGTO 14040 
      14045      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-     14045      8 DATAREF STACK 1309 esp + 0 PARENT LocalFrame LOCALFRAME
+     14045      8 DATAREF STACK 1304 esp + 0 PARENT LocalFrame LOCALFRAME
      14045      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
      14049     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
      14049      5 INSTR BELONGTO 14040 
@@ -6369,8 +6369,8 @@
      140b0      1 INSTR BELONGTO 140b0 
      140b0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
      140b0     -3 INSTR LOCAL NoWarn push    rbx 
-     140b1     16 DATAREF STACK 1310 esp + 0 PARENT LocalFrame LOCALFRAME
-     140b1      4 DATAREF STACK 1311 esp + 0 CHILDOF 1310 OFFSET 0 OutArgsRegion OUTARGS
+     140b1     16 DATAREF STACK 1305 esp + 0 PARENT LocalFrame LOCALFRAME
+     140b1      4 DATAREF STACK 1306 esp + 0 CHILDOF 1305 OFFSET 0 OutArgsRegion OUTARGS
      140b1      4 INSTR BELONGTO 140b0 
      140b1      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
      140b1      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -6499,13 +6499,13 @@
      1422a      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
      1422d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
      1422d      5 INSTR BELONGTO 14220 
-     14232     16 DATAREF STACK 1313 esp + 0 CHILDOF 1312 OFFSET 0 OutArgsRegion OUTARGS
-     14232     40 DATAREF STACK 1312 esp + 0 PARENT LocalFrame LOCALFRAME
+     14232     16 DATAREF STACK 1308 esp + 0 CHILDOF 1307 OFFSET 0 OutArgsRegion OUTARGS
+     14232     40 DATAREF STACK 1307 esp + 0 PARENT LocalFrame LOCALFRAME
      14232      4 INSTR BELONGTO 14220 
      14232      4 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 28h 
-     14232      8 DATAREF STACK 1314 esp + 16 CHILDOF 1312 OFFSET 16 LOCALVAR var_18 
-     14232      8 DATAREF STACK 1315 esp + 24 CHILDOF 1312 OFFSET 24 LOCALVAR var_10 
-     14232      8 DATAREF STACK 1316 esp + 32 CHILDOF 1312 OFFSET 32 LOCALVAR var_8 
+     14232      8 DATAREF STACK 1309 esp + 16 CHILDOF 1307 OFFSET 16 LOCALVAR var_18 
+     14232      8 DATAREF STACK 1310 esp + 24 CHILDOF 1307 OFFSET 24 LOCALVAR var_10 
+     14232      8 DATAREF STACK 1311 esp + 32 CHILDOF 1307 OFFSET 32 LOCALVAR var_8 
      14232      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
      14236      2 INSTR BELONGTO 14220 
      14236      2 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ mov     ebp, esi 
@@ -6573,7 +6573,7 @@
      142a5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
      142a5      4 INSTR BELONGTO 142a0 
      142a5      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-     142a5      8 DATAREF STACK 1317 esp + 0 PARENT LocalFrame LOCALFRAME
+     142a5      8 DATAREF STACK 1312 esp + 0 PARENT LocalFrame LOCALFRAME
      142a5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
      142a9     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
      142a9      5 INSTR BELONGTO 142a0 
@@ -6707,8 +6707,8 @@
      14480      1 INSTR BELONGTO 14480 
      14480      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
      14480     -3 INSTR LOCAL NoWarn push    rbx 
-     14481     16 DATAREF STACK 1318 esp + 0 PARENT LocalFrame LOCALFRAME
-     14481      4 DATAREF STACK 1319 esp + 0 CHILDOF 1318 OFFSET 0 OutArgsRegion OUTARGS
+     14481     16 DATAREF STACK 1313 esp + 0 PARENT LocalFrame LOCALFRAME
+     14481      4 DATAREF STACK 1314 esp + 0 CHILDOF 1313 OFFSET 0 OutArgsRegion OUTARGS
      14481      4 INSTR BELONGTO 14480 
      14481      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
      14481      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -6945,13 +6945,13 @@
      1490a      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
      1490d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
      1490d      5 INSTR BELONGTO 14900 
-     14912     32 DATAREF STACK 1321 esp + 0 CHILDOF 1320 OFFSET 0 OutArgsRegion OUTARGS
+     14912     32 DATAREF STACK 1316 esp + 0 CHILDOF 1315 OFFSET 0 OutArgsRegion OUTARGS
      14912      4 INSTR BELONGTO 14900 
      14912      4 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 38h 
-     14912     56 DATAREF STACK 1320 esp + 0 PARENT LocalFrame LOCALFRAME
-     14912      8 DATAREF STACK 1322 esp + 32 CHILDOF 1320 OFFSET 32 LOCALVAR var_18 
-     14912      8 DATAREF STACK 1323 esp + 40 CHILDOF 1320 OFFSET 40 LOCALVAR var_10 
-     14912      8 DATAREF STACK 1324 esp + 48 CHILDOF 1320 OFFSET 48 LOCALVAR var_8 
+     14912     56 DATAREF STACK 1315 esp + 0 PARENT LocalFrame LOCALFRAME
+     14912      8 DATAREF STACK 1317 esp + 32 CHILDOF 1315 OFFSET 32 LOCALVAR var_18 
+     14912      8 DATAREF STACK 1318 esp + 40 CHILDOF 1315 OFFSET 40 LOCALVAR var_10 
+     14912      8 DATAREF STACK 1319 esp + 48 CHILDOF 1315 OFFSET 48 LOCALVAR var_8 
      14912      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
      14916      3 INSTR BELONGTO 14900 
      14916      3 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
@@ -7041,13 +7041,13 @@
      149b7      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
      149bc      4 INSTR BELONGTO 14990 
      149bc      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-     149bc     56 DATAREF STACK 1325 esp + 0 PARENT LocalFrame LOCALFRAME
-     149bc      8 DATAREF STACK 1326 esp + 8 CHILDOF 1325 OFFSET 8 LOCALVAR var_30 
-     149bc      8 DATAREF STACK 1327 esp + 16 CHILDOF 1325 OFFSET 16 LOCALVAR var_28 
-     149bc      8 DATAREF STACK 1328 esp + 24 CHILDOF 1325 OFFSET 24 LOCALVAR var_20 
-     149bc      8 DATAREF STACK 1329 esp + 32 CHILDOF 1325 OFFSET 32 LOCALVAR var_18 
-     149bc      8 DATAREF STACK 1330 esp + 40 CHILDOF 1325 OFFSET 40 LOCALVAR var_10 
-     149bc      8 DATAREF STACK 1331 esp + 48 CHILDOF 1325 OFFSET 48 LOCALVAR var_8 
+     149bc     56 DATAREF STACK 1320 esp + 0 PARENT LocalFrame LOCALFRAME
+     149bc      8 DATAREF STACK 1321 esp + 8 CHILDOF 1320 OFFSET 8 LOCALVAR var_30 
+     149bc      8 DATAREF STACK 1322 esp + 16 CHILDOF 1320 OFFSET 16 LOCALVAR var_28 
+     149bc      8 DATAREF STACK 1323 esp + 24 CHILDOF 1320 OFFSET 24 LOCALVAR var_20 
+     149bc      8 DATAREF STACK 1324 esp + 32 CHILDOF 1320 OFFSET 32 LOCALVAR var_18 
+     149bc      8 DATAREF STACK 1325 esp + 40 CHILDOF 1320 OFFSET 40 LOCALVAR var_10 
+     149bc      8 DATAREF STACK 1326 esp + 48 CHILDOF 1320 OFFSET 48 LOCALVAR var_8 
      149bc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
      149c0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
      149c0      3 INSTR BELONGTO 14990 
@@ -7124,7 +7124,7 @@
      14a35     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
      14a35      4 INSTR BELONGTO 14a30 
      14a35      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-     14a35      8 DATAREF STACK 1332 esp + 0 PARENT LocalFrame LOCALFRAME
+     14a35      8 DATAREF STACK 1327 esp + 0 PARENT LocalFrame LOCALFRAME
      14a35      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
      14a39      7 INSTR BELONGTO 14a30 
      14a39      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_21C418 
@@ -7159,7 +7159,7 @@
      14a68     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET      14a75 
      14a68      4 INSTR BELONGTO 14a68 
      14a68      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-     14a68      8 DATAREF STACK 1333 esp + 0 PARENT LocalFrame LOCALFRAME
+     14a68      8 DATAREF STACK 1328 esp + 0 PARENT LocalFrame LOCALFRAME
      14a68      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
      14a6c     -1 INSTR LOCAL NoMetaUpdate call    sub_6D80 
      14a6c      5 INSTR BELONGTO 14a68 
@@ -9105,12 +9105,11 @@
       6d30     -1 INSTR LOCAL NoMetaUpdate call    _exit 
       6d30      5 INSTR BELONGTO 6b50 
       6d30      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _exit 
-      6d38      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
-      6d38      0 FUNC MMSAFENESS UNSAFE
+      6d38      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+      6d38      0 FUNC MMSAFENESS SAFE
       6d38     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
       6d38      2 INSTR BELONGTO 6d38 
       6d38     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET       6d61 
-      6d38      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
       6d3a      3 INSTR BELONGTO 6d38 
       6d3a      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
       6d3d      1 INSTR BELONGTO 6d38 
@@ -9122,8 +9121,11 @@
       6d41      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
       6d45      1 INSTR BELONGTO 6d38 
       6d45      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+      6d45     -3 INSTR LOCAL NoWarn push    rax 
+      6d46     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
       6d46      1 INSTR BELONGTO 6d38 
       6d46      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+      6d46      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
       6d47      7 INSTR BELONGTO 6d38 
       6d47      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, cs:fini     ; fini 
       6d4e      7 INSTR BELONGTO 6d38 
@@ -9168,10 +9170,9 @@
       6d88      3 INSTR BELONGTO 6d80 
       6d8b      2 INSTR BELONGTO 6d80 
       6d8b     -3 INSTR LOCAL NoWarn push    r12 
-      6d8d     16 DATAREF STACK 1082 esp + 0 PARENT LocalFrame LOCALFRAME
       6d8d      1 INSTR BELONGTO 6d80 
       6d8d      1 INSTR DEADREGS  R12 ZZ push    rbx 
-      6d8d      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
+      6d8d     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
       6d8d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       6d8e     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_6DF2 
       6d8e      2 INSTR BELONGTO 6d80 
@@ -9223,14 +9224,14 @@
       6df5      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ pop     rbp 
       6df6      1 INSTR BELONGTO 6d80 
       6df6      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 R12 ZZ retn 
-      6e00      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
+      6e00      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
       6e00      0 FUNC MMSAFENESS UNSAFE
       6e00     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_21C438, 0 
       6e00     42 FUNC GLOBAL sub_6E00 FUNC_UNSAFE USEFP RET       6e29 
       6e00      8 INSTR BELONGTO 6e00 
-      6e00      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-      6e00      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       6e08      1 INSTR BELONGTO 6e00 
+      6e08      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+      6e08      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       6e09      3 INSTR BELONGTO 6e00 
       6e0c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_6E28 
       6e0c      2 INSTR BELONGTO 6e00 
@@ -9264,18 +9265,18 @@
       6e47      5 INSTR BELONGTO 6e30 
       6e4c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
       6e4c      5 INSTR BELONGTO 6e30 
-      6e51     16 DATAREF STACK 1086 esp + 24 CHILDOF 1083 OFFSET 24 LOCALVAR var_40 
+      6e51     16 DATAREF STACK 1085 esp + 24 CHILDOF 1082 OFFSET 24 LOCALVAR var_40 
       6e51      4 INSTR BELONGTO 6e30 
       6e51      4 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 ZZ sub     rsp, 58h 
-      6e51     88 DATAREF STACK 1083 esp + 0 PARENT LocalFrame LOCALFRAME
-      6e51      8 DATAREF STACK 1084 esp + 8 CHILDOF 1083 OFFSET 8 LOCALVAR var_50 
-      6e51      8 DATAREF STACK 1085 esp + 16 CHILDOF 1083 OFFSET 16 LOCALVAR var_48 
-      6e51      8 DATAREF STACK 1087 esp + 40 CHILDOF 1083 OFFSET 40 LOCALVAR var_30 
-      6e51      8 DATAREF STACK 1088 esp + 48 CHILDOF 1083 OFFSET 48 LOCALVAR var_28 
-      6e51      8 DATAREF STACK 1089 esp + 56 CHILDOF 1083 OFFSET 56 LOCALVAR var_20 
-      6e51      8 DATAREF STACK 1090 esp + 64 CHILDOF 1083 OFFSET 64 LOCALVAR var_18 
-      6e51      8 DATAREF STACK 1091 esp + 72 CHILDOF 1083 OFFSET 72 LOCALVAR var_10 
-      6e51      8 DATAREF STACK 1092 esp + 80 CHILDOF 1083 OFFSET 80 LOCALVAR var_8 
+      6e51     88 DATAREF STACK 1082 esp + 0 PARENT LocalFrame LOCALFRAME
+      6e51      8 DATAREF STACK 1083 esp + 8 CHILDOF 1082 OFFSET 8 LOCALVAR var_50 
+      6e51      8 DATAREF STACK 1084 esp + 16 CHILDOF 1082 OFFSET 16 LOCALVAR var_48 
+      6e51      8 DATAREF STACK 1086 esp + 40 CHILDOF 1082 OFFSET 40 LOCALVAR var_30 
+      6e51      8 DATAREF STACK 1087 esp + 48 CHILDOF 1082 OFFSET 48 LOCALVAR var_28 
+      6e51      8 DATAREF STACK 1088 esp + 56 CHILDOF 1082 OFFSET 56 LOCALVAR var_20 
+      6e51      8 DATAREF STACK 1089 esp + 64 CHILDOF 1082 OFFSET 64 LOCALVAR var_18 
+      6e51      8 DATAREF STACK 1090 esp + 72 CHILDOF 1082 OFFSET 72 LOCALVAR var_10 
+      6e51      8 DATAREF STACK 1091 esp + 80 CHILDOF 1082 OFFSET 80 LOCALVAR var_8 
       6e51      8 MEMORYHOLE STACK esp + 88 ReturnAddress 
       6e55      4 INSTR BELONGTO 6e30 
       6e55      4 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 R15 ZZ mov     rax, [rdi+20h] 
@@ -9625,7 +9626,7 @@
       7105     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       7105      4 INSTR BELONGTO 7100 
       7105      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-      7105      8 DATAREF STACK 1093 esp + 0 PARENT LocalFrame LOCALFRAME
+      7105      8 DATAREF STACK 1092 esp + 0 PARENT LocalFrame LOCALFRAME
       7105      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       7109     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
       7109      3 INSTR BELONGTO 7100 
@@ -9799,7 +9800,7 @@
       7215     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       7215      4 INSTR BELONGTO 7210 
       7215      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-      7215      8 DATAREF STACK 1094 esp + 0 PARENT LocalFrame LOCALFRAME
+      7215      8 DATAREF STACK 1093 esp + 0 PARENT LocalFrame LOCALFRAME
       7215      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       7219     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
       7219      5 INSTR BELONGTO 7210 
@@ -9946,7 +9947,7 @@
       7328     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       7328      4 INSTR BELONGTO 7320 
       7328      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-      7328      8 DATAREF STACK 1095 esp + 0 PARENT LocalFrame LOCALFRAME
+      7328      8 DATAREF STACK 1094 esp + 0 PARENT LocalFrame LOCALFRAME
       7328      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       732c     -1 INSTR LOCAL NoMetaUpdate call    sub_10190 
       732c      5 INSTR BELONGTO 7320 
@@ -10018,11 +10019,11 @@
       7390     65 FUNC GLOBAL sub_7390 FUNC_UNSAFE NOFP RET       73d0 
       7395     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], rbp 
       7395      5 INSTR BELONGTO 7390 
-      739a     24 DATAREF STACK 1096 esp + 0 PARENT LocalFrame LOCALFRAME
+      739a     24 DATAREF STACK 1095 esp + 0 PARENT LocalFrame LOCALFRAME
       739a      4 INSTR BELONGTO 7390 
       739a      4 INSTR DEADREGS  EFLAGS RAX RCX RBX RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-      739a      8 DATAREF STACK 1097 esp + 8 CHILDOF 1096 OFFSET 8 LOCALVAR var_10 
-      739a      8 DATAREF STACK 1098 esp + 16 CHILDOF 1096 OFFSET 16 LOCALVAR var_8 
+      739a      8 DATAREF STACK 1096 esp + 8 CHILDOF 1095 OFFSET 8 LOCALVAR var_10 
+      739a      8 DATAREF STACK 1097 esp + 16 CHILDOF 1095 OFFSET 16 LOCALVAR var_8 
       739a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       739e     -1 INSTR LOCAL MetadataUnused mov     rbp, rdx 
       739e      3 INSTR BELONGTO 7390 
@@ -10060,7 +10061,7 @@
       73e0     21 FUNC GLOBAL sub_73E0 FUNC_UNSAFE NOFP RET       73f4 
       73e0      4 INSTR BELONGTO 73e0 
       73e0      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 8 
-      73e0      8 DATAREF STACK 1099 esp + 0 PARENT LocalFrame LOCALFRAME
+      73e0      8 DATAREF STACK 1098 esp + 0 PARENT LocalFrame LOCALFRAME
       73e0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       73e4      2 INSTR BELONGTO 73e0 
       73e4      2 INSTR DEADREGS  EFLAGS RDI ZZ xor     edi, edi 
@@ -10188,7 +10189,7 @@
       7698     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       7698      4 INSTR BELONGTO 7690 
       7698      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-      7698      8 DATAREF STACK 1100 esp + 0 PARENT LocalFrame LOCALFRAME
+      7698      8 DATAREF STACK 1099 esp + 0 PARENT LocalFrame LOCALFRAME
       7698      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       769c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_check_menu_item_get_type 
       769c      5 INSTR BELONGTO 7690 
@@ -10233,12 +10234,13 @@
       76d6     -1 INSTR LOCAL NoMetaUpdate jmp     sub_11000 
       76d6      5 INSTR BELONGTO 7690 
       76d6      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     sub_11000 
-      76e0      0 FUNC FRAMERESTORE 0 0 96 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
+      76e0      0 FUNC FRAMERESTORE 0 0 96 1 0 0 2 0 0 3 -4 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
       76e0      0 FUNC MMSAFENESS SAFE
       76e0      1 INSTR BELONGTO 76e0 
       76e0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
-      76e0     -3 INSTR LOCAL NoWarn push    rbx 
       76e0     73 FUNC GLOBAL sub_76E0 FUNC_UNSAFE NOFP RET       7728 
+      76e0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+      76e0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       76e1     -1 INSTR LOCAL MetadataUnused mov     rax, [rsi+20h] 
       76e1      4 INSTR BELONGTO 76e0 
       76e5     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
@@ -10291,11 +10293,11 @@
       7735      5 INSTR BELONGTO 7730 
       7735      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+var_8], rbp 
       7735      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
-      773a     24 DATAREF STACK 1101 esp + 0 PARENT LocalFrame LOCALFRAME
+      773a     24 DATAREF STACK 1100 esp + 0 PARENT LocalFrame LOCALFRAME
       773a      4 INSTR BELONGTO 7730 
       773a      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-      773a      8 DATAREF STACK 1102 esp + 8 CHILDOF 1101 OFFSET 8 LOCALVAR var_10 
-      773a      8 DATAREF STACK 1103 esp + 16 CHILDOF 1101 OFFSET 16 LOCALVAR var_8 
+      773a      8 DATAREF STACK 1101 esp + 8 CHILDOF 1100 OFFSET 8 LOCALVAR var_10 
+      773a      8 DATAREF STACK 1102 esp + 16 CHILDOF 1100 OFFSET 16 LOCALVAR var_8 
       773a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       773e     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rsi+1Ch], 0FF1Bh 
       773e      7 INSTR BELONGTO 7730 
@@ -10395,8 +10397,8 @@
       783a     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
       783c     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
       783c      3 INSTR BELONGTO 7830 
-      783f     16 DATAREF STACK 1104 esp + 0 PARENT LocalFrame LOCALFRAME
-      783f      4 DATAREF STACK 1105 esp + 12 CHILDOF 1104 OFFSET 12 LOCALVAR var_C 
+      783f     16 DATAREF STACK 1103 esp + 0 PARENT LocalFrame LOCALFRAME
+      783f      4 DATAREF STACK 1104 esp + 12 CHILDOF 1103 OFFSET 12 LOCALVAR var_C 
       783f      4 INSTR BELONGTO 7830 
       783f      4 INSTR DEADREGS  EFLAGS RDX ZZ sub     rsp, 10h 
       783f      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -10542,8 +10544,8 @@
       7b30      1 INSTR BELONGTO 7b30 
       7b30      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
       7b30     -3 INSTR LOCAL NoWarn push    rbx 
-      7b31     16 DATAREF STACK 1106 esp + 0 PARENT LocalFrame LOCALFRAME
-      7b31      4 DATAREF STACK 1107 esp + 0 CHILDOF 1106 OFFSET 0 OutArgsRegion OUTARGS
+      7b31     16 DATAREF STACK 1105 esp + 0 PARENT LocalFrame LOCALFRAME
+      7b31      4 DATAREF STACK 1106 esp + 0 CHILDOF 1105 OFFSET 0 OutArgsRegion OUTARGS
       7b31      4 INSTR BELONGTO 7b30 
       7b31      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
       7b31      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -10670,7 +10672,7 @@
       7d02      3 INSTR BELONGTO 7d00 
       7d05     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       7d05      4 INSTR BELONGTO 7d00 
-      7d05      8 DATAREF STACK 1108 esp + 0 PARENT LocalFrame LOCALFRAME
+      7d05      8 DATAREF STACK 1107 esp + 0 PARENT LocalFrame LOCALFRAME
       7d05      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       7d09     -1 INSTR LOCAL NoMetaUpdate call    sub_7B30 
       7d09      5 INSTR BELONGTO 7d00 
@@ -10941,12 +10943,12 @@
       824a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
       824d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
       824d      5 INSTR BELONGTO 8240 
-      8252     24 DATAREF STACK 1109 esp + 0 PARENT LocalFrame LOCALFRAME
+      8252     24 DATAREF STACK 1108 esp + 0 PARENT LocalFrame LOCALFRAME
       8252      4 INSTR BELONGTO 8240 
       8252      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-      8252      8 DATAREF STACK 1110 esp + 0 CHILDOF 1109 OFFSET 0 LOCALVAR var_18 
-      8252      8 DATAREF STACK 1111 esp + 8 CHILDOF 1109 OFFSET 8 LOCALVAR var_10 
-      8252      8 DATAREF STACK 1112 esp + 16 CHILDOF 1109 OFFSET 16 LOCALVAR var_8 
+      8252      8 DATAREF STACK 1109 esp + 0 CHILDOF 1108 OFFSET 0 LOCALVAR var_18 
+      8252      8 DATAREF STACK 1110 esp + 8 CHILDOF 1108 OFFSET 8 LOCALVAR var_10 
+      8252      8 DATAREF STACK 1111 esp + 16 CHILDOF 1108 OFFSET 16 LOCALVAR var_8 
       8252      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       8256      3 INSTR BELONGTO 8240 
       8256      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
@@ -11040,10 +11042,10 @@
       8305      3 INSTR BELONGTO 8300 
       8305      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbx, rdi 
       8308     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-      8308     24 DATAREF STACK 1113 esp + 0 PARENT LocalFrame LOCALFRAME
+      8308     24 DATAREF STACK 1112 esp + 0 PARENT LocalFrame LOCALFRAME
       8308      4 INSTR BELONGTO 8300 
       8308      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-      8308      8 DATAREF STACK 1114 esp + 0 CHILDOF 1113 OFFSET 0 OutArgsRegion OUTARGS
+      8308      8 DATAREF STACK 1113 esp + 0 CHILDOF 1112 OFFSET 0 OutArgsRegion OUTARGS
       8308      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
       830c     -1 INSTR LOCAL NoMetaUpdate call    sub_7B30 
       830c      5 INSTR BELONGTO 8300 
@@ -11335,11 +11337,11 @@
       8600     91 FUNC GLOBAL sub_8600 FUNC_UNSAFE NOFP RET       865a 
       8605     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], rbp 
       8605      5 INSTR BELONGTO 8600 
-      860a     24 DATAREF STACK 1115 esp + 0 PARENT LocalFrame LOCALFRAME
+      860a     24 DATAREF STACK 1114 esp + 0 PARENT LocalFrame LOCALFRAME
       860a      4 INSTR BELONGTO 8600 
       860a      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ sub     rsp, 18h 
-      860a      8 DATAREF STACK 1116 esp + 8 CHILDOF 1115 OFFSET 8 LOCALVAR var_10 
-      860a      8 DATAREF STACK 1117 esp + 16 CHILDOF 1115 OFFSET 16 LOCALVAR var_8 
+      860a      8 DATAREF STACK 1115 esp + 8 CHILDOF 1114 OFFSET 8 LOCALVAR var_10 
+      860a      8 DATAREF STACK 1116 esp + 16 CHILDOF 1114 OFFSET 16 LOCALVAR var_8 
       860a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       860e      3 INSTR BELONGTO 8600 
       860e      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
@@ -11405,7 +11407,7 @@
       8669     -3 INSTR LOCAL NoWarn push    rbp 
       866a      1 INSTR BELONGTO 8660 
       866a      1 INSTR DEADREGS  EFLAGS RAX R13 R14 ZZ push    rbx 
-      866a     40 DATAREF STACK 1118 esp + 0 PARENT LocalFrame LOCALFRAME
+      866a     40 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
       866a      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
       866b      4 INSTR BELONGTO 8660 
       866b      4 INSTR DEADREGS  EFLAGS RAX RBX R13 R14 ZZ mov     rax, [rdi+18h] 
@@ -11713,8 +11715,8 @@
       8883      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ jmp     short sub_8830 
       8890      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
       8890      0 FUNC MMSAFENESS UNSAFE
-      8890     16 DATAREF STACK 1120 esp + 8 CHILDOF 1119 OFFSET 8 LOCALVAR var_10 
-      8890     24 DATAREF STACK 1119 esp + 0 PARENT LocalFrame LOCALFRAME
+      8890     16 DATAREF STACK 1118 esp + 8 CHILDOF 1117 OFFSET 8 LOCALVAR var_10 
+      8890     24 DATAREF STACK 1117 esp + 0 PARENT LocalFrame LOCALFRAME
       8890      4 INSTR BELONGTO 8890 
       8890     86 FUNC GLOBAL sub_8890 FUNC_UNSAFE NOFP RET       88e5 
       8890      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -11755,8 +11757,8 @@
       88f0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
       88f0      0 FUNC MMSAFENESS SAFE
       88f0    122 FUNC GLOBAL sub_88F0 FUNC_UNSAFE NOFP RET       8969 
-      88f0     24 DATAREF STACK 1121 esp + 0 PARENT LocalFrame LOCALFRAME
-      88f0      4 DATAREF STACK 1122 esp + 0 CHILDOF 1121 OFFSET 0 OutArgsRegion OUTARGS
+      88f0     24 DATAREF STACK 1119 esp + 0 PARENT LocalFrame LOCALFRAME
+      88f0      4 DATAREF STACK 1120 esp + 0 CHILDOF 1119 OFFSET 0 OutArgsRegion OUTARGS
       88f0      4 INSTR BELONGTO 88f0 
       88f0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
       88f0      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -11859,7 +11861,7 @@
       8a92      3 INSTR BELONGTO 8a90 
       8a95     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       8a95      4 INSTR BELONGTO 8a90 
-      8a95      8 DATAREF STACK 1123 esp + 0 PARENT LocalFrame LOCALFRAME
+      8a95      8 DATAREF STACK 1121 esp + 0 PARENT LocalFrame LOCALFRAME
       8a95      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       8a99     -1 INSTR LOCAL NoMetaUpdate call    sub_88F0 
       8a99      5 INSTR BELONGTO 8a90 
@@ -12142,8 +12144,8 @@
       8e24      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
       8e24     -3 INSTR LOCAL NoWarn push    rbx 
       8e25     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-      8e25     24 DATAREF STACK 1124 esp + 0 PARENT LocalFrame LOCALFRAME
-      8e25      4 DATAREF STACK 1125 esp + 0 CHILDOF 1124 OFFSET 0 OutArgsRegion OUTARGS
+      8e25     24 DATAREF STACK 1122 esp + 0 PARENT LocalFrame LOCALFRAME
+      8e25      4 DATAREF STACK 1123 esp + 0 CHILDOF 1122 OFFSET 0 OutArgsRegion OUTARGS
       8e25      4 INSTR BELONGTO 8e20 
       8e25      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
       8e25      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -12656,8 +12658,8 @@
       9250      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
       9250      0 FUNC MMSAFENESS SAFE
       9250    122 FUNC GLOBAL sub_9250 FUNC_UNSAFE NOFP RET       92c9 
-      9250     24 DATAREF STACK 1126 esp + 0 PARENT LocalFrame LOCALFRAME
-      9250      4 DATAREF STACK 1127 esp + 0 CHILDOF 1126 OFFSET 0 OutArgsRegion OUTARGS
+      9250     24 DATAREF STACK 1124 esp + 0 PARENT LocalFrame LOCALFRAME
+      9250      4 DATAREF STACK 1125 esp + 0 CHILDOF 1124 OFFSET 0 OutArgsRegion OUTARGS
       9250      4 INSTR BELONGTO 9250 
       9250      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
       9250      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -12815,7 +12817,7 @@
       95a2      3 INSTR BELONGTO 95a0 
       95a5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       95a5      4 INSTR BELONGTO 95a0 
-      95a5      8 DATAREF STACK 1128 esp + 0 PARENT LocalFrame LOCALFRAME
+      95a5      8 DATAREF STACK 1126 esp + 0 PARENT LocalFrame LOCALFRAME
       95a5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       95a9     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
       95a9      3 INSTR BELONGTO 95a0 
@@ -13376,7 +13378,7 @@
       9a53     -3 INSTR LOCAL NoWarn push    rbx 
       9a54      3 INSTR BELONGTO 9a50 
       9a54      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbx, rdi 
-      9a57    152 DATAREF STACK 1129 esp + 0 PARENT LocalFrame LOCALFRAME
+      9a57    152 DATAREF STACK 1127 esp + 0 PARENT LocalFrame LOCALFRAME
       9a57     16 MEMORYHOLE STACK esp + 152 CalleeSavedRegs 
       9a57      7 INSTR BELONGTO 9a50 
       9a57      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 98h 
@@ -13695,12 +13697,12 @@
       9d0a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
       9d0d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
       9d0d      5 INSTR BELONGTO 9d00 
-      9d12     24 DATAREF STACK 1130 esp + 0 PARENT LocalFrame LOCALFRAME
+      9d12     24 DATAREF STACK 1128 esp + 0 PARENT LocalFrame LOCALFRAME
       9d12      4 INSTR BELONGTO 9d00 
       9d12      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-      9d12      8 DATAREF STACK 1131 esp + 0 CHILDOF 1130 OFFSET 0 LOCALVAR var_18 
-      9d12      8 DATAREF STACK 1132 esp + 8 CHILDOF 1130 OFFSET 8 LOCALVAR var_10 
-      9d12      8 DATAREF STACK 1133 esp + 16 CHILDOF 1130 OFFSET 16 LOCALVAR var_8 
+      9d12      8 DATAREF STACK 1129 esp + 0 CHILDOF 1128 OFFSET 0 LOCALVAR var_18 
+      9d12      8 DATAREF STACK 1130 esp + 8 CHILDOF 1128 OFFSET 8 LOCALVAR var_10 
+      9d12      8 DATAREF STACK 1131 esp + 16 CHILDOF 1128 OFFSET 16 LOCALVAR var_8 
       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 
@@ -13802,12 +13804,12 @@
       9dba      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
       9dbd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
       9dbd      5 INSTR BELONGTO 9db0 
-      9dc2     24 DATAREF STACK 1134 esp + 0 PARENT LocalFrame LOCALFRAME
+      9dc2     24 DATAREF STACK 1132 esp + 0 PARENT LocalFrame LOCALFRAME
       9dc2      4 INSTR BELONGTO 9db0 
       9dc2      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-      9dc2      8 DATAREF STACK 1135 esp + 0 CHILDOF 1134 OFFSET 0 LOCALVAR var_18 
-      9dc2      8 DATAREF STACK 1136 esp + 8 CHILDOF 1134 OFFSET 8 LOCALVAR var_10 
-      9dc2      8 DATAREF STACK 1137 esp + 16 CHILDOF 1134 OFFSET 16 LOCALVAR var_8 
+      9dc2      8 DATAREF STACK 1133 esp + 0 CHILDOF 1132 OFFSET 0 LOCALVAR var_18 
+      9dc2      8 DATAREF STACK 1134 esp + 8 CHILDOF 1132 OFFSET 8 LOCALVAR var_10 
+      9dc2      8 DATAREF STACK 1135 esp + 16 CHILDOF 1132 OFFSET 16 LOCALVAR var_8 
       9dc2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       9dc6      2 INSTR BELONGTO 9db0 
       9dc6      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ mov     ebp, esi 
@@ -14030,12 +14032,12 @@
       9f2a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
       9f2d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
       9f2d      5 INSTR BELONGTO 9f20 
-      9f32     24 DATAREF STACK 1138 esp + 0 PARENT LocalFrame LOCALFRAME
+      9f32     24 DATAREF STACK 1136 esp + 0 PARENT LocalFrame LOCALFRAME
       9f32      4 INSTR BELONGTO 9f20 
       9f32      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-      9f32      8 DATAREF STACK 1139 esp + 0 CHILDOF 1138 OFFSET 0 LOCALVAR var_18 
-      9f32      8 DATAREF STACK 1140 esp + 8 CHILDOF 1138 OFFSET 8 LOCALVAR var_10 
-      9f32      8 DATAREF STACK 1141 esp + 16 CHILDOF 1138 OFFSET 16 LOCALVAR var_8 
+      9f32      8 DATAREF STACK 1137 esp + 0 CHILDOF 1136 OFFSET 0 LOCALVAR var_18 
+      9f32      8 DATAREF STACK 1138 esp + 8 CHILDOF 1136 OFFSET 8 LOCALVAR var_10 
+      9f32      8 DATAREF STACK 1139 esp + 16 CHILDOF 1136 OFFSET 16 LOCALVAR var_8 
       9f32      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       9f36      3 INSTR BELONGTO 9f20 
       9f36      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
@@ -14141,12 +14143,12 @@
       9fea      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
       9fed     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
       9fed      5 INSTR BELONGTO 9fe0 
-      9ff2     24 DATAREF STACK 1142 esp + 0 PARENT LocalFrame LOCALFRAME
+      9ff2     24 DATAREF STACK 1140 esp + 0 PARENT LocalFrame LOCALFRAME
       9ff2      4 INSTR BELONGTO 9fe0 
       9ff2      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-      9ff2      8 DATAREF STACK 1143 esp + 0 CHILDOF 1142 OFFSET 0 LOCALVAR var_18 
-      9ff2      8 DATAREF STACK 1144 esp + 8 CHILDOF 1142 OFFSET 8 LOCALVAR var_10 
-      9ff2      8 DATAREF STACK 1145 esp + 16 CHILDOF 1142 OFFSET 16 LOCALVAR var_8 
+      9ff2      8 DATAREF STACK 1141 esp + 0 CHILDOF 1140 OFFSET 0 LOCALVAR var_18 
+      9ff2      8 DATAREF STACK 1142 esp + 8 CHILDOF 1140 OFFSET 8 LOCALVAR var_10 
+      9ff2      8 DATAREF STACK 1143 esp + 16 CHILDOF 1140 OFFSET 16 LOCALVAR var_8 
       9ff2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       9ff6      3 INSTR BELONGTO 9fe0 
       9ff6      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
@@ -14268,7 +14270,7 @@
       a107     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       a107      4 INSTR BELONGTO a100 
       a107      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-      a107      8 DATAREF STACK 1146 esp + 0 PARENT LocalFrame LOCALFRAME
+      a107      8 DATAREF STACK 1144 esp + 0 PARENT LocalFrame LOCALFRAME
       a107      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       a10b     -1 INSTR LOCAL NoMetaUpdate call    sub_9250 
       a10b      5 INSTR BELONGTO a100 
@@ -14378,7 +14380,7 @@
       a1f7     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       a1f7      4 INSTR BELONGTO a1f0 
       a1f7      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-      a1f7      8 DATAREF STACK 1147 esp + 0 PARENT LocalFrame LOCALFRAME
+      a1f7      8 DATAREF STACK 1145 esp + 0 PARENT LocalFrame LOCALFRAME
       a1f7      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       a1fb     -1 INSTR LOCAL NoMetaUpdate call    sub_9250 
       a1fb      5 INSTR BELONGTO a1f0 
@@ -14533,12 +14535,12 @@
       a2ea      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
       a2ed     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
       a2ed      5 INSTR BELONGTO a2e0 
-      a2f2     24 DATAREF STACK 1148 esp + 0 PARENT LocalFrame LOCALFRAME
+      a2f2     24 DATAREF STACK 1146 esp + 0 PARENT LocalFrame LOCALFRAME
       a2f2      4 INSTR BELONGTO a2e0 
       a2f2      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-      a2f2      8 DATAREF STACK 1149 esp + 0 CHILDOF 1148 OFFSET 0 LOCALVAR var_18 
-      a2f2      8 DATAREF STACK 1150 esp + 8 CHILDOF 1148 OFFSET 8 LOCALVAR var_10 
-      a2f2      8 DATAREF STACK 1151 esp + 16 CHILDOF 1148 OFFSET 16 LOCALVAR var_8 
+      a2f2      8 DATAREF STACK 1147 esp + 0 CHILDOF 1146 OFFSET 0 LOCALVAR var_18 
+      a2f2      8 DATAREF STACK 1148 esp + 8 CHILDOF 1146 OFFSET 8 LOCALVAR var_10 
+      a2f2      8 DATAREF STACK 1149 esp + 16 CHILDOF 1146 OFFSET 16 LOCALVAR var_8 
       a2f2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       a2f6      3 INSTR BELONGTO a2e0 
       a2f6      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
@@ -14686,12 +14688,12 @@
       a4da      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
       a4dd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
       a4dd      5 INSTR BELONGTO a4d0 
-      a4e2     24 DATAREF STACK 1152 esp + 0 PARENT LocalFrame LOCALFRAME
+      a4e2     24 DATAREF STACK 1150 esp + 0 PARENT LocalFrame LOCALFRAME
       a4e2      4 INSTR BELONGTO a4d0 
       a4e2      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-      a4e2      8 DATAREF STACK 1153 esp + 0 CHILDOF 1152 OFFSET 0 LOCALVAR var_18 
-      a4e2      8 DATAREF STACK 1154 esp + 8 CHILDOF 1152 OFFSET 8 LOCALVAR var_10 
-      a4e2      8 DATAREF STACK 1155 esp + 16 CHILDOF 1152 OFFSET 16 LOCALVAR var_8 
+      a4e2      8 DATAREF STACK 1151 esp + 0 CHILDOF 1150 OFFSET 0 LOCALVAR var_18 
+      a4e2      8 DATAREF STACK 1152 esp + 8 CHILDOF 1150 OFFSET 8 LOCALVAR var_10 
+      a4e2      8 DATAREF STACK 1153 esp + 16 CHILDOF 1150 OFFSET 16 LOCALVAR var_8 
       a4e2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       a4e6      3 INSTR BELONGTO a4d0 
       a4e6      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
@@ -14797,12 +14799,12 @@
       a59a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
       a59d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
       a59d      5 INSTR BELONGTO a590 
-      a5a2     24 DATAREF STACK 1156 esp + 0 PARENT LocalFrame LOCALFRAME
+      a5a2     24 DATAREF STACK 1154 esp + 0 PARENT LocalFrame LOCALFRAME
       a5a2      4 INSTR BELONGTO a590 
       a5a2      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-      a5a2      8 DATAREF STACK 1157 esp + 0 CHILDOF 1156 OFFSET 0 LOCALVAR var_18 
-      a5a2      8 DATAREF STACK 1158 esp + 8 CHILDOF 1156 OFFSET 8 LOCALVAR var_10 
-      a5a2      8 DATAREF STACK 1159 esp + 16 CHILDOF 1156 OFFSET 16 LOCALVAR var_8 
+      a5a2      8 DATAREF STACK 1155 esp + 0 CHILDOF 1154 OFFSET 0 LOCALVAR var_18 
+      a5a2      8 DATAREF STACK 1156 esp + 8 CHILDOF 1154 OFFSET 8 LOCALVAR var_10 
+      a5a2      8 DATAREF STACK 1157 esp + 16 CHILDOF 1154 OFFSET 16 LOCALVAR var_8 
       a5a2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       a5a6      3 INSTR BELONGTO a590 
       a5a6      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
@@ -14919,11 +14921,11 @@
       a6b5      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
       a6ba      3 INSTR BELONGTO a6b0 
       a6ba      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
-      a6bd     24 DATAREF STACK 1160 esp + 0 PARENT LocalFrame LOCALFRAME
+      a6bd     24 DATAREF STACK 1158 esp + 0 PARENT LocalFrame LOCALFRAME
       a6bd      4 INSTR BELONGTO a6b0 
       a6bd      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-      a6bd      8 DATAREF STACK 1161 esp + 8 CHILDOF 1160 OFFSET 8 LOCALVAR var_10 
-      a6bd      8 DATAREF STACK 1162 esp + 16 CHILDOF 1160 OFFSET 16 LOCALVAR var_8 
+      a6bd      8 DATAREF STACK 1159 esp + 8 CHILDOF 1158 OFFSET 8 LOCALVAR var_10 
+      a6bd      8 DATAREF STACK 1160 esp + 16 CHILDOF 1158 OFFSET 16 LOCALVAR var_8 
       a6bd      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       a6c1      2 INSTR BELONGTO a6b0 
       a6c1      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ mov     ebp, esi 
@@ -15039,7 +15041,7 @@
       a825     -3 INSTR LOCAL NoWarn push    rbp 
       a826      1 INSTR BELONGTO a820 
       a826      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ push    rbx 
-      a826     24 DATAREF STACK 1163 esp + 0 PARENT LocalFrame LOCALFRAME
+      a826     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
       a826      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       a827      3 INSTR BELONGTO a820 
       a827      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 ZZ mov     rbx, rsi 
@@ -15432,7 +15434,7 @@
       af08     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       af08      4 INSTR BELONGTO af00 
       af08      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-      af08      8 DATAREF STACK 1164 esp + 0 PARENT LocalFrame LOCALFRAME
+      af08      8 DATAREF STACK 1161 esp + 0 PARENT LocalFrame LOCALFRAME
       af08      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       af0c     -1 INSTR LOCAL NoMetaUpdate call    sub_9250 
       af0c      5 INSTR BELONGTO af00 
@@ -15559,7 +15561,7 @@
       b017     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       b017      4 INSTR BELONGTO b010 
       b017      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-      b017      8 DATAREF STACK 1165 esp + 0 PARENT LocalFrame LOCALFRAME
+      b017      8 DATAREF STACK 1162 esp + 0 PARENT LocalFrame LOCALFRAME
       b017      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       b01b     -1 INSTR LOCAL NoMetaUpdate call    sub_9250 
       b01b      5 INSTR BELONGTO b010 
@@ -15648,11 +15650,11 @@
       b0a0     -3 INSTR LOCAL NoWarn push    rbx 
       b0a1      3 INSTR BELONGTO b0a0 
       b0a1      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbx, rdi 
-      b0a4     16 DATAREF STACK 1167 esp + 8 CHILDOF 1166 OFFSET 8 LOCALVAR var_20 
-      b0a4     32 DATAREF STACK 1166 esp + 0 PARENT LocalFrame LOCALFRAME
+      b0a4     16 DATAREF STACK 1164 esp + 8 CHILDOF 1163 OFFSET 8 LOCALVAR var_20 
+      b0a4     32 DATAREF STACK 1163 esp + 0 PARENT LocalFrame LOCALFRAME
       b0a4      4 INSTR BELONGTO b0a0 
       b0a4      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 20h 
-      b0a4      8 DATAREF STACK 1168 esp + 24 CHILDOF 1166 OFFSET 24 LOCALVAR var_10 
+      b0a4      8 DATAREF STACK 1165 esp + 24 CHILDOF 1163 OFFSET 24 LOCALVAR var_10 
       b0a4      8 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
       b0a4      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
       b0a8     -1 INSTR LOCAL NoMetaUpdate call    sub_9250 
@@ -15775,8 +15777,8 @@
       b163      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
       b170      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
       b170      0 FUNC MMSAFENESS SAFE
-      b170     16 DATAREF STACK 1170 esp + 8 CHILDOF 1169 OFFSET 8 LOCALVAR var_10 
-      b170     24 DATAREF STACK 1169 esp + 0 PARENT LocalFrame LOCALFRAME
+      b170     16 DATAREF STACK 1167 esp + 8 CHILDOF 1166 OFFSET 8 LOCALVAR var_10 
+      b170     24 DATAREF STACK 1166 esp + 0 PARENT LocalFrame LOCALFRAME
       b170      4 INSTR BELONGTO b170 
       b170      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
       b170     68 FUNC GLOBAL sub_B170 FUNC_UNSAFE NOFP RET       b1b3 
@@ -15826,11 +15828,11 @@
       b1ca      3 INSTR BELONGTO b1c0 
       b1cd      5 INSTR BELONGTO b1c0 
       b1cd      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], rbp
-      b1d2     24 DATAREF STACK 1171 esp + 0 PARENT LocalFrame LOCALFRAME
+      b1d2     24 DATAREF STACK 1168 esp + 0 PARENT LocalFrame LOCALFRAME
       b1d2      4 INSTR BELONGTO b1c0 
-      b1d2      8 DATAREF STACK 1172 esp + 0 CHILDOF 1171 OFFSET 0 LOCALVAR var_18 
-      b1d2      8 DATAREF STACK 1173 esp + 8 CHILDOF 1171 OFFSET 8 LOCALVAR var_10 
-      b1d2      8 DATAREF STACK 1174 esp + 16 CHILDOF 1171 OFFSET 16 LOCALVAR var_8 
+      b1d2      8 DATAREF STACK 1169 esp + 0 CHILDOF 1168 OFFSET 0 LOCALVAR var_18 
+      b1d2      8 DATAREF STACK 1170 esp + 8 CHILDOF 1168 OFFSET 8 LOCALVAR var_10 
+      b1d2      8 DATAREF STACK 1171 esp + 16 CHILDOF 1168 OFFSET 16 LOCALVAR var_8 
       b1d2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       b1d6      3 INSTR BELONGTO b1c0 
       b1d9     -1 INSTR LOCAL NoMetaUpdate call    sub_9250 
@@ -15952,11 +15954,11 @@
       b2b0     -3 INSTR LOCAL NoWarn push    rbx 
       b2b1      3 INSTR BELONGTO b2b0 
       b2b1      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-      b2b4     20 DATAREF STACK 1176 esp + 0 CHILDOF 1175 OFFSET 0 OutArgsRegion OUTARGS
-      b2b4     32 DATAREF STACK 1175 esp + 0 PARENT LocalFrame LOCALFRAME
+      b2b4     20 DATAREF STACK 1173 esp + 0 CHILDOF 1172 OFFSET 0 OutArgsRegion OUTARGS
+      b2b4     32 DATAREF STACK 1172 esp + 0 PARENT LocalFrame LOCALFRAME
       b2b4      4 INSTR BELONGTO b2b0 
       b2b4      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 20h 
-      b2b4      8 DATAREF STACK 1177 esp + 24 CHILDOF 1175 OFFSET 24 LOCALVAR var_10 
+      b2b4      8 DATAREF STACK 1174 esp + 24 CHILDOF 1172 OFFSET 24 LOCALVAR var_10 
       b2b4      8 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
       b2b4      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
       b2b8     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
@@ -16029,8 +16031,8 @@
       b340      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
       b340      0 FUNC MMSAFENESS SAFE
       b340    122 FUNC GLOBAL sub_B340 FUNC_UNSAFE NOFP RET       b3b9 
-      b340     24 DATAREF STACK 1178 esp + 0 PARENT LocalFrame LOCALFRAME
-      b340      4 DATAREF STACK 1179 esp + 0 CHILDOF 1178 OFFSET 0 OutArgsRegion OUTARGS
+      b340     24 DATAREF STACK 1175 esp + 0 PARENT LocalFrame LOCALFRAME
+      b340      4 DATAREF STACK 1176 esp + 0 CHILDOF 1175 OFFSET 0 OutArgsRegion OUTARGS
       b340      4 INSTR BELONGTO b340 
       b340      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
       b340      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -16310,11 +16312,11 @@
       b655      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
       b65a      3 INSTR BELONGTO b650 
       b65a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
-      b65d     24 DATAREF STACK 1180 esp + 0 PARENT LocalFrame LOCALFRAME
+      b65d     24 DATAREF STACK 1177 esp + 0 PARENT LocalFrame LOCALFRAME
       b65d      4 INSTR BELONGTO b650 
       b65d      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-      b65d      8 DATAREF STACK 1181 esp + 8 CHILDOF 1180 OFFSET 8 LOCALVAR var_10 
-      b65d      8 DATAREF STACK 1182 esp + 16 CHILDOF 1180 OFFSET 16 LOCALVAR var_8 
+      b65d      8 DATAREF STACK 1178 esp + 8 CHILDOF 1177 OFFSET 8 LOCALVAR var_10 
+      b65d      8 DATAREF STACK 1179 esp + 16 CHILDOF 1177 OFFSET 16 LOCALVAR var_8 
       b65d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       b661     -1 INSTR LOCAL MetadataUnused mov     ebp, esi 
       b661      2 INSTR BELONGTO b650 
@@ -16395,7 +16397,7 @@
       b6e3      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 R12 ZZ mov     rbp, rdi 
       b6e6      1 INSTR BELONGTO b6e0 
       b6e6      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 ZZ push    rbx 
-      b6e6     24 DATAREF STACK 1183 esp + 0 PARENT LocalFrame LOCALFRAME
+      b6e6     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
       b6e6      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       b6e7     -1 INSTR LOCAL NoMetaUpdate call    sub_B340 
       b6e7      5 INSTR BELONGTO b6e0 
@@ -16748,13 +16750,13 @@
       b93d      5 INSTR BELONGTO b930 
       b942     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_10], r12 
       b942      5 INSTR BELONGTO b930 
-      b947     40 DATAREF STACK 1184 esp + 0 PARENT LocalFrame LOCALFRAME
+      b947     40 DATAREF STACK 1180 esp + 0 PARENT LocalFrame LOCALFRAME
       b947      4 INSTR BELONGTO b930 
       b947      4 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 28h 
-      b947      8 DATAREF STACK 1185 esp + 8 CHILDOF 1184 OFFSET 8 LOCALVAR var_20 
-      b947      8 DATAREF STACK 1186 esp + 16 CHILDOF 1184 OFFSET 16 LOCALVAR var_18 
-      b947      8 DATAREF STACK 1187 esp + 24 CHILDOF 1184 OFFSET 24 LOCALVAR var_10 
-      b947      8 DATAREF STACK 1188 esp + 32 CHILDOF 1184 OFFSET 32 LOCALVAR var_8 
+      b947      8 DATAREF STACK 1181 esp + 8 CHILDOF 1180 OFFSET 8 LOCALVAR var_20 
+      b947      8 DATAREF STACK 1182 esp + 16 CHILDOF 1180 OFFSET 16 LOCALVAR var_18 
+      b947      8 DATAREF STACK 1183 esp + 24 CHILDOF 1180 OFFSET 24 LOCALVAR var_10 
+      b947      8 DATAREF STACK 1184 esp + 32 CHILDOF 1180 OFFSET 32 LOCALVAR var_8 
       b947      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
       b94b      3 INSTR BELONGTO b930 
       b94b      3 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 R13 ZZ mov     rbp, rsi 
@@ -16926,13 +16928,13 @@
       baad      5 INSTR BELONGTO baa0 
       bab2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_10], r12 
       bab2      5 INSTR BELONGTO baa0 
-      bab7     40 DATAREF STACK 1189 esp + 0 PARENT LocalFrame LOCALFRAME
+      bab7     40 DATAREF STACK 1185 esp + 0 PARENT LocalFrame LOCALFRAME
       bab7      4 INSTR BELONGTO baa0 
       bab7      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 28h 
-      bab7      8 DATAREF STACK 1190 esp + 8 CHILDOF 1189 OFFSET 8 LOCALVAR var_20 
-      bab7      8 DATAREF STACK 1191 esp + 16 CHILDOF 1189 OFFSET 16 LOCALVAR var_18 
-      bab7      8 DATAREF STACK 1192 esp + 24 CHILDOF 1189 OFFSET 24 LOCALVAR var_10 
-      bab7      8 DATAREF STACK 1193 esp + 32 CHILDOF 1189 OFFSET 32 LOCALVAR var_8 
+      bab7      8 DATAREF STACK 1186 esp + 8 CHILDOF 1185 OFFSET 8 LOCALVAR var_20 
+      bab7      8 DATAREF STACK 1187 esp + 16 CHILDOF 1185 OFFSET 16 LOCALVAR var_18 
+      bab7      8 DATAREF STACK 1188 esp + 24 CHILDOF 1185 OFFSET 24 LOCALVAR var_10 
+      bab7      8 DATAREF STACK 1189 esp + 32 CHILDOF 1185 OFFSET 32 LOCALVAR var_8 
       bab7      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
       babb     -1 INSTR LOCAL NoMetaUpdate call    sub_B340 
       babb      5 INSTR BELONGTO baa0 
@@ -17101,12 +17103,12 @@
       bbdd      5 INSTR BELONGTO bbd0 
       bbe2      3 INSTR BELONGTO bbd0 
       bbe2      3 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     rdi, rsi 
-      bbe5     24 DATAREF STACK 1194 esp + 0 PARENT LocalFrame LOCALFRAME
+      bbe5     24 DATAREF STACK 1190 esp + 0 PARENT LocalFrame LOCALFRAME
       bbe5      4 INSTR BELONGTO bbd0 
       bbe5      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 18h 
-      bbe5      8 DATAREF STACK 1195 esp + 0 CHILDOF 1194 OFFSET 0 LOCALVAR var_18 
-      bbe5      8 DATAREF STACK 1196 esp + 8 CHILDOF 1194 OFFSET 8 LOCALVAR var_10 
-      bbe5      8 DATAREF STACK 1197 esp + 16 CHILDOF 1194 OFFSET 16 LOCALVAR var_8 
+      bbe5      8 DATAREF STACK 1191 esp + 0 CHILDOF 1190 OFFSET 0 LOCALVAR var_18 
+      bbe5      8 DATAREF STACK 1192 esp + 8 CHILDOF 1190 OFFSET 8 LOCALVAR var_10 
+      bbe5      8 DATAREF STACK 1193 esp + 16 CHILDOF 1190 OFFSET 16 LOCALVAR var_8 
       bbe5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       bbe9      3 INSTR BELONGTO bbd0 
       bbe9      3 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     rbx, rsi 
@@ -17187,13 +17189,13 @@
       bc6c      5 INSTR BELONGTO bc50 
       bc71      3 INSTR BELONGTO bc50 
       bc71      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     rdi, rbx 
-      bc74     40 DATAREF STACK 1198 esp + 0 PARENT LocalFrame LOCALFRAME
+      bc74     40 DATAREF STACK 1194 esp + 0 PARENT LocalFrame LOCALFRAME
       bc74      4 INSTR BELONGTO bc50 
       bc74      4 INSTR DEADREGS  EFLAGS R12 R13 ZZ sub     rsp, 28h 
-      bc74      8 DATAREF STACK 1199 esp + 8 CHILDOF 1198 OFFSET 8 LOCALVAR var_20 
-      bc74      8 DATAREF STACK 1200 esp + 16 CHILDOF 1198 OFFSET 16 LOCALVAR var_18 
-      bc74      8 DATAREF STACK 1201 esp + 24 CHILDOF 1198 OFFSET 24 LOCALVAR var_10 
-      bc74      8 DATAREF STACK 1202 esp + 32 CHILDOF 1198 OFFSET 32 LOCALVAR var_8 
+      bc74      8 DATAREF STACK 1195 esp + 8 CHILDOF 1194 OFFSET 8 LOCALVAR var_20 
+      bc74      8 DATAREF STACK 1196 esp + 16 CHILDOF 1194 OFFSET 16 LOCALVAR var_18 
+      bc74      8 DATAREF STACK 1197 esp + 24 CHILDOF 1194 OFFSET 24 LOCALVAR var_10 
+      bc74      8 DATAREF STACK 1198 esp + 32 CHILDOF 1194 OFFSET 32 LOCALVAR var_8 
       bc74      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
       bc78     -1 INSTR LOCAL MetadataUnused mov     r13, rdx 
       bc78      3 INSTR BELONGTO bc50 
@@ -17435,12 +17437,12 @@
       be2a      3 INSTR BELONGTO be20 
       be2d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
       be2d      5 INSTR BELONGTO be20 
-      be32     24 DATAREF STACK 1203 esp + 0 PARENT LocalFrame LOCALFRAME
+      be32     24 DATAREF STACK 1199 esp + 0 PARENT LocalFrame LOCALFRAME
       be32      4 INSTR BELONGTO be20 
       be32      4 INSTR DEADREGS  EFLAGS RDX R12 ZZ sub     rsp, 18h 
-      be32      8 DATAREF STACK 1204 esp + 0 CHILDOF 1203 OFFSET 0 LOCALVAR var_18 
-      be32      8 DATAREF STACK 1205 esp + 8 CHILDOF 1203 OFFSET 8 LOCALVAR var_10 
-      be32      8 DATAREF STACK 1206 esp + 16 CHILDOF 1203 OFFSET 16 LOCALVAR var_8 
+      be32      8 DATAREF STACK 1200 esp + 0 CHILDOF 1199 OFFSET 0 LOCALVAR var_18 
+      be32      8 DATAREF STACK 1201 esp + 8 CHILDOF 1199 OFFSET 8 LOCALVAR var_10 
+      be32      8 DATAREF STACK 1202 esp + 16 CHILDOF 1199 OFFSET 16 LOCALVAR var_8 
       be32      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       be36     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
       be36      3 INSTR BELONGTO be20 
@@ -17585,7 +17587,7 @@
       bf68     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       bf68      4 INSTR BELONGTO bf60 
       bf68      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-      bf68      8 DATAREF STACK 1207 esp + 0 PARENT LocalFrame LOCALFRAME
+      bf68      8 DATAREF STACK 1203 esp + 0 PARENT LocalFrame LOCALFRAME
       bf68      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       bf6c     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
       bf6c      3 INSTR BELONGTO bf60 
@@ -17740,15 +17742,15 @@
       c050      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
       c055     -1 INSTR LOCAL NoMetaUpdate jmp     loc_BFAE 
       c055      5 INSTR BELONGTO bf60 
-      c060      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
+      c060      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -4 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
       c060      0 FUNC MMSAFENESS SAFE
       c060     17 FUNC GLOBAL sub_C060 FUNC_UNSAFE NOFP RET       c070 
       c060      3 INSTR BELONGTO c060 
       c060      3 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, [rdx] 
-      c060      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-      c060      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       c063      1 INSTR BELONGTO c060 
       c063      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
+      c063      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+      c063      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       c064      3 INSTR BELONGTO c060 
       c064      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdx 
       c067     -1 INSTR LOCAL NoMetaUpdate call    _g_slist_prepend 
@@ -17776,7 +17778,7 @@
       c088     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       c088      4 INSTR BELONGTO c080 
       c088      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-      c088      8 DATAREF STACK 1208 esp + 0 PARENT LocalFrame LOCALFRAME
+      c088      8 DATAREF STACK 1204 esp + 0 PARENT LocalFrame LOCALFRAME
       c088      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       c08c     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
       c08c      3 INSTR BELONGTO c080 
@@ -17942,10 +17944,10 @@
       c181     -3 INSTR LOCAL NoWarn push    rbx 
       c182      3 INSTR BELONGTO c180 
       c182      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-      c185     16 DATAREF STACK 1211 esp + 24 CHILDOF 1209 OFFSET 24 LOCALVAR var_20 
+      c185     16 DATAREF STACK 1207 esp + 24 CHILDOF 1205 OFFSET 24 LOCALVAR var_20 
       c185     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-      c185     20 DATAREF STACK 1210 esp + 0 CHILDOF 1209 OFFSET 0 OutArgsRegion OUTARGS
-      c185     40 DATAREF STACK 1209 esp + 0 PARENT LocalFrame LOCALFRAME
+      c185     20 DATAREF STACK 1206 esp + 0 CHILDOF 1205 OFFSET 0 OutArgsRegion OUTARGS
+      c185     40 DATAREF STACK 1205 esp + 0 PARENT LocalFrame LOCALFRAME
       c185      4 INSTR BELONGTO c180 
       c185      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 28h 
       c185      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
@@ -18307,7 +18309,7 @@
       c460      4 INSTR BELONGTO c460 
       c460      4 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ sub     rsp, 8 
       c460     76 FUNC GLOBAL sub_C460 FUNC_UNSAFE NOFP RET       c4ab 
-      c460      8 DATAREF STACK 1212 esp + 0 PARENT LocalFrame LOCALFRAME
+      c460      8 DATAREF STACK 1208 esp + 0 PARENT LocalFrame LOCALFRAME
       c460      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       c464      4 INSTR BELONGTO c460 
       c464      4 INSTR DEADREGS  EFLAGS RAX RDX RSI ZZ mov     rax, [rdi+18h] 
@@ -18344,14 +18346,14 @@
       c4a7      5 INSTR BELONGTO c460 
       c4a7      5 INSTR DEADREGS  EFLAGS RSI RDI R8 R9 R10 R11 ZZ jmp     _g_log 
       c4a7      8 DEALLOC STACK esp - 8 jmp     _g_log
-      c4b0      0 FUNC FRAMERESTORE 0 0 1 1 0 1 2 0 96 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
+      c4b0      0 FUNC FRAMERESTORE 0 0 1 1 0 1 2 0 96 3 -4 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
       c4b0      0 FUNC MMSAFENESS SAFE
       c4b0     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
       c4b0      3 INSTR BELONGTO c4b0 
-      c4b0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-      c4b0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       c4b0     97 FUNC GLOBAL sub_C4B0 FUNC_UNSAFE NOFP RET       c510 
       c4b3      1 INSTR BELONGTO c4b0 
+      c4b3      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+      c4b3      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       c4b4     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
       c4b4      3 INSTR BELONGTO c4b0 
       c4b7     -1 INSTR LOCAL NoMetaUpdate jz      short loc_C4F8 
@@ -18405,14 +18407,14 @@
       c508      7 INSTR DEADREGS  EFLAGS RDX RSI RDI R8 R9 R10 R11 ZZ mov     dword ptr [rax+38h], 0 
       c50f     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_C4D6 
       c50f      2 INSTR BELONGTO c4b0 
-      c520      0 FUNC FRAMERESTORE 0 0 96 1 0 1 2 0 96 3 0 0 4 0 8 5 0 0 6 0 1 7 0 4 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
+      c520      0 FUNC FRAMERESTORE 0 0 96 1 0 1 2 0 96 3 -4 0 4 0 8 5 0 0 6 0 1 7 0 4 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
       c520      0 FUNC MMSAFENESS SAFE
       c520    101 FUNC GLOBAL sub_C520 FUNC_UNSAFE NOFP RET       c584 
       c520     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
       c520      3 INSTR BELONGTO c520 
-      c520      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-      c520      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       c523      1 INSTR BELONGTO c520 
+      c523      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+      c523      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       c524     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
       c524      3 INSTR BELONGTO c520 
       c527     -1 INSTR LOCAL NoMetaUpdate jz      short loc_C560 
@@ -18589,14 +18591,14 @@
       c8c2      5 INSTR BELONGTO c8b0 
       c8c7      3 INSTR BELONGTO c8b0 
       c8c7      3 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     r12, rdi 
-      c8ca     16 DATAREF STACK 1214 esp + 8 CHILDOF 1213 OFFSET 8 LOCALVAR var_30 
+      c8ca     16 DATAREF STACK 1210 esp + 8 CHILDOF 1209 OFFSET 8 LOCALVAR var_30 
       c8ca      4 INSTR BELONGTO c8b0 
       c8ca      4 INSTR DEADREGS  EFLAGS RDI R13 ZZ sub     rsp, 38h 
-      c8ca     56 DATAREF STACK 1213 esp + 0 PARENT LocalFrame LOCALFRAME
-      c8ca      8 DATAREF STACK 1215 esp + 24 CHILDOF 1213 OFFSET 24 LOCALVAR var_20 
-      c8ca      8 DATAREF STACK 1216 esp + 32 CHILDOF 1213 OFFSET 32 LOCALVAR var_18 
-      c8ca      8 DATAREF STACK 1217 esp + 40 CHILDOF 1213 OFFSET 40 LOCALVAR var_10 
-      c8ca      8 DATAREF STACK 1218 esp + 48 CHILDOF 1213 OFFSET 48 LOCALVAR var_8 
+      c8ca     56 DATAREF STACK 1209 esp + 0 PARENT LocalFrame LOCALFRAME
+      c8ca      8 DATAREF STACK 1211 esp + 24 CHILDOF 1209 OFFSET 24 LOCALVAR var_20 
+      c8ca      8 DATAREF STACK 1212 esp + 32 CHILDOF 1209 OFFSET 32 LOCALVAR var_18 
+      c8ca      8 DATAREF STACK 1213 esp + 40 CHILDOF 1209 OFFSET 40 LOCALVAR var_10 
+      c8ca      8 DATAREF STACK 1214 esp + 48 CHILDOF 1209 OFFSET 48 LOCALVAR var_8 
       c8ca      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
       c8ce      3 INSTR BELONGTO c8b0 
       c8ce      3 INSTR DEADREGS  EFLAGS RDI R13 ZZ mov     rdi, rsi 
@@ -18722,9 +18724,9 @@
       c991      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
       c994      4 INSTR BELONGTO c990 
       c994      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 40h 
-      c994     64 DATAREF STACK 1219 esp + 0 PARENT LocalFrame LOCALFRAME
-      c994      8 DATAREF STACK 1220 esp + 48 CHILDOF 1219 OFFSET 48 LOCALVAR var_18 
-      c994      8 DATAREF STACK 1221 esp + 56 CHILDOF 1219 OFFSET 56 LOCALVAR var_10 
+      c994     64 DATAREF STACK 1215 esp + 0 PARENT LocalFrame LOCALFRAME
+      c994      8 DATAREF STACK 1216 esp + 48 CHILDOF 1215 OFFSET 48 LOCALVAR var_18 
+      c994      8 DATAREF STACK 1217 esp + 56 CHILDOF 1215 OFFSET 56 LOCALVAR var_10 
       c994      8 MEMORYHOLE STACK esp + 64 CalleeSavedRegs 
       c994      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
       c998      3 INSTR BELONGTO c990 
@@ -18777,7 +18779,7 @@
       c9e0    107 FUNC GLOBAL sub_C9E0 FUNC_UNSAFE NOFP RET       ca4a 
       c9e0      4 INSTR BELONGTO c9e0 
       c9e0      4 INSTR DEADREGS  EFLAGS RAX RDX ZZ sub     rsp, 8 
-      c9e0      8 DATAREF STACK 1222 esp + 0 PARENT LocalFrame LOCALFRAME
+      c9e0      8 DATAREF STACK 1218 esp + 0 PARENT LocalFrame LOCALFRAME
       c9e0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       c9e4     -1 INSTR LOCAL MetadataUnused mov     rax, [rdi+18h] 
       c9e4      4 INSTR BELONGTO c9e0 
@@ -18839,7 +18841,7 @@
       ca50    107 FUNC GLOBAL sub_CA50 FUNC_UNSAFE NOFP RET       caba 
       ca50      4 INSTR BELONGTO ca50 
       ca50      4 INSTR DEADREGS  EFLAGS RAX RDX ZZ sub     rsp, 8 
-      ca50      8 DATAREF STACK 1223 esp + 0 PARENT LocalFrame LOCALFRAME
+      ca50      8 DATAREF STACK 1219 esp + 0 PARENT LocalFrame LOCALFRAME
       ca50      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       ca54     -1 INSTR LOCAL MetadataUnused mov     rax, [rdi+18h] 
       ca54      4 INSTR BELONGTO ca50 
@@ -18901,7 +18903,7 @@
       cac0    107 FUNC GLOBAL sub_CAC0 FUNC_UNSAFE NOFP RET       cb2a 
       cac0      4 INSTR BELONGTO cac0 
       cac0      4 INSTR DEADREGS  EFLAGS RAX RDX ZZ sub     rsp, 8 
-      cac0      8 DATAREF STACK 1224 esp + 0 PARENT LocalFrame LOCALFRAME
+      cac0      8 DATAREF STACK 1220 esp + 0 PARENT LocalFrame LOCALFRAME
       cac0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       cac4     -1 INSTR LOCAL MetadataUnused mov     rax, [rdi+18h] 
       cac4      4 INSTR BELONGTO cac0 
@@ -18963,7 +18965,7 @@
       cb30    107 FUNC GLOBAL sub_CB30 FUNC_UNSAFE NOFP RET       cb9a 
       cb30      4 INSTR BELONGTO cb30 
       cb30      4 INSTR DEADREGS  EFLAGS RAX RDX ZZ sub     rsp, 8 
-      cb30      8 DATAREF STACK 1225 esp + 0 PARENT LocalFrame LOCALFRAME
+      cb30      8 DATAREF STACK 1221 esp + 0 PARENT LocalFrame LOCALFRAME
       cb30      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       cb34     -1 INSTR LOCAL MetadataUnused mov     rax, [rdi+18h] 
       cb34      4 INSTR BELONGTO cb30 
@@ -19025,7 +19027,7 @@
       cba0    107 FUNC GLOBAL sub_CBA0 FUNC_UNSAFE NOFP RET       cc0a 
       cba0      4 INSTR BELONGTO cba0 
       cba0      4 INSTR DEADREGS  EFLAGS RAX RDX ZZ sub     rsp, 8 
-      cba0      8 DATAREF STACK 1226 esp + 0 PARENT LocalFrame LOCALFRAME
+      cba0      8 DATAREF STACK 1222 esp + 0 PARENT LocalFrame LOCALFRAME
       cba0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       cba4     -1 INSTR LOCAL MetadataUnused mov     rax, [rdi+18h] 
       cba4      4 INSTR BELONGTO cba0 
@@ -19087,7 +19089,7 @@
       cc10    107 FUNC GLOBAL sub_CC10 FUNC_UNSAFE NOFP RET       cc7a 
       cc10      4 INSTR BELONGTO cc10 
       cc10      4 INSTR DEADREGS  EFLAGS RAX RDX ZZ sub     rsp, 8 
-      cc10      8 DATAREF STACK 1227 esp + 0 PARENT LocalFrame LOCALFRAME
+      cc10      8 DATAREF STACK 1223 esp + 0 PARENT LocalFrame LOCALFRAME
       cc10      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       cc14     -1 INSTR LOCAL MetadataUnused mov     rax, [rdi+18h] 
       cc14      4 INSTR BELONGTO cc10 
@@ -19301,8 +19303,8 @@
       cf60      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
       cf60      0 FUNC MMSAFENESS SAFE
       cf60    122 FUNC GLOBAL sub_CF60 FUNC_UNSAFE NOFP RET       cfd9 
-      cf60     24 DATAREF STACK 1228 esp + 0 PARENT LocalFrame LOCALFRAME
-      cf60      4 DATAREF STACK 1229 esp + 0 CHILDOF 1228 OFFSET 0 OutArgsRegion OUTARGS
+      cf60     24 DATAREF STACK 1224 esp + 0 PARENT LocalFrame LOCALFRAME
+      cf60      4 DATAREF STACK 1225 esp + 0 CHILDOF 1224 OFFSET 0 OutArgsRegion OUTARGS
       cf60      4 INSTR BELONGTO cf60 
       cf60      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
       cf60      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -19383,7 +19385,7 @@
       cfe8     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       cfe8      4 INSTR BELONGTO cfe0 
       cfe8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-      cfe8      8 DATAREF STACK 1230 esp + 0 PARENT LocalFrame LOCALFRAME
+      cfe8      8 DATAREF STACK 1226 esp + 0 PARENT LocalFrame LOCALFRAME
       cfe8      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       cfec     -1 INSTR LOCAL NoMetaUpdate call    sub_CF60 
       cfec      5 INSTR BELONGTO cfe0 
@@ -20462,7 +20464,7 @@
       e812      3 INSTR BELONGTO e810 
       e815     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       e815      4 INSTR BELONGTO e810 
-      e815      8 DATAREF STACK 1231 esp + 0 PARENT LocalFrame LOCALFRAME
+      e815      8 DATAREF STACK 1227 esp + 0 PARENT LocalFrame LOCALFRAME
       e815      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       e819     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
       e819      3 INSTR BELONGTO e810 
@@ -20536,7 +20538,7 @@
       e8d2      3 INSTR BELONGTO e8d0 
       e8d5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       e8d5      4 INSTR BELONGTO e8d0 
-      e8d5      8 DATAREF STACK 1232 esp + 0 PARENT LocalFrame LOCALFRAME
+      e8d5      8 DATAREF STACK 1228 esp + 0 PARENT LocalFrame LOCALFRAME
       e8d5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       e8d9     -1 INSTR LOCAL NoMetaUpdate call    sub_CF60 
       e8d9      5 INSTR BELONGTO e8d0 
@@ -21158,10 +21160,10 @@
       f480     -3 INSTR LOCAL NoWarn push    rbx 
       f481      3 INSTR BELONGTO f480 
       f481      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbx, rdi 
-      f484     16 DATAREF STACK 1233 esp + 0 PARENT LocalFrame LOCALFRAME
+      f484     16 DATAREF STACK 1229 esp + 0 PARENT LocalFrame LOCALFRAME
       f484      4 INSTR BELONGTO f480 
       f484      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 10h 
-      f484      8 DATAREF STACK 1234 esp + 8 CHILDOF 1233 OFFSET 8 LOCALVAR var_10 
+      f484      8 DATAREF STACK 1230 esp + 8 CHILDOF 1229 OFFSET 8 LOCALVAR var_10 
       f484      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
       f484      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       f488     -1 INSTR LOCAL NoMetaUpdate call    sub_CF60 
@@ -21269,7 +21271,7 @@
       f575     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       f575      4 INSTR BELONGTO f570 
       f575      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-      f575      8 DATAREF STACK 1235 esp + 0 PARENT LocalFrame LOCALFRAME
+      f575      8 DATAREF STACK 1231 esp + 0 PARENT LocalFrame LOCALFRAME
       f575      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       f579     -1 INSTR LOCAL NoMetaUpdate call    sub_CF60 
       f579      5 INSTR BELONGTO f570 
@@ -21493,9 +21495,9 @@
       f6e1      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbx, rdi 
       f6e4      4 INSTR BELONGTO f6e0 
       f6e4      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 40h 
-      f6e4     64 DATAREF STACK 1236 esp + 0 PARENT LocalFrame LOCALFRAME
-      f6e4      8 DATAREF STACK 1237 esp + 48 CHILDOF 1236 OFFSET 48 LOCALVAR var_18 
-      f6e4      8 DATAREF STACK 1238 esp + 56 CHILDOF 1236 OFFSET 56 LOCALVAR var_10 
+      f6e4     64 DATAREF STACK 1232 esp + 0 PARENT LocalFrame LOCALFRAME
+      f6e4      8 DATAREF STACK 1233 esp + 48 CHILDOF 1232 OFFSET 48 LOCALVAR var_18 
+      f6e4      8 DATAREF STACK 1234 esp + 56 CHILDOF 1232 OFFSET 56 LOCALVAR var_10 
       f6e4      8 MEMORYHOLE STACK esp + 64 CalleeSavedRegs 
       f6e4      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
       f6e8     -1 INSTR LOCAL NoMetaUpdate call    sub_CF60 
@@ -21730,7 +21732,7 @@
       f920     29 FUNC GLOBAL sub_F920 FUNC_UNSAFE NOFP RET       f93c 
       f920      4 INSTR BELONGTO f920 
       f920      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-      f920      8 DATAREF STACK 1239 esp + 0 PARENT LocalFrame LOCALFRAME
+      f920      8 DATAREF STACK 1235 esp + 0 PARENT LocalFrame LOCALFRAME
       f920      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
       f924     -1 INSTR LOCAL MetadataUnused movsd   xmm0, cs:qword_16E80 
       f924      8 INSTR BELONGTO f920 
@@ -21763,11 +21765,11 @@
       f963     -3 INSTR LOCAL NoWarn push    rbx 
       f964      3 INSTR BELONGTO f960 
       f964      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R12 ZZ mov     rbx, rdi 
-      f967     16 DATAREF STACK 1240 esp + 0 PARENT LocalFrame LOCALFRAME
+      f967     16 DATAREF STACK 1236 esp + 0 PARENT LocalFrame LOCALFRAME
       f967     24 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
       f967      4 INSTR BELONGTO f960 
       f967      4 INSTR DEADREGS  EFLAGS RAX RCX R12 ZZ sub     rsp, 10h 
-      f967      8 DATAREF STACK 1241 esp + 0 CHILDOF 1240 OFFSET 0 OutArgsRegion OUTARGS
+      f967      8 DATAREF STACK 1237 esp + 0 CHILDOF 1236 OFFSET 0 OutArgsRegion OUTARGS
       f967      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
       f96b      4 INSTR BELONGTO f960 
       f96b      4 INSTR DEADREGS  EFLAGS RAX RCX R12 ZZ mov     rax, [rdi+30h] 
@@ -21976,12 +21978,12 @@
       fa9e     -3 INSTR LOCAL NoWarn push    rbx 
       fa9f      3 INSTR BELONGTO fa90 
       fa9f      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     rbx, rdi 
-      faa2     16 DATAREF STACK 1244 esp + 8 CHILDOF 1242 OFFSET 8 LOCALVAR var_40 
-      faa2     24 DATAREF STACK 1242 esp + 0 PARENT LocalFrame LOCALFRAME
+      faa2     16 DATAREF STACK 1240 esp + 8 CHILDOF 1238 OFFSET 8 LOCALVAR var_40 
+      faa2     24 DATAREF STACK 1238 esp + 0 PARENT LocalFrame LOCALFRAME
       faa2     48 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
       faa2      4 INSTR BELONGTO fa90 
       faa2      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 18h 
-      faa2      8 DATAREF STACK 1243 esp + 0 CHILDOF 1242 OFFSET 0 LOCALVAR var_48 
+      faa2      8 DATAREF STACK 1239 esp + 0 CHILDOF 1238 OFFSET 0 LOCALVAR var_48 
       faa2      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
       faa6      4 INSTR BELONGTO fa90 
       faa6      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ mov     rbp, [rdi+30h] 
@@ -22731,7 +22733,7 @@
       ff15     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
       ff15      4 INSTR BELONGTO ff10 
       ff15      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-      ff15      8 DATAREF STACK 1245 esp + 0 PARENT LocalFrame LOCALFRAME
+      ff15      8 DATAREF STACK 1241 esp + 0 PARENT LocalFrame LOCALFRAME
       ff15      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
       ff19     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
       ff19      5 INSTR BELONGTO ff10 
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 abe0d546..6a46253d 100644
--- a/tests/commit/trimmed-sorted-save-gnome-sound-recorder.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-sound-recorder.psexe.annot
@@ -2761,12 +2761,11 @@
     406847      5 INSTR DEADREGS  EFLAGS RAX RBX R8 R9 R10 R11 ZZ mov     eax, 1 
     40684c     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_40680D 
     40684c      2 INSTR BELONGTO 406690 
-    406850      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
-    406850      0 FUNC MMSAFENESS UNSAFE
+    406850      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    406850      0 FUNC MMSAFENESS SAFE
     406850     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     406850      2 INSTR BELONGTO 406850 
     406850     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     406879 
-    406850      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     406852      3 INSTR BELONGTO 406850 
     406852      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     406855      1 INSTR BELONGTO 406850 
@@ -2778,8 +2777,11 @@
     406859      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     40685d      1 INSTR BELONGTO 406850 
     40685d      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    40685d     -3 INSTR LOCAL NoWarn push    rax 
+    40685e     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40685e      1 INSTR BELONGTO 406850 
     40685e      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    40685e      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     40685f     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     40685f      7 INSTR BELONGTO 406850 
     40685f      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -2874,14 +2876,14 @@
     406902      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     406903      1 INSTR BELONGTO 4068a0 
     406903      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    406910      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
+    406910      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     406910      0 FUNC MMSAFENESS UNSAFE
     406910     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_60FD68, 0 
     406910     34 FUNC GLOBAL sub_406910 FUNC_UNSAFE USEFP RET     406931 
     406910      8 INSTR BELONGTO 406910 
-    406910      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    406910      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     406918      1 INSTR BELONGTO 406910 
+    406918      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    406918      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     406919      3 INSTR BELONGTO 406910 
     40691c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_406930 
     40691c      2 INSTR BELONGTO 406910 
@@ -5361,6 +5363,7 @@
     4079e0      5 FUNC GLOBAL sub_4079E0 FUNC_UNSAFE NOFP RET     4079e4 
     4079e0      5 INSTR BELONGTO 4079e0 
     4079e0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX ZZ jmp     sub_4069B0 
+    4079e0      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     4079f3     -3 INSTR LOCAL NoWarn push    rbx 
     4079f7     -1 INSTR LOCAL NoMetaUpdate call    _gtk_widget_destroy 
     407a00     -1 INSTR LOCAL NoMetaUpdate jmp     _g_free 
@@ -9420,7 +9423,7 @@
     409789     -3 INSTR LOCAL NoWarn push    rbp 
     40978a      1 INSTR BELONGTO 409780 
     40978a      1 INSTR DEADREGS  EFLAGS R11 R13 R14 ZZ push    rbx 
-    40978a     40 DATAREF STACK 913 esp + 0 PARENT LocalFrame LOCALFRAME
+    40978a     40 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40978a      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40978b      4 INSTR BELONGTO 409780 
     40978b      4 INSTR DEADREGS  EFLAGS RBX R11 R13 R14 ZZ mov     rbp, [rsi+38h] 
@@ -9765,7 +9768,7 @@
     4099ed     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4099ed      4 INSTR BELONGTO 4099e0 
     4099ed      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-    4099ed      8 DATAREF STACK 914 esp + 0 PARENT LocalFrame LOCALFRAME
+    4099ed      8 DATAREF STACK 913 esp + 0 PARENT LocalFrame LOCALFRAME
     4099ed      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4099f1     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
     4099f1      5 INSTR BELONGTO 4099e0 
@@ -9858,8 +9861,8 @@
     409a61     -2 INSTR LOCAL n EDI 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 915 esp + 0 PARENT LocalFrame LOCALFRAME
-    409a66     16 DATAREF STACK 916 esp + 0 CHILDOF 915 OFFSET 0 OutArgsRegion OUTARGS
+    409a66     16 DATAREF STACK 914 esp + 0 PARENT LocalFrame LOCALFRAME
+    409a66     16 DATAREF STACK 915 esp + 0 CHILDOF 914 OFFSET 0 OutArgsRegion OUTARGS
     409a66      4 INSTR BELONGTO 409a60 
     409a66      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 10h 
     409a66      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -9907,13 +9910,13 @@
     409aa5      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
     409ab0      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
     409ab0      0 FUNC MMSAFENESS UNSAFE
-    409ab0     24 DATAREF STACK 919 esp + 24 CHILDOF 917 OFFSET 24 LOCALVAR var_40 
-    409ab0      2 DATAREF STACK 918 esp + 0 CHILDOF 917 OFFSET 0 OutArgsRegion OUTARGS
-    409ab0     32 DATAREF STACK 921 esp + 56 CHILDOF 917 OFFSET 56 LOCALVAR var_20 
+    409ab0     24 DATAREF STACK 918 esp + 24 CHILDOF 916 OFFSET 24 LOCALVAR var_40 
+    409ab0      2 DATAREF STACK 917 esp + 0 CHILDOF 916 OFFSET 0 OutArgsRegion OUTARGS
+    409ab0     32 DATAREF STACK 920 esp + 56 CHILDOF 916 OFFSET 56 LOCALVAR var_20 
     409ab0      4 INSTR BELONGTO 409ab0 
     409ab0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 58h 
-    409ab0     88 DATAREF STACK 917 esp + 0 PARENT LocalFrame LOCALFRAME
-    409ab0      8 DATAREF STACK 920 esp + 48 CHILDOF 917 OFFSET 48 LOCALVAR var_28 
+    409ab0     88 DATAREF STACK 916 esp + 0 PARENT LocalFrame LOCALFRAME
+    409ab0      8 DATAREF STACK 919 esp + 48 CHILDOF 916 OFFSET 48 LOCALVAR var_28 
     409ab0      8 MEMORYHOLE STACK esp + 88 ReturnAddress 
     409ab0     93 FUNC GLOBAL sub_409AB0 FUNC_UNSAFE NOFP RET     409b0c 
     409ab4      7 INSTR BELONGTO 409ab0 
@@ -10550,10 +10553,10 @@
     40aae0     -3 INSTR LOCAL NoWarn push    rbx 
     40aae1      3 INSTR BELONGTO 40aae0 
     40aae1      3 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI RDI R8 R9 R10 R11 ZZ mov     rbx, rdx 
-    40aae4     16 DATAREF STACK 922 esp + 0 PARENT LocalFrame LOCALFRAME
+    40aae4     16 DATAREF STACK 921 esp + 0 PARENT LocalFrame LOCALFRAME
     40aae4      4 INSTR BELONGTO 40aae0 
     40aae4      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 10h 
-    40aae4      8 DATAREF STACK 923 esp + 0 CHILDOF 922 OFFSET 0 OutArgsRegion OUTARGS
+    40aae4      8 DATAREF STACK 922 esp + 0 CHILDOF 921 OFFSET 0 OutArgsRegion OUTARGS
     40aae4      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
     40aae4      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40aae8     -1 INSTR LOCAL NoMetaUpdate call    sub_409AB0 
@@ -10656,12 +10659,12 @@
     40ab78     -3 INSTR LOCAL NoWarn push    rbx 
     40ab79      3 INSTR BELONGTO 40ab70 
     40ab79      3 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ mov     rbx, rdx 
-    40ab7c     16 DATAREF STACK 926 esp + 8 CHILDOF 924 OFFSET 8 LOCALVAR var_30 
-    40ab7c     24 DATAREF STACK 924 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ab7c     16 DATAREF STACK 925 esp + 8 CHILDOF 923 OFFSET 8 LOCALVAR var_30 
+    40ab7c     24 DATAREF STACK 923 esp + 0 PARENT LocalFrame LOCALFRAME
     40ab7c     32 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
     40ab7c      4 INSTR BELONGTO 40ab70 
     40ab7c      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 18h 
-    40ab7c      8 DATAREF STACK 925 esp + 0 CHILDOF 924 OFFSET 0 LOCALVAR var_38 
+    40ab7c      8 DATAREF STACK 924 esp + 0 CHILDOF 923 OFFSET 0 LOCALVAR var_38 
     40ab7c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40ab80      8 INSTR BELONGTO 40ab70 
     40ab80      8 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 ZZ mov     [rsp+38h+var_38], 0 
@@ -11151,15 +11154,15 @@
     40aebd      5 INSTR BELONGTO 40aeb0 
     40aec2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     40aec2      5 INSTR BELONGTO 40aeb0 
-    40aec7     12 DATAREF STACK 929 esp + 28 CHILDOF 927 OFFSET 28 LOCALVAR var_2C 
-    40aec7     16 DATAREF STACK 928 esp + 0 CHILDOF 927 OFFSET 0 OutArgsRegion OUTARGS
+    40aec7     12 DATAREF STACK 928 esp + 28 CHILDOF 926 OFFSET 28 LOCALVAR var_2C 
+    40aec7     16 DATAREF STACK 927 esp + 0 CHILDOF 926 OFFSET 0 OutArgsRegion OUTARGS
     40aec7      4 INSTR BELONGTO 40aeb0 
     40aec7      4 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 R13 ZZ sub     rsp, 48h 
-    40aec7     72 DATAREF STACK 927 esp + 0 PARENT LocalFrame LOCALFRAME
-    40aec7      8 DATAREF STACK 930 esp + 40 CHILDOF 927 OFFSET 40 LOCALVAR var_20 
-    40aec7      8 DATAREF STACK 931 esp + 48 CHILDOF 927 OFFSET 48 LOCALVAR var_18 
-    40aec7      8 DATAREF STACK 932 esp + 56 CHILDOF 927 OFFSET 56 LOCALVAR var_10 
-    40aec7      8 DATAREF STACK 933 esp + 64 CHILDOF 927 OFFSET 64 LOCALVAR var_8 
+    40aec7     72 DATAREF STACK 926 esp + 0 PARENT LocalFrame LOCALFRAME
+    40aec7      8 DATAREF STACK 929 esp + 40 CHILDOF 926 OFFSET 40 LOCALVAR var_20 
+    40aec7      8 DATAREF STACK 930 esp + 48 CHILDOF 926 OFFSET 48 LOCALVAR var_18 
+    40aec7      8 DATAREF STACK 931 esp + 56 CHILDOF 926 OFFSET 56 LOCALVAR var_10 
+    40aec7      8 DATAREF STACK 932 esp + 64 CHILDOF 926 OFFSET 64 LOCALVAR var_8 
     40aec7      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     40aecb      3 INSTR BELONGTO 40aeb0 
     40aecb      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 R13 ZZ mov     rbp, rsi 
@@ -11641,10 +11644,10 @@
     40b232      3 INSTR BELONGTO 40b230 
     40b232      3 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI RDI R8 R9 R10 R11 ZZ mov     rbx, rdx 
     40b235     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    40b235     24 DATAREF STACK 934 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b235     24 DATAREF STACK 933 esp + 0 PARENT LocalFrame LOCALFRAME
     40b235      4 INSTR BELONGTO 40b230 
     40b235      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-    40b235      8 DATAREF STACK 935 esp + 0 CHILDOF 934 OFFSET 0 OutArgsRegion OUTARGS
+    40b235      8 DATAREF STACK 934 esp + 0 CHILDOF 933 OFFSET 0 OutArgsRegion OUTARGS
     40b235      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40b239     -1 INSTR LOCAL NoMetaUpdate call    sub_409AB0 
     40b239      5 INSTR BELONGTO 40b230 
@@ -11786,15 +11789,15 @@
     40b33d      5 INSTR BELONGTO 40b330 
     40b342     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     40b342      5 INSTR BELONGTO 40b330 
-    40b347     12 DATAREF STACK 938 esp + 28 CHILDOF 936 OFFSET 28 LOCALVAR var_2C 
-    40b347     16 DATAREF STACK 937 esp + 0 CHILDOF 936 OFFSET 0 OutArgsRegion OUTARGS
+    40b347     12 DATAREF STACK 937 esp + 28 CHILDOF 935 OFFSET 28 LOCALVAR var_2C 
+    40b347     16 DATAREF STACK 936 esp + 0 CHILDOF 935 OFFSET 0 OutArgsRegion OUTARGS
     40b347      4 INSTR BELONGTO 40b330 
     40b347      4 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 R13 ZZ sub     rsp, 48h 
-    40b347     72 DATAREF STACK 936 esp + 0 PARENT LocalFrame LOCALFRAME
-    40b347      8 DATAREF STACK 939 esp + 40 CHILDOF 936 OFFSET 40 LOCALVAR var_20 
-    40b347      8 DATAREF STACK 940 esp + 48 CHILDOF 936 OFFSET 48 LOCALVAR var_18 
-    40b347      8 DATAREF STACK 941 esp + 56 CHILDOF 936 OFFSET 56 LOCALVAR var_10 
-    40b347      8 DATAREF STACK 942 esp + 64 CHILDOF 936 OFFSET 64 LOCALVAR var_8 
+    40b347     72 DATAREF STACK 935 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b347      8 DATAREF STACK 938 esp + 40 CHILDOF 935 OFFSET 40 LOCALVAR var_20 
+    40b347      8 DATAREF STACK 939 esp + 48 CHILDOF 935 OFFSET 48 LOCALVAR var_18 
+    40b347      8 DATAREF STACK 940 esp + 56 CHILDOF 935 OFFSET 56 LOCALVAR var_10 
+    40b347      8 DATAREF STACK 941 esp + 64 CHILDOF 935 OFFSET 64 LOCALVAR var_8 
     40b347      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     40b34b      3 INSTR BELONGTO 40b330 
     40b34b      3 INSTR DEADREGS  EFLAGS RCX RDX RDI R12 R13 ZZ mov     rbp, rsi 
@@ -12246,7 +12249,7 @@
     40b669     32 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40b669      4 INSTR BELONGTO 40b660 
     40b669      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 8 
-    40b669      8 DATAREF STACK 943 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b669      8 DATAREF STACK 942 esp + 0 PARENT LocalFrame LOCALFRAME
     40b669      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40b66d     -1 INSTR LOCAL NoMetaUpdate call    sub_409AB0 
     40b66d      5 INSTR BELONGTO 40b660 
@@ -12544,18 +12547,18 @@
     40b869     -3 INSTR LOCAL NoWarn push    rbx 
     40b86a      3 INSTR BELONGTO 40b860 
     40b86a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ mov     rbx, rsi 
-    40b86d     16 DATAREF STACK 945 esp + 0 CHILDOF 944 OFFSET 0 OutArgsRegion OUTARGS
-    40b86d     16 DATAREF STACK 951 esp + 56 CHILDOF 944 OFFSET 56 LOCALVAR var_50 
-    40b86d     16 DATAREF STACK 952 esp + 72 CHILDOF 944 OFFSET 72 LOCALVAR var_40 
+    40b86d     16 DATAREF STACK 944 esp + 0 CHILDOF 943 OFFSET 0 OutArgsRegion OUTARGS
+    40b86d     16 DATAREF STACK 950 esp + 56 CHILDOF 943 OFFSET 56 LOCALVAR var_50 
+    40b86d     16 DATAREF STACK 951 esp + 72 CHILDOF 943 OFFSET 72 LOCALVAR var_40 
     40b86d     48 MEMORYHOLE STACK esp + 88 CalleeSavedRegs 
     40b86d      4 INSTR BELONGTO 40b860 
     40b86d      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ sub     rsp, 58h 
-    40b86d     88 DATAREF STACK 944 esp + 0 PARENT LocalFrame LOCALFRAME
-    40b86d      8 DATAREF STACK 946 esp + 16 CHILDOF 944 OFFSET 16 LOCALVAR var_78 
-    40b86d      8 DATAREF STACK 947 esp + 24 CHILDOF 944 OFFSET 24 LOCALVAR var_70 
-    40b86d      8 DATAREF STACK 948 esp + 32 CHILDOF 944 OFFSET 32 LOCALVAR var_68 
-    40b86d      8 DATAREF STACK 949 esp + 40 CHILDOF 944 OFFSET 40 LOCALVAR var_60 
-    40b86d      8 DATAREF STACK 950 esp + 48 CHILDOF 944 OFFSET 48 LOCALVAR var_58 
+    40b86d     88 DATAREF STACK 943 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b86d      8 DATAREF STACK 945 esp + 16 CHILDOF 943 OFFSET 16 LOCALVAR var_78 
+    40b86d      8 DATAREF STACK 946 esp + 24 CHILDOF 943 OFFSET 24 LOCALVAR var_70 
+    40b86d      8 DATAREF STACK 947 esp + 32 CHILDOF 943 OFFSET 32 LOCALVAR var_68 
+    40b86d      8 DATAREF STACK 948 esp + 40 CHILDOF 943 OFFSET 40 LOCALVAR var_60 
+    40b86d      8 DATAREF STACK 949 esp + 48 CHILDOF 943 OFFSET 48 LOCALVAR var_58 
     40b86d      8 MEMORYHOLE STACK esp + 136 ReturnAddress 
     40b871     -1 INSTR LOCAL NoMetaUpdate call    sub_409AB0 
     40b871      5 INSTR BELONGTO 40b860 
@@ -13597,12 +13600,12 @@
     40bf3f      1 INSTR BELONGTO 40bf30 
     40bf3f      1 INSTR DEADREGS  EFLAGS RDI R12 R14 ZZ push    rbx 
     40bf3f     -3 INSTR LOCAL NoWarn push    rbx 
-    40bf40     16 DATAREF STACK 953 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bf40     16 DATAREF STACK 952 esp + 0 PARENT LocalFrame LOCALFRAME
     40bf40     40 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
-    40bf40      4 DATAREF STACK 954 esp + 0 CHILDOF 953 OFFSET 0 OutArgsRegion OUTARGS
+    40bf40      4 DATAREF STACK 953 esp + 0 CHILDOF 952 OFFSET 0 OutArgsRegion OUTARGS
     40bf40      4 INSTR BELONGTO 40bf30 
     40bf40      4 INSTR DEADREGS  EFLAGS RBX RDI R12 R14 ZZ sub     rsp, 10h 
-    40bf40      8 DATAREF STACK 955 esp + 8 CHILDOF 953 OFFSET 8 LOCALVAR var_30 
+    40bf40      8 DATAREF STACK 954 esp + 8 CHILDOF 952 OFFSET 8 LOCALVAR var_30 
     40bf40      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40bf44     -1 INSTR LOCAL NoMetaUpdate test    esi, esi 
     40bf44      2 INSTR BELONGTO 40bf30 
@@ -13901,21 +13904,21 @@
     40c127      5 INSTR BELONGTO 40c110 
     40c12c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
     40c12c      5 INSTR BELONGTO 40c110 
-    40c131    120 DATAREF STACK 956 esp + 0 PARENT LocalFrame LOCALFRAME
-    40c131     16 DATAREF STACK 957 esp + 0 CHILDOF 956 OFFSET 0 OutArgsRegion OUTARGS
-    40c131     16 DATAREF STACK 961 esp + 40 CHILDOF 956 OFFSET 40 LOCALVAR var_50 
-    40c131     16 DATAREF STACK 962 esp + 56 CHILDOF 956 OFFSET 56 LOCALVAR var_40 
+    40c131    120 DATAREF STACK 955 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c131     16 DATAREF STACK 956 esp + 0 CHILDOF 955 OFFSET 0 OutArgsRegion OUTARGS
+    40c131     16 DATAREF STACK 960 esp + 40 CHILDOF 955 OFFSET 40 LOCALVAR var_50 
+    40c131     16 DATAREF STACK 961 esp + 56 CHILDOF 955 OFFSET 56 LOCALVAR var_40 
     40c131      4 INSTR BELONGTO 40c110 
     40c131      4 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 ZZ sub     rsp, 78h 
-    40c131      8 DATAREF STACK 958 esp + 16 CHILDOF 956 OFFSET 16 LOCALVAR var_68 
-    40c131      8 DATAREF STACK 959 esp + 24 CHILDOF 956 OFFSET 24 LOCALVAR var_60 
-    40c131      8 DATAREF STACK 960 esp + 32 CHILDOF 956 OFFSET 32 LOCALVAR var_58 
-    40c131      8 DATAREF STACK 963 esp + 72 CHILDOF 956 OFFSET 72 LOCALVAR var_30 
-    40c131      8 DATAREF STACK 964 esp + 80 CHILDOF 956 OFFSET 80 LOCALVAR var_28 
-    40c131      8 DATAREF STACK 965 esp + 88 CHILDOF 956 OFFSET 88 LOCALVAR var_20 
-    40c131      8 DATAREF STACK 966 esp + 96 CHILDOF 956 OFFSET 96 LOCALVAR var_18 
-    40c131      8 DATAREF STACK 967 esp + 104 CHILDOF 956 OFFSET 104 LOCALVAR var_10 
-    40c131      8 DATAREF STACK 968 esp + 112 CHILDOF 956 OFFSET 112 LOCALVAR var_8 
+    40c131      8 DATAREF STACK 957 esp + 16 CHILDOF 955 OFFSET 16 LOCALVAR var_68 
+    40c131      8 DATAREF STACK 958 esp + 24 CHILDOF 955 OFFSET 24 LOCALVAR var_60 
+    40c131      8 DATAREF STACK 959 esp + 32 CHILDOF 955 OFFSET 32 LOCALVAR var_58 
+    40c131      8 DATAREF STACK 962 esp + 72 CHILDOF 955 OFFSET 72 LOCALVAR var_30 
+    40c131      8 DATAREF STACK 963 esp + 80 CHILDOF 955 OFFSET 80 LOCALVAR var_28 
+    40c131      8 DATAREF STACK 964 esp + 88 CHILDOF 955 OFFSET 88 LOCALVAR var_20 
+    40c131      8 DATAREF STACK 965 esp + 96 CHILDOF 955 OFFSET 96 LOCALVAR var_18 
+    40c131      8 DATAREF STACK 966 esp + 104 CHILDOF 955 OFFSET 104 LOCALVAR var_10 
+    40c131      8 DATAREF STACK 967 esp + 112 CHILDOF 955 OFFSET 112 LOCALVAR var_8 
     40c131      8 MEMORYHOLE STACK esp + 120 ReturnAddress 
     40c135      4 INSTR BELONGTO 40c110 
     40c135      4 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 ZZ mov     rax, [rsi+38h] 
@@ -14725,17 +14728,17 @@
     40c707      5 INSTR BELONGTO 40c6f0 
     40c70c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
     40c70c      5 INSTR BELONGTO 40c6f0 
-    40c711     16 DATAREF STACK 971 esp + 8 CHILDOF 969 OFFSET 8 LOCALVAR var_40 
-    40c711      4 DATAREF STACK 970 esp + 0 CHILDOF 969 OFFSET 0 OutArgsRegion OUTARGS
+    40c711     16 DATAREF STACK 970 esp + 8 CHILDOF 968 OFFSET 8 LOCALVAR var_40 
+    40c711      4 DATAREF STACK 969 esp + 0 CHILDOF 968 OFFSET 0 OutArgsRegion OUTARGS
     40c711      4 INSTR BELONGTO 40c6f0 
     40c711      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R14 R15 ZZ sub     rsp, 48h 
-    40c711     72 DATAREF STACK 969 esp + 0 PARENT LocalFrame LOCALFRAME
-    40c711      8 DATAREF STACK 972 esp + 24 CHILDOF 969 OFFSET 24 LOCALVAR var_30 
-    40c711      8 DATAREF STACK 973 esp + 32 CHILDOF 969 OFFSET 32 LOCALVAR var_28 
-    40c711      8 DATAREF STACK 974 esp + 40 CHILDOF 969 OFFSET 40 LOCALVAR var_20 
-    40c711      8 DATAREF STACK 975 esp + 48 CHILDOF 969 OFFSET 48 LOCALVAR var_18 
-    40c711      8 DATAREF STACK 976 esp + 56 CHILDOF 969 OFFSET 56 LOCALVAR var_10 
-    40c711      8 DATAREF STACK 977 esp + 64 CHILDOF 969 OFFSET 64 LOCALVAR var_8 
+    40c711     72 DATAREF STACK 968 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c711      8 DATAREF STACK 971 esp + 24 CHILDOF 968 OFFSET 24 LOCALVAR var_30 
+    40c711      8 DATAREF STACK 972 esp + 32 CHILDOF 968 OFFSET 32 LOCALVAR var_28 
+    40c711      8 DATAREF STACK 973 esp + 40 CHILDOF 968 OFFSET 40 LOCALVAR var_20 
+    40c711      8 DATAREF STACK 974 esp + 48 CHILDOF 968 OFFSET 48 LOCALVAR var_18 
+    40c711      8 DATAREF STACK 975 esp + 56 CHILDOF 968 OFFSET 56 LOCALVAR var_10 
+    40c711      8 DATAREF STACK 976 esp + 64 CHILDOF 968 OFFSET 64 LOCALVAR var_8 
     40c711      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     40c715     -1 INSTR LOCAL NoMetaUpdate call    sub_409AB0 
     40c715      5 INSTR BELONGTO 40c6f0 
@@ -15092,10 +15095,10 @@
     40c970     71 FUNC GLOBAL sub_40C970 FUNC_UNSAFE NOFP RET     40c9b6 
     40c971     -1 INSTR LOCAL MetadataUnused mov     rbx, rdx 
     40c971      3 INSTR BELONGTO 40c970 
-    40c974     16 DATAREF STACK 978 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c974     16 DATAREF STACK 977 esp + 0 PARENT LocalFrame LOCALFRAME
     40c974      4 INSTR BELONGTO 40c970 
     40c974      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 10h 
-    40c974      8 DATAREF STACK 979 esp + 8 CHILDOF 978 OFFSET 8 LOCALVAR var_10 
+    40c974      8 DATAREF STACK 978 esp + 8 CHILDOF 977 OFFSET 8 LOCALVAR var_10 
     40c974      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
     40c974      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40c978     -1 INSTR LOCAL NoMetaUpdate cmp     esi, 1 
@@ -15308,7 +15311,7 @@
     40ce39     32 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40ce39      4 INSTR BELONGTO 40ce30 
     40ce39      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 8 
-    40ce39      8 DATAREF STACK 980 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ce39      8 DATAREF STACK 979 esp + 0 PARENT LocalFrame LOCALFRAME
     40ce39      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40ce3d     -1 INSTR LOCAL NoMetaUpdate call    sub_409AB0 
     40ce3d      5 INSTR BELONGTO 40ce30 
@@ -15513,13 +15516,13 @@
     40cfb7      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
     40cfbc      4 INSTR BELONGTO 40cf90 
     40cfbc      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-    40cfbc     56 DATAREF STACK 981 esp + 0 PARENT LocalFrame LOCALFRAME
-    40cfbc      8 DATAREF STACK 982 esp + 8 CHILDOF 981 OFFSET 8 LOCALVAR var_30 
-    40cfbc      8 DATAREF STACK 983 esp + 16 CHILDOF 981 OFFSET 16 LOCALVAR var_28 
-    40cfbc      8 DATAREF STACK 984 esp + 24 CHILDOF 981 OFFSET 24 LOCALVAR var_20 
-    40cfbc      8 DATAREF STACK 985 esp + 32 CHILDOF 981 OFFSET 32 LOCALVAR var_18 
-    40cfbc      8 DATAREF STACK 986 esp + 40 CHILDOF 981 OFFSET 40 LOCALVAR var_10 
-    40cfbc      8 DATAREF STACK 987 esp + 48 CHILDOF 981 OFFSET 48 LOCALVAR var_8 
+    40cfbc     56 DATAREF STACK 980 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cfbc      8 DATAREF STACK 981 esp + 8 CHILDOF 980 OFFSET 8 LOCALVAR var_30 
+    40cfbc      8 DATAREF STACK 982 esp + 16 CHILDOF 980 OFFSET 16 LOCALVAR var_28 
+    40cfbc      8 DATAREF STACK 983 esp + 24 CHILDOF 980 OFFSET 24 LOCALVAR var_20 
+    40cfbc      8 DATAREF STACK 984 esp + 32 CHILDOF 980 OFFSET 32 LOCALVAR var_18 
+    40cfbc      8 DATAREF STACK 985 esp + 40 CHILDOF 980 OFFSET 40 LOCALVAR var_10 
+    40cfbc      8 DATAREF STACK 986 esp + 48 CHILDOF 980 OFFSET 48 LOCALVAR var_8 
     40cfbc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     40cfc0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
     40cfc0      3 INSTR BELONGTO 40cf90 
@@ -15596,7 +15599,7 @@
     40d035     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40d035      4 INSTR BELONGTO 40d030 
     40d035      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    40d035      8 DATAREF STACK 988 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d035      8 DATAREF STACK 987 esp + 0 PARENT LocalFrame LOCALFRAME
     40d035      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40d039      7 INSTR BELONGTO 40d030 
     40d039      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_60FD48 
@@ -15631,7 +15634,7 @@
     40d068     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     40d075 
     40d068      4 INSTR BELONGTO 40d068 
     40d068      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    40d068      8 DATAREF STACK 989 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d068      8 DATAREF STACK 988 esp + 0 PARENT LocalFrame LOCALFRAME
     40d068      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40d06c     -1 INSTR LOCAL NoMetaUpdate call    sub_4068A0 
     40d06c      5 INSTR BELONGTO 40d068 
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 514df4d3..b87db225 100644
--- a/tests/commit/trimmed-sorted-save-gnome-system-log.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-system-log.psexe.annot
@@ -4086,12 +4086,11 @@
     409dbb     -1 INSTR LOCAL NoMetaUpdate call    _exit 
     409dbb      5 INSTR BELONGTO 409bd0 
     409dbb      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _exit 
-    409dc0      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
-    409dc0      0 FUNC MMSAFENESS UNSAFE
+    409dc0      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    409dc0      0 FUNC MMSAFENESS SAFE
     409dc0     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     409dc0      2 INSTR BELONGTO 409dc0 
     409dc0     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     409de9 
-    409dc0      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     409dc2      3 INSTR BELONGTO 409dc0 
     409dc2      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     409dc5      1 INSTR BELONGTO 409dc0 
@@ -4103,8 +4102,11 @@
     409dc9      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     409dcd      1 INSTR BELONGTO 409dc0 
     409dcd      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    409dcd     -3 INSTR LOCAL NoWarn push    rax 
+    409dce     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     409dce      1 INSTR BELONGTO 409dc0 
     409dce      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    409dce      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     409dcf     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     409dcf      7 INSTR BELONGTO 409dc0 
     409dcf      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -4199,14 +4201,14 @@
     409e72      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     409e73      1 INSTR BELONGTO 409e10 
     409e73      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    409e80      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
+    409e80      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     409e80      0 FUNC MMSAFENESS UNSAFE
     409e80     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_618DA8, 0 
     409e80     34 FUNC GLOBAL sub_409E80 FUNC_UNSAFE USEFP RET     409ea1 
     409e80      8 INSTR BELONGTO 409e80 
-    409e80      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    409e80      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     409e88      1 INSTR BELONGTO 409e80 
+    409e88      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    409e88      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     409e89      3 INSTR BELONGTO 409e80 
     409e8c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_409EA0 
     409e8c      2 INSTR BELONGTO 409e80 
@@ -6141,7 +6143,7 @@
     40b01a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 R13 R14 ZZ mov     rbp, rdi 
     40b01d      1 INSTR BELONGTO 40b010 
     40b01d      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R13 R14 ZZ push    rbx 
-    40b01d     40 DATAREF STACK 1174 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b01d     40 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40b01d      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40b01e      3 INSTR BELONGTO 40b010 
     40b01e      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 R13 R14 ZZ mov     rbx, rsi 
@@ -6315,7 +6317,7 @@
     40b12d      3 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI R8 R9 R10 R11 R14 ZZ mov     rbp, rdx 
     40b130      1 INSTR BELONGTO 40b120 
     40b130      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R14 ZZ push    rbx 
-    40b130     40 DATAREF STACK 1175 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b130     40 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     40b130      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40b131     -1 INSTR LOCAL NoMetaUpdate call    sub_40A9B0 
     40b131      5 INSTR BELONGTO 40b120 
@@ -6509,7 +6511,7 @@
     40b2b8     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40b2b8      4 INSTR BELONGTO 40b2b0 
     40b2b8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40b2b8      8 DATAREF STACK 1176 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b2b8      8 DATAREF STACK 1174 esp + 0 PARENT LocalFrame LOCALFRAME
     40b2b8      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40b2bc     -1 INSTR LOCAL NoMetaUpdate call    sub_40A9B0 
     40b2bc      5 INSTR BELONGTO 40b2b0 
@@ -6600,16 +6602,8 @@
     40b34d      5 INSTR BELONGTO 40d6c0 
     40b352     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     40b352      5 INSTR BELONGTO 40d6c0 
-    40b357     32 DATAREF STACK 1308 esp + 0 PARENT LocalFrame LOCALFRAME
-    40b357      4 DATAREF STACK 1309 esp + 0 CHILDOF 1308 OFFSET 0 LOCALVAR SMP_IDA_FixVar0 
-    40b357      4 DATAREF STACK 1310 esp + 4 CHILDOF 1308 OFFSET 4 LOCALVAR SMP_IDA_FixVar4 
     40b357      4 INSTR BELONGTO 40d6c0 
     40b357      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 28h 
-    40b357      8 DATAREF STACK 1311 esp + 8 CHILDOF 1308 OFFSET 8 LOCALVAR var_20 
-    40b357      8 DATAREF STACK 1312 esp + 16 CHILDOF 1308 OFFSET 16 LOCALVAR var_18 
-    40b357      8 DATAREF STACK 1313 esp + 24 CHILDOF 1308 OFFSET 24 LOCALVAR var_10 
-    40b357      8 DATAREF STACK 1314 esp + 32 CHILDOF 1308 OFFSET 32 LOCALVAR var_8 
-    40b357      8 MEMORYHOLE STACK esp + 32 ReturnAddress 
     40b35b     -1 INSTR LOCAL NoMetaUpdate call    sub_40A9B0 
     40b35b      5 INSTR BELONGTO 40d6c0 
     40b35b      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 ZZ call    sub_40A9B0 
@@ -6729,8 +6723,8 @@
     40b417      5 INSTR BELONGTO 40d6c0 
     40b41c     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 28h 
     40b41c      4 INSTR BELONGTO 40d6c0 
+    40b420      0 DEALLOC STACK esp - 0 jmp     _g_free
     40b420     -1 INSTR LOCAL NoMetaUpdate jmp     _g_free 
-    40b420     32 DEALLOC STACK esp - 32 jmp     _g_free
     40b420      5 INSTR BELONGTO 40d6c0 
     40b420      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ jmp     _g_free 
     40b430      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
@@ -6744,11 +6738,11 @@
     40b435      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
     40b43a      3 INSTR BELONGTO 40b430 
     40b43a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    40b43d     24 DATAREF STACK 1177 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b43d     24 DATAREF STACK 1175 esp + 0 PARENT LocalFrame LOCALFRAME
     40b43d      4 INSTR BELONGTO 40b430 
     40b43d      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-    40b43d      8 DATAREF STACK 1178 esp + 8 CHILDOF 1177 OFFSET 8 LOCALVAR var_10 
-    40b43d      8 DATAREF STACK 1179 esp + 16 CHILDOF 1177 OFFSET 16 LOCALVAR var_8 
+    40b43d      8 DATAREF STACK 1176 esp + 8 CHILDOF 1175 OFFSET 8 LOCALVAR var_10 
+    40b43d      8 DATAREF STACK 1177 esp + 16 CHILDOF 1175 OFFSET 16 LOCALVAR var_8 
     40b43d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40b441     -1 INSTR LOCAL MetadataUnused mov     rbp, rsi 
     40b441      3 INSTR BELONGTO 40b430 
@@ -6846,16 +6840,16 @@
     40b4da      5 INSTR BELONGTO 40b4c0 
     40b4da      5 INSTR DEADREGS  EFLAGS R13 R14 ZZ mov     [rsp+var_20], rbp 
     40b4da      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], rbp
-    40b4df    104 DATAREF STACK 1180 esp + 0 PARENT LocalFrame LOCALFRAME
-    40b4df     48 DATAREF STACK 1182 esp + 16 CHILDOF 1180 OFFSET 16 LOCALVAR var_58 
-    40b4df      4 DATAREF STACK 1181 esp + 12 CHILDOF 1180 OFFSET 12 LOCALVAR var_5C 
+    40b4df    104 DATAREF STACK 1178 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b4df     48 DATAREF STACK 1180 esp + 16 CHILDOF 1178 OFFSET 16 LOCALVAR var_58 
+    40b4df      4 DATAREF STACK 1179 esp + 12 CHILDOF 1178 OFFSET 12 LOCALVAR var_5C 
     40b4df      4 INSTR BELONGTO 40b4c0 
     40b4df      4 INSTR DEADREGS  EFLAGS R13 R14 ZZ sub     rsp, 68h 
-    40b4df      8 DATAREF STACK 1183 esp + 64 CHILDOF 1180 OFFSET 64 LOCALVAR var_28 
-    40b4df      8 DATAREF STACK 1184 esp + 72 CHILDOF 1180 OFFSET 72 LOCALVAR var_20 
-    40b4df      8 DATAREF STACK 1185 esp + 80 CHILDOF 1180 OFFSET 80 LOCALVAR var_18 
-    40b4df      8 DATAREF STACK 1186 esp + 88 CHILDOF 1180 OFFSET 88 LOCALVAR var_10 
-    40b4df      8 DATAREF STACK 1187 esp + 96 CHILDOF 1180 OFFSET 96 LOCALVAR var_8 
+    40b4df      8 DATAREF STACK 1181 esp + 64 CHILDOF 1178 OFFSET 64 LOCALVAR var_28 
+    40b4df      8 DATAREF STACK 1182 esp + 72 CHILDOF 1178 OFFSET 72 LOCALVAR var_20 
+    40b4df      8 DATAREF STACK 1183 esp + 80 CHILDOF 1178 OFFSET 80 LOCALVAR var_18 
+    40b4df      8 DATAREF STACK 1184 esp + 88 CHILDOF 1178 OFFSET 88 LOCALVAR var_10 
+    40b4df      8 DATAREF STACK 1185 esp + 96 CHILDOF 1178 OFFSET 96 LOCALVAR var_8 
     40b4df      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
     40b4e3     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40b4e3      3 INSTR BELONGTO 40b4c0 
@@ -6965,14 +6959,14 @@
     40b586      2 INSTR BELONGTO 40b4c0 
     40b588     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40B508 
     40b588      5 INSTR BELONGTO 40b4c0 
-    40b590      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 4 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
+    40b590      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -4 0 4 0 8 5 0 0 6 0 0 7 0 4 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
     40b590      0 FUNC MMSAFENESS SAFE
     40b590     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40b590     34 FUNC GLOBAL sub_40B590 FUNC_UNSAFE NOFP RET     40b5b1 
     40b590      3 INSTR BELONGTO 40b590 
-    40b590      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    40b590      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40b593      1 INSTR BELONGTO 40b590 
+    40b593      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    40b593      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40b594     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
     40b594      3 INSTR BELONGTO 40b590 
     40b597     -1 INSTR LOCAL NoMetaUpdate jz      short loc_40B5B0 
@@ -7004,11 +6998,11 @@
     40b5c5      5 INSTR BELONGTO 40b5c0 
     40b5c5      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+var_8], rbp 
     40b5c5      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
-    40b5ca     24 DATAREF STACK 1188 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b5ca     24 DATAREF STACK 1186 esp + 0 PARENT LocalFrame LOCALFRAME
     40b5ca      4 INSTR BELONGTO 40b5c0 
     40b5ca      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-    40b5ca      8 DATAREF STACK 1189 esp + 8 CHILDOF 1188 OFFSET 8 LOCALVAR var_10 
-    40b5ca      8 DATAREF STACK 1190 esp + 16 CHILDOF 1188 OFFSET 16 LOCALVAR var_8 
+    40b5ca      8 DATAREF STACK 1187 esp + 8 CHILDOF 1186 OFFSET 8 LOCALVAR var_10 
+    40b5ca      8 DATAREF STACK 1188 esp + 16 CHILDOF 1186 OFFSET 16 LOCALVAR var_8 
     40b5ca      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40b5ce     -1 INSTR LOCAL MetadataUnused mov     rbp, rdi 
     40b5ce      3 INSTR BELONGTO 40b5c0 
@@ -7072,7 +7066,7 @@
     40b624     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40b624      4 INSTR BELONGTO 40b620 
     40b624      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-    40b624      8 DATAREF STACK 1191 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b624      8 DATAREF STACK 1189 esp + 0 PARENT LocalFrame LOCALFRAME
     40b624      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40b628     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40b628      3 INSTR BELONGTO 40b620 
@@ -7135,20 +7129,20 @@
     40b669     -3 INSTR LOCAL NoWarn push    rbx 
     40b66a     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
     40b66a      3 INSTR BELONGTO 40b660 
-    40b66d     10 DATAREF STACK 1197 esp + 40 CHILDOF 1192 OFFSET 40 LOCALVAR var_60 
-    40b66d     12 DATAREF STACK 1201 esp + 64 CHILDOF 1192 OFFSET 64 LOCALVAR var_48 
-    40b66d     12 DATAREF STACK 1202 esp + 76 CHILDOF 1192 OFFSET 76 LOCALVAR var_3C 
-    40b66d      2 DATAREF STACK 1198 esp + 50 CHILDOF 1192 OFFSET 50 LOCALVAR var_56 
+    40b66d     10 DATAREF STACK 1195 esp + 40 CHILDOF 1190 OFFSET 40 LOCALVAR var_60 
+    40b66d     12 DATAREF STACK 1199 esp + 64 CHILDOF 1190 OFFSET 64 LOCALVAR var_48 
+    40b66d     12 DATAREF STACK 1200 esp + 76 CHILDOF 1190 OFFSET 76 LOCALVAR var_3C 
+    40b66d      2 DATAREF STACK 1196 esp + 50 CHILDOF 1190 OFFSET 50 LOCALVAR var_56 
     40b66d     48 MEMORYHOLE STACK esp + 88 CalleeSavedRegs 
-    40b66d      4 DATAREF STACK 1199 esp + 52 CHILDOF 1192 OFFSET 52 LOCALVAR var_54 
+    40b66d      4 DATAREF STACK 1197 esp + 52 CHILDOF 1190 OFFSET 52 LOCALVAR var_54 
     40b66d      4 INSTR BELONGTO 40b660 
     40b66d      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 58h 
-    40b66d     88 DATAREF STACK 1192 esp + 0 PARENT LocalFrame LOCALFRAME
-    40b66d      8 DATAREF STACK 1193 esp + 8 CHILDOF 1192 OFFSET 8 LOCALVAR var_80 
-    40b66d      8 DATAREF STACK 1194 esp + 16 CHILDOF 1192 OFFSET 16 LOCALVAR needle 
-    40b66d      8 DATAREF STACK 1195 esp + 24 CHILDOF 1192 OFFSET 24 LOCALVAR var_70 
-    40b66d      8 DATAREF STACK 1196 esp + 32 CHILDOF 1192 OFFSET 32 LOCALVAR var_68 
-    40b66d      8 DATAREF STACK 1200 esp + 56 CHILDOF 1192 OFFSET 56 LOCALVAR timer 
+    40b66d     88 DATAREF STACK 1190 esp + 0 PARENT LocalFrame LOCALFRAME
+    40b66d      8 DATAREF STACK 1191 esp + 8 CHILDOF 1190 OFFSET 8 LOCALVAR var_80 
+    40b66d      8 DATAREF STACK 1192 esp + 16 CHILDOF 1190 OFFSET 16 LOCALVAR needle 
+    40b66d      8 DATAREF STACK 1193 esp + 24 CHILDOF 1190 OFFSET 24 LOCALVAR var_70 
+    40b66d      8 DATAREF STACK 1194 esp + 32 CHILDOF 1190 OFFSET 32 LOCALVAR var_68 
+    40b66d      8 DATAREF STACK 1198 esp + 56 CHILDOF 1190 OFFSET 56 LOCALVAR timer 
     40b66d      8 MEMORYHOLE STACK esp + 136 ReturnAddress 
     40b671     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40b671      3 INSTR BELONGTO 40b660 
@@ -7709,10 +7703,10 @@
     40ba2a     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
     40ba2a      3 INSTR BELONGTO 40ba20 
     40ba2d     24 MEMORYHOLE STACK esp + 48 CalleeSavedRegs 
-    40ba2d     48 DATAREF STACK 1203 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ba2d     48 DATAREF STACK 1201 esp + 0 PARENT LocalFrame LOCALFRAME
     40ba2d      4 INSTR BELONGTO 40ba20 
     40ba2d      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 30h 
-    40ba2d      8 DATAREF STACK 1204 esp + 40 CHILDOF 1203 OFFSET 40 LOCALVAR var_20 
+    40ba2d      8 DATAREF STACK 1202 esp + 40 CHILDOF 1201 OFFSET 40 LOCALVAR var_20 
     40ba2d      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     40ba31     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get_type 
     40ba31      5 INSTR BELONGTO 40ba20 
@@ -7843,14 +7837,14 @@
     40badf     -3 INSTR LOCAL NoWarn push    rbx 
     40bae0     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
     40bae0      3 INSTR BELONGTO 40bad0 
-    40bae3     16 DATAREF STACK 1211 esp + 296 CHILDOF 1205 OFFSET 296 LOCALVAR var_40 
-    40bae3    200 DATAREF STACK 1210 esp + 96 CHILDOF 1205 OFFSET 96 LOCALVAR var_108 
-    40bae3    312 DATAREF STACK 1205 esp + 0 PARENT LocalFrame LOCALFRAME
-    40bae3     32 DATAREF STACK 1208 esp + 32 CHILDOF 1205 OFFSET 32 LOCALVAR var_148 
-    40bae3     32 DATAREF STACK 1209 esp + 64 CHILDOF 1205 OFFSET 64 LOCALVAR var_128 
+    40bae3     16 DATAREF STACK 1209 esp + 296 CHILDOF 1203 OFFSET 296 LOCALVAR var_40 
+    40bae3    200 DATAREF STACK 1208 esp + 96 CHILDOF 1203 OFFSET 96 LOCALVAR var_108 
+    40bae3    312 DATAREF STACK 1203 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bae3     32 DATAREF STACK 1206 esp + 32 CHILDOF 1203 OFFSET 32 LOCALVAR var_148 
+    40bae3     32 DATAREF STACK 1207 esp + 64 CHILDOF 1203 OFFSET 64 LOCALVAR var_128 
     40bae3     48 MEMORYHOLE STACK esp + 312 CalleeSavedRegs 
-    40bae3      4 DATAREF STACK 1206 esp + 0 CHILDOF 1205 OFFSET 0 OutArgsRegion OUTARGS
-    40bae3      4 DATAREF STACK 1207 esp + 28 CHILDOF 1205 OFFSET 28 LOCALVAR var_14C 
+    40bae3      4 DATAREF STACK 1204 esp + 0 CHILDOF 1203 OFFSET 0 OutArgsRegion OUTARGS
+    40bae3      4 DATAREF STACK 1205 esp + 28 CHILDOF 1203 OFFSET 28 LOCALVAR var_14C 
     40bae3      7 INSTR BELONGTO 40bad0 
     40bae3      7 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 ZZ sub     rsp, 138h 
     40bae3      8 MEMORYHOLE STACK esp + 360 ReturnAddress 
@@ -8100,10 +8094,10 @@
     40bc94      1 INSTR BELONGTO 40bc90 
     40bc94      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
     40bc94     -3 INSTR LOCAL NoWarn push    rbx 
-    40bc95     16 DATAREF STACK 1214 esp + 24 CHILDOF 1212 OFFSET 24 LOCALVAR var_20 
+    40bc95     16 DATAREF STACK 1212 esp + 24 CHILDOF 1210 OFFSET 24 LOCALVAR var_20 
     40bc95     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-    40bc95     20 DATAREF STACK 1213 esp + 0 CHILDOF 1212 OFFSET 0 OutArgsRegion OUTARGS
-    40bc95     40 DATAREF STACK 1212 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bc95     20 DATAREF STACK 1211 esp + 0 CHILDOF 1210 OFFSET 0 OutArgsRegion OUTARGS
+    40bc95     40 DATAREF STACK 1210 esp + 0 PARENT LocalFrame LOCALFRAME
     40bc95      4 INSTR BELONGTO 40bc90 
     40bc95      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 28h 
     40bc95      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
@@ -8214,9 +8208,9 @@
     40bd64     -3 INSTR LOCAL NoWarn push    rbx 
     40bd65     -1 INSTR LOCAL MetadataUnused mov     rbx, rcx 
     40bd65      3 INSTR BELONGTO 40bd60 
-    40bd68     16 DATAREF STACK 1216 esp + 8 CHILDOF 1215 OFFSET 8 LOCALVAR var_20 
+    40bd68     16 DATAREF STACK 1214 esp + 8 CHILDOF 1213 OFFSET 8 LOCALVAR var_20 
     40bd68     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    40bd68     24 DATAREF STACK 1215 esp + 0 PARENT LocalFrame LOCALFRAME
+    40bd68     24 DATAREF STACK 1213 esp + 0 PARENT LocalFrame LOCALFRAME
     40bd68      4 INSTR BELONGTO 40bd60 
     40bd68      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
     40bd68      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -8396,8 +8390,8 @@
     40c025      3 INSTR BELONGTO 40c020 
     40c025      3 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rbx, rdi 
     40c028     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    40c028     24 DATAREF STACK 1217 esp + 0 PARENT LocalFrame LOCALFRAME
-    40c028      4 DATAREF STACK 1218 esp + 0 CHILDOF 1217 OFFSET 0 OutArgsRegion OUTARGS
+    40c028     24 DATAREF STACK 1215 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c028      4 DATAREF STACK 1216 esp + 0 CHILDOF 1215 OFFSET 0 OutArgsRegion OUTARGS
     40c028      4 INSTR BELONGTO 40c020 
     40c028      4 INSTR DEADREGS  EFLAGS RAX RDI ZZ sub     rsp, 18h 
     40c028      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -8500,12 +8494,12 @@
     40c0b7      3 INSTR BELONGTO 40c0b0 
     40c0b7      3 INSTR DEADREGS  EFLAGS RAX RBX RSI RDI R12 ZZ mov     rbx, rdx 
     40c0ba     24 MEMORYHOLE STACK esp + 80 CalleeSavedRegs 
-    40c0ba     32 DATAREF STACK 1221 esp + 16 CHILDOF 1219 OFFSET 16 LOCALVAR var_58 
-    40c0ba     32 DATAREF STACK 1222 esp + 48 CHILDOF 1219 OFFSET 48 LOCALVAR var_38 
-    40c0ba      4 DATAREF STACK 1220 esp + 0 CHILDOF 1219 OFFSET 0 OutArgsRegion OUTARGS
+    40c0ba     32 DATAREF STACK 1219 esp + 16 CHILDOF 1217 OFFSET 16 LOCALVAR var_58 
+    40c0ba     32 DATAREF STACK 1220 esp + 48 CHILDOF 1217 OFFSET 48 LOCALVAR var_38 
+    40c0ba      4 DATAREF STACK 1218 esp + 0 CHILDOF 1217 OFFSET 0 OutArgsRegion OUTARGS
     40c0ba      4 INSTR BELONGTO 40c0b0 
     40c0ba      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 ZZ sub     rsp, 50h 
-    40c0ba     80 DATAREF STACK 1219 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c0ba     80 DATAREF STACK 1217 esp + 0 PARENT LocalFrame LOCALFRAME
     40c0ba      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
     40c0be      4 INSTR BELONGTO 40c0b0 
     40c0be      4 INSTR DEADREGS  EFLAGS RAX RSI RDI R12 ZZ mov     rax, [rdx+30h] 
@@ -8713,19 +8707,19 @@
     40c2e1     -3 INSTR LOCAL NoWarn push    rbx 
     40c2e2      3 INSTR BELONGTO 40c2e0 
     40c2e2      3 INSTR DEADREGS  EFLAGS RDX RBX ZZ mov     rbx, rsi 
-    40c2e5     12 DATAREF STACK 1231 esp + 112 CHILDOF 1223 OFFSET 112 LOCALVAR var_28 
-    40c2e5     12 DATAREF STACK 1232 esp + 124 CHILDOF 1223 OFFSET 124 LOCALVAR var_1C 
-    40c2e5    136 DATAREF STACK 1223 esp + 0 PARENT LocalFrame LOCALFRAME
-    40c2e5     16 DATAREF STACK 1226 esp + 16 CHILDOF 1223 OFFSET 16 LOCALVAR var_88 
+    40c2e5     12 DATAREF STACK 1229 esp + 112 CHILDOF 1221 OFFSET 112 LOCALVAR var_28 
+    40c2e5     12 DATAREF STACK 1230 esp + 124 CHILDOF 1221 OFFSET 124 LOCALVAR var_1C 
+    40c2e5    136 DATAREF STACK 1221 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c2e5     16 DATAREF STACK 1224 esp + 16 CHILDOF 1221 OFFSET 16 LOCALVAR var_88 
     40c2e5     16 MEMORYHOLE STACK esp + 136 CalleeSavedRegs 
-    40c2e5     32 DATAREF STACK 1227 esp + 32 CHILDOF 1223 OFFSET 32 LOCALVAR var_78 
-    40c2e5     32 DATAREF STACK 1228 esp + 64 CHILDOF 1223 OFFSET 64 LOCALVAR var_58 
-    40c2e5      4 DATAREF STACK 1224 esp + 0 CHILDOF 1223 OFFSET 0 OutArgsRegion OUTARGS
+    40c2e5     32 DATAREF STACK 1225 esp + 32 CHILDOF 1221 OFFSET 32 LOCALVAR var_78 
+    40c2e5     32 DATAREF STACK 1226 esp + 64 CHILDOF 1221 OFFSET 64 LOCALVAR var_58 
+    40c2e5      4 DATAREF STACK 1222 esp + 0 CHILDOF 1221 OFFSET 0 OutArgsRegion OUTARGS
     40c2e5      7 INSTR BELONGTO 40c2e0 
     40c2e5      7 INSTR DEADREGS  EFLAGS RDX RSI ZZ sub     rsp, 88h 
-    40c2e5      8 DATAREF STACK 1225 esp + 8 CHILDOF 1223 OFFSET 8 LOCALVAR var_90 
-    40c2e5      8 DATAREF STACK 1229 esp + 96 CHILDOF 1223 OFFSET 96 LOCALVAR var_38 
-    40c2e5      8 DATAREF STACK 1230 esp + 104 CHILDOF 1223 OFFSET 104 LOCALVAR var_30 
+    40c2e5      8 DATAREF STACK 1223 esp + 8 CHILDOF 1221 OFFSET 8 LOCALVAR var_90 
+    40c2e5      8 DATAREF STACK 1227 esp + 96 CHILDOF 1221 OFFSET 96 LOCALVAR var_38 
+    40c2e5      8 DATAREF STACK 1228 esp + 104 CHILDOF 1221 OFFSET 104 LOCALVAR var_30 
     40c2e5      8 MEMORYHOLE STACK esp + 152 ReturnAddress 
     40c2ec      5 INSTR BELONGTO 40c2e0 
     40c2ec      5 INSTR DEADREGS  EFLAGS RDX RSI ZZ lea     rdx, [rsp+98h+var_78] 
@@ -9019,8 +9013,8 @@
     40c4d0      1 INSTR BELONGTO 40c4d0 
     40c4d0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     40c4d0     -3 INSTR LOCAL NoWarn push    rbx 
-    40c4d1     16 DATAREF STACK 1233 esp + 0 PARENT LocalFrame LOCALFRAME
-    40c4d1      4 DATAREF STACK 1234 esp + 0 CHILDOF 1233 OFFSET 0 OutArgsRegion OUTARGS
+    40c4d1     16 DATAREF STACK 1231 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c4d1      4 DATAREF STACK 1232 esp + 0 CHILDOF 1231 OFFSET 0 OutArgsRegion OUTARGS
     40c4d1      4 INSTR BELONGTO 40c4d0 
     40c4d1      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
     40c4d1      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -9102,7 +9096,7 @@
     40c552      3 INSTR BELONGTO 40c550 
     40c555     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40c555      4 INSTR BELONGTO 40c550 
-    40c555      8 DATAREF STACK 1235 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c555      8 DATAREF STACK 1233 esp + 0 PARENT LocalFrame LOCALFRAME
     40c555      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40c559     -1 INSTR LOCAL NoMetaUpdate call    sub_40C4D0 
     40c559      5 INSTR BELONGTO 40c550 
@@ -9218,7 +9212,7 @@
     40c820     25 FUNC GLOBAL sub_40C820 FUNC_UNSAFE NOFP RET     40c838 
     40c820      4 INSTR BELONGTO 40c820 
     40c820      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    40c820      8 DATAREF STACK 1236 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c820      8 DATAREF STACK 1234 esp + 0 PARENT LocalFrame LOCALFRAME
     40c820      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40c824     -1 INSTR LOCAL NoMetaUpdate call    sub_40C4D0 
     40c824      5 INSTR BELONGTO 40c820 
@@ -9247,12 +9241,12 @@
     40c84a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
     40c84d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40c84d      5 INSTR BELONGTO 40c840 
-    40c852     24 DATAREF STACK 1237 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c852     24 DATAREF STACK 1235 esp + 0 PARENT LocalFrame LOCALFRAME
     40c852      4 INSTR BELONGTO 40c840 
     40c852      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-    40c852      8 DATAREF STACK 1238 esp + 0 CHILDOF 1237 OFFSET 0 LOCALVAR var_18 
-    40c852      8 DATAREF STACK 1239 esp + 8 CHILDOF 1237 OFFSET 8 LOCALVAR var_10 
-    40c852      8 DATAREF STACK 1240 esp + 16 CHILDOF 1237 OFFSET 16 LOCALVAR var_8 
+    40c852      8 DATAREF STACK 1236 esp + 0 CHILDOF 1235 OFFSET 0 LOCALVAR var_18 
+    40c852      8 DATAREF STACK 1237 esp + 8 CHILDOF 1235 OFFSET 8 LOCALVAR var_10 
+    40c852      8 DATAREF STACK 1238 esp + 16 CHILDOF 1235 OFFSET 16 LOCALVAR var_8 
     40c852      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40c856      3 INSTR BELONGTO 40c840 
     40c856      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
@@ -9406,13 +9400,13 @@
     40c965      5 INSTR BELONGTO 40c950 
     40c96a      5 INSTR BELONGTO 40c950 
     40c96a      5 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 ZZ mov     edi, offset aBSB; "<b>%s</b>" 
-    40c96f     40 DATAREF STACK 1241 esp + 0 PARENT LocalFrame LOCALFRAME
+    40c96f     40 DATAREF STACK 1239 esp + 0 PARENT LocalFrame LOCALFRAME
     40c96f      4 INSTR BELONGTO 40c950 
     40c96f      4 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ sub     rsp, 28h 
-    40c96f      8 DATAREF STACK 1242 esp + 8 CHILDOF 1241 OFFSET 8 LOCALVAR var_20 
-    40c96f      8 DATAREF STACK 1243 esp + 16 CHILDOF 1241 OFFSET 16 LOCALVAR var_18 
-    40c96f      8 DATAREF STACK 1244 esp + 24 CHILDOF 1241 OFFSET 24 LOCALVAR var_10 
-    40c96f      8 DATAREF STACK 1245 esp + 32 CHILDOF 1241 OFFSET 32 LOCALVAR var_8 
+    40c96f      8 DATAREF STACK 1240 esp + 8 CHILDOF 1239 OFFSET 8 LOCALVAR var_20 
+    40c96f      8 DATAREF STACK 1241 esp + 16 CHILDOF 1239 OFFSET 16 LOCALVAR var_18 
+    40c96f      8 DATAREF STACK 1242 esp + 24 CHILDOF 1239 OFFSET 24 LOCALVAR var_10 
+    40c96f      8 DATAREF STACK 1243 esp + 32 CHILDOF 1239 OFFSET 32 LOCALVAR var_8 
     40c96f      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40c973      2 INSTR BELONGTO 40c950 
     40c973      2 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ xor     eax, eax 
@@ -9503,12 +9497,12 @@
     40ca05      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
     40ca0a      3 INSTR BELONGTO 40ca00 
     40ca0a      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    40ca0d     40 DATAREF STACK 1246 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ca0d     40 DATAREF STACK 1244 esp + 0 PARENT LocalFrame LOCALFRAME
     40ca0d      4 INSTR BELONGTO 40ca00 
     40ca0d      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 28h 
-    40ca0d      8 DATAREF STACK 1247 esp + 0 CHILDOF 1246 OFFSET 0 OutArgsRegion OUTARGS
-    40ca0d      8 DATAREF STACK 1248 esp + 24 CHILDOF 1246 OFFSET 24 LOCALVAR var_10 
-    40ca0d      8 DATAREF STACK 1249 esp + 32 CHILDOF 1246 OFFSET 32 LOCALVAR var_8 
+    40ca0d      8 DATAREF STACK 1245 esp + 0 CHILDOF 1244 OFFSET 0 OutArgsRegion OUTARGS
+    40ca0d      8 DATAREF STACK 1246 esp + 24 CHILDOF 1244 OFFSET 24 LOCALVAR var_10 
+    40ca0d      8 DATAREF STACK 1247 esp + 32 CHILDOF 1244 OFFSET 32 LOCALVAR var_8 
     40ca0d      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40ca11      3 INSTR BELONGTO 40ca00 
     40ca11      3 INSTR DEADREGS  EFLAGS ZZ mov     rbp, rdx 
@@ -9640,14 +9634,14 @@
     40cacc     -3 INSTR LOCAL NoWarn push    rbx 
     40cacd      2 INSTR BELONGTO 40cac0 
     40cacd      2 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ mov     ebx, esi 
-    40cacf    104 DATAREF STACK 1250 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cacf    104 DATAREF STACK 1248 esp + 0 PARENT LocalFrame LOCALFRAME
     40cacf     48 MEMORYHOLE STACK esp + 104 CalleeSavedRegs 
-    40cacf      4 DATAREF STACK 1251 esp + 4 CHILDOF 1250 OFFSET 4 LOCALVAR var_94 
-    40cacf      4 DATAREF STACK 1252 esp + 8 CHILDOF 1250 OFFSET 8 LOCALVAR var_90 
-    40cacf      4 DATAREF STACK 1253 esp + 12 CHILDOF 1250 OFFSET 12 LOCALVAR var_8C 
+    40cacf      4 DATAREF STACK 1249 esp + 4 CHILDOF 1248 OFFSET 4 LOCALVAR var_94 
+    40cacf      4 DATAREF STACK 1250 esp + 8 CHILDOF 1248 OFFSET 8 LOCALVAR var_90 
+    40cacf      4 DATAREF STACK 1251 esp + 12 CHILDOF 1248 OFFSET 12 LOCALVAR var_8C 
     40cacf      4 INSTR BELONGTO 40cac0 
     40cacf      4 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ sub     rsp, 68h 
-    40cacf     88 DATAREF STACK 1254 esp + 16 CHILDOF 1250 OFFSET 16 LOCALVAR var_88 
+    40cacf     88 DATAREF STACK 1252 esp + 16 CHILDOF 1248 OFFSET 16 LOCALVAR var_88 
     40cacf      8 MEMORYHOLE STACK esp + 152 ReturnAddress 
     40cad3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_view_get_type 
     40cad3      5 INSTR BELONGTO 40cac0 
@@ -9890,11 +9884,11 @@
     40cc60      5 INSTR BELONGTO 40cc60 
     40cc65     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], rbp 
     40cc65      5 INSTR BELONGTO 40cc60 
-    40cc6a     24 DATAREF STACK 1255 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cc6a     24 DATAREF STACK 1253 esp + 0 PARENT LocalFrame LOCALFRAME
     40cc6a      4 INSTR BELONGTO 40cc60 
     40cc6a      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-    40cc6a      8 DATAREF STACK 1256 esp + 8 CHILDOF 1255 OFFSET 8 LOCALVAR var_10 
-    40cc6a      8 DATAREF STACK 1257 esp + 16 CHILDOF 1255 OFFSET 16 LOCALVAR var_8 
+    40cc6a      8 DATAREF STACK 1254 esp + 8 CHILDOF 1253 OFFSET 8 LOCALVAR var_10 
+    40cc6a      8 DATAREF STACK 1255 esp + 16 CHILDOF 1253 OFFSET 16 LOCALVAR var_8 
     40cc6a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40cc6e      4 INSTR BELONGTO 40cc60 
     40cc6e      4 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbp, [rsi+38h] 
@@ -9934,26 +9928,26 @@
     40ccb2      5 INSTR BELONGTO 40cca0 
     40ccb7     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
     40ccb7      5 INSTR BELONGTO 40cca0 
-    40ccbc    168 DATAREF STACK 1258 esp + 0 PARENT LocalFrame LOCALFRAME
-    40ccbc     36 DATAREF STACK 1259 esp + 0 CHILDOF 1258 OFFSET 0 OutArgsRegion OUTARGS
+    40ccbc    168 DATAREF STACK 1256 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ccbc     36 DATAREF STACK 1257 esp + 0 CHILDOF 1256 OFFSET 0 OutArgsRegion OUTARGS
     40ccbc      7 INSTR BELONGTO 40cca0 
     40ccbc      7 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ sub     rsp, 0A8h 
-    40ccbc      8 DATAREF STACK 1260 esp + 40 CHILDOF 1258 OFFSET 40 LOCALVAR var_80 
-    40ccbc      8 DATAREF STACK 1261 esp + 48 CHILDOF 1258 OFFSET 48 LOCALVAR var_78 
-    40ccbc      8 DATAREF STACK 1262 esp + 56 CHILDOF 1258 OFFSET 56 LOCALVAR var_70 
-    40ccbc      8 DATAREF STACK 1263 esp + 64 CHILDOF 1258 OFFSET 64 LOCALVAR var_68 
-    40ccbc      8 DATAREF STACK 1264 esp + 72 CHILDOF 1258 OFFSET 72 LOCALVAR var_60 
-    40ccbc      8 DATAREF STACK 1265 esp + 80 CHILDOF 1258 OFFSET 80 LOCALVAR var_58 
-    40ccbc      8 DATAREF STACK 1266 esp + 88 CHILDOF 1258 OFFSET 88 LOCALVAR var_50 
-    40ccbc      8 DATAREF STACK 1267 esp + 96 CHILDOF 1258 OFFSET 96 LOCALVAR var_48 
-    40ccbc      8 DATAREF STACK 1268 esp + 104 CHILDOF 1258 OFFSET 104 LOCALVAR var_40 
-    40ccbc      8 DATAREF STACK 1269 esp + 112 CHILDOF 1258 OFFSET 112 LOCALVAR var_38 
-    40ccbc      8 DATAREF STACK 1270 esp + 120 CHILDOF 1258 OFFSET 120 LOCALVAR var_30 
-    40ccbc      8 DATAREF STACK 1271 esp + 128 CHILDOF 1258 OFFSET 128 LOCALVAR var_28 
-    40ccbc      8 DATAREF STACK 1272 esp + 136 CHILDOF 1258 OFFSET 136 LOCALVAR var_20 
-    40ccbc      8 DATAREF STACK 1273 esp + 144 CHILDOF 1258 OFFSET 144 LOCALVAR var_18 
-    40ccbc      8 DATAREF STACK 1274 esp + 152 CHILDOF 1258 OFFSET 152 LOCALVAR var_10 
-    40ccbc      8 DATAREF STACK 1275 esp + 160 CHILDOF 1258 OFFSET 160 LOCALVAR var_8 
+    40ccbc      8 DATAREF STACK 1258 esp + 40 CHILDOF 1256 OFFSET 40 LOCALVAR var_80 
+    40ccbc      8 DATAREF STACK 1259 esp + 48 CHILDOF 1256 OFFSET 48 LOCALVAR var_78 
+    40ccbc      8 DATAREF STACK 1260 esp + 56 CHILDOF 1256 OFFSET 56 LOCALVAR var_70 
+    40ccbc      8 DATAREF STACK 1261 esp + 64 CHILDOF 1256 OFFSET 64 LOCALVAR var_68 
+    40ccbc      8 DATAREF STACK 1262 esp + 72 CHILDOF 1256 OFFSET 72 LOCALVAR var_60 
+    40ccbc      8 DATAREF STACK 1263 esp + 80 CHILDOF 1256 OFFSET 80 LOCALVAR var_58 
+    40ccbc      8 DATAREF STACK 1264 esp + 88 CHILDOF 1256 OFFSET 88 LOCALVAR var_50 
+    40ccbc      8 DATAREF STACK 1265 esp + 96 CHILDOF 1256 OFFSET 96 LOCALVAR var_48 
+    40ccbc      8 DATAREF STACK 1266 esp + 104 CHILDOF 1256 OFFSET 104 LOCALVAR var_40 
+    40ccbc      8 DATAREF STACK 1267 esp + 112 CHILDOF 1256 OFFSET 112 LOCALVAR var_38 
+    40ccbc      8 DATAREF STACK 1268 esp + 120 CHILDOF 1256 OFFSET 120 LOCALVAR var_30 
+    40ccbc      8 DATAREF STACK 1269 esp + 128 CHILDOF 1256 OFFSET 128 LOCALVAR var_28 
+    40ccbc      8 DATAREF STACK 1270 esp + 136 CHILDOF 1256 OFFSET 136 LOCALVAR var_20 
+    40ccbc      8 DATAREF STACK 1271 esp + 144 CHILDOF 1256 OFFSET 144 LOCALVAR var_18 
+    40ccbc      8 DATAREF STACK 1272 esp + 152 CHILDOF 1256 OFFSET 152 LOCALVAR var_10 
+    40ccbc      8 DATAREF STACK 1273 esp + 160 CHILDOF 1256 OFFSET 160 LOCALVAR var_8 
     40ccbc      8 MEMORYHOLE STACK esp + 168 ReturnAddress 
     40ccc3     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
     40ccc3      5 INSTR BELONGTO 40cca0 
@@ -10176,9 +10170,9 @@
     40cea4      1 INSTR BELONGTO 40cea0 
     40cea4      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
     40cea4     -3 INSTR LOCAL NoWarn push    rbx 
-    40cea5     16 DATAREF STACK 1277 esp + 8 CHILDOF 1276 OFFSET 8 LOCALVAR var_20 
+    40cea5     16 DATAREF STACK 1275 esp + 8 CHILDOF 1274 OFFSET 8 LOCALVAR var_20 
     40cea5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    40cea5     24 DATAREF STACK 1276 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cea5     24 DATAREF STACK 1274 esp + 0 PARENT LocalFrame LOCALFRAME
     40cea5      4 INSTR BELONGTO 40cea0 
     40cea5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
     40cea5      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -10270,12 +10264,12 @@
     40cf2a      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbp, rsi 
     40cf2d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40cf2d      5 INSTR BELONGTO 40cf20 
-    40cf32     24 DATAREF STACK 1278 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cf32     24 DATAREF STACK 1276 esp + 0 PARENT LocalFrame LOCALFRAME
     40cf32      4 INSTR BELONGTO 40cf20 
     40cf32      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 18h 
-    40cf32      8 DATAREF STACK 1279 esp + 0 CHILDOF 1278 OFFSET 0 LOCALVAR var_18 
-    40cf32      8 DATAREF STACK 1280 esp + 8 CHILDOF 1278 OFFSET 8 LOCALVAR var_10 
-    40cf32      8 DATAREF STACK 1281 esp + 16 CHILDOF 1278 OFFSET 16 LOCALVAR var_8 
+    40cf32      8 DATAREF STACK 1277 esp + 0 CHILDOF 1276 OFFSET 0 LOCALVAR var_18 
+    40cf32      8 DATAREF STACK 1278 esp + 8 CHILDOF 1276 OFFSET 8 LOCALVAR var_10 
+    40cf32      8 DATAREF STACK 1279 esp + 16 CHILDOF 1276 OFFSET 16 LOCALVAR var_8 
     40cf32      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40cf36     -1 INSTR LOCAL NoMetaUpdate call    sub_413ED0 
     40cf36      5 INSTR BELONGTO 40cf20 
@@ -10392,10 +10386,10 @@
     40cfe0     89 FUNC GLOBAL sub_40CFE0 FUNC_UNSAFE NOFP RET     40d038 
     40cfe1     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
     40cfe1      3 INSTR BELONGTO 40cfe0 
-    40cfe4    160 DATAREF STACK 1282 esp + 0 PARENT LocalFrame LOCALFRAME
+    40cfe4    160 DATAREF STACK 1280 esp + 0 PARENT LocalFrame LOCALFRAME
     40cfe4      7 INSTR BELONGTO 40cfe0 
     40cfe4      7 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 0A0h 
-    40cfe4     80 DATAREF STACK 1283 esp + 80 CHILDOF 1282 OFFSET 80 LOCALVAR var_58 
+    40cfe4     80 DATAREF STACK 1281 esp + 80 CHILDOF 1280 OFFSET 80 LOCALVAR var_58 
     40cfe4      8 MEMORYHOLE STACK esp + 160 CalleeSavedRegs 
     40cfe4      8 MEMORYHOLE STACK esp + 168 ReturnAddress 
     40cfeb     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_view_get_type 
@@ -10459,11 +10453,11 @@
     40d041     -3 INSTR LOCAL NoWarn push    rbx 
     40d042     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
     40d042      3 INSTR BELONGTO 40d040 
-    40d045    168 DATAREF STACK 1284 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d045    168 DATAREF STACK 1282 esp + 0 PARENT LocalFrame LOCALFRAME
     40d045     16 MEMORYHOLE STACK esp + 168 CalleeSavedRegs 
     40d045      7 INSTR BELONGTO 40d040 
     40d045      7 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 0A8h 
-    40d045     88 DATAREF STACK 1285 esp + 80 CHILDOF 1284 OFFSET 80 LOCALVAR var_68 
+    40d045     88 DATAREF STACK 1283 esp + 80 CHILDOF 1282 OFFSET 80 LOCALVAR var_68 
     40d045      8 MEMORYHOLE STACK esp + 184 ReturnAddress 
     40d04c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_view_get_type 
     40d04c      5 INSTR BELONGTO 40d040 
@@ -10546,7 +10540,7 @@
     40d0c5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     40d0c5      4 INSTR BELONGTO 40d0c0 
     40d0c5      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-    40d0c5      8 DATAREF STACK 1286 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d0c5      8 DATAREF STACK 1284 esp + 0 PARENT LocalFrame LOCALFRAME
     40d0c5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40d0c9     -1 INSTR LOCAL NoMetaUpdate call    _gtk_text_view_get_type 
     40d0c9      5 INSTR BELONGTO 40d0c0 
@@ -10615,14 +10609,14 @@
     40d13a      3 INSTR DEADREGS  EFLAGS R12 ZZ mov     rbp, rsi 
     40d13d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_18], rbx 
     40d13d      5 INSTR BELONGTO 40d130 
-    40d142     40 DATAREF STACK 1287 esp + 0 PARENT LocalFrame LOCALFRAME
-    40d142      4 DATAREF STACK 1288 esp + 0 CHILDOF 1287 OFFSET 0 OutArgsRegion OUTARGS
+    40d142     40 DATAREF STACK 1285 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d142      4 DATAREF STACK 1286 esp + 0 CHILDOF 1285 OFFSET 0 OutArgsRegion OUTARGS
     40d142      4 INSTR BELONGTO 40d130 
     40d142      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 28h 
-    40d142      8 DATAREF STACK 1289 esp + 8 CHILDOF 1287 OFFSET 8 LOCALVAR var_20 
-    40d142      8 DATAREF STACK 1290 esp + 16 CHILDOF 1287 OFFSET 16 LOCALVAR var_18 
-    40d142      8 DATAREF STACK 1291 esp + 24 CHILDOF 1287 OFFSET 24 LOCALVAR var_10 
-    40d142      8 DATAREF STACK 1292 esp + 32 CHILDOF 1287 OFFSET 32 LOCALVAR var_8 
+    40d142      8 DATAREF STACK 1287 esp + 8 CHILDOF 1285 OFFSET 8 LOCALVAR var_20 
+    40d142      8 DATAREF STACK 1288 esp + 16 CHILDOF 1285 OFFSET 16 LOCALVAR var_18 
+    40d142      8 DATAREF STACK 1289 esp + 24 CHILDOF 1285 OFFSET 24 LOCALVAR var_10 
+    40d142      8 DATAREF STACK 1290 esp + 32 CHILDOF 1285 OFFSET 32 LOCALVAR var_8 
     40d142      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40d146      7 INSTR BELONGTO 40d130 
     40d146      7 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     r12, cs:qword_61A318 
@@ -10827,11 +10821,11 @@
     40d2b5      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
     40d2ba      5 INSTR BELONGTO 40d2b0 
     40d2ba      5 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     eax, offset aMonospace10; "Monospace 10" 
-    40d2bf     24 DATAREF STACK 1293 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d2bf     24 DATAREF STACK 1291 esp + 0 PARENT LocalFrame LOCALFRAME
     40d2bf      4 INSTR BELONGTO 40d2b0 
     40d2bf      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-    40d2bf      8 DATAREF STACK 1294 esp + 8 CHILDOF 1293 OFFSET 8 LOCALVAR var_10 
-    40d2bf      8 DATAREF STACK 1295 esp + 16 CHILDOF 1293 OFFSET 16 LOCALVAR var_8 
+    40d2bf      8 DATAREF STACK 1292 esp + 8 CHILDOF 1291 OFFSET 8 LOCALVAR var_10 
+    40d2bf      8 DATAREF STACK 1293 esp + 16 CHILDOF 1291 OFFSET 16 LOCALVAR var_8 
     40d2bf      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40d2c3     -1 INSTR LOCAL NoMetaUpdate test    rsi, rsi 
     40d2c3      3 INSTR BELONGTO 40d2b0 
@@ -10904,13 +10898,13 @@
     40d33d      5 INSTR BELONGTO 40d330 
     40d342     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     40d342      5 INSTR BELONGTO 40d330 
-    40d347     40 DATAREF STACK 1296 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d347     40 DATAREF STACK 1294 esp + 0 PARENT LocalFrame LOCALFRAME
     40d347      4 INSTR BELONGTO 40d330 
     40d347      4 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ sub     rsp, 28h 
-    40d347      8 DATAREF STACK 1297 esp + 8 CHILDOF 1296 OFFSET 8 LOCALVAR var_20 
-    40d347      8 DATAREF STACK 1298 esp + 16 CHILDOF 1296 OFFSET 16 LOCALVAR var_18 
-    40d347      8 DATAREF STACK 1299 esp + 24 CHILDOF 1296 OFFSET 24 LOCALVAR var_10 
-    40d347      8 DATAREF STACK 1300 esp + 32 CHILDOF 1296 OFFSET 32 LOCALVAR var_8 
+    40d347      8 DATAREF STACK 1295 esp + 8 CHILDOF 1294 OFFSET 8 LOCALVAR var_20 
+    40d347      8 DATAREF STACK 1296 esp + 16 CHILDOF 1294 OFFSET 16 LOCALVAR var_18 
+    40d347      8 DATAREF STACK 1297 esp + 24 CHILDOF 1294 OFFSET 24 LOCALVAR var_10 
+    40d347      8 DATAREF STACK 1298 esp + 32 CHILDOF 1294 OFFSET 32 LOCALVAR var_8 
     40d347      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40d34b     -1 INSTR LOCAL MetadataUnused mov     rbx, [rdi+38h] 
     40d34b      4 INSTR BELONGTO 40d330 
@@ -11065,12 +11059,12 @@
     40d45a      3 INSTR BELONGTO 40d450 
     40d45d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40d45d      5 INSTR BELONGTO 40d450 
-    40d462     24 DATAREF STACK 1301 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d462     24 DATAREF STACK 1299 esp + 0 PARENT LocalFrame LOCALFRAME
     40d462      4 INSTR BELONGTO 40d450 
     40d462      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-    40d462      8 DATAREF STACK 1302 esp + 0 CHILDOF 1301 OFFSET 0 LOCALVAR var_18 
-    40d462      8 DATAREF STACK 1303 esp + 8 CHILDOF 1301 OFFSET 8 LOCALVAR var_10 
-    40d462      8 DATAREF STACK 1304 esp + 16 CHILDOF 1301 OFFSET 16 LOCALVAR var_8 
+    40d462      8 DATAREF STACK 1300 esp + 0 CHILDOF 1299 OFFSET 0 LOCALVAR var_18 
+    40d462      8 DATAREF STACK 1301 esp + 8 CHILDOF 1299 OFFSET 8 LOCALVAR var_10 
+    40d462      8 DATAREF STACK 1302 esp + 16 CHILDOF 1299 OFFSET 16 LOCALVAR var_8 
     40d462      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40d466     -1 INSTR LOCAL MetadataUnused mov     ebp, [rsi+18h] 
     40d466      3 INSTR BELONGTO 40d450 
@@ -11193,11 +11187,11 @@
     40d5af      1 INSTR BELONGTO 40d5a0 
     40d5af      1 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ push    rbx 
     40d5af     -3 INSTR LOCAL NoWarn push    rbx 
-    40d5b0    168 DATAREF STACK 1305 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d5b0    168 DATAREF STACK 1303 esp + 0 PARENT LocalFrame LOCALFRAME
     40d5b0     48 MEMORYHOLE STACK esp + 168 CalleeSavedRegs 
     40d5b0      7 INSTR BELONGTO 40d5a0 
     40d5b0      7 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ sub     rsp, 0A8h 
-    40d5b0     88 DATAREF STACK 1306 esp + 80 CHILDOF 1305 OFFSET 80 LOCALVAR var_88 
+    40d5b0     88 DATAREF STACK 1304 esp + 80 CHILDOF 1303 OFFSET 80 LOCALVAR var_88 
     40d5b0      8 MEMORYHOLE STACK esp + 216 ReturnAddress 
     40d5b7     -1 INSTR LOCAL NoMetaUpdate test    rdx, rdx 
     40d5b7      3 INSTR BELONGTO 40d5a0 
@@ -11312,7 +11306,7 @@
     40d660     35 FUNC GLOBAL sub_40D660 FUNC_UNSAFE NOFP RET     40d682 
     40d660      4 INSTR BELONGTO 40d660 
     40d660      4 INSTR DEADREGS  EFLAGS RAX RDI ZZ sub     rsp, 8 
-    40d660      8 DATAREF STACK 1307 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d660      8 DATAREF STACK 1305 esp + 0 PARENT LocalFrame LOCALFRAME
     40d660      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40d664     -1 INSTR LOCAL MetadataUnused mov     rdx, [rdx+38h] 
     40d664      4 INSTR BELONGTO 40d660 
@@ -11368,12 +11362,13 @@
     40d6b2     -1 INSTR LOCAL NoMetaUpdate jmp     sub_411320 
     40d6b2      5 INSTR BELONGTO 40d690 
     40d6b2      5 INSTR DEADREGS  EFLAGS RBX RSI RDI R8 R9 R10 R11 ZZ jmp     sub_411320 
-    40d6c0      0 FUNC FRAMERESTORE 0 0 4 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
+    40d6c0      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 -4 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
     40d6c0      0 FUNC MMSAFENESS SAFE
     40d6c0      1 INSTR BELONGTO 40d6c0 
     40d6c0      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ push    rbx 
-    40d6c0     -3 INSTR LOCAL NoWarn push    rbx 
     40d6c0     53 FUNC GLOBAL sub_40D6C0 FUNC_UNSAFE NOFP RET     40d6f4 
+    40d6c0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    40d6c0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40d6c1      3 INSTR BELONGTO 40d6c0 
     40d6c1      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 ZZ mov     rbx, rsi 
     40d6c4     -1 INSTR LOCAL NoMetaUpdate call    sub_410C80 
@@ -11516,17 +11511,17 @@
     40d95c     -3 INSTR LOCAL NoWarn push    rbx 
     40d95d     -1 INSTR LOCAL MetadataUnused mov     ebx, esi 
     40d95d      2 INSTR BELONGTO 40d950 
-    40d95f    360 DATAREF STACK 1315 esp + 0 PARENT LocalFrame LOCALFRAME
+    40d95f    360 DATAREF STACK 1306 esp + 0 PARENT LocalFrame LOCALFRAME
     40d95f     48 MEMORYHOLE STACK esp + 360 CalleeSavedRegs 
     40d95f      7 INSTR BELONGTO 40d950 
     40d95f      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R15 ZZ sub     rsp, 168h 
-    40d95f     80 DATAREF STACK 1319 esp + 32 CHILDOF 1315 OFFSET 32 LOCALVAR var_178 
-    40d95f     80 DATAREF STACK 1320 esp + 112 CHILDOF 1315 OFFSET 112 LOCALVAR var_128 
-    40d95f     80 DATAREF STACK 1321 esp + 192 CHILDOF 1315 OFFSET 192 LOCALVAR var_D8 
-    40d95f     88 DATAREF STACK 1322 esp + 272 CHILDOF 1315 OFFSET 272 LOCALVAR var_88 
-    40d95f      8 DATAREF STACK 1316 esp + 8 CHILDOF 1315 OFFSET 8 LOCALVAR var_190 
-    40d95f      8 DATAREF STACK 1317 esp + 16 CHILDOF 1315 OFFSET 16 LOCALVAR var_188 
-    40d95f      8 DATAREF STACK 1318 esp + 24 CHILDOF 1315 OFFSET 24 LOCALVAR var_180 
+    40d95f     80 DATAREF STACK 1310 esp + 32 CHILDOF 1306 OFFSET 32 LOCALVAR var_178 
+    40d95f     80 DATAREF STACK 1311 esp + 112 CHILDOF 1306 OFFSET 112 LOCALVAR var_128 
+    40d95f     80 DATAREF STACK 1312 esp + 192 CHILDOF 1306 OFFSET 192 LOCALVAR var_D8 
+    40d95f     88 DATAREF STACK 1313 esp + 272 CHILDOF 1306 OFFSET 272 LOCALVAR var_88 
+    40d95f      8 DATAREF STACK 1307 esp + 8 CHILDOF 1306 OFFSET 8 LOCALVAR var_190 
+    40d95f      8 DATAREF STACK 1308 esp + 16 CHILDOF 1306 OFFSET 16 LOCALVAR var_188 
+    40d95f      8 DATAREF STACK 1309 esp + 24 CHILDOF 1306 OFFSET 24 LOCALVAR var_180 
     40d95f      8 MEMORYHOLE STACK esp + 408 ReturnAddress 
     40d966     -1 INSTR LOCAL NoMetaUpdate call    sub_410C80 
     40d966      5 INSTR BELONGTO 40d950 
@@ -11923,15 +11918,15 @@
     40dcc8     -1 INSTR LOCAL NoMetaUpdate jmp     sub_40D950 
     40dcd3     -2 INSTR LOCAL n ESI 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 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
+    40dce0      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 -4 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
     40dce0     46 FUNC GLOBAL sub_40DCE0 FUNC_UNSAFE NOFP RET     40dd0d 
     40dce0      4 INSTR BELONGTO 40dce0 
     40dce0      4 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     rax, [rsi+38h] 
-    40dce0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    40dce0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40dce4      1 INSTR BELONGTO 40dce0 
     40dce4      1 INSTR DEADREGS  EFLAGS RDI ZZ push    rbx 
+    40dce4      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    40dce4      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40dce5     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
     40dce5      3 INSTR BELONGTO 40dce0 
     40dce8      4 INSTR BELONGTO 40dce0 
@@ -11957,15 +11952,15 @@
     40dd09     -1 INSTR LOCAL NoMetaUpdate jmp     _gtk_widget_hide 
     40dd09      5 INSTR BELONGTO 40dce0 
     40dd09      5 INSTR DEADREGS  EFLAGS RBX RSI R8 R9 R10 R11 ZZ jmp     _gtk_widget_hide 
-    40dd10      0 FUNC FRAMERESTORE 0 0 4 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
+    40dd10      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 -4 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
     40dd10      0 FUNC MMSAFENESS SAFE
     40dd10     46 FUNC GLOBAL sub_40DD10 FUNC_UNSAFE NOFP RET     40dd3d 
     40dd10      4 INSTR BELONGTO 40dd10 
     40dd10      4 INSTR DEADREGS  EFLAGS RAX RDI ZZ mov     rax, [rsi+38h] 
-    40dd10      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    40dd10      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40dd14      1 INSTR BELONGTO 40dd10 
     40dd14      1 INSTR DEADREGS  EFLAGS RDI ZZ push    rbx 
+    40dd14      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    40dd14      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40dd15     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
     40dd15      3 INSTR BELONGTO 40dd10 
     40dd18      4 INSTR BELONGTO 40dd10 
@@ -12072,8 +12067,8 @@
     40df90      1 INSTR BELONGTO 40df90 
     40df90      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     40df90     -3 INSTR LOCAL NoWarn push    rbx 
-    40df91     16 DATAREF STACK 1323 esp + 0 PARENT LocalFrame LOCALFRAME
-    40df91      4 DATAREF STACK 1324 esp + 0 CHILDOF 1323 OFFSET 0 OutArgsRegion OUTARGS
+    40df91     16 DATAREF STACK 1314 esp + 0 PARENT LocalFrame LOCALFRAME
+    40df91      4 DATAREF STACK 1315 esp + 0 CHILDOF 1314 OFFSET 0 OutArgsRegion OUTARGS
     40df91      4 INSTR BELONGTO 40df90 
     40df91      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
     40df91      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -12195,16 +12190,16 @@
     40e05c      1 INSTR BELONGTO 40e050 
     40e05c      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 R15 ZZ push    rbx 
     40e05c     -3 INSTR LOCAL NoWarn push    rbx 
-    40e05d     16 DATAREF STACK 1330 esp + 40 CHILDOF 1325 OFFSET 40 LOCALVAR var_50 
-    40e05d     16 DATAREF STACK 1331 esp + 56 CHILDOF 1325 OFFSET 56 LOCALVAR var_40 
+    40e05d     16 DATAREF STACK 1321 esp + 40 CHILDOF 1316 OFFSET 40 LOCALVAR var_50 
+    40e05d     16 DATAREF STACK 1322 esp + 56 CHILDOF 1316 OFFSET 56 LOCALVAR var_40 
     40e05d     48 MEMORYHOLE STACK esp + 72 CalleeSavedRegs 
     40e05d      4 INSTR BELONGTO 40e050 
     40e05d      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 R15 ZZ sub     rsp, 48h 
-    40e05d     72 DATAREF STACK 1325 esp + 0 PARENT LocalFrame LOCALFRAME
-    40e05d      8 DATAREF STACK 1326 esp + 0 CHILDOF 1325 OFFSET 0 OutArgsRegion OUTARGS
-    40e05d      8 DATAREF STACK 1327 esp + 16 CHILDOF 1325 OFFSET 16 LOCALVAR var_68 
-    40e05d      8 DATAREF STACK 1328 esp + 24 CHILDOF 1325 OFFSET 24 LOCALVAR var_60 
-    40e05d      8 DATAREF STACK 1329 esp + 32 CHILDOF 1325 OFFSET 32 LOCALVAR var_58 
+    40e05d     72 DATAREF STACK 1316 esp + 0 PARENT LocalFrame LOCALFRAME
+    40e05d      8 DATAREF STACK 1317 esp + 0 CHILDOF 1316 OFFSET 0 OutArgsRegion OUTARGS
+    40e05d      8 DATAREF STACK 1318 esp + 16 CHILDOF 1316 OFFSET 16 LOCALVAR var_68 
+    40e05d      8 DATAREF STACK 1319 esp + 24 CHILDOF 1316 OFFSET 24 LOCALVAR var_60 
+    40e05d      8 DATAREF STACK 1320 esp + 32 CHILDOF 1316 OFFSET 32 LOCALVAR var_58 
     40e05d      8 MEMORYHOLE STACK esp + 120 ReturnAddress 
     40e061     -1 INSTR LOCAL NoMetaUpdate call    sub_40DF90 
     40e061      5 INSTR BELONGTO 40e050 
@@ -13113,13 +13108,13 @@
     40ef8d      5 INSTR BELONGTO 40ef80 
     40ef92     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
     40ef92      5 INSTR BELONGTO 40ef80 
-    40ef97     40 DATAREF STACK 1332 esp + 0 PARENT LocalFrame LOCALFRAME
+    40ef97     40 DATAREF STACK 1323 esp + 0 PARENT LocalFrame LOCALFRAME
     40ef97      4 INSTR BELONGTO 40ef80 
     40ef97      4 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 28h 
-    40ef97      8 DATAREF STACK 1333 esp + 8 CHILDOF 1332 OFFSET 8 LOCALVAR var_20 
-    40ef97      8 DATAREF STACK 1334 esp + 16 CHILDOF 1332 OFFSET 16 LOCALVAR var_18 
-    40ef97      8 DATAREF STACK 1335 esp + 24 CHILDOF 1332 OFFSET 24 LOCALVAR var_10 
-    40ef97      8 DATAREF STACK 1336 esp + 32 CHILDOF 1332 OFFSET 32 LOCALVAR var_8 
+    40ef97      8 DATAREF STACK 1324 esp + 8 CHILDOF 1323 OFFSET 8 LOCALVAR var_20 
+    40ef97      8 DATAREF STACK 1325 esp + 16 CHILDOF 1323 OFFSET 16 LOCALVAR var_18 
+    40ef97      8 DATAREF STACK 1326 esp + 24 CHILDOF 1323 OFFSET 24 LOCALVAR var_10 
+    40ef97      8 DATAREF STACK 1327 esp + 32 CHILDOF 1323 OFFSET 32 LOCALVAR var_8 
     40ef97      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     40ef9b      3 INSTR BELONGTO 40ef80 
     40ef9b      3 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 R13 ZZ mov     rbp, rsi 
@@ -13405,8 +13400,8 @@
     40f4ec     -3 INSTR LOCAL NoWarn push    rbx 
     40f4ed     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
     40f4ed      3 INSTR BELONGTO 40f4e0 
-    40f4f0     16 DATAREF STACK 1338 esp + 8 CHILDOF 1337 OFFSET 8 LOCALVAR var_40 
-    40f4f0     24 DATAREF STACK 1337 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f4f0     16 DATAREF STACK 1329 esp + 8 CHILDOF 1328 OFFSET 8 LOCALVAR var_40 
+    40f4f0     24 DATAREF STACK 1328 esp + 0 PARENT LocalFrame LOCALFRAME
     40f4f0     48 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
     40f4f0      4 INSTR BELONGTO 40f4e0 
     40f4f0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R13 R14 R15 ZZ sub     rsp, 18h 
@@ -13651,12 +13646,12 @@
     40f675     -2 INSTR LOCAL n EDI 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 1339 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f67a     24 DATAREF STACK 1330 esp + 0 PARENT LocalFrame LOCALFRAME
     40f67a      4 INSTR BELONGTO 40f660 
     40f67a      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-    40f67a      8 DATAREF STACK 1340 esp + 0 CHILDOF 1339 OFFSET 0 LOCALVAR var_18 
-    40f67a      8 DATAREF STACK 1341 esp + 8 CHILDOF 1339 OFFSET 8 LOCALVAR var_10 
-    40f67a      8 DATAREF STACK 1342 esp + 16 CHILDOF 1339 OFFSET 16 LOCALVAR var_8 
+    40f67a      8 DATAREF STACK 1331 esp + 0 CHILDOF 1330 OFFSET 0 LOCALVAR var_18 
+    40f67a      8 DATAREF STACK 1332 esp + 8 CHILDOF 1330 OFFSET 8 LOCALVAR var_10 
+    40f67a      8 DATAREF STACK 1333 esp + 16 CHILDOF 1330 OFFSET 16 LOCALVAR var_8 
     40f67a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40f67e      3 INSTR BELONGTO 40f660 
     40f67e      3 INSTR DEADREGS  EFLAGS R12 ZZ mov     r12, rdx 
@@ -13828,8 +13823,8 @@
     40f840     -3 INSTR LOCAL NoWarn push    rbx 
     40f841      3 INSTR BELONGTO 40f840 
     40f841      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    40f844     20 DATAREF STACK 1344 esp + 0 CHILDOF 1343 OFFSET 0 OutArgsRegion OUTARGS
-    40f844     32 DATAREF STACK 1343 esp + 0 PARENT LocalFrame LOCALFRAME
+    40f844     20 DATAREF STACK 1335 esp + 0 CHILDOF 1334 OFFSET 0 OutArgsRegion OUTARGS
+    40f844     32 DATAREF STACK 1334 esp + 0 PARENT LocalFrame LOCALFRAME
     40f844      4 INSTR BELONGTO 40f840 
     40f844      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 20h 
     40f844      8 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
@@ -14204,8 +14199,8 @@
     410040      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
     410040      0 FUNC MMSAFENESS SAFE
     410040    113 FUNC GLOBAL sub_410040 FUNC_UNSAFE NOFP RET     4100b0 
-    410040     24 DATAREF STACK 1345 esp + 0 PARENT LocalFrame LOCALFRAME
-    410040      4 DATAREF STACK 1346 esp + 0 CHILDOF 1345 OFFSET 0 OutArgsRegion OUTARGS
+    410040     24 DATAREF STACK 1336 esp + 0 PARENT LocalFrame LOCALFRAME
+    410040      4 DATAREF STACK 1337 esp + 0 CHILDOF 1336 OFFSET 0 OutArgsRegion OUTARGS
     410040      4 INSTR BELONGTO 410040 
     410040      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
     410040      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -14362,7 +14357,7 @@
     4102e4     -3 INSTR LOCAL NoWarn push    rbx 
     4102e5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4102e5      4 INSTR BELONGTO 4102e0 
-    4102e5      8 DATAREF STACK 1347 esp + 0 PARENT LocalFrame LOCALFRAME
+    4102e5      8 DATAREF STACK 1338 esp + 0 PARENT LocalFrame LOCALFRAME
     4102e5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4102e9     -1 INSTR LOCAL NoMetaUpdate call    sub_410040 
     4102e9      5 INSTR BELONGTO 4102e0 
@@ -14497,13 +14492,13 @@
     410422      5 INSTR BELONGTO 410410 
     410427      3 INSTR BELONGTO 410410 
     410427      3 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     r12, rsi 
-    41042a     40 DATAREF STACK 1348 esp + 0 PARENT LocalFrame LOCALFRAME
+    41042a     40 DATAREF STACK 1339 esp + 0 PARENT LocalFrame LOCALFRAME
     41042a      4 INSTR BELONGTO 410410 
     41042a      4 INSTR DEADREGS  EFLAGS RBX RDI R13 ZZ sub     rsp, 28h 
-    41042a      8 DATAREF STACK 1349 esp + 8 CHILDOF 1348 OFFSET 8 LOCALVAR var_20 
-    41042a      8 DATAREF STACK 1350 esp + 16 CHILDOF 1348 OFFSET 16 LOCALVAR var_18 
-    41042a      8 DATAREF STACK 1351 esp + 24 CHILDOF 1348 OFFSET 24 LOCALVAR var_10 
-    41042a      8 DATAREF STACK 1352 esp + 32 CHILDOF 1348 OFFSET 32 LOCALVAR var_8 
+    41042a      8 DATAREF STACK 1340 esp + 8 CHILDOF 1339 OFFSET 8 LOCALVAR var_20 
+    41042a      8 DATAREF STACK 1341 esp + 16 CHILDOF 1339 OFFSET 16 LOCALVAR var_18 
+    41042a      8 DATAREF STACK 1342 esp + 24 CHILDOF 1339 OFFSET 24 LOCALVAR var_10 
+    41042a      8 DATAREF STACK 1343 esp + 32 CHILDOF 1339 OFFSET 32 LOCALVAR var_8 
     41042a      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     41042e      3 INSTR BELONGTO 410410 
     41042e      3 INSTR DEADREGS  EFLAGS RBX RDI R13 ZZ mov     r13, rdx 
@@ -14593,14 +14588,14 @@
     410537      3 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI R8 R9 R10 R11 R12 R13 ZZ mov     r12, rdi 
     41053a     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
     41053a      5 INSTR BELONGTO 410520 
-    41053f     40 DATAREF STACK 1353 esp + 0 PARENT LocalFrame LOCALFRAME
+    41053f     40 DATAREF STACK 1344 esp + 0 PARENT LocalFrame LOCALFRAME
     41053f      4 INSTR BELONGTO 410520 
     41053f      4 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI RDI R8 R9 R10 R11 R13 R14 ZZ sub     rsp, 28h 
-    41053f      8 DATAREF STACK 1354 esp + 0 CHILDOF 1353 OFFSET 0 LOCALVAR var_28 
-    41053f      8 DATAREF STACK 1355 esp + 8 CHILDOF 1353 OFFSET 8 LOCALVAR var_20 
-    41053f      8 DATAREF STACK 1356 esp + 16 CHILDOF 1353 OFFSET 16 LOCALVAR var_18 
-    41053f      8 DATAREF STACK 1357 esp + 24 CHILDOF 1353 OFFSET 24 LOCALVAR var_10 
-    41053f      8 DATAREF STACK 1358 esp + 32 CHILDOF 1353 OFFSET 32 LOCALVAR var_8 
+    41053f      8 DATAREF STACK 1345 esp + 0 CHILDOF 1344 OFFSET 0 LOCALVAR var_28 
+    41053f      8 DATAREF STACK 1346 esp + 8 CHILDOF 1344 OFFSET 8 LOCALVAR var_20 
+    41053f      8 DATAREF STACK 1347 esp + 16 CHILDOF 1344 OFFSET 16 LOCALVAR var_18 
+    41053f      8 DATAREF STACK 1348 esp + 24 CHILDOF 1344 OFFSET 24 LOCALVAR var_10 
+    41053f      8 DATAREF STACK 1349 esp + 32 CHILDOF 1344 OFFSET 32 LOCALVAR var_8 
     41053f      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     410543      3 INSTR BELONGTO 410520 
     410543      3 INSTR DEADREGS  EFLAGS RAX RCX RBX RSI RDI R8 R9 R10 R11 R13 R14 ZZ mov     r13, rdx 
@@ -15289,8 +15284,8 @@
     4109c4      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
     4109c4     -3 INSTR LOCAL NoWarn push    rbx 
     4109c5     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-    4109c5     20 DATAREF STACK 1360 esp + 0 CHILDOF 1359 OFFSET 0 OutArgsRegion OUTARGS
-    4109c5     40 DATAREF STACK 1359 esp + 0 PARENT LocalFrame LOCALFRAME
+    4109c5     20 DATAREF STACK 1351 esp + 0 CHILDOF 1350 OFFSET 0 OutArgsRegion OUTARGS
+    4109c5     40 DATAREF STACK 1350 esp + 0 PARENT LocalFrame LOCALFRAME
     4109c5      4 INSTR BELONGTO 4109c0 
     4109c5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 28h 
     4109c5      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
@@ -15510,7 +15505,7 @@
     410c40      4 INSTR BELONGTO 410c40 
     410c40      4 INSTR DEADREGS  EFLAGS RAX RDI ZZ sub     rsp, 8 
     410c40     55 FUNC GLOBAL sub_410C40 FUNC_UNSAFE NOFP RET     410c76 
-    410c40      8 DATAREF STACK 1361 esp + 0 PARENT LocalFrame LOCALFRAME
+    410c40      8 DATAREF STACK 1352 esp + 0 PARENT LocalFrame LOCALFRAME
     410c40      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     410c44      2 INSTR BELONGTO 410c40 
     410c44      2 INSTR DEADREGS  EFLAGS RAX RDI ZZ xor     eax, eax 
@@ -15547,8 +15542,8 @@
     410c80      1 INSTR BELONGTO 410c80 
     410c80      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     410c80     -3 INSTR LOCAL NoWarn push    rbx 
-    410c81     16 DATAREF STACK 1362 esp + 0 PARENT LocalFrame LOCALFRAME
-    410c81      4 DATAREF STACK 1363 esp + 0 CHILDOF 1362 OFFSET 0 OutArgsRegion OUTARGS
+    410c81     16 DATAREF STACK 1353 esp + 0 PARENT LocalFrame LOCALFRAME
+    410c81      4 DATAREF STACK 1354 esp + 0 CHILDOF 1353 OFFSET 0 OutArgsRegion OUTARGS
     410c81      4 INSTR BELONGTO 410c80 
     410c81      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
     410c81      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -15845,7 +15840,7 @@
     411210     25 FUNC GLOBAL sub_411210 FUNC_UNSAFE NOFP RET     411228 
     411210      4 INSTR BELONGTO 411210 
     411210      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    411210      8 DATAREF STACK 1364 esp + 0 PARENT LocalFrame LOCALFRAME
+    411210      8 DATAREF STACK 1355 esp + 0 PARENT LocalFrame LOCALFRAME
     411210      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     411214     -1 INSTR LOCAL NoMetaUpdate call    sub_410C80 
     411214      5 INSTR BELONGTO 411210 
@@ -15877,7 +15872,7 @@
     411235     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     411235      4 INSTR BELONGTO 411230 
     411235      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    411235      8 DATAREF STACK 1365 esp + 0 PARENT LocalFrame LOCALFRAME
+    411235      8 DATAREF STACK 1356 esp + 0 PARENT LocalFrame LOCALFRAME
     411235      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     411239     -1 INSTR LOCAL NoMetaUpdate call    sub_410C80 
     411239      5 INSTR BELONGTO 411230 
@@ -16033,7 +16028,7 @@
     411323      3 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
     411326      1 INSTR BELONGTO 411320 
     411326      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 R12 ZZ push    rbx 
-    411326     24 DATAREF STACK 1366 esp + 0 PARENT LocalFrame LOCALFRAME
+    411326     24 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     411326      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     411327      3 INSTR BELONGTO 411320 
     411327      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 R12 ZZ mov     rbx, rdi 
@@ -16251,7 +16246,7 @@
     411465     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     411465      4 INSTR BELONGTO 411460 
     411465      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-    411465      8 DATAREF STACK 1367 esp + 0 PARENT LocalFrame LOCALFRAME
+    411465      8 DATAREF STACK 1357 esp + 0 PARENT LocalFrame LOCALFRAME
     411465      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     411469     -1 INSTR LOCAL NoMetaUpdate call    _g_ptr_array_new 
     411469      5 INSTR BELONGTO 411460 
@@ -16328,19 +16323,19 @@
     4114c9     -3 INSTR LOCAL NoWarn push    rbx 
     4114ca      3 INSTR BELONGTO 4114c0 
     4114ca      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    4114cd     12 DATAREF STACK 1373 esp + 72 CHILDOF 1368 OFFSET 72 LOCALVAR var_30 
+    4114cd     12 DATAREF STACK 1363 esp + 72 CHILDOF 1358 OFFSET 72 LOCALVAR var_30 
     4114cd     24 MEMORYHOLE STACK esp + 96 CalleeSavedRegs 
-    4114cd     48 DATAREF STACK 1369 esp + 0 CHILDOF 1368 OFFSET 0 OutArgsRegion OUTARGS
-    4114cd      4 DATAREF STACK 1374 esp + 84 CHILDOF 1368 OFFSET 84 LOCALVAR var_24 
-    4114cd      4 DATAREF STACK 1375 esp + 88 CHILDOF 1368 OFFSET 88 LOCALVAR var_20 
-    4114cd      4 DATAREF STACK 1376 esp + 92 CHILDOF 1368 OFFSET 92 LOCALVAR var_1C 
+    4114cd     48 DATAREF STACK 1359 esp + 0 CHILDOF 1358 OFFSET 0 OutArgsRegion OUTARGS
+    4114cd      4 DATAREF STACK 1364 esp + 84 CHILDOF 1358 OFFSET 84 LOCALVAR var_24 
+    4114cd      4 DATAREF STACK 1365 esp + 88 CHILDOF 1358 OFFSET 88 LOCALVAR var_20 
+    4114cd      4 DATAREF STACK 1366 esp + 92 CHILDOF 1358 OFFSET 92 LOCALVAR var_1C 
     4114cd      4 INSTR BELONGTO 4114c0 
     4114cd      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 60h 
-    4114cd      8 DATAREF STACK 1370 esp + 48 CHILDOF 1368 OFFSET 48 LOCALVAR var_48 
-    4114cd      8 DATAREF STACK 1371 esp + 56 CHILDOF 1368 OFFSET 56 LOCALVAR var_40 
-    4114cd      8 DATAREF STACK 1372 esp + 64 CHILDOF 1368 OFFSET 64 LOCALVAR var_38 
+    4114cd      8 DATAREF STACK 1360 esp + 48 CHILDOF 1358 OFFSET 48 LOCALVAR var_48 
+    4114cd      8 DATAREF STACK 1361 esp + 56 CHILDOF 1358 OFFSET 56 LOCALVAR var_40 
+    4114cd      8 DATAREF STACK 1362 esp + 64 CHILDOF 1358 OFFSET 64 LOCALVAR var_38 
     4114cd      8 MEMORYHOLE STACK esp + 120 ReturnAddress 
-    4114cd     96 DATAREF STACK 1368 esp + 0 PARENT LocalFrame LOCALFRAME
+    4114cd     96 DATAREF STACK 1358 esp + 0 PARENT LocalFrame LOCALFRAME
     4114d1     -1 INSTR LOCAL NoMetaUpdate call    sub_412660 
     4114d1      5 INSTR BELONGTO 4114c0 
     4114d1      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ call    sub_412660 
@@ -16615,10 +16610,10 @@
     4116c4      1 INSTR BELONGTO 4116c0 
     4116c4      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
     4116c4     -3 INSTR LOCAL NoWarn push    rbx 
-    4116c5     16 DATAREF STACK 1379 esp + 24 CHILDOF 1377 OFFSET 24 LOCALVAR var_20 
+    4116c5     16 DATAREF STACK 1369 esp + 24 CHILDOF 1367 OFFSET 24 LOCALVAR var_20 
     4116c5     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-    4116c5     20 DATAREF STACK 1378 esp + 0 CHILDOF 1377 OFFSET 0 OutArgsRegion OUTARGS
-    4116c5     40 DATAREF STACK 1377 esp + 0 PARENT LocalFrame LOCALFRAME
+    4116c5     20 DATAREF STACK 1368 esp + 0 CHILDOF 1367 OFFSET 0 OutArgsRegion OUTARGS
+    4116c5     40 DATAREF STACK 1367 esp + 0 PARENT LocalFrame LOCALFRAME
     4116c5      4 INSTR BELONGTO 4116c0 
     4116c5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 28h 
     4116c5      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
@@ -16764,8 +16759,8 @@
     411810      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
     411810      0 FUNC MMSAFENESS SAFE
     411810    113 FUNC GLOBAL sub_411810 FUNC_UNSAFE NOFP RET     411880 
-    411810     24 DATAREF STACK 1380 esp + 0 PARENT LocalFrame LOCALFRAME
-    411810      4 DATAREF STACK 1381 esp + 0 CHILDOF 1380 OFFSET 0 OutArgsRegion OUTARGS
+    411810     24 DATAREF STACK 1370 esp + 0 PARENT LocalFrame LOCALFRAME
+    411810      4 DATAREF STACK 1371 esp + 0 CHILDOF 1370 OFFSET 0 OutArgsRegion OUTARGS
     411810      4 INSTR BELONGTO 411810 
     411810      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
     411810      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -16840,7 +16835,7 @@
     411892      3 INSTR BELONGTO 411890 
     411895     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     411895      4 INSTR BELONGTO 411890 
-    411895      8 DATAREF STACK 1382 esp + 0 PARENT LocalFrame LOCALFRAME
+    411895      8 DATAREF STACK 1372 esp + 0 PARENT LocalFrame LOCALFRAME
     411895      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     411899     -1 INSTR LOCAL NoMetaUpdate call    sub_411810 
     411899      5 INSTR BELONGTO 411890 
@@ -16948,7 +16943,7 @@
     411b00      4 INSTR BELONGTO 411b00 
     411b00      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
     411b00     53 FUNC GLOBAL sub_411B00 FUNC_UNSAFE NOFP RET     411b34 
-    411b00      8 DATAREF STACK 1383 esp + 0 PARENT LocalFrame LOCALFRAME
+    411b00      8 DATAREF STACK 1373 esp + 0 PARENT LocalFrame LOCALFRAME
     411b00      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     411b04      7 INSTR BELONGTO 411b00 
     411b04      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_61A378 
@@ -16992,12 +16987,12 @@
     411b4a      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
     411b4d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     411b4d      5 INSTR BELONGTO 411b40 
-    411b52     24 DATAREF STACK 1384 esp + 0 PARENT LocalFrame LOCALFRAME
+    411b52     24 DATAREF STACK 1374 esp + 0 PARENT LocalFrame LOCALFRAME
     411b52      4 INSTR BELONGTO 411b40 
     411b52      4 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-    411b52      8 DATAREF STACK 1385 esp + 0 CHILDOF 1384 OFFSET 0 LOCALVAR var_18 
-    411b52      8 DATAREF STACK 1386 esp + 8 CHILDOF 1384 OFFSET 8 LOCALVAR var_10 
-    411b52      8 DATAREF STACK 1387 esp + 16 CHILDOF 1384 OFFSET 16 LOCALVAR var_8 
+    411b52      8 DATAREF STACK 1375 esp + 0 CHILDOF 1374 OFFSET 0 LOCALVAR var_18 
+    411b52      8 DATAREF STACK 1376 esp + 8 CHILDOF 1374 OFFSET 8 LOCALVAR var_10 
+    411b52      8 DATAREF STACK 1377 esp + 16 CHILDOF 1374 OFFSET 16 LOCALVAR var_8 
     411b52      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     411b56      3 INSTR BELONGTO 411b40 
     411b56      3 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ mov     r12d, esi 
@@ -17089,12 +17084,12 @@
     411bea      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
     411bed     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     411bed      5 INSTR BELONGTO 411be0 
-    411bf2     24 DATAREF STACK 1388 esp + 0 PARENT LocalFrame LOCALFRAME
+    411bf2     24 DATAREF STACK 1378 esp + 0 PARENT LocalFrame LOCALFRAME
     411bf2      4 INSTR BELONGTO 411be0 
     411bf2      4 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-    411bf2      8 DATAREF STACK 1389 esp + 0 CHILDOF 1388 OFFSET 0 LOCALVAR var_18 
-    411bf2      8 DATAREF STACK 1390 esp + 8 CHILDOF 1388 OFFSET 8 LOCALVAR var_10 
-    411bf2      8 DATAREF STACK 1391 esp + 16 CHILDOF 1388 OFFSET 16 LOCALVAR var_8 
+    411bf2      8 DATAREF STACK 1379 esp + 0 CHILDOF 1378 OFFSET 0 LOCALVAR var_18 
+    411bf2      8 DATAREF STACK 1380 esp + 8 CHILDOF 1378 OFFSET 8 LOCALVAR var_10 
+    411bf2      8 DATAREF STACK 1381 esp + 16 CHILDOF 1378 OFFSET 16 LOCALVAR var_8 
     411bf2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     411bf6      3 INSTR BELONGTO 411be0 
     411bf6      3 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ mov     rbp, rsi 
@@ -17408,7 +17403,7 @@
     411e0c     -3 INSTR LOCAL NoWarn push    rbp 
     411e0d      1 INSTR BELONGTO 411e00 
     411e0d      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 ZZ push    rbx 
-    411e0d     40 DATAREF STACK 1392 esp + 0 PARENT LocalFrame LOCALFRAME
+    411e0d     40 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     411e0d      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     411e0e     -1 INSTR LOCAL NoMetaUpdate call    sub_411810 
     411e0e      5 INSTR BELONGTO 411e00 
@@ -17646,8 +17641,8 @@
     411f7f      1 INSTR BELONGTO 411f70 
     411f7f      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R14 ZZ push    rbx 
     411f7f     -3 INSTR LOCAL NoWarn push    rbx 
-    411f80     16 DATAREF STACK 1394 esp + 8 CHILDOF 1393 OFFSET 8 LOCALVAR var_40 
-    411f80     24 DATAREF STACK 1393 esp + 0 PARENT LocalFrame LOCALFRAME
+    411f80     16 DATAREF STACK 1383 esp + 8 CHILDOF 1382 OFFSET 8 LOCALVAR var_40 
+    411f80     24 DATAREF STACK 1382 esp + 0 PARENT LocalFrame LOCALFRAME
     411f80     48 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
     411f80      4 INSTR BELONGTO 411f70 
     411f80      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R14 ZZ sub     rsp, 18h 
@@ -17884,7 +17879,7 @@
     4120f7     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4120f7      4 INSTR BELONGTO 4120f0 
     4120f7      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    4120f7      8 DATAREF STACK 1395 esp + 0 PARENT LocalFrame LOCALFRAME
+    4120f7      8 DATAREF STACK 1384 esp + 0 PARENT LocalFrame LOCALFRAME
     4120f7      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4120fb     -1 INSTR LOCAL NoMetaUpdate call    sub_411810 
     4120fb      5 INSTR BELONGTO 4120f0 
@@ -18037,11 +18032,11 @@
     4121f5      5 INSTR BELONGTO 4121f0 
     4121fa      3 INSTR BELONGTO 4121f0 
     4121fa      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    4121fd     24 DATAREF STACK 1396 esp + 0 PARENT LocalFrame LOCALFRAME
+    4121fd     24 DATAREF STACK 1385 esp + 0 PARENT LocalFrame LOCALFRAME
     4121fd      4 INSTR BELONGTO 4121f0 
     4121fd      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-    4121fd      8 DATAREF STACK 1397 esp + 8 CHILDOF 1396 OFFSET 8 LOCALVAR var_10 
-    4121fd      8 DATAREF STACK 1398 esp + 16 CHILDOF 1396 OFFSET 16 LOCALVAR var_8 
+    4121fd      8 DATAREF STACK 1386 esp + 8 CHILDOF 1385 OFFSET 8 LOCALVAR var_10 
+    4121fd      8 DATAREF STACK 1387 esp + 16 CHILDOF 1385 OFFSET 16 LOCALVAR var_8 
     4121fd      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     412201      3 INSTR BELONGTO 4121f0 
     412201      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ mov     rbp, rsi 
@@ -18177,10 +18172,10 @@
     4122f0     -3 INSTR LOCAL NoWarn push    rbx 
     4122f1      3 INSTR BELONGTO 4122f0 
     4122f1      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    4122f4     16 DATAREF STACK 1399 esp + 0 PARENT LocalFrame LOCALFRAME
+    4122f4     16 DATAREF STACK 1388 esp + 0 PARENT LocalFrame LOCALFRAME
     4122f4      4 INSTR BELONGTO 4122f0 
     4122f4      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 10h 
-    4122f4      8 DATAREF STACK 1400 esp + 8 CHILDOF 1399 OFFSET 8 LOCALVAR var_10 
+    4122f4      8 DATAREF STACK 1389 esp + 8 CHILDOF 1388 OFFSET 8 LOCALVAR var_10 
     4122f4      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
     4122f4      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4122f8      9 INSTR BELONGTO 4122f0 
@@ -18262,11 +18257,11 @@
     412385      5 INSTR BELONGTO 412380 
     41238a      3 INSTR BELONGTO 412380 
     41238a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    41238d     24 DATAREF STACK 1401 esp + 0 PARENT LocalFrame LOCALFRAME
+    41238d     24 DATAREF STACK 1390 esp + 0 PARENT LocalFrame LOCALFRAME
     41238d      4 INSTR BELONGTO 412380 
     41238d      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-    41238d      8 DATAREF STACK 1402 esp + 8 CHILDOF 1401 OFFSET 8 LOCALVAR var_10 
-    41238d      8 DATAREF STACK 1403 esp + 16 CHILDOF 1401 OFFSET 16 LOCALVAR var_8 
+    41238d      8 DATAREF STACK 1391 esp + 8 CHILDOF 1390 OFFSET 8 LOCALVAR var_10 
+    41238d      8 DATAREF STACK 1392 esp + 16 CHILDOF 1390 OFFSET 16 LOCALVAR var_8 
     41238d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     412391      3 INSTR BELONGTO 412380 
     412391      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ mov     rbp, rsi 
@@ -18347,9 +18342,9 @@
     412414     -3 INSTR LOCAL NoWarn push    rbx 
     412415      3 INSTR BELONGTO 412410 
     412415      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    412418     16 DATAREF STACK 1405 esp + 8 CHILDOF 1404 OFFSET 8 LOCALVAR var_20 
+    412418     16 DATAREF STACK 1394 esp + 8 CHILDOF 1393 OFFSET 8 LOCALVAR var_20 
     412418     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    412418     24 DATAREF STACK 1404 esp + 0 PARENT LocalFrame LOCALFRAME
+    412418     24 DATAREF STACK 1393 esp + 0 PARENT LocalFrame LOCALFRAME
     412418      4 INSTR BELONGTO 412410 
     412418      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
     412418      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -18496,11 +18491,11 @@
     412505      5 INSTR BELONGTO 412500 
     41250a      3 INSTR BELONGTO 412500 
     41250a      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    41250d     24 DATAREF STACK 1406 esp + 0 PARENT LocalFrame LOCALFRAME
+    41250d     24 DATAREF STACK 1395 esp + 0 PARENT LocalFrame LOCALFRAME
     41250d      4 INSTR BELONGTO 412500 
     41250d      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-    41250d      8 DATAREF STACK 1407 esp + 8 CHILDOF 1406 OFFSET 8 LOCALVAR var_10 
-    41250d      8 DATAREF STACK 1408 esp + 16 CHILDOF 1406 OFFSET 16 LOCALVAR var_8 
+    41250d      8 DATAREF STACK 1396 esp + 8 CHILDOF 1395 OFFSET 8 LOCALVAR var_10 
+    41250d      8 DATAREF STACK 1397 esp + 16 CHILDOF 1395 OFFSET 16 LOCALVAR var_8 
     41250d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     412511     -1 INSTR LOCAL MetadataUnused mov     rbp, rsi 
     412511      3 INSTR BELONGTO 412500 
@@ -18577,7 +18572,7 @@
     412585     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     412585      4 INSTR BELONGTO 412580 
     412585      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-    412585      8 DATAREF STACK 1409 esp + 0 PARENT LocalFrame LOCALFRAME
+    412585      8 DATAREF STACK 1398 esp + 0 PARENT LocalFrame LOCALFRAME
     412585      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     412589     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
     412589      5 INSTR BELONGTO 412580 
@@ -18692,8 +18687,8 @@
     412660      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
     412660      0 FUNC MMSAFENESS SAFE
     412660    113 FUNC GLOBAL sub_412660 FUNC_UNSAFE NOFP RET     4126d0 
-    412660     24 DATAREF STACK 1410 esp + 0 PARENT LocalFrame LOCALFRAME
-    412660      4 DATAREF STACK 1411 esp + 0 CHILDOF 1410 OFFSET 0 OutArgsRegion OUTARGS
+    412660     24 DATAREF STACK 1399 esp + 0 PARENT LocalFrame LOCALFRAME
+    412660      4 DATAREF STACK 1400 esp + 0 CHILDOF 1399 OFFSET 0 OutArgsRegion OUTARGS
     412660      4 INSTR BELONGTO 412660 
     412660      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
     412660      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -18849,7 +18844,7 @@
     412912      3 INSTR BELONGTO 412910 
     412915     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     412915      4 INSTR BELONGTO 412910 
-    412915      8 DATAREF STACK 1412 esp + 0 PARENT LocalFrame LOCALFRAME
+    412915      8 DATAREF STACK 1401 esp + 0 PARENT LocalFrame LOCALFRAME
     412915      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     412919     -1 INSTR LOCAL NoMetaUpdate call    sub_412660 
     412919      5 INSTR BELONGTO 412910 
@@ -18921,11 +18916,11 @@
     4129a5      5 INSTR BELONGTO 4129a0 
     4129aa      3 INSTR BELONGTO 4129a0 
     4129aa      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
-    4129ad     24 DATAREF STACK 1413 esp + 0 PARENT LocalFrame LOCALFRAME
+    4129ad     24 DATAREF STACK 1402 esp + 0 PARENT LocalFrame LOCALFRAME
     4129ad      4 INSTR BELONGTO 4129a0 
     4129ad      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-    4129ad      8 DATAREF STACK 1414 esp + 8 CHILDOF 1413 OFFSET 8 LOCALVAR var_10 
-    4129ad      8 DATAREF STACK 1415 esp + 16 CHILDOF 1413 OFFSET 16 LOCALVAR var_8 
+    4129ad      8 DATAREF STACK 1403 esp + 8 CHILDOF 1402 OFFSET 8 LOCALVAR var_10 
+    4129ad      8 DATAREF STACK 1404 esp + 16 CHILDOF 1402 OFFSET 16 LOCALVAR var_8 
     4129ad      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4129b1     -1 INSTR LOCAL MetadataUnused mov     rbp, rsi 
     4129b1      3 INSTR BELONGTO 4129a0 
@@ -18970,9 +18965,9 @@
     4129f4     -3 INSTR LOCAL NoWarn push    rbx 
     4129f5      3 INSTR BELONGTO 4129f0 
     4129f5      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 ZZ mov     rbx, rsi 
-    4129f8     16 DATAREF STACK 1417 esp + 8 CHILDOF 1416 OFFSET 8 LOCALVAR var_20 
+    4129f8     16 DATAREF STACK 1406 esp + 8 CHILDOF 1405 OFFSET 8 LOCALVAR var_20 
     4129f8     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    4129f8     24 DATAREF STACK 1416 esp + 0 PARENT LocalFrame LOCALFRAME
+    4129f8     24 DATAREF STACK 1405 esp + 0 PARENT LocalFrame LOCALFRAME
     4129f8      4 INSTR BELONGTO 4129f0 
     4129f8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
     4129f8      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -19219,13 +19214,13 @@
     412bbc      1 INSTR BELONGTO 412bb0 
     412bbc      1 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ push    rbx 
     412bbc     -3 INSTR LOCAL NoWarn push    rbx 
-    412bbd     16 DATAREF STACK 1421 esp + 56 CHILDOF 1418 OFFSET 56 LOCALVAR var_40 
-    412bbd     40 DATAREF STACK 1420 esp + 16 CHILDOF 1418 OFFSET 16 LOCALVAR var_68 
+    412bbd     16 DATAREF STACK 1410 esp + 56 CHILDOF 1407 OFFSET 56 LOCALVAR var_40 
+    412bbd     40 DATAREF STACK 1409 esp + 16 CHILDOF 1407 OFFSET 16 LOCALVAR var_68 
     412bbd     48 MEMORYHOLE STACK esp + 72 CalleeSavedRegs 
-    412bbd      4 DATAREF STACK 1419 esp + 0 CHILDOF 1418 OFFSET 0 OutArgsRegion OUTARGS
+    412bbd      4 DATAREF STACK 1408 esp + 0 CHILDOF 1407 OFFSET 0 OutArgsRegion OUTARGS
     412bbd      4 INSTR BELONGTO 412bb0 
     412bbd      4 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ sub     rsp, 48h 
-    412bbd     72 DATAREF STACK 1418 esp + 0 PARENT LocalFrame LOCALFRAME
+    412bbd     72 DATAREF STACK 1407 esp + 0 PARENT LocalFrame LOCALFRAME
     412bbd      8 MEMORYHOLE STACK esp + 120 ReturnAddress 
     412bc1     -1 INSTR LOCAL NoMetaUpdate call    _gtk_list_store_get_type 
     412bc1      5 INSTR BELONGTO 412bb0 
@@ -19378,11 +19373,11 @@
     412ca5      5 INSTR BELONGTO 412ca0 
     412caa     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
     412caa      3 INSTR BELONGTO 412ca0 
-    412cad     24 DATAREF STACK 1422 esp + 0 PARENT LocalFrame LOCALFRAME
+    412cad     24 DATAREF STACK 1411 esp + 0 PARENT LocalFrame LOCALFRAME
     412cad      4 INSTR BELONGTO 412ca0 
     412cad      4 INSTR DEADREGS  EFLAGS RDX RSI ZZ sub     rsp, 18h 
-    412cad      8 DATAREF STACK 1423 esp + 8 CHILDOF 1422 OFFSET 8 LOCALVAR var_10 
-    412cad      8 DATAREF STACK 1424 esp + 16 CHILDOF 1422 OFFSET 16 LOCALVAR var_8 
+    412cad      8 DATAREF STACK 1412 esp + 8 CHILDOF 1411 OFFSET 8 LOCALVAR var_10 
+    412cad      8 DATAREF STACK 1413 esp + 16 CHILDOF 1411 OFFSET 16 LOCALVAR var_8 
     412cad      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     412cb1      2 INSTR BELONGTO 412ca0 
     412cb1      2 INSTR DEADREGS  EFLAGS RDX RSI ZZ xor     edx, edx 
@@ -19428,11 +19423,11 @@
     412cf0     -3 INSTR LOCAL NoWarn push    rbx 
     412cf1      3 INSTR BELONGTO 412cf0 
     412cf1      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rsi 
-    412cf4     48 DATAREF STACK 1425 esp + 0 PARENT LocalFrame LOCALFRAME
+    412cf4     48 DATAREF STACK 1414 esp + 0 PARENT LocalFrame LOCALFRAME
     412cf4      4 INSTR BELONGTO 412cf0 
     412cf4      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 30h 
-    412cf4      8 DATAREF STACK 1426 esp + 32 CHILDOF 1425 OFFSET 32 LOCALVAR var_18 
-    412cf4      8 DATAREF STACK 1427 esp + 40 CHILDOF 1425 OFFSET 40 LOCALVAR var_10 
+    412cf4      8 DATAREF STACK 1415 esp + 32 CHILDOF 1414 OFFSET 32 LOCALVAR var_18 
+    412cf4      8 DATAREF STACK 1416 esp + 40 CHILDOF 1414 OFFSET 40 LOCALVAR var_10 
     412cf4      8 MEMORYHOLE STACK esp + 48 CalleeSavedRegs 
     412cf4      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     412cf8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_type 
@@ -19560,29 +19555,29 @@
     412da4      1 INSTR BELONGTO 412d90 
     412da4      1 INSTR DEADREGS  EFLAGS RAX RDX R12 R14 R15 ZZ push    rbx 
     412da4     -3 INSTR LOCAL NoWarn push    rbx 
-    412da5     12 DATAREF STACK 1444 esp + 136 CHILDOF 1428 OFFSET 136 LOCALVAR var_50 
-    412da5     12 DATAREF STACK 1447 esp + 156 CHILDOF 1428 OFFSET 156 LOCALVAR var_3C 
-    412da5    168 DATAREF STACK 1428 esp + 0 PARENT LocalFrame LOCALFRAME
-    412da5     16 DATAREF STACK 1429 esp + 0 CHILDOF 1428 OFFSET 0 OutArgsRegion OUTARGS
-    412da5     16 DATAREF STACK 1439 esp + 88 CHILDOF 1428 OFFSET 88 LOCALVAR var_80 
+    412da5     12 DATAREF STACK 1433 esp + 136 CHILDOF 1417 OFFSET 136 LOCALVAR var_50 
+    412da5     12 DATAREF STACK 1436 esp + 156 CHILDOF 1417 OFFSET 156 LOCALVAR var_3C 
+    412da5    168 DATAREF STACK 1417 esp + 0 PARENT LocalFrame LOCALFRAME
+    412da5     16 DATAREF STACK 1418 esp + 0 CHILDOF 1417 OFFSET 0 OutArgsRegion OUTARGS
+    412da5     16 DATAREF STACK 1428 esp + 88 CHILDOF 1417 OFFSET 88 LOCALVAR var_80 
     412da5     48 MEMORYHOLE STACK esp + 168 CalleeSavedRegs 
-    412da5      4 DATAREF STACK 1445 esp + 148 CHILDOF 1428 OFFSET 148 LOCALVAR var_44 
-    412da5      4 DATAREF STACK 1446 esp + 152 CHILDOF 1428 OFFSET 152 LOCALVAR var_40 
+    412da5      4 DATAREF STACK 1434 esp + 148 CHILDOF 1417 OFFSET 148 LOCALVAR var_44 
+    412da5      4 DATAREF STACK 1435 esp + 152 CHILDOF 1417 OFFSET 152 LOCALVAR var_40 
     412da5      7 INSTR BELONGTO 412d90 
     412da5      7 INSTR DEADREGS  EFLAGS RAX RDX RBX R12 R14 R15 ZZ sub     rsp, 0A8h 
-    412da5      8 DATAREF STACK 1430 esp + 16 CHILDOF 1428 OFFSET 16 LOCALVAR var_C8 
-    412da5      8 DATAREF STACK 1431 esp + 24 CHILDOF 1428 OFFSET 24 LOCALVAR var_C0 
-    412da5      8 DATAREF STACK 1432 esp + 32 CHILDOF 1428 OFFSET 32 LOCALVAR var_B8 
-    412da5      8 DATAREF STACK 1433 esp + 40 CHILDOF 1428 OFFSET 40 LOCALVAR var_B0 
-    412da5      8 DATAREF STACK 1434 esp + 48 CHILDOF 1428 OFFSET 48 LOCALVAR var_A8 
-    412da5      8 DATAREF STACK 1435 esp + 56 CHILDOF 1428 OFFSET 56 LOCALVAR var_A0 
-    412da5      8 DATAREF STACK 1436 esp + 64 CHILDOF 1428 OFFSET 64 LOCALVAR var_98 
-    412da5      8 DATAREF STACK 1437 esp + 72 CHILDOF 1428 OFFSET 72 LOCALVAR var_90 
-    412da5      8 DATAREF STACK 1438 esp + 80 CHILDOF 1428 OFFSET 80 LOCALVAR var_88 
-    412da5      8 DATAREF STACK 1440 esp + 104 CHILDOF 1428 OFFSET 104 LOCALVAR var_70 
-    412da5      8 DATAREF STACK 1441 esp + 112 CHILDOF 1428 OFFSET 112 LOCALVAR var_68 
-    412da5      8 DATAREF STACK 1442 esp + 120 CHILDOF 1428 OFFSET 120 LOCALVAR var_60 
-    412da5      8 DATAREF STACK 1443 esp + 128 CHILDOF 1428 OFFSET 128 LOCALVAR var_58 
+    412da5      8 DATAREF STACK 1419 esp + 16 CHILDOF 1417 OFFSET 16 LOCALVAR var_C8 
+    412da5      8 DATAREF STACK 1420 esp + 24 CHILDOF 1417 OFFSET 24 LOCALVAR var_C0 
+    412da5      8 DATAREF STACK 1421 esp + 32 CHILDOF 1417 OFFSET 32 LOCALVAR var_B8 
+    412da5      8 DATAREF STACK 1422 esp + 40 CHILDOF 1417 OFFSET 40 LOCALVAR var_B0 
+    412da5      8 DATAREF STACK 1423 esp + 48 CHILDOF 1417 OFFSET 48 LOCALVAR var_A8 
+    412da5      8 DATAREF STACK 1424 esp + 56 CHILDOF 1417 OFFSET 56 LOCALVAR var_A0 
+    412da5      8 DATAREF STACK 1425 esp + 64 CHILDOF 1417 OFFSET 64 LOCALVAR var_98 
+    412da5      8 DATAREF STACK 1426 esp + 72 CHILDOF 1417 OFFSET 72 LOCALVAR var_90 
+    412da5      8 DATAREF STACK 1427 esp + 80 CHILDOF 1417 OFFSET 80 LOCALVAR var_88 
+    412da5      8 DATAREF STACK 1429 esp + 104 CHILDOF 1417 OFFSET 104 LOCALVAR var_70 
+    412da5      8 DATAREF STACK 1430 esp + 112 CHILDOF 1417 OFFSET 112 LOCALVAR var_68 
+    412da5      8 DATAREF STACK 1431 esp + 120 CHILDOF 1417 OFFSET 120 LOCALVAR var_60 
+    412da5      8 DATAREF STACK 1432 esp + 128 CHILDOF 1417 OFFSET 128 LOCALVAR var_58 
     412da5      8 MEMORYHOLE STACK esp + 216 ReturnAddress 
     412dac      4 INSTR BELONGTO 412d90 
     412dac      4 INSTR DEADREGS  EFLAGS RAX RDX RBX R12 R14 R15 ZZ mov     rax, [rdi+40h] 
@@ -20448,11 +20443,11 @@
     4133a0     -3 INSTR LOCAL NoWarn push    rbx 
     4133a1      3 INSTR BELONGTO 4133a0 
     4133a1      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rsi 
-    4133a4     48 DATAREF STACK 1448 esp + 0 PARENT LocalFrame LOCALFRAME
+    4133a4     48 DATAREF STACK 1437 esp + 0 PARENT LocalFrame LOCALFRAME
     4133a4      4 INSTR BELONGTO 4133a0 
     4133a4      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 30h 
-    4133a4      8 DATAREF STACK 1449 esp + 32 CHILDOF 1448 OFFSET 32 LOCALVAR var_18 
-    4133a4      8 DATAREF STACK 1450 esp + 40 CHILDOF 1448 OFFSET 40 LOCALVAR var_10 
+    4133a4      8 DATAREF STACK 1438 esp + 32 CHILDOF 1437 OFFSET 32 LOCALVAR var_18 
+    4133a4      8 DATAREF STACK 1439 esp + 40 CHILDOF 1437 OFFSET 40 LOCALVAR var_10 
     4133a4      8 MEMORYHOLE STACK esp + 48 CalleeSavedRegs 
     4133a4      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     4133a8     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_type 
@@ -20752,8 +20747,8 @@
     4139a0      1 INSTR BELONGTO 4139a0 
     4139a0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     4139a0     -3 INSTR LOCAL NoWarn push    rbx 
-    4139a1     16 DATAREF STACK 1451 esp + 0 PARENT LocalFrame LOCALFRAME
-    4139a1      4 DATAREF STACK 1452 esp + 0 CHILDOF 1451 OFFSET 0 OutArgsRegion OUTARGS
+    4139a1     16 DATAREF STACK 1440 esp + 0 PARENT LocalFrame LOCALFRAME
+    4139a1      4 DATAREF STACK 1441 esp + 0 CHILDOF 1440 OFFSET 0 OutArgsRegion OUTARGS
     4139a1      4 INSTR BELONGTO 4139a0 
     4139a1      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
     4139a1      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -21018,7 +21013,7 @@
     413ed0     25 FUNC GLOBAL sub_413ED0 FUNC_UNSAFE NOFP RET     413ee8 
     413ed0      4 INSTR BELONGTO 413ed0 
     413ed0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    413ed0      8 DATAREF STACK 1453 esp + 0 PARENT LocalFrame LOCALFRAME
+    413ed0      8 DATAREF STACK 1442 esp + 0 PARENT LocalFrame LOCALFRAME
     413ed0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     413ed4     -1 INSTR LOCAL NoMetaUpdate call    sub_4139A0 
     413ed4      5 INSTR BELONGTO 413ed0 
@@ -21092,13 +21087,13 @@
     413fd7      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
     413fdc      4 INSTR BELONGTO 413fb0 
     413fdc      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-    413fdc     56 DATAREF STACK 1454 esp + 0 PARENT LocalFrame LOCALFRAME
-    413fdc      8 DATAREF STACK 1455 esp + 8 CHILDOF 1454 OFFSET 8 LOCALVAR var_30 
-    413fdc      8 DATAREF STACK 1456 esp + 16 CHILDOF 1454 OFFSET 16 LOCALVAR var_28 
-    413fdc      8 DATAREF STACK 1457 esp + 24 CHILDOF 1454 OFFSET 24 LOCALVAR var_20 
-    413fdc      8 DATAREF STACK 1458 esp + 32 CHILDOF 1454 OFFSET 32 LOCALVAR var_18 
-    413fdc      8 DATAREF STACK 1459 esp + 40 CHILDOF 1454 OFFSET 40 LOCALVAR var_10 
-    413fdc      8 DATAREF STACK 1460 esp + 48 CHILDOF 1454 OFFSET 48 LOCALVAR var_8 
+    413fdc     56 DATAREF STACK 1443 esp + 0 PARENT LocalFrame LOCALFRAME
+    413fdc      8 DATAREF STACK 1444 esp + 8 CHILDOF 1443 OFFSET 8 LOCALVAR var_30 
+    413fdc      8 DATAREF STACK 1445 esp + 16 CHILDOF 1443 OFFSET 16 LOCALVAR var_28 
+    413fdc      8 DATAREF STACK 1446 esp + 24 CHILDOF 1443 OFFSET 24 LOCALVAR var_20 
+    413fdc      8 DATAREF STACK 1447 esp + 32 CHILDOF 1443 OFFSET 32 LOCALVAR var_18 
+    413fdc      8 DATAREF STACK 1448 esp + 40 CHILDOF 1443 OFFSET 40 LOCALVAR var_10 
+    413fdc      8 DATAREF STACK 1449 esp + 48 CHILDOF 1443 OFFSET 48 LOCALVAR var_8 
     413fdc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     413fe0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
     413fe0      3 INSTR BELONGTO 413fb0 
@@ -21175,7 +21170,7 @@
     414055     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     414055      4 INSTR BELONGTO 414050 
     414055      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    414055      8 DATAREF STACK 1461 esp + 0 PARENT LocalFrame LOCALFRAME
+    414055      8 DATAREF STACK 1450 esp + 0 PARENT LocalFrame LOCALFRAME
     414055      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     414059      7 INSTR BELONGTO 414050 
     414059      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_618D88 
@@ -21210,7 +21205,7 @@
     414088     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     414095 
     414088      4 INSTR BELONGTO 414088 
     414088      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    414088      8 DATAREF STACK 1462 esp + 0 PARENT LocalFrame LOCALFRAME
+    414088      8 DATAREF STACK 1451 esp + 0 PARENT LocalFrame LOCALFRAME
     414088      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     41408c     -1 INSTR LOCAL NoMetaUpdate call    sub_409E10 
     41408c      5 INSTR BELONGTO 414088 
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 a1db635e..9664b78b 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 @@
-c50e50d8b7c5f37ce781ef0af2920e894002e76d
\ No newline at end of file
+3bf9977592976eb73651aa0fa3e46fdd6e233faa
\ 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 4866dfc6..e1b5b19a 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 @@
-bd3c2736f74b7feffd11bb0aecadfe1675b81f6c
\ No newline at end of file
+1892a42886aa175fe8b5a6ba0af6b822fe66d5ce
\ 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 11231123..90d2af3d 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 @@
-fcf0581b9358163ad6f18d9594d048ecfa514777
\ No newline at end of file
+d4d6e5c44bc8a949da730f46219d3ca2b30ca958
\ 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 25297073..355ee2f3 100644
--- a/tests/commit/trimmed-sorted-save-gnome-thumbnail-font.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-thumbnail-font.psexe.annot
@@ -2057,12 +2057,11 @@
     40209f      5 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 XMM0 ZZ call    _g_printerr 
     4020a4     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40197F 
     4020a4      5 INSTR BELONGTO 4017c0 
-    4020ac      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
-    4020ac      0 FUNC MMSAFENESS UNSAFE
+    4020ac      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    4020ac      0 FUNC MMSAFENESS SAFE
     4020ac     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     4020ac      2 INSTR BELONGTO 4020ac 
     4020ac     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     4020d5 
-    4020ac      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     4020ae      3 INSTR BELONGTO 4020ac 
     4020ae      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     4020b1      1 INSTR BELONGTO 4020ac 
@@ -2074,8 +2073,11 @@
     4020b5      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     4020b9      1 INSTR BELONGTO 4020ac 
     4020b9      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    4020b9     -3 INSTR LOCAL NoWarn push    rax 
+    4020ba     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     4020ba      1 INSTR BELONGTO 4020ac 
     4020ba      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    4020ba      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     4020bb     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     4020bb      7 INSTR BELONGTO 4020ac 
     4020bb      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -2170,14 +2172,14 @@
     402152      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     402153      1 INSTR BELONGTO 4020f0 
     402153      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    402160      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
+    402160      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     402160      0 FUNC MMSAFENESS UNSAFE
     402160     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_603DE8, 0 
     402160     34 FUNC GLOBAL sub_402160 FUNC_UNSAFE USEFP RET     402181 
     402160      8 INSTR BELONGTO 402160 
-    402160      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    402160      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     402168      1 INSTR BELONGTO 402160 
+    402168      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    402168      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     402169      3 INSTR BELONGTO 402160 
     40216c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_402180 
     40216c      2 INSTR BELONGTO 402160 
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 0ce23649..c0234799 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 @@
-32695b6a2175d979b87e586c4cdf52f9ebc45af2
\ No newline at end of file
+092c2b393a78444fe70eb7e215531cce91675999
\ 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 11463376..4dcd8766 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 @@
-85f23b2056b8818c7156a98580402cdf46fd7858
\ No newline at end of file
+40f58020596c78a7e2aef2713ebb076f610bff3f
\ 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 45938957..196084a1 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 @@
-395376a2683f38a48f3df59b6ccb11618743ae58
\ No newline at end of file
+3acd3a17d29a78882180d26049c95300c647304d
\ 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 6bb67b56..bc157e5b 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 @@
-46c248ea61f072d94c5ef028399d7d9e975b182f
\ No newline at end of file
+dc6ce728724ef154d37774ab477a042cbc17830b
\ 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 44998c28..c152d1f1 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 @@
-b44ef6e919ff223846002d96b21feb6ed7162e9b
\ No newline at end of file
+913a0fdd645a80463a2b6614de43ddc74f98bf3a
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-malloc.psexe.annot b/tests/commit/trimmed-sorted-save-malloc.psexe.annot
index 8010982f..4f11617f 100644
--- a/tests/commit/trimmed-sorted-save-malloc.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-malloc.psexe.annot
@@ -146,12 +146,11 @@
    8048520      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
    8048520      6 FUNC GLOBAL .__assert_fail FUNC_UNSAFE NOFP NORET    8048525 
    8048520      6 INSTR BELONGTO 8048520 
-   8048530      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 ZZ
+   8048530      0 FUNC FRAMERESTORE 0 0 0 1 -20 0 2 -8 0 3 0 0 4 -4 0 5 0 0 6 -24 0 7 0 0 ZZ
    8048530      0 FUNC MMSAFENESS UNSAFE
    8048530     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
    8048530      2 INSTR BELONGTO 8048530 
    8048530     34 FUNC GLOBAL _start FUNC_UNSAFE NOFP NORET    8048551 
-   8048530      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
    8048532      1 INSTR BELONGTO 8048530 
    8048532      1 INSTR DEADREGS  EFLAGS ECX ESI ZZ pop     esi 
    8048533      2 INSTR BELONGTO 8048530 
@@ -161,18 +160,27 @@
    8048535      3 INSTR DEADREGS  EFLAGS ZZ and     esp, 0FFFFFFF0h 
    8048538      1 INSTR BELONGTO 8048530 
    8048538      1 INSTR DEADREGS  EFLAGS ZZ push    eax 
+   8048538     -3 INSTR LOCAL NoWarn push    eax 
    8048539      1 INSTR BELONGTO 8048530 
    8048539      1 INSTR DEADREGS  EFLAGS ZZ push    esp             ; stack_end 
+   8048539     -3 INSTR LOCAL NoWarn push    esp             ; stack_end 
    804853a      1 INSTR BELONGTO 8048530 
    804853a      1 INSTR DEADREGS  EFLAGS ZZ push    edx             ; rtld_fini 
+   804853a     -3 INSTR LOCAL NoWarn push    edx             ; rtld_fini 
+   804853b     -3 INSTR LOCAL NoWarn push    offset __libc_csu_fini; fini 
    804853b      5 INSTR BELONGTO 8048530 
    804853b      5 INSTR DEADREGS  EFLAGS ZZ push    offset __libc_csu_fini; fini 
+   8048540     -3 INSTR LOCAL NoWarn push    offset __libc_csu_init; init 
    8048540      5 INSTR BELONGTO 8048530 
    8048540      5 INSTR DEADREGS  EFLAGS ZZ push    offset __libc_csu_init; init 
    8048545      1 INSTR BELONGTO 8048530 
    8048545      1 INSTR DEADREGS  EFLAGS ZZ push    ecx             ; ubp_av 
+   8048545     -3 INSTR LOCAL NoWarn push    ecx             ; ubp_av 
    8048546      1 INSTR BELONGTO 8048530 
    8048546      1 INSTR DEADREGS  EFLAGS ZZ push    esi             ; argc 
+   8048546     -3 INSTR LOCAL NoWarn push    esi             ; argc 
+   8048547     32 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+   8048547      4 MEMORYHOLE STACK esp + 32 ReturnAddress 
    8048547      5 INSTR BELONGTO 8048530 
    8048547      5 INSTR DEADREGS  EFLAGS ESI ZZ push    offset main     ; main 
    804854c     -1 INSTR LOCAL NoMetaUpdate call    ___libc_start_main 
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 ce244faf..5d20fc21 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 @@
-277a20b9553e87e267e0b3539d002d5122ed2d0a
\ No newline at end of file
+0ffc5df7e9b3a1dd10f04446b586f008e88e0b78
\ 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 6ac4a391..514fd44e 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 @@
-edb904c12fceba358d5f39ecbdf0f3e64edfd088
\ No newline at end of file
+7205345587b42b713e5081326f653a268c2ab981
\ 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 e5c8fc86..067937d6 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 @@
-25f47bdb38e24be0162be3369d572f065230705c
\ No newline at end of file
+eb257b113ba86c2f98b100bfe10a16eea25ba075
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-toy.exe.annot b/tests/commit/trimmed-sorted-save-toy.exe.annot
index 4c78fc71..c3f8dc15 100644
--- a/tests/commit/trimmed-sorted-save-toy.exe.annot
+++ b/tests/commit/trimmed-sorted-save-toy.exe.annot
@@ -78,12 +78,11 @@
    80482f8      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
    80482f8      6 FUNC GLOBAL .puts FUNC_UNSAFE NOFP RET    80482fd 
    80482f8      6 INSTR BELONGTO 80482f8 
-   8048310      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 ZZ
+   8048310      0 FUNC FRAMERESTORE 0 0 0 1 -20 0 2 -8 0 3 0 0 4 -4 0 5 0 0 6 -24 0 7 0 0 ZZ
    8048310      0 FUNC MMSAFENESS UNSAFE
    8048310     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
    8048310      2 INSTR BELONGTO 8048310 
    8048310     34 FUNC GLOBAL _start FUNC_UNSAFE NOFP NORET    8048331 
-   8048310      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
    8048312      1 INSTR BELONGTO 8048310 
    8048312      1 INSTR DEADREGS  EFLAGS ECX ESI ZZ pop     esi 
    8048313      2 INSTR BELONGTO 8048310 
@@ -93,18 +92,27 @@
    8048315      3 INSTR DEADREGS  EFLAGS ZZ and     esp, 0FFFFFFF0h 
    8048318      1 INSTR BELONGTO 8048310 
    8048318      1 INSTR DEADREGS  EFLAGS ZZ push    eax 
+   8048318     -3 INSTR LOCAL NoWarn push    eax 
    8048319      1 INSTR BELONGTO 8048310 
    8048319      1 INSTR DEADREGS  EFLAGS ZZ push    esp             ; stack_end 
+   8048319     -3 INSTR LOCAL NoWarn push    esp             ; stack_end 
    804831a      1 INSTR BELONGTO 8048310 
    804831a      1 INSTR DEADREGS  EFLAGS ZZ push    edx             ; rtld_fini 
+   804831a     -3 INSTR LOCAL NoWarn push    edx             ; rtld_fini 
+   804831b     -3 INSTR LOCAL NoWarn push    offset __libc_csu_fini; fini 
    804831b      5 INSTR BELONGTO 8048310 
    804831b      5 INSTR DEADREGS  EFLAGS ZZ push    offset __libc_csu_fini; fini 
+   8048320     -3 INSTR LOCAL NoWarn push    offset __libc_csu_init; init 
    8048320      5 INSTR BELONGTO 8048310 
    8048320      5 INSTR DEADREGS  EFLAGS ZZ push    offset __libc_csu_init; init 
    8048325      1 INSTR BELONGTO 8048310 
    8048325      1 INSTR DEADREGS  EFLAGS ZZ push    ecx             ; ubp_av 
+   8048325     -3 INSTR LOCAL NoWarn push    ecx             ; ubp_av 
    8048326      1 INSTR BELONGTO 8048310 
    8048326      1 INSTR DEADREGS  EFLAGS ZZ push    esi             ; argc 
+   8048326     -3 INSTR LOCAL NoWarn push    esi             ; argc 
+   8048327     32 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+   8048327      4 MEMORYHOLE STACK esp + 32 ReturnAddress 
    8048327      5 INSTR BELONGTO 8048310 
    8048327      5 INSTR DEADREGS  EFLAGS ESI ZZ push    offset main     ; main 
    804832c     -1 INSTR LOCAL NoMetaUpdate call    ___libc_start_main 
diff --git a/tests/commit/trimmed-sorted-save-xcalc.psexe.annot b/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
index 9fdcdb45..9d242ac4 100644
--- a/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
@@ -1450,12 +1450,11 @@
     401cdd     -1 INSTR LOCAL NoMetaUpdate call    _exit 
     401cdd      5 INSTR BELONGTO 401810 
     401cdd      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _exit 
-    401ce4      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
-    401ce4      0 FUNC MMSAFENESS UNSAFE
+    401ce4      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    401ce4      0 FUNC MMSAFENESS SAFE
     401ce4     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     401ce4      2 INSTR BELONGTO 401ce4 
     401ce4     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     401d0d 
-    401ce4      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     401ce6      3 INSTR BELONGTO 401ce4 
     401ce6      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     401ce9      1 INSTR BELONGTO 401ce4 
@@ -1467,8 +1466,11 @@
     401ced      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     401cf1      1 INSTR BELONGTO 401ce4 
     401cf1      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    401cf1     -3 INSTR LOCAL NoWarn push    rax 
+    401cf2     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     401cf2      1 INSTR BELONGTO 401ce4 
     401cf2      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    401cf2      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     401cf3     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     401cf3      7 INSTR BELONGTO 401ce4 
     401cf3      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -1563,14 +1565,14 @@
     401d92      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     401d93      1 INSTR BELONGTO 401d30 
     401d93      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    401da0      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
+    401da0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     401da0      0 FUNC MMSAFENESS UNSAFE
     401da0     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_606E08, 0 
     401da0     34 FUNC GLOBAL sub_401DA0 FUNC_UNSAFE USEFP RET     401dc1 
     401da0      8 INSTR BELONGTO 401da0 
-    401da0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    401da0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401da8      1 INSTR BELONGTO 401da0 
+    401da8      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    401da8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401da9      3 INSTR BELONGTO 401da0 
     401dac     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401DC0 
     401dac      2 INSTR BELONGTO 401da0 
@@ -2831,9 +2833,10 @@
     4026d0      5 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 ZZ call    sub_4031D0 
     4026d5     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_402682 
     4026d5      2 INSTR BELONGTO 402670 
-    4026e0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -4 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+    4026e0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     4026e0      0 FUNC MMSAFENESS UNSAFE
     4026e0      4 INSTR BELONGTO 4026e0 
+    4026e0      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     4026e0      9 FUNC GLOBAL sub_4026E0 FUNC_UNSAFE NOFP RET     4026e8 
     4026e4     -1 INSTR LOCAL NoMetaUpdate jmp     loc_404D50 
     4026e4      5 INSTR BELONGTO 4026e0 
@@ -2842,7 +2845,7 @@
     4026f0      4 INSTR BELONGTO 4026f0 
     4026f0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
     4026f0     74 FUNC GLOBAL sub_4026F0 FUNC_UNSAFE NOFP RET     402739 
-    4026f0      8 DATAREF STACK 524 esp + 0 PARENT LocalFrame LOCALFRAME
+    4026f0      8 DATAREF STACK 521 esp + 0 PARENT LocalFrame LOCALFRAME
     4026f0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4026f4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Bh 
     4026f4      5 INSTR BELONGTO 4026f0 
@@ -2890,7 +2893,7 @@
     402740      4 INSTR BELONGTO 402740 
     402740      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
     402740     74 FUNC GLOBAL sub_402740 FUNC_UNSAFE NOFP RET     402789 
-    402740      8 DATAREF STACK 525 esp + 0 PARENT LocalFrame LOCALFRAME
+    402740      8 DATAREF STACK 522 esp + 0 PARENT LocalFrame LOCALFRAME
     402740      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     402744     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Ch 
     402744      5 INSTR BELONGTO 402740 
@@ -2938,7 +2941,7 @@
     402790      4 INSTR BELONGTO 402790 
     402790      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
     402790     74 FUNC GLOBAL sub_402790 FUNC_UNSAFE NOFP RET     4027d9 
-    402790      8 DATAREF STACK 526 esp + 0 PARENT LocalFrame LOCALFRAME
+    402790      8 DATAREF STACK 523 esp + 0 PARENT LocalFrame LOCALFRAME
     402790      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     402794     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 12h 
     402794      5 INSTR BELONGTO 402790 
@@ -3020,7 +3023,7 @@
     402830      4 INSTR BELONGTO 402830 
     402830      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
     402830     74 FUNC GLOBAL sub_402830 FUNC_UNSAFE NOFP RET     402879 
-    402830      8 DATAREF STACK 527 esp + 0 PARENT LocalFrame LOCALFRAME
+    402830      8 DATAREF STACK 524 esp + 0 PARENT LocalFrame LOCALFRAME
     402830      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     402834     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 4 
     402834      5 INSTR BELONGTO 402830 
@@ -3068,7 +3071,7 @@
     402880      4 INSTR BELONGTO 402880 
     402880      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
     402880     74 FUNC GLOBAL sub_402880 FUNC_UNSAFE NOFP RET     4028c9 
-    402880      8 DATAREF STACK 528 esp + 0 PARENT LocalFrame LOCALFRAME
+    402880      8 DATAREF STACK 525 esp + 0 PARENT LocalFrame LOCALFRAME
     402880      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     402884     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 26h 
     402884      5 INSTR BELONGTO 402880 
@@ -3116,7 +3119,7 @@
     4028d0      4 INSTR BELONGTO 4028d0 
     4028d0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
     4028d0     74 FUNC GLOBAL sub_4028D0 FUNC_UNSAFE NOFP RET     402919 
-    4028d0      8 DATAREF STACK 529 esp + 0 PARENT LocalFrame LOCALFRAME
+    4028d0      8 DATAREF STACK 526 esp + 0 PARENT LocalFrame LOCALFRAME
     4028d0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4028d4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 11h 
     4028d4      5 INSTR BELONGTO 4028d0 
@@ -3164,7 +3167,7 @@
     402920      4 INSTR BELONGTO 402920 
     402920      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
     402920     74 FUNC GLOBAL sub_402920 FUNC_UNSAFE NOFP RET     402969 
-    402920      8 DATAREF STACK 530 esp + 0 PARENT LocalFrame LOCALFRAME
+    402920      8 DATAREF STACK 527 esp + 0 PARENT LocalFrame LOCALFRAME
     402920      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     402924     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 5 
     402924      5 INSTR BELONGTO 402920 
@@ -3212,7 +3215,7 @@
     402970      4 INSTR BELONGTO 402970 
     402970      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
     402970     74 FUNC GLOBAL sub_402970 FUNC_UNSAFE NOFP RET     4029b9 
-    402970      8 DATAREF STACK 531 esp + 0 PARENT LocalFrame LOCALFRAME
+    402970      8 DATAREF STACK 528 esp + 0 PARENT LocalFrame LOCALFRAME
     402970      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     402974     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 27h 
     402974      5 INSTR BELONGTO 402970 
@@ -3260,7 +3263,7 @@
     4029c0      4 INSTR BELONGTO 4029c0 
     4029c0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
     4029c0     74 FUNC GLOBAL sub_4029C0 FUNC_UNSAFE NOFP RET     402a09 
-    4029c0      8 DATAREF STACK 532 esp + 0 PARENT LocalFrame LOCALFRAME
+    4029c0      8 DATAREF STACK 529 esp + 0 PARENT LocalFrame LOCALFRAME
     4029c0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4029c4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
     4029c4      5 INSTR BELONGTO 4029c0 
@@ -3308,7 +3311,7 @@
     402a10      4 INSTR BELONGTO 402a10 
     402a10      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
     402a10    586 FUNC GLOBAL sub_402A10 FUNC_UNSAFE NOFP RET     402c59 
-    402a10      8 DATAREF STACK 533 esp + 0 PARENT LocalFrame LOCALFRAME
+    402a10      8 DATAREF STACK 530 esp + 0 PARENT LocalFrame LOCALFRAME
     402a10      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     402a14     -1 INSTR LOCAL MetadataUnused mov     rax, [rdx] 
     402a14      3 INSTR BELONGTO 402a10 
@@ -3616,7 +3619,7 @@
     402c60      4 INSTR BELONGTO 402c60 
     402c60      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
     402c60     74 FUNC GLOBAL sub_402C60 FUNC_UNSAFE NOFP RET     402ca9 
-    402c60      8 DATAREF STACK 534 esp + 0 PARENT LocalFrame LOCALFRAME
+    402c60      8 DATAREF STACK 531 esp + 0 PARENT LocalFrame LOCALFRAME
     402c60      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     402c64     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 9 
     402c64      5 INSTR BELONGTO 402c60 
@@ -3664,7 +3667,7 @@
     402cb0      4 INSTR BELONGTO 402cb0 
     402cb0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
     402cb0     74 FUNC GLOBAL sub_402CB0 FUNC_UNSAFE NOFP RET     402cf9 
-    402cb0      8 DATAREF STACK 535 esp + 0 PARENT LocalFrame LOCALFRAME
+    402cb0      8 DATAREF STACK 532 esp + 0 PARENT LocalFrame LOCALFRAME
     402cb0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     402cb4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 25h 
     402cb4      5 INSTR BELONGTO 402cb0 
@@ -3712,7 +3715,7 @@
     402d00      4 INSTR BELONGTO 402d00 
     402d00      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
     402d00     74 FUNC GLOBAL sub_402D00 FUNC_UNSAFE NOFP RET     402d49 
-    402d00      8 DATAREF STACK 536 esp + 0 PARENT LocalFrame LOCALFRAME
+    402d00      8 DATAREF STACK 533 esp + 0 PARENT LocalFrame LOCALFRAME
     402d00      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     402d04     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
     402d04      5 INSTR BELONGTO 402d00 
@@ -3760,7 +3763,7 @@
     402d50      4 INSTR BELONGTO 402d50 
     402d50      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
     402d50     74 FUNC GLOBAL sub_402D50 FUNC_UNSAFE NOFP RET     402d99 
-    402d50      8 DATAREF STACK 537 esp + 0 PARENT LocalFrame LOCALFRAME
+    402d50      8 DATAREF STACK 534 esp + 0 PARENT LocalFrame LOCALFRAME
     402d50      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     402d54     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Eh 
     402d54      5 INSTR BELONGTO 402d50 
@@ -3814,11 +3817,11 @@
     402da6      1 INSTR BELONGTO 402da0 
     402da6      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
     402da6     -3 INSTR LOCAL NoWarn push    rbx 
-    402da7     16 DATAREF STACK 539 esp + 40 CHILDOF 538 OFFSET 40 LOCALVAR var_20 
+    402da7     16 DATAREF STACK 536 esp + 40 CHILDOF 535 OFFSET 40 LOCALVAR var_20 
     402da7     16 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
     402da7      4 INSTR BELONGTO 402da0 
     402da7      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 38h 
-    402da7     56 DATAREF STACK 538 esp + 0 PARENT LocalFrame LOCALFRAME
+    402da7     56 DATAREF STACK 535 esp + 0 PARENT LocalFrame LOCALFRAME
     402da7      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
     402dab     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, fs:28h 
     402dab      9 INSTR BELONGTO 402da0 
@@ -4230,11 +4233,11 @@
     403115      5 INSTR BELONGTO 403110 
     403115      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+var_8], rbp 
     403115      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
-    40311a     24 DATAREF STACK 540 esp + 0 PARENT LocalFrame LOCALFRAME
+    40311a     24 DATAREF STACK 537 esp + 0 PARENT LocalFrame LOCALFRAME
     40311a      4 INSTR BELONGTO 403110 
     40311a      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-    40311a      8 DATAREF STACK 541 esp + 8 CHILDOF 540 OFFSET 8 LOCALVAR var_10 
-    40311a      8 DATAREF STACK 542 esp + 16 CHILDOF 540 OFFSET 16 LOCALVAR var_8 
+    40311a      8 DATAREF STACK 538 esp + 8 CHILDOF 537 OFFSET 8 LOCALVAR var_10 
+    40311a      8 DATAREF STACK 539 esp + 16 CHILDOF 537 OFFSET 16 LOCALVAR var_8 
     40311a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     40311e     -1 INSTR LOCAL NoMetaUpdate call    ___errno_location 
     40311e      5 INSTR BELONGTO 403110 
@@ -4268,17 +4271,17 @@
     40314e      1 INSTR BELONGTO 403110 
     40314e      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
     40314e     24 DEALLOC STACK esp - 24 retn
-    403150      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 1 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
+    403150      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 3 -4 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
     403150      0 FUNC MMSAFENESS SAFE
     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      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    403150      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     403152     -1 INSTR LOCAL NoMetaUpdate cmp     edi, 0FFFFFFFFh 
     403152      3 INSTR BELONGTO 403150 
     403155      1 INSTR BELONGTO 403150 
+    403155      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    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 
@@ -4438,8 +4441,8 @@
     4032b2      2 INSTR DEADREGS  EFLAGS RAX RDX RBX ZZ mov     ebx, edi 
     4032b2     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, edi 
     4032b4     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    4032b4     24 DATAREF STACK 543 esp + 0 PARENT LocalFrame LOCALFRAME
-    4032b4      2 DATAREF STACK 544 esp + 0 CHILDOF 543 OFFSET 0 OutArgsRegion OUTARGS
+    4032b4     24 DATAREF STACK 540 esp + 0 PARENT LocalFrame LOCALFRAME
+    4032b4      2 DATAREF STACK 541 esp + 0 CHILDOF 540 OFFSET 0 OutArgsRegion OUTARGS
     4032b4      4 INSTR BELONGTO 4032b0 
     4032b4      4 INSTR DEADREGS  EFLAGS RAX RDX ZZ sub     rsp, 18h 
     4032b4      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -4723,7 +4726,7 @@
     403580    145 FUNC GLOBAL sub_403580 FUNC_UNSAFE NOFP RET     403610 
     403580      4 INSTR BELONGTO 403580 
     403580      4 INSTR DEADREGS  EFLAGS R8 ZZ sub     rsp, 8 
-    403580      8 DATAREF STACK 545 esp + 0 PARENT LocalFrame LOCALFRAME
+    403580      8 DATAREF STACK 542 esp + 0 PARENT LocalFrame LOCALFRAME
     403580      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     403584      7 INSTR BELONGTO 403580 
     403584      7 INSTR DEADREGS  EFLAGS R8 ZZ mov     r8d, cs:dword_607494 
@@ -4787,15 +4790,15 @@
     40360a      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI XMM0 ZZ call    sub_403000 
     40360f     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_4035A4 
     40360f      2 INSTR BELONGTO 403580 
-    403620      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 1 3 0 0 4 0 8 5 0 0 6 0 1 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
+    403620      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 1 3 -4 0 4 0 8 5 0 0 6 0 1 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
     403620      0 FUNC MMSAFENESS SAFE
     403620    179 FUNC GLOBAL sub_403620 FUNC_UNSAFE NOFP RET     4036d2 
     403620      6 INSTR BELONGTO 403620 
     403620      6 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, cs:dword_607494 
-    403620      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    403620      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     403626      1 INSTR BELONGTO 403620 
     403626      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
+    403626      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    403626      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     403627     10 INSTR BELONGTO 403620 
     403627     10 INSTR DEADREGS  EFLAGS RBX ZZ mov     cs:dword_60860C, 0 
     403631     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
@@ -4924,12 +4927,12 @@
     403765      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], rbp
     40376a     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
     40376a      5 INSTR BELONGTO 403760 
-    40376f     24 DATAREF STACK 546 esp + 0 PARENT LocalFrame LOCALFRAME
+    40376f     24 DATAREF STACK 543 esp + 0 PARENT LocalFrame LOCALFRAME
     40376f      4 INSTR BELONGTO 403760 
     40376f      4 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ sub     rsp, 18h 
-    40376f      8 DATAREF STACK 547 esp + 0 CHILDOF 546 OFFSET 0 LOCALVAR var_18 
-    40376f      8 DATAREF STACK 548 esp + 8 CHILDOF 546 OFFSET 8 LOCALVAR var_10 
-    40376f      8 DATAREF STACK 549 esp + 16 CHILDOF 546 OFFSET 16 LOCALVAR var_8 
+    40376f      8 DATAREF STACK 544 esp + 0 CHILDOF 543 OFFSET 0 LOCALVAR var_18 
+    40376f      8 DATAREF STACK 545 esp + 8 CHILDOF 543 OFFSET 8 LOCALVAR var_10 
+    40376f      8 DATAREF STACK 546 esp + 16 CHILDOF 543 OFFSET 16 LOCALVAR var_8 
     40376f      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     403773      6 INSTR BELONGTO 403760 
     403773      6 INSTR DEADREGS  EFLAGS RBX RSI R12 ZZ mov     esi, cs:dword_60860C 
@@ -5076,11 +5079,11 @@
     4038b2     24 DEALLOC STACK esp - 24 retn
     4038c0      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
     4038c0      0 FUNC MMSAFENESS SAFE
-    4038c0     16 DATAREF STACK 551 esp + 40 CHILDOF 550 OFFSET 40 LOCALVAR var_10 
+    4038c0     16 DATAREF STACK 548 esp + 40 CHILDOF 547 OFFSET 40 LOCALVAR var_10 
     4038c0    251 FUNC GLOBAL sub_4038C0 FUNC_UNSAFE NOFP RET     4039ba 
     4038c0      4 INSTR BELONGTO 4038c0 
     4038c0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 38h 
-    4038c0     56 DATAREF STACK 550 esp + 0 PARENT LocalFrame LOCALFRAME
+    4038c0     56 DATAREF STACK 547 esp + 0 PARENT LocalFrame LOCALFRAME
     4038c0      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     4038c4     10 INSTR BELONGTO 4038c0 
     4038c4     10 INSTR DEADREGS  EFLAGS RAX ZZ mov     cs:dword_60860C, 0 
@@ -5217,8 +5220,8 @@
     4039c2     -1 INSTR LOCAL MetadataUnused mov     ebx, edi 
     4039c2      2 INSTR BELONGTO 4039c0 
     4039c4     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-    4039c4     24 DATAREF STACK 552 esp + 0 PARENT LocalFrame LOCALFRAME
-    4039c4     24 DATAREF STACK 553 esp + 0 CHILDOF 552 OFFSET 0 LOCALVAR var_28 
+    4039c4     24 DATAREF STACK 549 esp + 0 PARENT LocalFrame LOCALFRAME
+    4039c4     24 DATAREF STACK 550 esp + 0 CHILDOF 549 OFFSET 0 LOCALVAR var_28 
     4039c4      4 INSTR BELONGTO 4039c0 
     4039c4      4 INSTR DEADREGS  EFLAGS R9 XMM2 ZZ sub     rsp, 18h 
     4039c4      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -5485,8 +5488,8 @@
     403c30     -3 INSTR LOCAL NoWarn push    rbx 
     403c31     -1 INSTR LOCAL MetadataUnused mov     ebx, edi 
     403c31      2 INSTR BELONGTO 403c30 
-    403c33     16 DATAREF STACK 554 esp + 0 PARENT LocalFrame LOCALFRAME
-    403c33     16 DATAREF STACK 555 esp + 0 CHILDOF 554 OFFSET 0 LOCALVAR var_18 
+    403c33     16 DATAREF STACK 551 esp + 0 PARENT LocalFrame LOCALFRAME
+    403c33     16 DATAREF STACK 552 esp + 0 CHILDOF 551 OFFSET 0 LOCALVAR var_18 
     403c33      4 INSTR BELONGTO 403c30 
     403c33      4 INSTR DEADREGS  EFLAGS R10 XMM2 ZZ sub     rsp, 10h 
     403c33      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -5628,7 +5631,7 @@
     403dc0     -1 INSTR LOCAL SafeFrameAlloc sub     rsp, 8 
     403dc0      4 INSTR BELONGTO 403dc0 
     403dc0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-    403dc0      8 DATAREF STACK 556 esp + 0 PARENT LocalFrame LOCALFRAME
+    403dc0      8 DATAREF STACK 553 esp + 0 PARENT LocalFrame LOCALFRAME
     403dc0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     403dc4      6 INSTR BELONGTO 403dc0 
     403dc4      6 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, cs:dword_607490 
@@ -5669,8 +5672,8 @@
     403e3d      2 INSTR BELONGTO 403dc0 
     403e40      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
     403e40      0 FUNC MMSAFENESS SAFE
-    403e40     24 DATAREF STACK 557 esp + 0 PARENT LocalFrame LOCALFRAME
-    403e40     24 DATAREF STACK 558 esp + 0 CHILDOF 557 OFFSET 0 LOCALVAR var_18 
+    403e40     24 DATAREF STACK 554 esp + 0 PARENT LocalFrame LOCALFRAME
+    403e40     24 DATAREF STACK 555 esp + 0 CHILDOF 554 OFFSET 0 LOCALVAR var_18 
     403e40    442 FUNC GLOBAL sub_403E40 FUNC_UNSAFE NOFP RET     403ff9 
     403e40      4 INSTR BELONGTO 403e40 
     403e40      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
@@ -5842,7 +5845,7 @@
     404000     40 FUNC GLOBAL sub_404000 FUNC_UNSAFE NOFP RET     404027 
     404000      4 INSTR BELONGTO 404000 
     404000      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    404000      8 DATAREF STACK 559 esp + 0 PARENT LocalFrame LOCALFRAME
+    404000      8 DATAREF STACK 556 esp + 0 PARENT LocalFrame LOCALFRAME
     404000      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     404004     -1 INSTR LOCAL MetadataUnused mov     edi, 11h 
     404004      5 INSTR BELONGTO 404000 
@@ -5864,7 +5867,7 @@
     404030    261 FUNC GLOBAL sub_404030 FUNC_UNSAFE NOFP RET     404134 
     404030      4 INSTR BELONGTO 404030 
     404030      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-    404030      8 DATAREF STACK 560 esp + 0 PARENT LocalFrame LOCALFRAME
+    404030      8 DATAREF STACK 557 esp + 0 PARENT LocalFrame LOCALFRAME
     404030      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     404034      6 INSTR BELONGTO 404030 
     404034      6 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, cs:dword_607490 
@@ -5956,15 +5959,15 @@
     40412d      3 INSTR BELONGTO 404030 
     404130     -1 INSTR LOCAL NoMetaUpdate jmp     loc_40404B 
     404130      5 INSTR BELONGTO 404030 
-    404140      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
+    404140      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -4 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
     404140      0 FUNC MMSAFENESS SAFE
     404140    418 FUNC GLOBAL sub_404140 FUNC_UNSAFE NOFP RET     4042e1 
     404140      6 INSTR BELONGTO 404140 
     404140      6 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, cs:dword_607490 
-    404140      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    404140      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     404146      1 INSTR BELONGTO 404140 
     404146      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
+    404146      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    404146      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     404147     10 INSTR BELONGTO 404140 
     404147     10 INSTR DEADREGS  EFLAGS RBX ZZ mov     cs:dword_60860C, 0 
     404151     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
@@ -6115,7 +6118,7 @@
     4042f0    461 FUNC GLOBAL sub_4042F0 FUNC_UNSAFE NOFP RET     4044bc 
     4042f0      4 INSTR BELONGTO 4042f0 
     4042f0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-    4042f0      8 DATAREF STACK 561 esp + 0 PARENT LocalFrame LOCALFRAME
+    4042f0      8 DATAREF STACK 558 esp + 0 PARENT LocalFrame LOCALFRAME
     4042f0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4042f4      6 INSTR BELONGTO 4042f0 
     4042f4      6 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, cs:dword_60860C 
@@ -6296,7 +6299,7 @@
     4044d0      4 INSTR BELONGTO 4044d0 
     4044d0      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
     4044d0     63 FUNC GLOBAL sub_4044D0 FUNC_UNSAFE NOFP RET     40450e 
-    4044d0      8 DATAREF STACK 562 esp + 0 PARENT LocalFrame LOCALFRAME
+    4044d0      8 DATAREF STACK 559 esp + 0 PARENT LocalFrame LOCALFRAME
     4044d0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4044d4     -1 INSTR LOCAL NoMetaUpdate cmp     cs:dword_607490, 1 
     4044d4      7 INSTR BELONGTO 4044d0 
@@ -6328,11 +6331,11 @@
     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 
-    404513     16 DATAREF STACK 565 esp + 16 CHILDOF 563 OFFSET 16 LOCALVAR var_18 
-    404513     32 DATAREF STACK 563 esp + 0 PARENT LocalFrame LOCALFRAME
+    404513     16 DATAREF STACK 562 esp + 16 CHILDOF 560 OFFSET 16 LOCALVAR var_18 
+    404513     32 DATAREF STACK 560 esp + 0 PARENT LocalFrame LOCALFRAME
     404513      4 INSTR BELONGTO 404510 
     404513      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 20h 
-    404513      8 DATAREF STACK 564 esp + 8 CHILDOF 563 OFFSET 8 LOCALVAR var_20 
+    404513      8 DATAREF STACK 561 esp + 8 CHILDOF 560 OFFSET 8 LOCALVAR var_20 
     404513      8 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
     404513      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     404517     -1 INSTR LOCAL NoMetaUpdate cmp     cs:dword_607490, 1 
@@ -6814,7 +6817,7 @@
     404a40    239 FUNC GLOBAL sub_404A40 FUNC_UNSAFE NOFP RET     404b2e 
     404a40      4 INSTR BELONGTO 404a40 
     404a40      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-    404a40      8 DATAREF STACK 566 esp + 0 PARENT LocalFrame LOCALFRAME
+    404a40      8 DATAREF STACK 563 esp + 0 PARENT LocalFrame LOCALFRAME
     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 
@@ -6912,7 +6915,7 @@
     404b30     -1 INSTR LOCAL SafeFrameAlloc sub     rsp, 8 
     404b30      4 INSTR BELONGTO 404b30 
     404b30      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ sub     rsp, 8 
-    404b30      8 DATAREF STACK 567 esp + 0 PARENT LocalFrame LOCALFRAME
+    404b30      8 DATAREF STACK 564 esp + 0 PARENT LocalFrame LOCALFRAME
     404b30      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     404b34     -1 INSTR LOCAL NoMetaUpdate call    sub_404A40 
     404b34      5 INSTR BELONGTO 404b30 
@@ -6976,8 +6979,8 @@
     404bd0      0 FUNC FRAMERESTORE 0 0 1 1 0 4 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
     404bd0      0 FUNC MMSAFENESS SAFE
     404bd0    157 FUNC GLOBAL sub_404BD0 FUNC_UNSAFE NOFP RET     404c6c 
-    404bd0     16 DATAREF STACK 569 esp + 8 CHILDOF 568 OFFSET 8 LOCALVAR var_10 
-    404bd0     24 DATAREF STACK 568 esp + 0 PARENT LocalFrame LOCALFRAME
+    404bd0     16 DATAREF STACK 566 esp + 8 CHILDOF 565 OFFSET 8 LOCALVAR var_10 
+    404bd0     24 DATAREF STACK 565 esp + 0 PARENT LocalFrame LOCALFRAME
     404bd0      4 INSTR BELONGTO 404bd0 
     404bd0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
     404bd0      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -7063,8 +7066,8 @@
     404c68      5 INSTR BELONGTO 404bd0 
     404c70      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
     404c70      0 FUNC MMSAFENESS SAFE
-    404c70     16 DATAREF STACK 571 esp + 0 CHILDOF 570 OFFSET 0 OutArgsRegion OUTARGS
-    404c70     24 DATAREF STACK 570 esp + 0 PARENT LocalFrame LOCALFRAME
+    404c70     16 DATAREF STACK 568 esp + 0 CHILDOF 567 OFFSET 0 OutArgsRegion OUTARGS
+    404c70     24 DATAREF STACK 567 esp + 0 PARENT LocalFrame LOCALFRAME
     404c70     42 FUNC GLOBAL sub_404C70 FUNC_UNSAFE NOFP RET     404c99 
     404c70      4 INSTR BELONGTO 404c70 
     404c70      4 INSTR DEADREGS  EFLAGS RDX RSI ZZ sub     rsp, 18h 
@@ -7100,11 +7103,11 @@
     404ca5      5 INSTR BELONGTO 404ca0 
     404caa     -1 INSTR LOCAL MetadataUnused movsxd  rbx, edi 
     404caa      3 INSTR BELONGTO 404ca0 
-    404cad     24 DATAREF STACK 572 esp + 0 PARENT LocalFrame LOCALFRAME
+    404cad     24 DATAREF STACK 569 esp + 0 PARENT LocalFrame LOCALFRAME
     404cad      4 INSTR BELONGTO 404ca0 
     404cad      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 18h 
-    404cad      8 DATAREF STACK 573 esp + 8 CHILDOF 572 OFFSET 8 LOCALVAR var_10 
-    404cad      8 DATAREF STACK 574 esp + 16 CHILDOF 572 OFFSET 16 LOCALVAR var_8 
+    404cad      8 DATAREF STACK 570 esp + 8 CHILDOF 569 OFFSET 8 LOCALVAR var_10 
+    404cad      8 DATAREF STACK 571 esp + 16 CHILDOF 569 OFFSET 16 LOCALVAR var_8 
     404cad      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     404cb1     -1 INSTR LOCAL NoMetaUpdate test    sil, sil 
     404cb1      3 INSTR BELONGTO 404ca0 
@@ -7175,7 +7178,7 @@
     404d30     23 FUNC GLOBAL sub_404D30 FUNC_UNSAFE NOFP NORET     404d46 
     404d30      4 INSTR BELONGTO 404d30 
     404d30      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 8 
-    404d30      8 DATAREF STACK 575 esp + 0 PARENT LocalFrame LOCALFRAME
+    404d30      8 DATAREF STACK 572 esp + 0 PARENT LocalFrame LOCALFRAME
     404d30      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     404d34      7 INSTR BELONGTO 404d30 
     404d34      7 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, cs:qword_608828 
@@ -7189,15 +7192,10 @@
     404d42      5 INSTR BELONGTO 404d30 
     404d42      5 INSTR DEADREGS  EFLAGS ZZ call    _exit 
     404d50      1 INSTR BELONGTO 4026e0 
-    404d50     -3 INSTR LOCAL NoWarn push    rbx 
     404d51      3 INSTR BELONGTO 4026e0 
     404d54     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 1 
     404d54      5 INSTR BELONGTO 4026e0 
-    404d59     16 DATAREF STACK 522 esp + 0 CHILDOF 521 OFFSET 0 OutArgsRegion OUTARGS
-    404d59     40 DATAREF STACK 521 esp + 0 PARENT LocalFrame LOCALFRAME
     404d59      4 INSTR BELONGTO 4026e0 
-    404d59      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
-    404d59      9 DATAREF STACK 523 esp + 31 CHILDOF 521 OFFSET 31 LOCALVAR var_9 
     404d5d      7 INSTR BELONGTO 4026e0 
     404d64      5 INSTR BELONGTO 4026e0 
     404d64      5 PTRIMMEDESP STACK 31 displ lea     rax, [rsp+28h+var_9]
@@ -7230,8 +7228,8 @@
     404db8      5 INSTR BELONGTO 4026e0 
     404dbd     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     rsp, 20h 
     404dbd      4 INSTR BELONGTO 4026e0 
+    404dc1      0 DEALLOC STACK esp - 0 pop     rbx
     404dc1      1 INSTR BELONGTO 4026e0 
-    404dc1     40 DEALLOC STACK esp - 40 pop     rbx
     404dc2      1 INSTR BELONGTO 4026e0 
     404dd0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     404dd0      0 FUNC MMSAFENESS SPECSAFE
@@ -7260,13 +7258,13 @@
     404df7      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
     404dfc      4 INSTR BELONGTO 404dd0 
     404dfc      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-    404dfc     56 DATAREF STACK 576 esp + 0 PARENT LocalFrame LOCALFRAME
-    404dfc      8 DATAREF STACK 577 esp + 8 CHILDOF 576 OFFSET 8 LOCALVAR var_30 
-    404dfc      8 DATAREF STACK 578 esp + 16 CHILDOF 576 OFFSET 16 LOCALVAR var_28 
-    404dfc      8 DATAREF STACK 579 esp + 24 CHILDOF 576 OFFSET 24 LOCALVAR var_20 
-    404dfc      8 DATAREF STACK 580 esp + 32 CHILDOF 576 OFFSET 32 LOCALVAR var_18 
-    404dfc      8 DATAREF STACK 581 esp + 40 CHILDOF 576 OFFSET 40 LOCALVAR var_10 
-    404dfc      8 DATAREF STACK 582 esp + 48 CHILDOF 576 OFFSET 48 LOCALVAR var_8 
+    404dfc     56 DATAREF STACK 573 esp + 0 PARENT LocalFrame LOCALFRAME
+    404dfc      8 DATAREF STACK 574 esp + 8 CHILDOF 573 OFFSET 8 LOCALVAR var_30 
+    404dfc      8 DATAREF STACK 575 esp + 16 CHILDOF 573 OFFSET 16 LOCALVAR var_28 
+    404dfc      8 DATAREF STACK 576 esp + 24 CHILDOF 573 OFFSET 24 LOCALVAR var_20 
+    404dfc      8 DATAREF STACK 577 esp + 32 CHILDOF 573 OFFSET 32 LOCALVAR var_18 
+    404dfc      8 DATAREF STACK 578 esp + 40 CHILDOF 573 OFFSET 40 LOCALVAR var_10 
+    404dfc      8 DATAREF STACK 579 esp + 48 CHILDOF 573 OFFSET 48 LOCALVAR var_8 
     404dfc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     404e00     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
     404e00      3 INSTR BELONGTO 404dd0 
@@ -7343,7 +7341,7 @@
     404e75     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     404e75      4 INSTR BELONGTO 404e70 
     404e75      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    404e75      8 DATAREF STACK 583 esp + 0 PARENT LocalFrame LOCALFRAME
+    404e75      8 DATAREF STACK 580 esp + 0 PARENT LocalFrame LOCALFRAME
     404e75      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     404e79      7 INSTR BELONGTO 404e70 
     404e79      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_606DE8 
@@ -7378,7 +7376,7 @@
     404ea8     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     404eb5 
     404ea8      4 INSTR BELONGTO 404ea8 
     404ea8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    404ea8      8 DATAREF STACK 584 esp + 0 PARENT LocalFrame LOCALFRAME
+    404ea8      8 DATAREF STACK 581 esp + 0 PARENT LocalFrame LOCALFRAME
     404ea8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     404eac     -1 INSTR LOCAL NoMetaUpdate call    sub_401D30 
     404eac      5 INSTR BELONGTO 404ea8 
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 ce888fe8..823dbe8d 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 @@
-b6c1d61e65b7a34967f815210617166771e6d507
\ No newline at end of file
+93cfcad302be8656efd4bad4c32501c847964eea
\ 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 c400d2f9..00a4f011 100644
--- a/tests/commit/trimmed-sorted-save-xeyes.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-xeyes.psexe.annot
@@ -823,12 +823,11 @@
     4018cd     -1 INSTR LOCAL NoMetaUpdate call    _exit 
     4018cd      5 INSTR BELONGTO 401700 
     4018cd      5 INSTR DEADREGS  EFLAGS RBX R12 ZZ call    _exit 
-    4018d4      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
-    4018d4      0 FUNC MMSAFENESS UNSAFE
+    4018d4      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    4018d4      0 FUNC MMSAFENESS SAFE
     4018d4     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     4018d4      2 INSTR BELONGTO 4018d4 
     4018d4     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     4018fd 
-    4018d4      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     4018d6      3 INSTR BELONGTO 4018d4 
     4018d6      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     4018d9      1 INSTR BELONGTO 4018d4 
@@ -840,8 +839,11 @@
     4018dd      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     4018e1      1 INSTR BELONGTO 4018d4 
     4018e1      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    4018e1     -3 INSTR LOCAL NoWarn push    rax 
+    4018e2     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     4018e2      1 INSTR BELONGTO 4018d4 
     4018e2      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    4018e2      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     4018e3     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     4018e3      7 INSTR BELONGTO 4018d4 
     4018e3      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -936,14 +938,14 @@
     401982      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     401983      1 INSTR BELONGTO 401920 
     401983      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    401990      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
+    401990      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     401990      0 FUNC MMSAFENESS UNSAFE
     401990     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_603DE8, 0 
     401990     34 FUNC GLOBAL sub_401990 FUNC_UNSAFE USEFP RET     4019b1 
     401990      8 INSTR BELONGTO 401990 
-    401990      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    401990      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401998      1 INSTR BELONGTO 401990 
+    401998      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    401998      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401999      3 INSTR BELONGTO 401990 
     40199c     -1 INSTR LOCAL NoMetaUpdate jz      short loc_4019B0 
     40199c      2 INSTR BELONGTO 401990 
diff --git a/tests/quick/trimmed-sorted-save-bzip2.psexe.annot b/tests/quick/trimmed-sorted-save-bzip2.psexe.annot
index be4c2414..3efacb45 100644
--- a/tests/quick/trimmed-sorted-save-bzip2.psexe.annot
+++ b/tests/quick/trimmed-sorted-save-bzip2.psexe.annot
@@ -1808,12 +1808,11 @@
     401de8      5 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ call    _fwrite 
     401ded     -1 INSTR LOCAL NoMetaUpdate jmp     loc_401C4A 
     401ded      5 INSTR BELONGTO 4013a0 
-    401df4      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
-    401df4      0 FUNC MMSAFENESS UNSAFE
+    401df4      0 FUNC FRAMERESTORE 0 4 0 1 0 0 2 0 0 3 0 0 4 -4 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
+    401df4      0 FUNC MMSAFENESS SAFE
     401df4     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
     401df4      2 INSTR BELONGTO 401df4 
     401df4     42 FUNC GLOBAL start FUNC_UNSAFE NOFP NORET     401e1d 
-    401df4      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
     401df6      3 INSTR BELONGTO 401df4 
     401df6      3 INSTR DEADREGS  EFLAGS RCX RSI RDI R8 R9 ZZ mov     r9, rdx         ; rtld_fini 
     401df9      1 INSTR BELONGTO 401df4 
@@ -1825,8 +1824,11 @@
     401dfd      4 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ and     rsp, 0FFFFFFFFFFFFFFF0h 
     401e01      1 INSTR BELONGTO 401df4 
     401e01      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rax 
+    401e01     -3 INSTR LOCAL NoWarn push    rax 
+    401e02     16 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     401e02      1 INSTR BELONGTO 401df4 
     401e02      1 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ push    rsp             ; stack_end 
+    401e02      8 MEMORYHOLE STACK esp + 16 ReturnAddress 
     401e03     -2 INSTR LOCAL n R8 ZZ  NumericDEFs mov     r8, offset fini ; fini 
     401e03      7 INSTR BELONGTO 401df4 
     401e03      7 INSTR DEADREGS  EFLAGS RCX RDI R8 ZZ mov     r8, offset fini ; fini 
@@ -1921,14 +1923,14 @@
     401ea2      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ pop     rbp 
     401ea3      1 INSTR BELONGTO 401e40 
     401ea3      1 INSTR DEADREGS  EFLAGS R8 R9 R10 R11 ZZ retn 
-    401eb0      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
+    401eb0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 0 5 -4 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
     401eb0      0 FUNC MMSAFENESS UNSAFE
     401eb0     -1 INSTR LOCAL NoMetaUpdate cmp     cs:qword_606E38, 0 
     401eb0     34 FUNC GLOBAL sub_401EB0 FUNC_UNSAFE USEFP RET     401ed1 
     401eb0      8 INSTR BELONGTO 401eb0 
-    401eb0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    401eb0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401eb8      1 INSTR BELONGTO 401eb0 
+    401eb8      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    401eb8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     401eb9      3 INSTR BELONGTO 401eb0 
     401ebc     -1 INSTR LOCAL NoMetaUpdate jz      short loc_401ED0 
     401ebc      2 INSTR BELONGTO 401eb0 
@@ -2778,15 +2780,15 @@
     4024a9     -1 INSTR LOCAL NoMetaUpdate call    sub_4020D0 
     4024a9      5 INSTR BELONGTO 402470 
     4024a9      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 R9 R10 R11 ZZ call    sub_4020D0 
-    4024b0      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
+    4024b0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -4 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
     4024b0      0 FUNC MMSAFENESS SAFE
     4024b0     43 FUNC GLOBAL sub_4024B0 FUNC_UNSAFE NOFP RET     4024da 
     4024b0      6 INSTR BELONGTO 4024b0 
     4024b0      6 INSTR DEADREGS  EFLAGS RSI ZZ mov     esi, cs:stat_buf.st_mode; mode 
-    4024b0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-    4024b0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4024b6      1 INSTR BELONGTO 4024b0 
     4024b6      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
+    4024b6      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+    4024b6      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     4024b7     -1 INSTR LOCAL MetadataUnused mov     ebx, edi 
     4024b7      2 INSTR BELONGTO 4024b0 
     4024b9     -1 INSTR LOCAL NoMetaUpdate call    _fchmod 
@@ -4678,7 +4680,7 @@
     4031c3      2 INSTR BELONGTO 4031b0 
     4031c5      1 INSTR BELONGTO 4031b0 
     4031c5      1 INSTR DEADREGS  EFLAGS R14 ZZ push    rbx 
-    4031c5     40 DATAREF STACK 347 esp + 0 PARENT LocalFrame LOCALFRAME
+    4031c5     40 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
     4031c5      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
     4031c6     -1 INSTR LOCAL NoMetaUpdate call    _getenv 
     4031c6      5 INSTR BELONGTO 4031b0 
@@ -4817,11 +4819,11 @@
     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 
-    4032ac     24 DATAREF STACK 348 esp + 0 PARENT LocalFrame LOCALFRAME
+    4032ac     24 DATAREF STACK 347 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 DATAREF STACK 349 esp + 8 CHILDOF 348 OFFSET 8 LOCALVAR var_10 
-    4032ac      8 DATAREF STACK 350 esp + 16 CHILDOF 348 OFFSET 16 LOCALVAR var_8 
+    4032ac      8 DATAREF STACK 348 esp + 8 CHILDOF 347 OFFSET 8 LOCALVAR var_10 
+    4032ac      8 DATAREF STACK 349 esp + 16 CHILDOF 347 OFFSET 16 LOCALVAR var_8 
     4032ac      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4032b0     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 180h 
     4032b0      5 INSTR BELONGTO 4032a0 
@@ -4877,8 +4879,8 @@
     4032ff      2 INSTR BELONGTO 4032a0 
     403310      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 1 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
     403310      0 FUNC MMSAFENESS SAFE
-    403310    128 DATAREF STACK 352 esp + 24 CHILDOF 351 OFFSET 24 LOCALVAR var_80 
-    403310    152 DATAREF STACK 351 esp + 0 PARENT LocalFrame LOCALFRAME
+    403310    128 DATAREF STACK 351 esp + 24 CHILDOF 350 OFFSET 24 LOCALVAR var_80 
+    403310    152 DATAREF STACK 350 esp + 0 PARENT LocalFrame LOCALFRAME
     403310     61 FUNC GLOBAL sub_403310 FUNC_UNSAFE NOFP RET     40334c 
     403310      7 INSTR BELONGTO 403310 
     403310      7 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ sub     rsp, 98h 
@@ -4923,7 +4925,7 @@
     403350     38 FUNC GLOBAL sub_403350 FUNC_UNSAFE NOFP RET     403375 
     403350      4 INSTR BELONGTO 403350 
     403350      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ sub     rsp, 8 
-    403350      8 DATAREF STACK 353 esp + 0 PARENT LocalFrame LOCALFRAME
+    403350      8 DATAREF STACK 352 esp + 0 PARENT LocalFrame LOCALFRAME
     403350      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     403354      5 INSTR BELONGTO 403350 
     403354      5 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ mov     edx, offset stat_buf; stat_buf 
@@ -4949,8 +4951,8 @@
     403371      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI ZZ call    sub_402470 
     403380      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
     403380      0 FUNC MMSAFENESS SAFE
-    403380     16 DATAREF STACK 355 esp + 0 CHILDOF 354 OFFSET 0 OutArgsRegion OUTARGS
-    403380     24 DATAREF STACK 354 esp + 0 PARENT LocalFrame LOCALFRAME
+    403380     16 DATAREF STACK 354 esp + 0 CHILDOF 353 OFFSET 0 OutArgsRegion OUTARGS
+    403380     24 DATAREF STACK 353 esp + 0 PARENT LocalFrame LOCALFRAME
     403380      4 INSTR BELONGTO 403380 
     403380      4 INSTR DEADREGS  EFLAGS RAX RSI RDI ZZ sub     rsp, 18h 
     403380     54 FUNC GLOBAL sub_403380 FUNC_UNSAFE NOFP RET     4033b5 
@@ -5110,13 +5112,13 @@
     403483     -3 INSTR LOCAL NoWarn push    rbx 
     403484      3 INSTR BELONGTO 403480 
     403484      3 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     rbx, rdi 
-    403487    144 DATAREF STACK 358 esp + 16 CHILDOF 356 OFFSET 16 LOCALVAR stat_buf 
-    403487    144 DATAREF STACK 359 esp + 160 CHILDOF 356 OFFSET 160 LOCALVAR var_A8 
+    403487    144 DATAREF STACK 357 esp + 16 CHILDOF 355 OFFSET 16 LOCALVAR stat_buf 
+    403487    144 DATAREF STACK 358 esp + 160 CHILDOF 355 OFFSET 160 LOCALVAR var_A8 
     403487     24 MEMORYHOLE STACK esp + 304 CalleeSavedRegs 
-    403487    304 DATAREF STACK 356 esp + 0 PARENT LocalFrame LOCALFRAME
+    403487    304 DATAREF STACK 355 esp + 0 PARENT LocalFrame LOCALFRAME
     403487      7 INSTR BELONGTO 403480 
     403487      7 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 130h 
-    403487      8 DATAREF STACK 357 esp + 0 CHILDOF 356 OFFSET 0 OutArgsRegion OUTARGS
+    403487      8 DATAREF STACK 356 esp + 0 CHILDOF 355 OFFSET 0 OutArgsRegion OUTARGS
     403487      8 MEMORYHOLE STACK esp + 328 ReturnAddress 
     40348e     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     40348e      3 INSTR BELONGTO 403480 
@@ -5960,8 +5962,8 @@
     403c00    739 FUNC GLOBAL sub_403C00 FUNC_UNSAFE NOFP RET     403ee2 
     403c01      3 INSTR BELONGTO 403c00 
     403c01      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    403c04    120 DATAREF STACK 361 esp + 24 CHILDOF 360 OFFSET 24 LOCALVAR var_80 
-    403c04    144 DATAREF STACK 360 esp + 0 PARENT LocalFrame LOCALFRAME
+    403c04    120 DATAREF STACK 360 esp + 24 CHILDOF 359 OFFSET 24 LOCALVAR var_80 
+    403c04    144 DATAREF STACK 359 esp + 0 PARENT LocalFrame LOCALFRAME
     403c04      7 INSTR BELONGTO 403c00 
     403c04      7 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 90h 
     403c04      8 MEMORYHOLE STACK esp + 144 CalleeSavedRegs 
@@ -6296,13 +6298,13 @@
     403ef1     -3 INSTR LOCAL NoWarn push    rbx 
     403ef2      3 INSTR BELONGTO 403ef0 
     403ef2      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-    403ef5    144 DATAREF STACK 364 esp + 16 CHILDOF 362 OFFSET 16 LOCALVAR stat_buf 
-    403ef5    152 DATAREF STACK 365 esp + 160 CHILDOF 362 OFFSET 160 LOCALVAR var_A8 
+    403ef5    144 DATAREF STACK 363 esp + 16 CHILDOF 361 OFFSET 16 LOCALVAR stat_buf 
+    403ef5    152 DATAREF STACK 364 esp + 160 CHILDOF 361 OFFSET 160 LOCALVAR var_A8 
     403ef5     16 MEMORYHOLE STACK esp + 312 CalleeSavedRegs 
-    403ef5    312 DATAREF STACK 362 esp + 0 PARENT LocalFrame LOCALFRAME
+    403ef5    312 DATAREF STACK 361 esp + 0 PARENT LocalFrame LOCALFRAME
     403ef5      7 INSTR BELONGTO 403ef0 
     403ef5      7 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 138h 
-    403ef5      8 DATAREF STACK 363 esp + 0 CHILDOF 362 OFFSET 0 OutArgsRegion OUTARGS
+    403ef5      8 DATAREF STACK 362 esp + 0 CHILDOF 361 OFFSET 0 OutArgsRegion OUTARGS
     403ef5      8 MEMORYHOLE STACK esp + 328 ReturnAddress 
     403efc     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
     403efc      3 INSTR BELONGTO 403ef0 
@@ -7046,13 +7048,13 @@
     404567      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
     40456c      4 INSTR BELONGTO 404540 
     40456c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-    40456c     56 DATAREF STACK 366 esp + 0 PARENT LocalFrame LOCALFRAME
-    40456c      8 DATAREF STACK 367 esp + 8 CHILDOF 366 OFFSET 8 LOCALVAR var_30 
-    40456c      8 DATAREF STACK 368 esp + 16 CHILDOF 366 OFFSET 16 LOCALVAR var_28 
-    40456c      8 DATAREF STACK 369 esp + 24 CHILDOF 366 OFFSET 24 LOCALVAR var_20 
-    40456c      8 DATAREF STACK 370 esp + 32 CHILDOF 366 OFFSET 32 LOCALVAR var_18 
-    40456c      8 DATAREF STACK 371 esp + 40 CHILDOF 366 OFFSET 40 LOCALVAR var_10 
-    40456c      8 DATAREF STACK 372 esp + 48 CHILDOF 366 OFFSET 48 LOCALVAR var_8 
+    40456c     56 DATAREF STACK 365 esp + 0 PARENT LocalFrame LOCALFRAME
+    40456c      8 DATAREF STACK 366 esp + 8 CHILDOF 365 OFFSET 8 LOCALVAR var_30 
+    40456c      8 DATAREF STACK 367 esp + 16 CHILDOF 365 OFFSET 16 LOCALVAR var_28 
+    40456c      8 DATAREF STACK 368 esp + 24 CHILDOF 365 OFFSET 24 LOCALVAR var_20 
+    40456c      8 DATAREF STACK 369 esp + 32 CHILDOF 365 OFFSET 32 LOCALVAR var_18 
+    40456c      8 DATAREF STACK 370 esp + 40 CHILDOF 365 OFFSET 40 LOCALVAR var_10 
+    40456c      8 DATAREF STACK 371 esp + 48 CHILDOF 365 OFFSET 48 LOCALVAR var_8 
     40456c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
     404570     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
     404570      3 INSTR BELONGTO 404540 
@@ -7129,7 +7131,7 @@
     4045e5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
     4045e5      4 INSTR BELONGTO 4045e0 
     4045e5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-    4045e5      8 DATAREF STACK 373 esp + 0 PARENT LocalFrame LOCALFRAME
+    4045e5      8 DATAREF STACK 372 esp + 0 PARENT LocalFrame LOCALFRAME
     4045e5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
     4045e9      7 INSTR BELONGTO 4045e0 
     4045e9      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_606E18 
@@ -7164,7 +7166,7 @@
     404618     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET     404625 
     404618      4 INSTR BELONGTO 404618 
     404618      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-    404618      8 DATAREF STACK 374 esp + 0 PARENT LocalFrame LOCALFRAME
+    404618      8 DATAREF STACK 373 esp + 0 PARENT LocalFrame LOCALFRAME
     404618      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
     40461c     -1 INSTR LOCAL NoMetaUpdate call    sub_401E40 
     40461c      5 INSTR BELONGTO 404618 
diff --git a/tests/quick/trimmed-sorted-save-malloc.psexe.annot b/tests/quick/trimmed-sorted-save-malloc.psexe.annot
index 8010982f..4f11617f 100644
--- a/tests/quick/trimmed-sorted-save-malloc.psexe.annot
+++ b/tests/quick/trimmed-sorted-save-malloc.psexe.annot
@@ -146,12 +146,11 @@
    8048520      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
    8048520      6 FUNC GLOBAL .__assert_fail FUNC_UNSAFE NOFP NORET    8048525 
    8048520      6 INSTR BELONGTO 8048520 
-   8048530      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 ZZ
+   8048530      0 FUNC FRAMERESTORE 0 0 0 1 -20 0 2 -8 0 3 0 0 4 -4 0 5 0 0 6 -24 0 7 0 0 ZZ
    8048530      0 FUNC MMSAFENESS UNSAFE
    8048530     -1 INSTR LOCAL MetadataUnused xor     ebp, ebp 
    8048530      2 INSTR BELONGTO 8048530 
    8048530     34 FUNC GLOBAL _start FUNC_UNSAFE NOFP NORET    8048551 
-   8048530      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
    8048532      1 INSTR BELONGTO 8048530 
    8048532      1 INSTR DEADREGS  EFLAGS ECX ESI ZZ pop     esi 
    8048533      2 INSTR BELONGTO 8048530 
@@ -161,18 +160,27 @@
    8048535      3 INSTR DEADREGS  EFLAGS ZZ and     esp, 0FFFFFFF0h 
    8048538      1 INSTR BELONGTO 8048530 
    8048538      1 INSTR DEADREGS  EFLAGS ZZ push    eax 
+   8048538     -3 INSTR LOCAL NoWarn push    eax 
    8048539      1 INSTR BELONGTO 8048530 
    8048539      1 INSTR DEADREGS  EFLAGS ZZ push    esp             ; stack_end 
+   8048539     -3 INSTR LOCAL NoWarn push    esp             ; stack_end 
    804853a      1 INSTR BELONGTO 8048530 
    804853a      1 INSTR DEADREGS  EFLAGS ZZ push    edx             ; rtld_fini 
+   804853a     -3 INSTR LOCAL NoWarn push    edx             ; rtld_fini 
+   804853b     -3 INSTR LOCAL NoWarn push    offset __libc_csu_fini; fini 
    804853b      5 INSTR BELONGTO 8048530 
    804853b      5 INSTR DEADREGS  EFLAGS ZZ push    offset __libc_csu_fini; fini 
+   8048540     -3 INSTR LOCAL NoWarn push    offset __libc_csu_init; init 
    8048540      5 INSTR BELONGTO 8048530 
    8048540      5 INSTR DEADREGS  EFLAGS ZZ push    offset __libc_csu_init; init 
    8048545      1 INSTR BELONGTO 8048530 
    8048545      1 INSTR DEADREGS  EFLAGS ZZ push    ecx             ; ubp_av 
+   8048545     -3 INSTR LOCAL NoWarn push    ecx             ; ubp_av 
    8048546      1 INSTR BELONGTO 8048530 
    8048546      1 INSTR DEADREGS  EFLAGS ZZ push    esi             ; argc 
+   8048546     -3 INSTR LOCAL NoWarn push    esi             ; argc 
+   8048547     32 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+   8048547      4 MEMORYHOLE STACK esp + 32 ReturnAddress 
    8048547      5 INSTR BELONGTO 8048530 
    8048547      5 INSTR DEADREGS  EFLAGS ESI ZZ push    offset main     ; main 
    804854c     -1 INSTR LOCAL NoMetaUpdate call    ___libc_start_main 
-- 
GitLab