diff --git a/include/base/SMPFunction.h b/include/base/SMPFunction.h
index 32ea9ac60f9fe1015f8de106262f7286e1604a63..2221cdc4cbb8ca761fed22a8dd4670b6bbca42ac 100644
--- a/include/base/SMPFunction.h
+++ b/include/base/SMPFunction.h
@@ -337,7 +337,7 @@ public:
 	inline bool IsGlobalName(const STARSOpndTypePtr &RefOp) const { return (GlobalNames.end() != GlobalNames.find(RefOp)); };
 	inline bool UsesFramePointer(void) const { return UseFP; };
 	inline bool FuncHasHashingCode(void) const { return HasHashingCode; };
-	inline bool HasGoodFGStackTable(void) const { return (!(FineGrainedStackTable.empty())); };
+	inline bool HasGoodFGStackTable(void) const { return (!(NegativeOffsetFineGrainedStackTable.empty())); };
 	inline bool IsLiveIn(const STARSOpndTypePtr &CurrOp) const {
 		return (Blocks.front()->IsLiveIn(CurrOp));
 	}
diff --git a/include/base/SMPInstr.h b/include/base/SMPInstr.h
index 6da99aef33634e5ac16ea07c867c0c532094435d..b06a21b64dd3fca486d43c8c80a7086177c1bbd1 100644
--- a/include/base/SMPInstr.h
+++ b/include/base/SMPInstr.h
@@ -418,6 +418,7 @@ public:
 	STARSOpndTypePtr GetUseOnlyAddSubOp(void) const;
 	STARSOpndTypePtr GetDefUseAddSubOp(void) const;
 	std::size_t GetPushedOpndByteSize(void) const; // return # bytes width of first pushed operand
+	STARSOpndTypePtr GetPushedOpnd(void) const;
 #endif
 	inline STARS_sval_t GetStackPtrOffset(void) const { return StackPtrOffset; };
 	STARS_ea_t GetJumpTarget(void) const; // return BADADDR if not jump, target addr otherwise.
diff --git a/src/base/SMPDataFlowAnalysis.cpp b/src/base/SMPDataFlowAnalysis.cpp
index 66c4ed1417802d029de444ff6601449797539112..1dba6471eafce0ea67612d5e5f8dafd88a2f7255 100644
--- a/src/base/SMPDataFlowAnalysis.cpp
+++ b/src/base/SMPDataFlowAnalysis.cpp
@@ -84,8 +84,8 @@ const unsigned char RegSizes[MAX_IDA_REG + 1] =
 	{ 4, 4, 4, 4, 4, 4, 4, 4,
 	  8, 8, 8, 8, 8, 8, 8, 8,
 	  1, 1, 1, 1, 1, 1, 1, 1,
-	  1, 1, 1, 1, 4, 4, 4, 4,
-	  4, 4, 4, 4, 4, 4, 4, 4,
+	  1, 1, 1, 1, 4, 2, 2, 2,
+	  2, 2, 2, 4, 4, 4, 4, 4,
 	  4, 4, 4, 4, 4, 10, 10, 10,
 	  10, 10, 10, 10, 10, 4, 4, 4,
 	  16, 16, 16, 16, 16, 16, 16, 16,
diff --git a/src/base/SMPFunction.cpp b/src/base/SMPFunction.cpp
index 47dffb137730aed95816c0fb3703e3a2029e5c18..be965ce82ddbd1521cf90c3cb93278b8848359cb 100644
--- a/src/base/SMPFunction.cpp
+++ b/src/base/SMPFunction.cpp
@@ -1936,9 +1936,9 @@ void SMPFunction::FindAllAllocsAndDeallocs(void) {
 #endif
 #endif
 		if (this->UsesFramePointer()) { // now that MDFixUseFP() has validated this flag ...
-			if (0 != this->FramePointerStackDelta) {
+			if (0 != this->GetFramePtrStackDelta()) {
 				SMP_msg("INFO: Found FramePointerStackDelta of %ld in frameless leaf function %s\n", 
-					(long) this->FramePointerStackDelta, this->GetFuncName());
+					(long) this->GetFramePtrStackDelta(), this->GetFuncName());
 			}
 		}
 	}
@@ -2543,12 +2543,13 @@ void SMPFunction::MDFindIncomingTypes(void) {
 
 // Determine boundaries in the stack frame.
 void SMPFunction::BuildLocalVarTable(void) {
-#if 0
+#if 1
 	this->BuildStackAccessTables();
-#endif
+#else
 	// Currently we just use the info that IDA Pro has inferred from the direct
 	//  addressing of stack locations.
 	this->SemiNaiveLocalVarID();
+#endif
 	return;
 } // end of SMPFunction::BuildLocalVarTable()
 
@@ -2628,7 +2629,7 @@ void SMPFunction::BuildStackAccessTables(void) {
 		this->SetStackFrameExtendsPastStackTop();
 	}
 
-	if (!this->AnalyzedSP || this->CallsAlloca || (STARS_BADADDR == this->LocalVarsAllocInstr)) {
+	if (!this->AnalyzedSP || (STARS_BADADDR == this->LocalVarsAllocInstr)) {
 		SMP_msg("FindOutgoingArgsSize not called for %s ", this->GetFuncName());
 		SMP_msg("AnalyzedSP: %d CallsAlloca: %d LocalVarsAllocInstr: %lx \n",
 			this->AnalyzedSP, this->CallsAlloca, (unsigned long) this->LocalVarsAllocInstr);
@@ -2660,7 +2661,7 @@ void SMPFunction::BuildStackAccessTables(void) {
 	for (int i = this->MinStackAccessOffset; i < this->MaxStackAccessLimit; ++i) {
 		struct StackFrameEntry TempEntry;
 		TempEntry.VarPtr = NULL;
-		TempEntry.offset = (long)i;
+		TempEntry.offset = (long) i;
 		TempEntry.Read = false;
 		TempEntry.Written = false;
 		TempEntry.AddressTaken = false;
@@ -2690,7 +2691,7 @@ void SMPFunction::BuildStackAccessTables(void) {
 	}
 	assert(0 >= this->AllocPointDelta);
 
-	// Iterate through all instructions and record stack frame accesses in the StackFrameMap.
+	// Iterate through all instructions and record stack frame accesses in the StackFrameMaps.
 	InstIter = this->Instrs.begin();
 #if SMP_USE_SSA_FNOP_MARKER
 	if ((*InstIter)->IsMarkerInst())
@@ -2702,20 +2703,22 @@ void SMPFunction::BuildStackAccessTables(void) {
 		STARS_sval_t sp_delta = CurrInst->GetStackPtrOffset();
 		if (0 < sp_delta) {
 			// Stack underflow.
-			SMP_msg("ERROR: Stack underflow at %lx %s sp_delta: %ld\n", (unsigned long) InstAddr,
+			SMP_msg("WARNING: Stack underflow at %lx %s sp_delta: %ld\n", (unsigned long) InstAddr,
 				CurrInst->GetDisasm(), (long)sp_delta);
+#if 0
 			this->OutgoingArgsComputed = false;
 			this->OutgoingArgsSize = 0;
 			return;
+#endif
 		}
-		assert(0 >= sp_delta);
+		// assert(0 >= sp_delta);
 		STARS_ea_t offset;
 		std::size_t DataSize;
 		bool UsedFramePointer;
 		bool IndexedAccess;
 		bool SignedMove;
 		bool UnsignedMove;
-		if (CurrInst->HasDestMemoryOperand()) {
+		if (CurrInst->HasDestMemoryOperand() || CurrInst->MDIsPushInstr()) {
 			set<DefOrUse, LessDefUse>::iterator CurrDef;
 			for (CurrDef = CurrInst->GetFirstDef(); CurrDef != CurrInst->GetLastDef(); ++CurrDef) {
 				STARSOpndTypePtr TempOp = CurrDef->GetOp();
@@ -2729,14 +2732,7 @@ void SMPFunction::BuildStackAccessTables(void) {
 					}
 					assert(0 <= SignedOffset);
 					SignedOffset += this->MinStackAccessOffset;
-#if 0
-					if ((offset + DataSize) > this->StackFrameMap.size()) {
-						SMP_msg("ERROR: offset = %lu DataSize = %zu FrameMapSize = %zu\n",
-							(unsigned long)offset, DataSize, this->StackFrameMap.size());
-						continue;
-					}
-					assert((offset + DataSize) <= this->StackFrameMap.size());
-#endif
+
 					bool ESPRelative = (!(UsedFramePointer || CurrInst->HasFPNormalizedToSP()));
 					if (SignedOffset < 0) {
 						for (int j = 0; j < (int) DataSize; ++j) { // offset has zero-based index into negative offset vectors
@@ -2807,11 +2803,35 @@ void SMPFunction::BuildStackAccessTables(void) {
 					else if (UnsignedMove) {
 						StackDefFG.SignMiscInfo |= FG_MASK_UNSIGNED;
 					}
-					// Insert the StackDefFG into the map of InstAddr to DEF FG info.
-					pair<map<STARS_ea_t, struct FineGrainedInfo>::iterator, bool> InsertResult;
-					pair<STARS_ea_t, struct FineGrainedInfo> InsertValue(InstAddr, StackDefFG);
-					InsertResult = this->StackDefFGInfo.insert(InsertValue);
-					assert(InsertResult.second);
+					if (!CurrInst->MDIsPushInstr()) { // could just exclude push-all, which had multiple DEFs per InstAddr
+						// Insert the StackDefFG into the map of InstAddr to DEF FG info.
+						pair<map<STARS_ea_t, struct FineGrainedInfo>::iterator, bool> InsertResult;
+						pair<STARS_ea_t, struct FineGrainedInfo> InsertValue(InstAddr, StackDefFG);
+						InsertResult = this->StackDefFGInfo.insert(InsertValue);
+						if (!InsertResult.second) {
+							SMP_msg("FATAL ERROR: Duplicate item in StackDefFGInfo at %llx\n", (unsigned long long) InstAddr);
+							SMP_msg("Inst dump follows:\n");
+							CurrInst->Dump();
+						}
+						assert(InsertResult.second);
+					}
+
+					// Find saves of registers.
+					if ((0 == CurrInst->GetBlock()->GetNumber()) && CurrInst->MDIsPushInstr()) { // push in entry block
+						STARSOpndTypePtr PushedOp = CurrInst->GetPushedOpnd();
+						if (PushedOp->IsRegOp()) {
+							if (SignedOffset < 0) {
+								for (int j = 0; j < (int)DataSize; ++j) {
+									this->NegativeOffsetStackFrameMap[offset + j].EntryType = STARS_STACK_CALLEE_SAVED_REG;
+								}
+							}
+							else { // odd to have callee-saved regs up here
+								for (int j = 0; j < (int)DataSize; ++j) {
+									this->PositiveOffsetStackFrameMap[SignedOffset + j].EntryType = STARS_STACK_CALLEE_SAVED_REG;
+								}
+							}
+						}
+					}
 				} // end if MDGetStackOffsetAndSize()
 			} // end for all DEFs
 		} // end if DestMemoryOperand
@@ -2830,14 +2850,7 @@ void SMPFunction::BuildStackAccessTables(void) {
 					}
 					assert(0 <= SignedOffset);
 					SignedOffset += this->MinStackAccessOffset;
-#if 0
-					if ((SignedOffset + DataSize) > this->StackFrameMap.size()) {
-						SMP_msg("ERROR: offset = %lu DataSize = %zu FrameMapSize = %zu\n",
-							(unsigned long)offset, DataSize, this->StackFrameMap.size());
-						continue;
-					}
-					assert((SignedOffset + DataSize) <= this->StackFrameMap.size());
-#endif
+
 					bool ESPRelative = (!(UsedFramePointer || CurrInst->HasFPNormalizedToSP()));
 					if (SignedOffset < 0) { // offset has zero-based index into negative offset vectors
 						for (int j = 0; j < (int) DataSize; ++j) {
@@ -2926,90 +2939,122 @@ void SMPFunction::BuildStackAccessTables(void) {
 		// NOTE: Detect taking the address of stack locations. **!!**
 	} // end for all instructions
 
+	this->GoodLocalVarTable = true;
+	this->OutgoingArgsComputed = true;
+
 	// If function is a leaf function, set OutgoingArgsSize to zero and return.
 	// If function has no local frame allocation, ditto.
 	if ((this->IsLeaf() && !(this->IsDirectlyRecursive())) || (this->AllocPointDelta == 0)) {
 		this->OutgoingArgsSize = 0;
-		return;
+		if (0 == this->AllocPointDelta)
+			return;
 	}
+	else {
 
-	// For non-leaf functions, set the OutgoingArgsSize to the write-only, ESP-relative
-	//  region of the bottom of the StackFrameMap.
-	bool OutgoingArgsRegionFinished = false;
-	bool IndexedOutgoingArgs = false; // Any indexed accesses to outgoing args?
-	std::size_t FramePadSize = 0;
-	std::size_t AlignmentPadSize = 0; // bottom of frame, unused space below outargs
-	for (std::size_t MapIndex = 0; MapIndex < this->NegativeOffsetStackFrameMap.size(); ++MapIndex) {
-		// Some of the bottom of the stack frame might be below the local frame allocation.
-		//  These are pushes that happened after allocation, etc. We skip over these
-		//  locations and define the outgoing args region to start strictly at the bottom
-		//  of the local frame allocation.
-		struct StackFrameEntry TempEntry = this->NegativeOffsetStackFrameMap.at(MapIndex);
-#if 0
-		if (DebugFlag) {
-			SMP_msg("StackFrameMap entry %zu: offset: %ld Read: %d Written: %d ESP: %d EBP: %d\n",
-				MapIndex, TempEntry.offset, TempEntry.Read, TempEntry.Written,
-				TempEntry.ESPRelativeAccess, TempEntry.EBPRelativeAccess);
-		}
-#endif
-		if (TempEntry.offset < this->AllocPointDelta)
-			continue;
+		// For non-leaf functions, set the OutgoingArgsSize to the write-only, ESP-relative
+		//  region of the bottom of the NegativeOffsetStackFrameMap.
+		bool OutgoingArgsRegionFinished = false;
+		bool IndexedOutgoingArgs = false; // Any indexed accesses to outgoing args?
+		std::size_t FramePadSize = 0;
+		std::size_t AlignmentPadSize = 0; // bottom of frame, unused space below outargs
+		for (std::size_t MapIndex = 0; MapIndex < this->NegativeOffsetStackFrameMap.size(); ++MapIndex) {
+			// Some of the bottom of the stack frame might be below the local frame allocation.
+			//  These are pushes that happened after allocation, etc. We skip over these
+			//  locations and define the outgoing args region to start strictly at the bottom
+			//  of the local frame allocation.
+			struct StackFrameEntry TempEntry = this->NegativeOffsetStackFrameMap.at(MapIndex);
 #if 0
-		if ((NULL != TempEntry.VarPtr) && ((0 == strcmp(" s", TempEntry.VarPtr->VarName)) || (0 == strcmp(" r", TempEntry.VarPtr->VarName)))) {
-			// We have reached saved regs or the return address.
-			break;
-		}
+			if (DebugFlag) {
+				SMP_msg("StackFrameMap entry %zu: offset: %ld Read: %d Written: %d ESP: %d EBP: %d\n",
+					MapIndex, TempEntry.offset, TempEntry.Read, TempEntry.Written,
+					TempEntry.ESPRelativeAccess, TempEntry.EBPRelativeAccess);
+			}
 #endif
+			if (TempEntry.offset < this->AllocPointDelta)
+				continue; // don't look below the stack frame allocation region
+			if (STARS_STACK_CALLEE_SAVED_REG == this->NegativeOffsetStackFrameMap[MapIndex].EntryType)
+				break;
 
-		if (OutgoingArgsRegionFinished) {
-			// We are just processing the stack frame padding.
-			if (!TempEntry.Read && !TempEntry.Written) {
-				// Could be stack frame padding.
-				++FramePadSize;
-			}
-			else {
-				break; // No more padding region
+			if (OutgoingArgsRegionFinished) {
+				// We are just processing the stack frame padding.
+				if (!TempEntry.Read && !TempEntry.Written) {
+					// Could be stack frame padding.
+					++FramePadSize;
+				}
+				else {
+					break; // No more padding region
+				}
 			}
-		}
-		else if ((this->OutgoingArgsSize == 0) && (!TempEntry.Read) && (!TempEntry.Written)) {
-			// We have not started accumulating outgoing args bytes, we have reached the
-			//  AllocPointDelta, yet we find space that is neither written nor read. This
-			//  empty space at the bottom of the stack frame could just be for stack alignment
-			//  purposes, especially in the new x86-64 ABI, so it should not prevent us from
-			//  finding outgoing args space above it.
-			++AlignmentPadSize;
-		}
-		else if (TempEntry.Read || TempEntry.EBPRelativeAccess || !TempEntry.Written
-			|| !TempEntry.ESPRelativeAccess) {
-			OutgoingArgsRegionFinished = true;
-			if (!TempEntry.Read && !TempEntry.Written) {
-				// Could be stack frame padding.
-				++FramePadSize;
+			else if ((this->OutgoingArgsSize == 0) && (!TempEntry.Read) && (!TempEntry.Written)) {
+				// We have not started accumulating outgoing args bytes, we have reached the
+				//  AllocPointDelta, yet we find space that is neither written nor read. This
+				//  empty space at the bottom of the stack frame could just be for stack alignment
+				//  purposes, especially in the new x86-64 ABI, so it should not prevent us from
+				//  finding outgoing args space above it.
+				++AlignmentPadSize;
+			}
+			else if (TempEntry.Read || TempEntry.EBPRelativeAccess || !TempEntry.Written
+				|| !TempEntry.ESPRelativeAccess) {
+				OutgoingArgsRegionFinished = true;
+				if (!TempEntry.Read && !TempEntry.Written) {
+					// Could be stack frame padding.
+					++FramePadSize;
+				}
+				else {
+					break; // No padding region
+				}
 			}
 			else {
-				break; // No padding region
+				this->OutgoingArgsSize++;
+				if (TempEntry.IndexedAccess) {
+					IndexedOutgoingArgs = true;
+				}
 			}
 		}
-		else {
-			this->OutgoingArgsSize++;
-			if (TempEntry.IndexedAccess) {
-				IndexedOutgoingArgs = true;
-			}
+
+		// Add in the alignment padding below the written outargs region.
+		if (this->OutgoingArgsSize > 0) {
+			this->OutgoingArgsSize += AlignmentPadSize;
 		}
-	}
 
-	// Add in the alignment padding below the written outargs region.
-	if (this->OutgoingArgsSize > 0) {
-		this->OutgoingArgsSize += AlignmentPadSize;
+		// If any outgoing arg was accessed using an index register, then we don't know how high
+		//  the index register value went. It could potentially consume the so-called padding
+		//  region, which might be just the region we did not detect direct accesses to because
+		//  the accesses were indirect. To be safe, we expand the outgoing args region to fill
+		//  the padding region above it in this indexed access case.
+		if (IndexedOutgoingArgs) {
+			this->OutgoingArgsSize += FramePadSize;
+		}
+
+		// Mark the outgoing args entries in the map.
+		// Could have stack accesses below stack frame allocation. Don't go below the frame allocation for outargs
+		//  !!!!****!!!! Might need to change for Windows and other stack frame conventions.
+		int AllocIndex = ((int) this->NegativeOffsetStackFrameMap.size()) + (int) this->AllocPointDelta;
+		// e.g. if 20 bytes in map but -16 is AllocPointDelta, then bottom four bytes are below the frame.
+		assert(0 <= AllocIndex);
+		for (size_t index = (size_t) AllocIndex; index < (AllocIndex + this->OutgoingArgsSize); ++index) {
+			this->NegativeOffsetStackFrameMap[index].EntryType = STARS_STACK_OUTARG;
+		}
 	}
 
-	// If any outgoing arg was accessed using an index register, then we don't know how high
-	//  the index register value went. It could potentially consume the so-called padding
-	//  region, which might be just the region we did not detect direct accesses to because
-	//  the accesses were indirect. To be safe, we expand the outgoing args region to fill
-	//  the padding region above it in this indexed access case.
-	if (IndexedOutgoingArgs) {
-		this->OutgoingArgsSize += FramePadSize;
+	// Mark the local vars entries in the map.
+	bool LocalFrameMarked = false;
+	int AllocIndex = ((int) this->NegativeOffsetStackFrameMap.size()) + (int) this->AllocPointDelta;
+	// e.g. if 20 bytes in map but -16 is AllocPointDelta, then bottom four bytes are below the frame.
+	assert(0 <= AllocIndex);
+	for (size_t index = AllocIndex + this->OutgoingArgsSize; index < this->NegativeOffsetStackFrameMap.size(); ++index) {
+		if (this->NegativeOffsetStackFrameMap.at(index).EntryType == STARS_STACK_UNKNOWN) {
+			this->NegativeOffsetStackFrameMap[index].EntryType = STARS_STACK_LOCAL_FRAME;
+			LocalFrameMarked = true;
+		}
+		else if (LocalFrameMarked) {
+			// Marked some local frame entries, and now we are running up into something besides the local frame,
+			//  like callee-saved regs. We don't want to go above them and mark a second local frame area, which might
+			//  be a save from memory, for example: push [ecx+4] ; push ebx; push edx; sub esp,32 should be treated as
+			//  4 unknown bytes at top, 8 callee-saved reg bytes, then 32 local frame bytes. We don't want to keep
+			//  processing and mark the 4 unknown bytes as another local var frame.
+			break;
+		}
 	}
 
 	return;
@@ -3817,7 +3862,7 @@ bool SMPFunction::MDGetFGStackLocInfo(STARS_ea_t InstAddr, const STARSOpndTypePt
 	}
 	else if (this->UseFP && ((BaseReg == MD_FRAME_POINTER_REG) || (IndexReg == MD_FRAME_POINTER_REG))) {
 		assert(false); // should never get here with unnormalized stack operand
-		SignedOffset -= this->FuncInfo->GetSavedRegSize(); // base offsets from entry ESP value
+		SignedOffset += this->GetFramePtrStackDelta(); // base offsets from entry ESP value
 		SignedOffset -= this->MinStackAccessOffset; // convert to StackFrameMap index
 	}
 	else {
@@ -3825,16 +3870,14 @@ bool SMPFunction::MDGetFGStackLocInfo(STARS_ea_t InstAddr, const STARSOpndTypePt
 	}
 	// We did not return false, so we should have a good offset. Use it to
 	//  pass back the fine grained stack table entry for that offset.
-	if ((0 > SignedOffset) || (SignedOffset >= (int) this->FineGrainedStackTable.size())) {
-		if (this->OutgoingArgsComputed) {
-			SMP_msg("ERROR: FG stack table index out of range in MDGetFGStackLocInfo at %lx\n",
-				(unsigned long) InstAddr);
-		}
-		FGEntry.SignMiscInfo = 0; // We cannot figure out signedness info without an FG info stack table.
-		FGEntry.SizeInfo = ComputeOperandBitWidthMask(TempOp, 0); // IDA can figure out width, anyway.
+	if (SignedOffset >= (int) this->NegativeOffsetFineGrainedStackTable.size()) {
+		SignedOffset -= (int) this->NegativeOffsetFineGrainedStackTable.size();
+		assert(SignedOffset < this->PositiveOffsetFineGrainedStackTable.size());
+		FGEntry = this->PositiveOffsetFineGrainedStackTable.at((std::size_t) SignedOffset);
 	}
 	else {
-		FGEntry = this->FineGrainedStackTable.at((std::size_t) SignedOffset);
+		assert(SignedOffset >= 0);
+		FGEntry = this->NegativeOffsetFineGrainedStackTable.at((std::size_t) SignedOffset);
 	}
 	return true;
 } // end of SMPFunction::MDGetFGStackLocInfo()
@@ -3862,7 +3905,7 @@ bool SMPFunction::MDUpdateFGStackLocInfo(STARS_ea_t InstAddr, const STARSOpndTyp
 	}
 	else if (this->UseFP && ((BaseReg == MD_FRAME_POINTER_REG) || (IndexReg == MD_FRAME_POINTER_REG))) {
 		assert(false); // should never get here with unnormalized stack operands
-		SignedOffset -= this->FuncInfo->GetSavedRegSize(); // base offsets from entry ESP value
+		SignedOffset += this->GetFramePtrStackDelta(); // base offsets from entry ESP value
 		SignedOffset -= this->MinStackAccessOffset; // convert to StackFrameMap index
 	}
 	else {
@@ -3870,28 +3913,33 @@ bool SMPFunction::MDUpdateFGStackLocInfo(STARS_ea_t InstAddr, const STARSOpndTyp
 	}
 	// We did not return false, so we should have a good offset. Use it to
 	//  retrieve the fine grained stack table entry for that offset.
-	if ((0 > SignedOffset) || (SignedOffset >= (int) this->FineGrainedStackTable.size())) {
-		if (this->OutgoingArgsComputed) {
-			SMP_msg("ERROR: FG stack table index out of range in MDGetFGStackLocInfo at %lx\n",
-				(unsigned long) InstAddr);
+	if (SignedOffset >= (int) this->NegativeOffsetFineGrainedStackTable.size()) { // in Positive offset table
+		SignedOffset -= (int) this->NegativeOffsetFineGrainedStackTable.size();
+		assert(SignedOffset < this->PositiveOffsetFineGrainedStackTable.size());
+		OldFG = this->PositiveOffsetFineGrainedStackTable.at((std::size_t) SignedOffset);
+		UnionFG.SignMiscInfo = OldFG.SignMiscInfo | NewFG.SignMiscInfo;
+		UnionFG.SizeInfo = OldFG.SizeInfo | NewFG.SizeInfo;
+		if ((OldFG.SignMiscInfo != UnionFG.SignMiscInfo) || (OldFG.SizeInfo != UnionFG.SizeInfo)) {
+			// The signs they are a-changin'. Or maybe the sizes.
+			this->PositiveOffsetFineGrainedStackTable[SignedOffset].SignMiscInfo |= NewFG.SignMiscInfo;
+			this->PositiveOffsetFineGrainedStackTable[SignedOffset].SizeInfo |= NewFG.SizeInfo;
 		}
-		return false;
 	}
-	else if (this->OutgoingArgsComputed && (((std::size_t)SignedOffset) < this->OutgoingArgsSize)) {
+	else if (this->OutgoingArgsComputed && (((std::size_t) SignedOffset) < this->OutgoingArgsSize)) {
 		// We don't want to update the outgoing args region, as it will not be consistent
 		//  over multiple function calls. NOTE: We could fine tune this by seeing if we
 		//  call mutliple target functions or not; if only one, then outgoing args region
 		//  would be consistent in the absence of varargs targets.
 		return false;
 	}
-	else {
-		OldFG = this->FineGrainedStackTable.at((std::size_t) SignedOffset);
+	else { // local var access in NegativeOffsetFineGrainedStackTable
+		OldFG = this->NegativeOffsetFineGrainedStackTable.at((std::size_t) SignedOffset);
 		UnionFG.SignMiscInfo = OldFG.SignMiscInfo | NewFG.SignMiscInfo;
 		UnionFG.SizeInfo = OldFG.SizeInfo | NewFG.SizeInfo;
 		if ((OldFG.SignMiscInfo != UnionFG.SignMiscInfo) || (OldFG.SizeInfo != UnionFG.SizeInfo)) {
 			// The signs they are a-changin'. Or maybe the sizes.
-			this->FineGrainedStackTable.at(SignedOffset).SignMiscInfo |= NewFG.SignMiscInfo;
-			this->FineGrainedStackTable.at(SignedOffset).SizeInfo |= NewFG.SizeInfo;
+			this->NegativeOffsetFineGrainedStackTable[SignedOffset].SignMiscInfo |= NewFG.SignMiscInfo;
+			this->NegativeOffsetFineGrainedStackTable[SignedOffset].SizeInfo |= NewFG.SizeInfo;
 		}
 	}
 	return true;
@@ -4039,7 +4087,9 @@ bool SMPFunction::IsInOutgoingArgsRegion(const STARSOpndTypePtr &DestOp) {
 	else {
 		int SignedOffset = (int) offset;
 		SignedOffset -= this->MinStackDelta; // convert to zero-based from bottom of stack frame
-		OutArgWrite = (((std::size_t) SignedOffset) < this->OutgoingArgsSize);
+		int BelowFrameBytes = this->AllocPointDelta - this->MinStackDelta;
+		assert(BelowFrameBytes >= 0);
+		OutArgWrite = (((std::size_t) SignedOffset) < ((size_t) BelowFrameBytes + this->OutgoingArgsSize));
 	}
 	return OutArgWrite;
 } // end of SMPFunction::IsInOutgoingArgsRegion()
@@ -4053,7 +4103,7 @@ bool SMPFunction::IsInIncomingArgsRegion(SMPInstr *SourceInst, const STARSOpndTy
 
 	if (InArg) {
 		MDExtractAddressFields(SourceOp, BaseReg, IndexReg, ScaleFactor, offset);
-		int SignedOffset = (int) offset;
+		int SignedOffset = (int) offset; // will be greater than ISA_ByteWidth if SourceOp is above the return address
 		if (((BaseReg != STARS_x86_R_sp) && (IndexReg != STARS_x86_R_sp)) || (SignedOffset < global_STARS_program->GetSTARS_ISA_Bytewidth())) {
 			InArg = false;
 		}
@@ -4257,6 +4307,111 @@ bool SMPFunction::FindAlloca(void) {
 	return FoundAlloca;
 } // end of SMPFunction::FindAlloca()
 
+#if 1
+// Emit the annotations describing the regions of the stack frame.
+void SMPFunction::EmitStackFrameAnnotations(FILE *AnnotFile, SMPInstr *Instr) {
+	STARS_ea_t addr = Instr->GetAddr();
+
+#if 0
+	if (0 < IncomingArgsSize) {
+		SMP_fprintf(AnnotFile, "%18llx %6llu INARGS STACK esp + %ld %s \n",
+			(unsigned long long) addr, (unsigned long long) IncomingArgsSize,
+			(long) (LocalVarsSize + CalleeSavedRegsSize + RetAddrSize),
+			Instr->GetDisasm());
+	}
+#endif
+	if (0 < this->RetAddrSize) {
+		SMP_fprintf(AnnotFile, "%18llx %6d MEMORYHOLE STACK esp + %lu ReturnAddress \n",
+			(unsigned long long) addr, RetAddrSize, (unsigned long)(this->LocalVarsSize + this->CalleeSavedRegsSize));
+	}
+	if (this->GoodLocalVarTable && (!this->NegativeOffsetStackFrameMap.empty())) {
+		// Walk through the NegativeOffsetStackFrameMap and emit annotations for the regions.
+		bool LocalFrameEmitted = false; // have we emitted the LOCALFRAME annotation?
+		unsigned long ParentReferentID = 0;
+		size_t Limit = this->NegativeOffsetStackFrameMap.size();
+		uint16_t CurrentRegionBytes = 0;
+		StackAccessType CurrentRegionType = STARS_STACK_RETURN_ADDRESS; // start with previous type
+		// Could have stack accesses below stack frame allocation. Don't look below the frame allocation, because
+		//  we are emitting these annotations at the frame allocation instruction. !!!!****!!!! Might need to change
+		//  for Windows and other stack frame conventions.
+		int AllocIndex = ((int) this->NegativeOffsetStackFrameMap.size()) + (int) this->AllocPointDelta;
+		// e.g. if 20 bytes in map but -16 is AllocPointDelta, then bottom four bytes are below the frame.
+		assert(0 <= AllocIndex);
+		for (int index = Limit - 1; index >= AllocIndex; --index) {
+			StackAccessType NewType = this->NegativeOffsetStackFrameMap[index].EntryType;
+			if (NewType == CurrentRegionType) {
+				++CurrentRegionBytes;
+			}
+			else { // changing regions; time for annotation for previous region
+				if (CurrentRegionType == STARS_STACK_CALLEE_SAVED_REG) {
+					SMP_fprintf(AnnotFile, "%18llx %6u MEMORYHOLE STACK esp + %lu CalleeSavedRegs \n",
+						(unsigned long long) addr, CurrentRegionBytes, (unsigned long) (index + 1 - AllocIndex));
+				}
+				else if (CurrentRegionType == STARS_STACK_LOCAL_FRAME) {
+					ParentReferentID = global_STARS_program->GetDataReferentID();
+					global_STARS_program->IncrementDataReferentID();
+					if (this->LocalVarsSize != (CurrentRegionBytes + this->OutgoingArgsSize)) {
+						SMP_msg("ERROR: LocalVarsSize: %lu not sum of CurrentRegionBytes: %u  and OutArgsSize: %zu at %llu\n",
+							this->LocalVarsSize, CurrentRegionBytes, this->OutgoingArgsSize, (unsigned long long) addr);
+					}
+					SMP_fprintf(AnnotFile, "%18llx %6u DATAREF STACK %lu esp + 0 PARENT LocalFrame LOCALFRAME\n",
+						(unsigned long long) addr, CurrentRegionBytes + this->OutgoingArgsSize, (unsigned long) ParentReferentID);
+					LocalFrameEmitted = true;
+				}
+				else if (CurrentRegionType == STARS_STACK_OUTARG) {
+					if (!LocalFrameEmitted) { // entire local stack frame is outgoing args region; unusual case
+						ParentReferentID = global_STARS_program->GetDataReferentID();
+						global_STARS_program->IncrementDataReferentID();
+						SMP_fprintf(AnnotFile, "%18llx %6u DATAREF STACK %lu esp + 0 PARENT LocalFrame LOCALFRAME\n",
+							(unsigned long long) addr, CurrentRegionBytes, (unsigned long)ParentReferentID);
+						LocalFrameEmitted = true;
+					}
+					SMP_fprintf(AnnotFile, "%18llx %6zu DATAREF STACK %lu esp + %d CHILDOF %lu OFFSET %d OutArgsRegion OUTARGS\n",
+						(unsigned long long) addr, CurrentRegionBytes, global_STARS_program->GetDataReferentID(),
+						(unsigned long) (index + 1 - AllocIndex), ParentReferentID, 0);
+					global_STARS_program->IncrementDataReferentID();
+				}
+				else if (CurrentRegionType == STARS_STACK_RETURN_ADDRESS) {
+					; // just getting started
+				}
+				else { // something odd is happening
+					;
+				}
+				CurrentRegionType = NewType;
+				CurrentRegionBytes = 1;
+			}
+		} // end for index in range of NegativeOffsetStackAccessTable
+		if (CurrentRegionBytes > 0) { // Get last region as we exited the loop.
+			if (CurrentRegionType == STARS_STACK_CALLEE_SAVED_REG) {
+				SMP_fprintf(AnnotFile, "%18llx %6u MEMORYHOLE STACK esp + 0 CalleeSavedRegs \n",
+					(unsigned long long) addr, CurrentRegionBytes);
+			}
+			else if (CurrentRegionType == STARS_STACK_LOCAL_FRAME) {
+				ParentReferentID = global_STARS_program->GetDataReferentID();
+				global_STARS_program->IncrementDataReferentID();
+				SMP_fprintf(AnnotFile, "%18llx %6u DATAREF STACK %lu esp + 0 PARENT LocalFrame LOCALFRAME\n",
+					(unsigned long long) addr, CurrentRegionBytes, (unsigned long) ParentReferentID);
+				LocalFrameEmitted = true;
+			}
+			else if (CurrentRegionType == STARS_STACK_OUTARG) {
+				if (!LocalFrameEmitted) { // entire local stack frame is outgoing args region; unusual case
+					ParentReferentID = global_STARS_program->GetDataReferentID();
+					global_STARS_program->IncrementDataReferentID();
+					SMP_fprintf(AnnotFile, "%18llx %6u DATAREF STACK %lu esp + 0 PARENT LocalFrame LOCALFRAME\n",
+						(unsigned long long) addr, CurrentRegionBytes, (unsigned long)ParentReferentID);
+					LocalFrameEmitted = true;
+				}
+				SMP_fprintf(AnnotFile, "%18llx %6zu DATAREF STACK %lu esp + 0 CHILDOF %lu OFFSET %d OutArgsRegion OUTARGS\n",
+					(unsigned long long) addr, CurrentRegionBytes, global_STARS_program->GetDataReferentID(), ParentReferentID, 0);
+				global_STARS_program->IncrementDataReferentID();
+			}
+		}
+
+	} // end if (0 < LocalVarsSize)
+	return;
+} // end of SMPFunction::EmitStackFrameAnnotations() 
+
+#else
 // Emit the annotations describing the regions of the stack frame.
 void SMPFunction::EmitStackFrameAnnotations(FILE *AnnotFile, SMPInstr *Instr) {
 	STARS_ea_t addr = Instr->GetAddr();
@@ -4313,6 +4468,7 @@ void SMPFunction::EmitStackFrameAnnotations(FILE *AnnotFile, SMPInstr *Instr) {
 	} // end if (0 < LocalVarsSize)
 	return;
 } // end of SMPFunction::EmitStackFrameAnnotations() 
+#endif
 
 // Mark functions with multiple entry points. These will be unsafe for fast returns and
 //  are probably IDA Pro disassembly problems rather than true multi-entry functions.
@@ -4772,34 +4928,6 @@ void SMPFunction::FreeUnusedMemory2(void) {
 #endif
 	}
 
-	CurrSize = this->StackFrameMap.size();
-	UnusedElements = this->StackFrameMap.capacity() - CurrSize;
-	if (0 < UnusedElements) {
-		struct StackFrameEntry DummyEntry;
-		DummyEntry.offset = 0;
-		DummyEntry.VarPtr = NULL;
-		UnusedStructCount += (unsigned long) UnusedElements;
-#if SMP_SHRINK_TO_FIT
-		std::vector<struct StackFrameEntry>(this->StackFrameMap).swap(this->StackFrameMap);
-#else
-		this->StackFrameMap.resize(CurrSize, DummyEntry);
-#endif
-	}
-
-	CurrSize = this->FineGrainedStackTable.size();
-	UnusedElements = this->FineGrainedStackTable.capacity() - CurrSize;
-	if (0 < UnusedElements) {
-		struct FineGrainedInfo DummyFG;
-		DummyFG.SignMiscInfo = 0;
-		DummyFG.SizeInfo = 0;
-		UnusedStructCount += (unsigned long) UnusedElements;
-#if SMP_SHRINK_TO_FIT
-		std::vector<struct FineGrainedInfo>(this->FineGrainedStackTable).swap(this->FineGrainedStackTable);
-#else
-		this->FineGrainedStackTable.resize(CurrSize, DummyFG);
-#endif
-	}
-
 	return;
 } // end of SMPFunction::FreeUnusedMemory2()
 
@@ -4828,7 +4956,6 @@ void SMPFunction::FreeUnusedMemory3(void) {
 void SMPFunction::FreeUnusedMemory4(void) {
 	this->KillSet.clear();
 	this->LiveOutSet.clear();
-	this->StackFrameMap.clear();
 	this->BlocksDefinedIn.clear();
 
 #if SMP_SHRINK_TO_FIT
@@ -7588,7 +7715,9 @@ void SMPFunction::InferTypes(bool FirstIter) {
 			//  (e.g. loads from stack locations whose signedness has been inferred earlier
 			//  in FindOutGoingArgSize(), or inherently signed arithmetic opcodes like signed
 			//  or unsigned multiplies and divides).
-			CurrInst->MDSetWidthSignInfo(this->UseFP);
+			if (this->HasGoodFGStackTable()) {
+				CurrInst->MDSetWidthSignInfo(this->UseFP);
+			}
 		}
 		// Check for signedness inferences from conditional branches at the end of blocks.
 		for (BlockIter = this->Blocks.begin(); BlockIter != this->Blocks.end(); ++BlockIter) {
diff --git a/src/base/SMPInstr.cpp b/src/base/SMPInstr.cpp
index 805b594c4a2f5f6fe7e760c88315c47095e59e16..1b847b2f0aba25562b6ebecce8677c2cff256a4d 100644
--- a/src/base/SMPInstr.cpp
+++ b/src/base/SMPInstr.cpp
@@ -897,7 +897,7 @@ SMPRegTransfer::~SMPRegTransfer() {
 // Get the left operand, and normalize it if it is a stack operand.
 STARSOpndTypePtr SMPRegTransfer::GetLeftOperand(void) const {
 	STARSOpndTypePtr TempOp = this->LeftOperand;
-	if (this->ParentInst->AreDefsNormalized()) {
+	if (this->ParentInst->AreDefsNormalized() && (0 != this->ParentInst->GetStackPtrOffset())) {
 		STARS_ea_t InstAddr = this->ParentInst->GetAddr();
 		TempOp = this->ParentInst->GetBlock()->GetFunc()->GetNormalizedOperand(InstAddr, TempOp);
 	}
@@ -907,7 +907,7 @@ STARSOpndTypePtr SMPRegTransfer::GetLeftOperand(void) const {
 // Get the right operand, and normalize it if it is a stack operand.
 STARSOpndTypePtr SMPRegTransfer::GetRightOperand(void) const {
 	STARSOpndTypePtr TempOp = this->RightOperand;
-	if (this->ParentInst->AreDefsNormalized()) {
+	if (this->ParentInst->AreDefsNormalized() && (0 != this->ParentInst->GetStackPtrOffset())) {
 		STARS_ea_t InstAddr = this->ParentInst->GetAddr();
 		TempOp = this->ParentInst->GetBlock()->GetFunc()->GetNormalizedOperand(InstAddr, TempOp);
 	}
@@ -1744,6 +1744,18 @@ size_t SMPInstr::GetPushedOpndByteSize(void) const {
 	return OpndWidth;
 }
 
+// return # bytes width of first pushed operand
+STARSOpndTypePtr SMPInstr::GetPushedOpnd(void) const {
+	size_t OpndWidth = global_STARS_program->GetSTARS_ISA_Bytewidth();
+	if (this->RTL.GetRT(0)->HasRightSubTree()) {
+		SMP_msg("ERROR: bad RTL structure for push instruction at %llx\n", (unsigned long long) this->GetAddr());
+		return this->STARSInstPtr->MakeVoidOpnd();
+	}
+	else {
+		return this->RTL.GetRT(0)->GetRightOperand();
+	}
+}
+
 // return STARS_BADADDR if not jump, target addr otherwise.
 STARS_ea_t SMPInstr::GetJumpTarget(void) const {
 	STARS_ea_t TargetAddr = STARS_BADADDR;
@@ -1875,13 +1887,13 @@ set<DefOrUse, LessDefUse>::iterator SMPInstr::GetPointerAddressReg(const STARSOp
 #define IMMEDNUM_UPPER 8191
 bool SMPInstr::IsSecondSrcOperandNumeric(void) const {
 	bool SecondOpImm = (this->STARSInstPtr->GetOpnd(1)->IsImmedOp());
-	uintptr_t TempImm;
+	STARS_uval_t TempImm;
 
 	if (SecondOpImm) {
 		TempImm = this->STARSInstPtr->GetOpnd(1)->GetImmedValue();
 	}
 
-	return (SecondOpImm && IsImmedNumeric(TempImm));
+	return (SecondOpImm && IsImmedNumeric((STARS_ea_t) TempImm));
 } // end of SMPInstr::IsSecondSrcOperandNumeric()
 
 // Determine the type of the USE-only operand for add and subtract
@@ -4477,7 +4489,7 @@ STARS_sval_t SMPInstr::FindStackAdjustment(void) {
 // DefOp comes in with the operand to be normalized, and contains the normalized operand upon return.
 // Return true if operand is a register or stack location, false otherwise (true => include in data flow analysis sets and SSA.)
 bool SMPInstr::MDComputeNormalizedDataFlowOp(bool UseFP, STARS_sval_t FPDelta, STARSOpndTypePtr &DefOp) {
-	if (nullptr == DefOp)
+	if ((nullptr == DefOp) || (this->GetStackPtrOffset() == 0))
 		return false;
 
 	if (DefOp->IsRegOp()) {
@@ -4565,7 +4577,7 @@ bool SMPInstr::MDComputeNormalizedDataFlowOp(bool UseFP, STARS_sval_t FPDelta, S
 			//  was upon function entry. We get the value "-32" in that case from a member variable.
 			NormalizedDelta = this->GetStackPtrOffset() + (STARS_sval_t) SignedOffset;
 		}
-		DefOp->SetAddr((uintptr_t) NormalizedDelta); // common to frame and stack pointer cases
+		DefOp->SetAddr((STARS_ea_t) NormalizedDelta); // common to frame and stack pointer cases
 		this->GetBlock()->GetFunc()->UpdateMaxDirectStackAccessOffset(NormalizedDelta); // maintain record of maximum
 		if (DefOp->IsMemNoDisplacementOp() && (0 != NormalizedDelta)) {
 			// mov [esp],eax has an [esp] operand of type o_phrase, because there is no
@@ -4772,7 +4784,7 @@ bool SMPInstr::MDNormalizeStackOps(bool UseFP, STARS_sval_t FPDelta, bool Recomp
 // DefOp comes in with the operand to be renormalized, and contains the normalized operand upon return.
 // Return true if operand is a register or stack location, false otherwise (true => include in data flow analysis sets and SSA.)
 bool SMPInstr::MDRecomputeNormalizedDataFlowOp(STARS_sval_t DeltaIncrement, bool UpdateMaps, STARSOpndTypePtr &DefOp) {
-	if (nullptr == DefOp)
+	if ((nullptr == DefOp) || (DeltaIncrement == 0))
 		return false;
 
 	if (DefOp->IsRegOp()) {
@@ -4791,7 +4803,7 @@ bool SMPInstr::MDRecomputeNormalizedDataFlowOp(STARS_sval_t DeltaIncrement, bool
 		STARS_sval_t NormalizedDelta = DeltaIncrement + (STARS_sval_t) SignedOffset;
 
 		STARSOpndTypePtr OldOp = DefOp->clone();
-		DefOp->SetAddr((uintptr_t) NormalizedDelta);
+		DefOp->SetAddr((STARS_ea_t) NormalizedDelta);
 
 		if (DefOp->IsMemNoDisplacementOp() && (0 != NormalizedDelta)) {
 			// mov [esp],eax has an [esp] operand of type o_phrase, because there is no
@@ -4814,7 +4826,7 @@ bool SMPInstr::MDRecomputeNormalizedDataFlowOp(STARS_sval_t DeltaIncrement, bool
 void SMPInstr::MDGetUnnormalizedOp(STARSOpndTypePtr &NormOp) {
 	STARS_sval_t SignedOffset;
 	bool UseFP = this->GetBlock()->GetFunc()->UsesFramePointer();
-	if (this->AreDefsNormalized() && MDIsStackAccessOpnd(NormOp, UseFP)) {
+	if (this->AreDefsNormalized() && (0 != this->GetStackPtrOffset()) && MDIsStackAccessOpnd(NormOp, UseFP)) {
 		if (this->HasFPNormalizedToSP()) {
 			// Need to convert NormOp back to frame-pointer-relative address.
 			if (NormOp->HasSIBByte()) {
@@ -4836,7 +4848,7 @@ void SMPInstr::MDGetUnnormalizedOp(STARSOpndTypePtr &NormOp) {
 			SignedOffset -= this->GetStackPtrOffset();
 			assert((0 <= SignedOffset) || this->GetBlock()->GetFunc()->DoesStackFrameExtendPastStackTop());
 		}
-		NormOp->SetAddr((uintptr_t) SignedOffset);
+		NormOp->SetAddr((STARS_ea_t) SignedOffset);
 	}
 	return;
 } // end of SMPInstr::MDGetUnnormalizedOp()
@@ -5253,6 +5265,7 @@ void SMPInstr::MDFixupDefUseLists(void) {
 		// IDA does not include the stack pointer in the DEFs or USEs.
 		this->MDAddRegDef(STARS_x86_R_sp, false);
 		this->MDAddRegUse(STARS_x86_R_sp, false);
+#if 0
 		if (!this->MDIsReturnInstr()) {
 			// We always reference [esp+0] or [esp-4 or 8], so add it to the DEF or USE list.
 			if (this->MDIsPopInstr()) {
@@ -5265,6 +5278,7 @@ void SMPInstr::MDFixupDefUseLists(void) {
 				this->Defs.SetRef(StackOp); // DEF
 			}
 		}
+#endif
 	}
 	else if (this->MDIsEnterInstr() || this->MDIsLeaveInstr()) {
 		// Entire function prologue or epilogue microcoded.
@@ -6510,7 +6524,7 @@ bool SMPInstr::IsOpSourceByteSwap(const STARSOpndTypePtr &UseOp, int UseSSANum,
 					}
 					if (LeftSuccess && IsMemOperand(LeftMemOp) && IsMemOperand(RightMemOp) && (1 == LeftMemOp->GetByteWidth()) && (1 == RightMemOp->GetByteWidth())) {
 						// Is RightMemOp equal to LeftMemOp plus one in the address space?
-						uintptr_t LeftAddr = LeftMemOp->GetAddr();
+						STARS_ea_t LeftAddr = LeftMemOp->GetAddr();
 						if (RightMemOp->GetAddr() == (LeftAddr + 1)) {
 							LeftMemOp->SetAddr(LeftAddr + 1); // increment before comparing all fields
 							if (IsEqOp(LeftMemOp, RightMemOp)) {
@@ -7979,7 +7993,7 @@ bool SMPInstr::TraceUltimateMoveSource(const STARSOpndTypePtr &UseOp, int UseSSA
 				//  downward, it does not matter if we add 1000 to [esp+500] to produce [esp+1500],
 				//  or we add 1000 to [ebp-2000] to make [ebp-1000]. Either way, we are simulating the
 				//  addition of 1000 as we move up in the stack frame.
-				uintptr_t NewAddr = NewUseOp->GetAddr() + ImmOp->GetImmedValue();
+				STARS_ea_t NewAddr = NewUseOp->GetAddr() + ImmOp->GetImmedValue();
 				NewUseOp->SetAddr(NewAddr); // perform the address arithmetic addition
 				UltSource = NewUseOp;
 				FPRelative = NewDefInst->HasFPNormalizedToSP();
@@ -15077,7 +15091,7 @@ bool SMPInstr::BuildCallRTL(void) {
 // Build the RTL for a return instruction, with or without extra bytes popped off stack
 bool SMPInstr::BuildReturnRTL(void) {
 	std::size_t OpNum;
-	uintptr_t PopBytes = global_STARS_program->GetSTARS_ISA_Bytewidth();  // default: pop off return address
+	STARS_uval_t PopBytes = (STARS_uval_t) global_STARS_program->GetSTARS_ISA_Bytewidth();  // default: pop off return address
 
 	switch (this->GetIDAOpcode()) {
 		// Returns modified by operand size prefixes
@@ -15548,6 +15562,7 @@ bool SMPInstr::BuildPopRTL(void) {
 				TempRT->SetOperator(SMP_ASSIGN);
 				OpSize = GetOpDataSize(TempOp);
 				STARSOpndTypePtr StackOp = this->STARSInstPtr->MakeMemDisplacementOpnd(STARS_x86_R_sp, STARS_x86_R_none, 0, 0);
+				StackOp->SetByteWidth(OpSize);
 				TempRT->SetRightOperand(StackOp);
 				this->RTL.push_back(TempRT);
 				// Now create the stack pointer increment effect.
@@ -15707,6 +15722,7 @@ bool SMPInstr::BuildPushRTL(void) {
 				TempRT->SetOperator(SMP_ASSIGN);
 				STARSOpndTypePtr StackOp = this->STARSInstPtr->MakeMemDisplacementOpnd(STARS_x86_R_sp, STARS_x86_R_none, 0,
 					-((STARS_ea_t) OpSize));
+				StackOp->SetByteWidth(OpSize);
 				TempRT->SetLeftOperand(StackOp);
 				this->RTL.push_back(TempRT);
 				TempRT = NULL;
diff --git a/src/base/SMPProgram.cpp b/src/base/SMPProgram.cpp
index 474e56cd0b7982a28222a71194b91f2ed9565e58..a14ba9cf298aaa91557547f565cbad616ef52609 100644
--- a/src/base/SMPProgram.cpp
+++ b/src/base/SMPProgram.cpp
@@ -941,6 +941,7 @@ void SMPProgram::ProcessExceptionHandlingFileSections(void) {
 	string EHFileName(global_STARS_program->GetRootFileName());
 	string FileSuffix(".eh_frame_addrs");
 	EHFileName += FileSuffix;
+	bool mode64 = (global_STARS_program->GetSTARS_ISA_Bitwidth() == 64);
 
 	FILE *EHAddrsFile = SMP_fopen(EHFileName.c_str(), "r");
 	if (EHAddrsFile == NULL) {
@@ -950,12 +951,12 @@ void SMPProgram::ProcessExceptionHandlingFileSections(void) {
 
 	while (!SMP_feof(EHAddrsFile)) {
 		STARS_ea_t ExceptionFuncAddr;
-// #ifdef __EA64__
-#if 1
-		int ReadCount = SMP_fscanf(EHAddrsFile, "%llx", &ExceptionFuncAddr);
-#else
-		int ReadCount = SMP_fscanf(EHAddrsFile, "%x", &ExceptionFuncAddr);
-#endif
+		int ReadCount;
+		if (mode64)
+			ReadCount = SMP_fscanf(EHAddrsFile, "%Lx", &ExceptionFuncAddr);
+		else
+			ReadCount = SMP_fscanf(EHAddrsFile, "%x", &ExceptionFuncAddr);
+
 		if (1 == ReadCount) { // success
 			SMPFunction *EHFunc = this->FindFunction(ExceptionFuncAddr);
 			if (NULL == EHFunc) {
diff --git a/src/drivers/idapro/SMPStaticAnalyzer.cpp b/src/drivers/idapro/SMPStaticAnalyzer.cpp
index a79c5559b40eb406b36a562123bc614938e3c725..a8c55b1cd3f483e3fe7565d79c5daef56c911748 100644
--- a/src/drivers/idapro/SMPStaticAnalyzer.cpp
+++ b/src/drivers/idapro/SMPStaticAnalyzer.cpp
@@ -315,6 +315,7 @@ void IDAP_run(int arg) {
 	time_t current;
 
 	time(&start);
+	SMP_msg("delay for 15 seconds.\n");
 	printf("delay for 15 seconds.\n");
 	do {
 		time(&current);
diff --git a/tests/commit/save-busybox.psexe.infoannot b/tests/commit/save-busybox.psexe.infoannot
index fe572988db5d0cd6818287e49b4e1f5328ac2e73..cb051a686ef4fcd2aa4f9d96a28dd10c5643aa1b 100644
--- a/tests/commit/save-busybox.psexe.infoannot
+++ b/tests/commit/save-busybox.psexe.infoannot
@@ -4473,7 +4473,7 @@
             45b502   1252 FUNC RETURNTYPE RAX 4
             45b502   1252 FUNC INARGS    6  ARG0 1 ARG1 1 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             45b5a5      2 INSTR CHECK OVERFLOW SIGNED 32  ESI ZZ inc     esi 
-            45b946      2 INSTR CHECK UNDERFLOW UNKNOWNSIGN 32  EDI ZZ dec     edi 
+            45b946      2 INSTR CHECK UNDERFLOW SIGNED 32  EDI ZZ dec     edi 
             45b9e6    123 FUNC RETURNTYPE RAX 0
             45b9e6    123 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             45ba61    929 FUNC RETURNTYPE RAX 96
@@ -4505,9 +4505,9 @@
             45c478      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+64 ZZ IDIOM 18 MEMORYSINK lea     r8, [rbp+40h] 
             45c66a      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EAX ZZ IDIOM 31 sub     eax, 61h 
             45c6c2      3 INSTR CHECK OVERFLOW NOFLAGSIGNED 32 RDX+1 ZZ lea     esi, [rdx+1] 
-            45c8c9      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+1 ZZ lea     esi, [r13+1] 
+            45c8c9      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+1 ZZ lea     esi, [r13+1] 
             45c97b      3 INSTR CHECK TRUNCATION UNSIGNED 32 EBX 8 BL ZZ IDIOM 5 movzx   edi, bl 
-            45c988      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R13+1 ZZ lea     esi, [r13+1] 
+            45c988      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R13+1 ZZ lea     esi, [r13+1] 
             45ca04      3 INSTR CHECK UNDERFLOW UNSIGNED 32  EAX ZZ IDIOM 31 sub     eax, 61h 
             45ca6e      3 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 32 RBX+1 ZZ lea     esi, [rbx+1] 
             45ca94      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R12+RBX ZZ lea     edx, [r12+rbx-1] 
@@ -4661,7 +4661,7 @@
             4615df      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+1] 
             4615e3      2 INSTR CHECK TRUNCATION UNSIGNED 64 RBP 32 EBP ZZ IDIOM 30 mov     esi, ebp 
             4615e9      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, edi 
-            461686      2 INSTR CHECK TRUNCATION UNSIGNED 64 RAX 32 EAX ZZ IDIOM 30 mov     esi, eax 
+            461686      2 INSTR CHECK TRUNCATION UNSIGNED 32 EAX 32 EAX ZZ IDIOM 30 mov     esi, eax 
             46168e      2 INSTR CHECK UNDERFLOW UNSIGNED 32  ESI ZZ IDIOM 19 sub     esi, ebp 
             461785      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+16 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+10h]  ; preg 
             4617e0      5 INSTR MEMSET STACKOFFSET_ESP 32 SIZE 80 ZZ call    _memset 
@@ -5474,7 +5474,7 @@
             474953    634 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             474953    634 FUNC PROBLEM sub_474953 CALLUNRESOLVED 
             4749ab      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ inc     rdi 
-            474a01      4 INSTR CHECK OVERFLOW SIGNED 64  RDI ZZ add     rdi, 20h 
+            474a01      4 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDI ZZ add     rdi, 20h 
             474a18      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+28 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+1Ch]  ; dest 
             474bcd    110 FUNC RETURNTYPE RAX 1
             474bcd    110 FUNC INARGS    6  ARG0 4 ARG1 1 ARG2 0 ARG3 1 ARG4 0 ARG5 0 
@@ -7318,8 +7318,6 @@
             49df4e      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+48 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+30h]  ; s 
             49e048      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+244 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbp+0F4h] 
             49e04f      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rax+1] 
-            49e0a0      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edx, eax 
-            49e0bb      2 INSTR CHECK TRUNCATION UNKNOWNSIGN 64 RAX 32 EAX ZZ mov     edx, eax 
             49e201      7 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+136 ZZ IDIOM 18 MEMORYSINK lea     rsi, [rbp+88h] 
             49e248      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBX+4 ZZ IDIOM 18 STACKMEMSINK lea     rdi, [rbx+4] 
             49e251      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 RBP+116 ZZ IDIOM 18 MEMORYSINK lea     rdx, [rbp+74h] 
diff --git a/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id b/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
index 2d3eb955f9fe70e3961203d38da4574d407cf984..d9c923f13d2bbdc60d405d6cac8fc515ac0f901e 100644
--- a/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
+++ b/tests/commit/save-ffmpeg.psexe.infoannot.REMOVED.git-id
@@ -1 +1 @@
-ccc239a03cb1e8442fe4c65e2438d5f18c95bb28
\ No newline at end of file
+ef5828c47345c5fb7ef1c6273fbf15e5b31c08b2
\ No newline at end of file
diff --git a/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id b/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id
index c70839e1a331d5b8ffa1dd5cb9b2e421e7a58d97..430778170aabbbb3a9083253d00f6585de777d96 100644
--- a/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id
+++ b/tests/commit/save-gimp.psexe.infoannot.REMOVED.git-id
@@ -1 +1 @@
-5091b89ca5c99b8fc7d520253c128c2bea76d538
\ No newline at end of file
+cc136a8a3e4244517e73435a79c64b3b1fe92938
\ No newline at end of file
diff --git a/tests/commit/save-gnome-calculator.psexe.infoannot b/tests/commit/save-gnome-calculator.psexe.infoannot
index 261082475c8296de1ca80ef2049e8f3cc143955f..f0021c506b260cfa1d647a024a7802b1d461466f 100644
--- a/tests/commit/save-gnome-calculator.psexe.infoannot
+++ b/tests/commit/save-gnome-calculator.psexe.infoannot
@@ -1442,7 +1442,7 @@
             42032b      3 INSTR CHECK UNDERFLOW SIGNED 64  RSI ZZ sub     rsi, rax 
             420370    166 FUNC RETURNTYPE RAX 1
             420370    166 FUNC INARGS    3  ARG0 4 ARG1 0 ARG2 0 
-            4203af      3 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RCX ZZ add     rcx, r8 
+            4203af      3 INSTR CHECK OVERFLOW UNSIGNED 64  RCX ZZ add     rcx, r8 
             4203e9      3 INSTR CHECK UNDERFLOW UNSIGNED 64  R8 ZZ sub     r8, rax 
             420420    361 FUNC RETURNTYPE RAX 1
             420420    361 FUNC INARGS    6  ARG0 4 ARG1 96 ARG2 96 ARG3 1 ARG4 0 ARG5 0 
diff --git a/tests/commit/save-less.psexe.infoannot b/tests/commit/save-less.psexe.infoannot
index 82d179262e64f82cb691ec28459cac6a5f6bbff4..1e0f76d7d864b8ba8319ffb076f42ebf595a615b 100644
--- a/tests/commit/save-less.psexe.infoannot
+++ b/tests/commit/save-less.psexe.infoannot
@@ -159,7 +159,7 @@
             402040     35 FUNC INARGS    4  ARG0 4 ARG1 0 ARG2 0 ARG3 1 
             402070    120 FUNC RETURNTYPE RAX 1
             402070    120 FUNC INARGS    4  ARG0 0 ARG1 4 ARG2 0 ARG3 1 
-            4020a0      4 INSTR CHECK OVERFLOW NOFLAGSIGNED 64 R9+-97 ZZ lea     r10d, [r9-61h] 
+            4020a0      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 R9+-97 ZZ lea     r10d, [r9-61h] 
             4020f0    112 FUNC RETURNTYPE RAX 0
             4020f0    112 FUNC INARGS    6  ARG0 1 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             402160     50 FUNC RETURNTYPE RAX 4
diff --git a/tests/commit/save-toy.exe.infoannot b/tests/commit/save-toy.exe.infoannot
index fd05339ae9a292e2dc590ba916962d94e629f54d..78679302fbd065be0a887cf405b2127f90022938 100644
--- a/tests/commit/save-toy.exe.infoannot
+++ b/tests/commit/save-toy.exe.infoannot
@@ -1,27 +1,27 @@
-   8048290     23 FUNC RETURNTYPE EAX 0
-   80482b8      6 FUNC RETURNTYPE EAX 0
-   80482b8      6 FUNC PROBLEM .__gmon_start__ JUMPUNRESOLVED 
-   80482c8      6 FUNC RETURNTYPE EAX 0
-   80482c8      6 FUNC PROBLEM .__libc_start_main JUMPUNRESOLVED 
-   80482d8      6 FUNC RETURNTYPE EAX 0
-   80482d8      6 FUNC PROBLEM .scanf JUMPUNRESOLVED 
-   80482e8      6 FUNC RETURNTYPE EAX 0
-   80482e8      6 FUNC PROBLEM .printf CHUNKS JUMPUNRESOLVED 
-   80482f8      6 FUNC RETURNTYPE EAX 0
-   80482f8      6 FUNC PROBLEM .puts JUMPUNRESOLVED 
-   8048310     34 FUNC RETURNTYPE EAX 0
-   8048334     38 FUNC RETURNTYPE EAX 0
-   8048360     47 FUNC RETURNTYPE EAX 4
-   8048360     47 FUNC PROBLEM __do_global_dtors_aux CALLUNRESOLVED 
-   8048390     35 FUNC RETURNTYPE EAX 0
-   8048390     35 FUNC PROBLEM frame_dummy CALLUNRESOLVED 
-   80483b4    163 FUNC RETURNTYPE EAX 1
-   8048460      5 FUNC RETURNTYPE EAX 0
-   8048470    105 FUNC RETURNTYPE EAX 4
-   8048470    105 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 0 
-   8048470    105 FUNC PROBLEM __libc_csu_init CALLUNRESOLVED 
-   80484d9      4 FUNC RETURNTYPE EAX 0
-   80484e0     40 FUNC RETURNTYPE EAX 0
-   80484e0     40 FUNC PROBLEM __do_global_ctors_aux CALLUNRESOLVED 
-   8048508     28 FUNC RETURNTYPE EAX 4
+           8048290     23 FUNC RETURNTYPE EAX 0
+           80482b8      6 FUNC RETURNTYPE EAX 0
+           80482b8      6 FUNC PROBLEM .__gmon_start__ JUMPUNRESOLVED 
+           80482c8      6 FUNC RETURNTYPE EAX 0
+           80482c8      6 FUNC PROBLEM .__libc_start_main JUMPUNRESOLVED 
+           80482d8      6 FUNC RETURNTYPE EAX 0
+           80482d8      6 FUNC PROBLEM .scanf JUMPUNRESOLVED 
+           80482e8      6 FUNC RETURNTYPE EAX 0
+           80482e8      6 FUNC PROBLEM .printf CHUNKS JUMPUNRESOLVED 
+           80482f8      6 FUNC RETURNTYPE EAX 0
+           80482f8      6 FUNC PROBLEM .puts JUMPUNRESOLVED 
+           8048310     34 FUNC RETURNTYPE EAX 0
+           8048334     38 FUNC RETURNTYPE EAX 0
+           8048360     47 FUNC RETURNTYPE EAX 4
+           8048360     47 FUNC PROBLEM __do_global_dtors_aux CALLUNRESOLVED 
+           8048390     35 FUNC RETURNTYPE EAX 0
+           8048390     35 FUNC PROBLEM frame_dummy CALLUNRESOLVED 
+           80483b4    163 FUNC RETURNTYPE EAX 1
+           8048460      5 FUNC RETURNTYPE EAX 0
+           8048470    105 FUNC RETURNTYPE EAX 4
+           8048470    105 FUNC INARGS    3  ARG0 0 ARG1 0 ARG2 0 
+           8048470    105 FUNC PROBLEM __libc_csu_init CALLUNRESOLVED 
+           80484d9      4 FUNC RETURNTYPE EAX 0
+           80484e0     40 FUNC RETURNTYPE EAX 0
+           80484e0     40 FUNC PROBLEM __do_global_ctors_aux CALLUNRESOLVED 
+           8048508     28 FUNC RETURNTYPE EAX 4
    8000000      2 SUCCESS ANALYSISCOMPLETED
diff --git a/tests/commit/save-xedit.psexe.infoannot b/tests/commit/save-xedit.psexe.infoannot
index 98fd23fb96f10cd44bc910c84c3d084cdef7d0af..2349c6e71144ee96e54cc7c9edbebe3366c7a350 100644
--- a/tests/commit/save-xedit.psexe.infoannot
+++ b/tests/commit/save-xedit.psexe.infoannot
@@ -2235,9 +2235,9 @@
             46c57f      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, [rsp+0D8h+var_60] 
             46c61a      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  R9 ZZ add     r9, [rsp+0D8h+var_90] 
             46c679      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RDX ZZ IDIOM 18 MEMORYSINK add     rdx, [rsp+0D8h+var_60] 
-            46c72c      9 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 imul    rsi, [rsp+0D8h+var_50] 
-            46c781      9 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 imul    rsi, [rsp+0D8h+s] 
-            46c7d7      9 INSTR CHECK OVERFLOW UNKNOWNSIGN 64 RSI ZZ IDIOM 33 imul    rsi, [rsp+0D8h+var_48] 
+            46c72c      9 INSTR CHECK OVERFLOW UNSIGNED 64 RSI ZZ IDIOM 33 imul    rsi, [rsp+0D8h+var_50] 
+            46c781      9 INSTR CHECK OVERFLOW UNSIGNED 64 RSI ZZ IDIOM 33 imul    rsi, [rsp+0D8h+s] 
+            46c7d7      9 INSTR CHECK OVERFLOW UNSIGNED 64 RSI ZZ IDIOM 33 imul    rsi, [rsp+0D8h+var_48] 
             46c858      5 INSTR CHECK OVERFLOW UNKNOWNSIGN 64  RSI ZZ add     rsi, [rsp+0D8h+var_A8] 
             46cb14      4 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RDX*4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r14+rdx*4] 
             46cb14      4 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+RDX*4 ZZ IDIOM 18 MEMORYSINK lea     rdi, [r14+rdx*4] 
@@ -2423,8 +2423,8 @@
             470a3d      5 INSTR CHECK OVERFLOW NOFLAGUNKNOWNSIGN 64 RBX+RAX+1 ZZ IDIOM 18 MEMORYSINK lea     rdi, [rbx+rax+1] 
             470a9f      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+RDI ZZ IDIOM 32 lea     edi, [r14+rdi+2] 
             470a9f      5 INSTR CHECK OVERFLOW NOFLAGUNSIGNED 64 R14+RDI+2 ZZ IDIOM 32 lea     edi, [r14+rdi+2] 
-            470aa4      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, ebx 
-            470aa6      2 INSTR CHECK OVERFLOW UNKNOWNSIGN 32  EDI ZZ add     edi, eax 
+            470aa4      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, ebx 
+            470aa6      2 INSTR CHECK OVERFLOW UNSIGNED 32  EDI ZZ add     edi, eax 
             470ac0    137 FUNC RETURNTYPE RAX 0
             470ac0    137 FUNC INARGS    6  ARG0 0 ARG1 0 ARG2 0 ARG3 0 ARG4 0 ARG5 0 
             470ac0    137 FUNC PROBLEM init CALLUNRESOLVED 
diff --git a/tests/commit/trimmed-sorted-save-busybox.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-busybox.psexe.annot.REMOVED.git-id
index 17a7a5629eb6570e588e1687e0a1e4586425fe07..336a11d6a5c0c766c1e7019b6b96973014275ea5 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 @@
-25e21befecb0e87941eb3c49d8aa768fcd213129
\ No newline at end of file
+9806662ab89774b881c363097cb18b75263c0ac5
\ 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 810fd4ca8fa7d6abc8c63d914e30d53f03497dda..1eaa48c48abdbbca42c84a5310771967bbf1a68f 100644
--- a/tests/commit/trimmed-sorted-save-bzip2.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-bzip2.psexe.annot
@@ -600,7 +600,6 @@
             4013b4      1 INSTR BELONGTO 4013a0 
             4013b4      1 INSTR DEADREGS  EFLAGS R13 ZZ push    rbx 
             4013b4     -3 INSTR LOCAL NoWarn push    rbx 
-            4013b5     16 DATAREF STACK 271 esp + 8 CHILDOF 270 OFFSET 8 LOCALVAR ptr 
             4013b5     24 DATAREF STACK 270 esp + 0 PARENT LocalFrame LOCALFRAME
             4013b5     32 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
             4013b5      4 INSTR BELONGTO 4013a0 
@@ -1825,9 +1824,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -1849,7 +1848,7 @@
             401e20     23 FUNC GLOBAL sub_401E20 FUNC_SAFE NOFP RET             401e36 
             401e20      4 INSTR BELONGTO 401e20 
             401e20      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            401e20      8 DATAREF STACK 272 esp + 0 PARENT LocalFrame LOCALFRAME
+            401e20      8 DATAREF STACK 271 esp + 0 PARENT LocalFrame LOCALFRAME
             401e20      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             401e24      7 INSTR BELONGTO 401e20 
             401e24      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -1879,7 +1878,7 @@
             401e45     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             401e45      4 INSTR BELONGTO 401e40 
             401e45      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            401e45      8 DATAREF STACK 273 esp + 0 PARENT LocalFrame LOCALFRAME
+            401e45      8 DATAREF STACK 272 esp + 0 PARENT LocalFrame LOCALFRAME
             401e45      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             401e49     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_6071F8, 0 
             401e49      7 INSTR BELONGTO 401e40 
@@ -1948,14 +1947,10 @@
             401ed1      1 INSTR BELONGTO 401eb0 
             401ee0      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 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
             401ee0      0 FUNC MMSAFENESS UNSAFE
-            401ee0     16 DATAREF STACK 278 esp + 40 CHILDOF 274 OFFSET 40 LOCALVAR var_10 
-            401ee0      1 DATAREF STACK 276 esp + 31 CHILDOF 274 OFFSET 31 LOCALVAR var_19 
             401ee0    206 FUNC GLOBAL sub_401EE0 FUNC_UNSAFE NOFP RET             401fad 
-            401ee0     31 DATAREF STACK 275 esp + 0 CHILDOF 274 OFFSET 0 LOCALVAR var_38 
             401ee0      4 INSTR BELONGTO 401ee0 
             401ee0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 ZZ sub     rsp, 38h 
-            401ee0     56 DATAREF STACK 274 esp + 0 PARENT LocalFrame LOCALFRAME
-            401ee0      8 DATAREF STACK 277 esp + 32 CHILDOF 274 OFFSET 32 LOCALVAR var_18 
+            401ee0     56 DATAREF STACK 273 esp + 0 PARENT LocalFrame LOCALFRAME
             401ee0      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             401ee4     -2 INSTR LOCAL n R11 ZZ  AlwaysNUM xor     r11d, r11d 
             401ee4      3 INSTR BELONGTO 401ee0 
@@ -2096,12 +2091,9 @@
             401fba      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbp, rsi 
             401fbd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
             401fbd      5 INSTR BELONGTO 401fb0 
-            401fc2     24 DATAREF STACK 279 esp + 0 PARENT LocalFrame LOCALFRAME
+            401fc2     24 DATAREF STACK 274 esp + 0 PARENT LocalFrame LOCALFRAME
             401fc2      4 INSTR BELONGTO 401fb0 
             401fc2      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 18h 
-            401fc2      8 DATAREF STACK 280 esp + 0 CHILDOF 279 OFFSET 0 LOCALVAR var_18 
-            401fc2      8 DATAREF STACK 281 esp + 8 CHILDOF 279 OFFSET 8 LOCALVAR var_10 
-            401fc2      8 DATAREF STACK 282 esp + 16 CHILDOF 279 OFFSET 16 LOCALVAR var_8 
             401fc2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             401fc6      3 INSTR BELONGTO 401fb0 
             401fc6      3 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     rbx, rdi 
@@ -2246,7 +2238,7 @@
             402090      4 INSTR BELONGTO 402090 
             402090      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ sub     rsp, 8 
             402090     61 FUNC GLOBAL sub_402090 FUNC_UNSAFE NOFP NORET             4020cc 
-            402090      8 DATAREF STACK 283 esp + 0 PARENT LocalFrame LOCALFRAME
+            402090      8 DATAREF STACK 275 esp + 0 PARENT LocalFrame LOCALFRAME
             402090      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402094      7 INSTR BELONGTO 402090 
             402094      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, cs:stderr  ; s 
@@ -2281,9 +2273,8 @@
             4020d1      2 INSTR BELONGTO 4020d0 
             4020d1      2 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, edi 
             4020d1     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, edi 
-            4020d3    144 DATAREF STACK 286 esp + 16 CHILDOF 284 OFFSET 16 LOCALVAR stat_buf 
-            4020d3    160 DATAREF STACK 284 esp + 0 PARENT LocalFrame LOCALFRAME
-            4020d3      4 DATAREF STACK 285 esp + 0 CHILDOF 284 OFFSET 0 OutArgsRegion OUTARGS
+            4020d3    160 DATAREF STACK 276 esp + 0 PARENT LocalFrame LOCALFRAME
+            4020d3      4 DATAREF STACK 277 esp + 0 CHILDOF 276 OFFSET 0 OutArgsRegion OUTARGS
             4020d3      7 INSTR BELONGTO 4020d0 
             4020d3      7 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 0A0h 
             4020d3      8 MEMORYHOLE STACK esp + 160 CalleeSavedRegs 
@@ -2489,7 +2480,7 @@
             402280     45 FUNC GLOBAL sub_402280 FUNC_UNSAFE NOFP NORET             4022ac 
             402280      4 INSTR BELONGTO 402280 
             402280      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ sub     rsp, 8 
-            402280      8 DATAREF STACK 287 esp + 0 PARENT LocalFrame LOCALFRAME
+            402280      8 DATAREF STACK 278 esp + 0 PARENT LocalFrame LOCALFRAME
             402280      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402284      7 INSTR BELONGTO 402280 
             402284      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rdi, cs:stderr 
@@ -2517,7 +2508,7 @@
             4022b0     40 FUNC GLOBAL sub_4022B0 FUNC_UNSAFE NOFP RET             4022d7 
             4022b0      4 INSTR BELONGTO 4022b0 
             4022b0      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-            4022b0      8 DATAREF STACK 288 esp + 0 PARENT LocalFrame LOCALFRAME
+            4022b0      8 DATAREF STACK 279 esp + 0 PARENT LocalFrame LOCALFRAME
             4022b0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4022b4     -1 INSTR LOCAL NoMetaUpdate call    _BZ2_bzlibVersion 
             4022b4      5 INSTR BELONGTO 4022b0 
@@ -2622,7 +2613,7 @@
             402380      4 INSTR BELONGTO 402380 
             402380      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ sub     rsp, 8 
             402380     50 FUNC GLOBAL sub_402380 FUNC_UNSAFE NOFP NORET             4023b1 
-            402380      8 DATAREF STACK 289 esp + 0 PARENT LocalFrame LOCALFRAME
+            402380      8 DATAREF STACK 280 esp + 0 PARENT LocalFrame LOCALFRAME
             402380      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402384      7 INSTR BELONGTO 402380 
             402384      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rdi, cs:stderr 
@@ -2653,7 +2644,7 @@
             4023c0      4 INSTR BELONGTO 4023c0 
             4023c0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 ZZ sub     rsp, 8 
             4023c0     53 FUNC GLOBAL sub_4023C0 FUNC_UNSAFE NOFP NORET             4023f4 
-            4023c0      8 DATAREF STACK 290 esp + 0 PARENT LocalFrame LOCALFRAME
+            4023c0      8 DATAREF STACK 281 esp + 0 PARENT LocalFrame LOCALFRAME
             4023c0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4023c4      3 INSTR BELONGTO 4023c0 
             4023c4      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 ZZ mov     r8, rdi 
@@ -2686,7 +2677,7 @@
             402400    109 FUNC GLOBAL handler FUNC_UNSAFE NOFP NORET             40246c 
             402400      4 INSTR BELONGTO 402400 
             402400      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ sub     rsp, 8 
-            402400      8 DATAREF STACK 291 esp + 0 PARENT LocalFrame LOCALFRAME
+            402400      8 DATAREF STACK 282 esp + 0 PARENT LocalFrame LOCALFRAME
             402400      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402404     -1 INSTR LOCAL NoMetaUpdate cmp     cs:dword_608350, 1 
             402404      7 INSTR BELONGTO 402400 
@@ -2749,7 +2740,7 @@
             402470      4 INSTR BELONGTO 402470 
             402470      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ sub     rsp, 8 
             402470     62 FUNC GLOBAL sub_402470 FUNC_UNSAFE NOFP NORET             4024ad 
-            402470      8 DATAREF STACK 292 esp + 0 PARENT LocalFrame LOCALFRAME
+            402470      8 DATAREF STACK 283 esp + 0 PARENT LocalFrame LOCALFRAME
             402470      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402474      7 INSTR BELONGTO 402470 
             402474      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rcx, cs:s 
@@ -2835,42 +2826,11 @@
             4024ec      1 INSTR BELONGTO 4024e0 
             4024ec      1 INSTR DEADREGS  EFLAGS RAX R12 R13 R15 ZZ push    rbx 
             4024ec     -3 INSTR LOCAL NoWarn push    rbx 
-            4024ed     16 DATAREF STACK 296 esp + 32 CHILDOF 293 OFFSET 32 LOCALVAR var_1478 
-            4024ed     16 DATAREF STACK 298 esp + 72 CHILDOF 293 OFFSET 72 LOCALVAR stream 
-            4024ed     16 DATAREF STACK 325 esp + 5208 CHILDOF 293 OFFSET 5208 LOCALVAR var_40 
-            4024ed      1 DATAREF STACK 308 esp + 5184 CHILDOF 293 OFFSET 5184 LOCALVAR var_58 
-            4024ed      1 DATAREF STACK 309 esp + 5185 CHILDOF 293 OFFSET 5185 LOCALVAR var_57 
-            4024ed      1 DATAREF STACK 310 esp + 5186 CHILDOF 293 OFFSET 5186 LOCALVAR var_56 
-            4024ed      1 DATAREF STACK 311 esp + 5187 CHILDOF 293 OFFSET 5187 LOCALVAR var_55 
-            4024ed      1 DATAREF STACK 312 esp + 5188 CHILDOF 293 OFFSET 5188 LOCALVAR var_54 
-            4024ed      1 DATAREF STACK 313 esp + 5189 CHILDOF 293 OFFSET 5189 LOCALVAR var_53 
-            4024ed      1 DATAREF STACK 314 esp + 5190 CHILDOF 293 OFFSET 5190 LOCALVAR var_52 
-            4024ed      1 DATAREF STACK 315 esp + 5191 CHILDOF 293 OFFSET 5191 LOCALVAR var_51 
-            4024ed      1 DATAREF STACK 317 esp + 5200 CHILDOF 293 OFFSET 5200 LOCALVAR var_48 
-            4024ed      1 DATAREF STACK 318 esp + 5201 CHILDOF 293 OFFSET 5201 LOCALVAR var_47 
-            4024ed      1 DATAREF STACK 319 esp + 5202 CHILDOF 293 OFFSET 5202 LOCALVAR var_46 
-            4024ed      1 DATAREF STACK 320 esp + 5203 CHILDOF 293 OFFSET 5203 LOCALVAR var_45 
-            4024ed      1 DATAREF STACK 321 esp + 5204 CHILDOF 293 OFFSET 5204 LOCALVAR var_44 
-            4024ed      1 DATAREF STACK 322 esp + 5205 CHILDOF 293 OFFSET 5205 LOCALVAR var_43 
-            4024ed      1 DATAREF STACK 323 esp + 5206 CHILDOF 293 OFFSET 5206 LOCALVAR var_42 
-            4024ed      1 DATAREF STACK 324 esp + 5207 CHILDOF 293 OFFSET 5207 LOCALVAR var_41 
-            4024ed     24 DATAREF STACK 297 esp + 48 CHILDOF 293 OFFSET 48 LOCALVAR var_1468 
-            4024ed     32 DATAREF STACK 306 esp + 5120 CHILDOF 293 OFFSET 5120 LOCALVAR var_98 
-            4024ed     32 DATAREF STACK 307 esp + 5152 CHILDOF 293 OFFSET 5152 LOCALVAR var_78 
             4024ed     48 MEMORYHOLE STACK esp + 5224 CalleeSavedRegs 
-            4024ed      4 DATAREF STACK 299 esp + 88 CHILDOF 293 OFFSET 88 LOCALVAR var_1440 
-            4024ed      4 DATAREF STACK 300 esp + 92 CHILDOF 293 OFFSET 92 LOCALVAR var_143C 
-            4024ed      4 DATAREF STACK 301 esp + 96 CHILDOF 293 OFFSET 96 LOCALVAR var_1438 
-            4024ed      4 DATAREF STACK 302 esp + 100 CHILDOF 293 OFFSET 100 LOCALVAR var_1434 
-            4024ed      4 DATAREF STACK 303 esp + 104 CHILDOF 293 OFFSET 104 LOCALVAR var_1430 
-            4024ed      4 DATAREF STACK 304 esp + 108 CHILDOF 293 OFFSET 108 LOCALVAR var_142C 
-            4024ed   5008 DATAREF STACK 305 esp + 112 CHILDOF 293 OFFSET 112 LOCALVAR ptr 
-            4024ed   5224 DATAREF STACK 293 esp + 0 PARENT LocalFrame LOCALFRAME
+            4024ed   5224 DATAREF STACK 284 esp + 0 PARENT LocalFrame LOCALFRAME
             4024ed      7 INSTR BELONGTO 4024e0 
             4024ed      7 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 R15 ZZ sub     rsp, 1468h 
-            4024ed      8 DATAREF STACK 294 esp + 0 CHILDOF 293 OFFSET 0 OutArgsRegion OUTARGS
-            4024ed      8 DATAREF STACK 295 esp + 24 CHILDOF 293 OFFSET 24 LOCALVAR var_1480 
-            4024ed      8 DATAREF STACK 316 esp + 5192 CHILDOF 293 OFFSET 5192 LOCALVAR var_50 
+            4024ed      8 DATAREF STACK 285 esp + 0 CHILDOF 284 OFFSET 0 OutArgsRegion OUTARGS
             4024ed      8 MEMORYHOLE STACK esp + 5272 ReturnAddress 
             4024f4     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, fs:28h 
             4024f4      9 INSTR BELONGTO 4024e0 
@@ -3466,17 +3426,10 @@
             402983     -3 INSTR LOCAL NoWarn push    rbx 
             402984      3 INSTR BELONGTO 402980 
             402984      3 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ mov     rbx, rdi 
-            402987  10048 DATAREF STACK 326 esp + 0 PARENT LocalFrame LOCALFRAME
-            402987     12 DATAREF STACK 327 esp + 8 CHILDOF 326 OFFSET 8 LOCALVAR var_2750 
+            402987  10048 DATAREF STACK 286 esp + 0 PARENT LocalFrame LOCALFRAME
             402987     24 MEMORYHOLE STACK esp + 10048 CalleeSavedRegs 
-            402987      4 DATAREF STACK 328 esp + 20 CHILDOF 326 OFFSET 20 LOCALVAR var_2744 
-            402987      4 DATAREF STACK 329 esp + 24 CHILDOF 326 OFFSET 24 LOCALVAR var_2740 
-            402987      4 DATAREF STACK 330 esp + 28 CHILDOF 326 OFFSET 28 LOCALVAR var_273C 
-            402987   5000 DATAREF STACK 332 esp + 5040 CHILDOF 326 OFFSET 5040 LOCALVAR var_13A8 
-            402987   5008 DATAREF STACK 331 esp + 32 CHILDOF 326 OFFSET 32 LOCALVAR var_2738 
             402987      7 INSTR BELONGTO 402980 
             402987      7 INSTR DEADREGS  EFLAGS RAX R12 ZZ sub     rsp, 2740h 
-            402987      8 DATAREF STACK 333 esp + 10040 CHILDOF 326 OFFSET 10040 LOCALVAR var_20 
             402987      8 MEMORYHOLE STACK esp + 10072 ReturnAddress 
             40298e      9 INSTR BELONGTO 402980 
             40298e      9 INSTR DEADREGS  EFLAGS RAX R12 ZZ mov     rax, fs:28h 
@@ -3887,15 +3840,8 @@
             402c6b     -3 INSTR LOCAL NoWarn push    rbx 
             402c6c      3 INSTR BELONGTO 402c60 
             402c6c      3 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ mov     rbx, rsi 
-            402c6f  10056 DATAREF STACK 334 esp + 0 PARENT LocalFrame LOCALFRAME
-            402c6f     12 DATAREF STACK 335 esp + 8 CHILDOF 334 OFFSET 8 LOCALVAR var_2760 
-            402c6f     16 DATAREF STACK 341 esp + 10040 CHILDOF 334 OFFSET 10040 LOCALVAR var_30 
+            402c6f  10056 DATAREF STACK 287 esp + 0 PARENT LocalFrame LOCALFRAME
             402c6f     32 MEMORYHOLE STACK esp + 10056 CalleeSavedRegs 
-            402c6f      4 DATAREF STACK 336 esp + 20 CHILDOF 334 OFFSET 20 LOCALVAR var_2754 
-            402c6f      4 DATAREF STACK 337 esp + 24 CHILDOF 334 OFFSET 24 LOCALVAR var_2750 
-            402c6f      4 DATAREF STACK 338 esp + 28 CHILDOF 334 OFFSET 28 LOCALVAR var_274C 
-            402c6f   5000 DATAREF STACK 340 esp + 5040 CHILDOF 334 OFFSET 5040 LOCALVAR var_13B8 
-            402c6f   5008 DATAREF STACK 339 esp + 32 CHILDOF 334 OFFSET 32 LOCALVAR ptr 
             402c6f      7 INSTR BELONGTO 402c60 
             402c6f      7 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ sub     rsp, 2748h 
             402c6f      8 MEMORYHOLE STACK esp + 10088 ReturnAddress 
@@ -4472,11 +4418,9 @@
             403085      5 INSTR BELONGTO 403080 
             403085      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+var_8], rbp 
             403085      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
-            40308a     24 DATAREF STACK 342 esp + 0 PARENT LocalFrame LOCALFRAME
+            40308a     24 DATAREF STACK 288 esp + 0 PARENT LocalFrame LOCALFRAME
             40308a      4 INSTR BELONGTO 403080 
             40308a      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-            40308a      8 DATAREF STACK 343 esp + 8 CHILDOF 342 OFFSET 8 LOCALVAR var_10 
-            40308a      8 DATAREF STACK 344 esp + 16 CHILDOF 342 OFFSET 16 LOCALVAR var_8 
             40308a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             40308e      3 INSTR BELONGTO 403080 
             40308e      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbp, rdi 
@@ -4558,9 +4502,8 @@
             403114     -3 INSTR LOCAL NoWarn push    rbx 
             403115      3 INSTR BELONGTO 403110 
             403115      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-            403118     16 DATAREF STACK 346 esp + 8 CHILDOF 345 OFFSET 8 LOCALVAR s 
             403118     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            403118     24 DATAREF STACK 345 esp + 0 PARENT LocalFrame LOCALFRAME
+            403118     24 DATAREF STACK 289 esp + 0 PARENT LocalFrame LOCALFRAME
             403118      4 INSTR BELONGTO 403110 
             403118      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
             403118      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -4819,11 +4762,9 @@
             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 347 esp + 0 PARENT LocalFrame LOCALFRAME
+            4032ac     24 DATAREF STACK 290 esp + 0 PARENT LocalFrame LOCALFRAME
             4032ac      4 INSTR BELONGTO 4032a0 
             4032ac      4 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ sub     rsp, 18h 
-            4032ac      8 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 
@@ -4879,8 +4820,7 @@
             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 351 esp + 24 CHILDOF 350 OFFSET 24 LOCALVAR var_80 
-            403310    152 DATAREF STACK 350 esp + 0 PARENT LocalFrame LOCALFRAME
+            403310    152 DATAREF STACK 291 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 
@@ -4925,7 +4865,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 352 esp + 0 PARENT LocalFrame LOCALFRAME
+            403350      8 DATAREF STACK 292 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 
@@ -4951,8 +4891,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 354 esp + 0 CHILDOF 353 OFFSET 0 OutArgsRegion OUTARGS
-            403380     24 DATAREF STACK 353 esp + 0 PARENT LocalFrame LOCALFRAME
+            403380     16 DATAREF STACK 294 esp + 0 CHILDOF 293 OFFSET 0 OutArgsRegion OUTARGS
+            403380     24 DATAREF STACK 293 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 
@@ -5112,13 +5052,11 @@
             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 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 355 esp + 0 PARENT LocalFrame LOCALFRAME
+            403487    304 DATAREF STACK 295 esp + 0 PARENT LocalFrame LOCALFRAME
             403487      7 INSTR BELONGTO 403480 
             403487      7 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 130h 
-            403487      8 DATAREF STACK 356 esp + 0 CHILDOF 355 OFFSET 0 OutArgsRegion OUTARGS
+            403487      8 DATAREF STACK 296 esp + 0 CHILDOF 295 OFFSET 0 OutArgsRegion OUTARGS
             403487      8 MEMORYHOLE STACK esp + 328 ReturnAddress 
             40348e     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             40348e      3 INSTR BELONGTO 403480 
@@ -5962,8 +5900,7 @@
             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 360 esp + 24 CHILDOF 359 OFFSET 24 LOCALVAR var_80 
-            403c04    144 DATAREF STACK 359 esp + 0 PARENT LocalFrame LOCALFRAME
+            403c04    144 DATAREF STACK 297 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 
@@ -6298,13 +6235,11 @@
             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 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 361 esp + 0 PARENT LocalFrame LOCALFRAME
+            403ef5    312 DATAREF STACK 298 esp + 0 PARENT LocalFrame LOCALFRAME
             403ef5      7 INSTR BELONGTO 403ef0 
             403ef5      7 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 138h 
-            403ef5      8 DATAREF STACK 362 esp + 0 CHILDOF 361 OFFSET 0 OutArgsRegion OUTARGS
+            403ef5      8 DATAREF STACK 299 esp + 0 CHILDOF 298 OFFSET 0 OutArgsRegion OUTARGS
             403ef5      8 MEMORYHOLE STACK esp + 328 ReturnAddress 
             403efc     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             403efc      3 INSTR BELONGTO 403ef0 
@@ -7048,13 +6983,7 @@
             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 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     56 DATAREF STACK 300 esp + 0 PARENT LocalFrame LOCALFRAME
             40456c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             404570     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             404570      3 INSTR BELONGTO 404540 
@@ -7131,7 +7060,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 372 esp + 0 PARENT LocalFrame LOCALFRAME
+            4045e5      8 DATAREF STACK 301 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 
@@ -7166,7 +7095,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 373 esp + 0 PARENT LocalFrame LOCALFRAME
+            404618      8 DATAREF STACK 302 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 500a659facc6435166be7bd41df9a39a3c45b9eb..ab6d1961f63a8a2cc0276a36659a944490417f2b 100644
--- a/tests/commit/trimmed-sorted-save-destripe.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-destripe.psexe.annot
@@ -545,9 +545,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -674,9 +674,7 @@
             401ca4     -3 INSTR LOCAL NoWarn push    rbp 
             401ca5      3 INSTR BELONGTO 401ca4 
             401ca5      3 INSTR DEADREGS  EFLAGS RAX RDX ZZ mov     rbp, rsp 
-            401ca8     12 DATAREF STACK 144 esp + 0 CHILDOF 143 OFFSET 0 LOCALVAR var_10 
             401ca8     16 DATAREF STACK 143 esp + 0 PARENT LocalFrame LOCALFRAME
-            401ca8      4 DATAREF STACK 145 esp + 12 CHILDOF 143 OFFSET 12 LOCALVAR var_4 
             401ca8      4 INSTR BELONGTO 401ca4 
             401ca8      4 INSTR DEADREGS  EFLAGS RAX RDX ZZ sub     rsp, 10h 
             401ca8      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -713,14 +711,10 @@
             401cc8     -3 INSTR LOCAL NoWarn push    rbp 
             401cc9      3 INSTR BELONGTO 401cc8 
             401cc9      3 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 ZZ mov     rbp, rsp 
-            401ccc     16 DATAREF STACK 151 esp + 48 CHILDOF 146 OFFSET 48 LOCALVAR var_10 
-            401ccc     20 DATAREF STACK 147 esp + 0 CHILDOF 146 OFFSET 0 OutArgsRegion OUTARGS
+            401ccc     20 DATAREF STACK 145 esp + 0 CHILDOF 144 OFFSET 0 OutArgsRegion OUTARGS
             401ccc      4 INSTR BELONGTO 401cc8 
             401ccc      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 R9 ZZ sub     rsp, 40h 
-            401ccc     64 DATAREF STACK 146 esp + 0 PARENT LocalFrame LOCALFRAME
-            401ccc      8 DATAREF STACK 148 esp + 24 CHILDOF 146 OFFSET 24 LOCALVAR var_28 
-            401ccc      8 DATAREF STACK 149 esp + 32 CHILDOF 146 OFFSET 32 LOCALVAR var_20 
-            401ccc      8 DATAREF STACK 150 esp + 40 CHILDOF 146 OFFSET 40 LOCALVAR var_18 
+            401ccc     64 DATAREF STACK 144 esp + 0 PARENT LocalFrame LOCALFRAME
             401ccc      8 MEMORYHOLE STACK esp + 64 CalleeSavedRegs 
             401ccc      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             401cd0     -1 INSTR LOCAL MetadataUnused mov     [rsp+40h+var_10], 0 
@@ -778,19 +772,10 @@
             401d45      1 INSTR BELONGTO 401d41 
             401d45      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             401d45     -3 INSTR LOCAL NoWarn push    rbx 
-            401d46     12 DATAREF STACK 156 esp + 24 CHILDOF 152 OFFSET 24 LOCALVAR var_38 
-            401d46     12 DATAREF STACK 161 esp + 60 CHILDOF 152 OFFSET 60 LOCALVAR var_14 
             401d46     16 MEMORYHOLE STACK esp + 72 CalleeSavedRegs 
-            401d46      4 DATAREF STACK 153 esp + 4 CHILDOF 152 OFFSET 4 LOCALVAR var_4C 
-            401d46      4 DATAREF STACK 157 esp + 36 CHILDOF 152 OFFSET 36 LOCALVAR var_2C 
-            401d46      4 DATAREF STACK 160 esp + 56 CHILDOF 152 OFFSET 56 LOCALVAR var_18 
             401d46      4 INSTR BELONGTO 401d41 
             401d46      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 48h 
-            401d46     72 DATAREF STACK 152 esp + 0 PARENT LocalFrame LOCALFRAME
-            401d46      8 DATAREF STACK 154 esp + 8 CHILDOF 152 OFFSET 8 LOCALVAR var_48 
-            401d46      8 DATAREF STACK 155 esp + 16 CHILDOF 152 OFFSET 16 LOCALVAR var_40 
-            401d46      8 DATAREF STACK 158 esp + 40 CHILDOF 152 OFFSET 40 LOCALVAR var_28 
-            401d46      8 DATAREF STACK 159 esp + 48 CHILDOF 152 OFFSET 48 LOCALVAR var_20 
+            401d46     72 DATAREF STACK 146 esp + 0 PARENT LocalFrame LOCALFRAME
             401d46      8 MEMORYHOLE STACK esp + 88 ReturnAddress 
             401d4a     -1 INSTR LOCAL MetadataUnused mov     [rbp+var_28], rdi 
             401d4a      4 INSTR BELONGTO 401d41 
@@ -1076,44 +1061,10 @@
             401f00     -3 INSTR LOCAL NoWarn push    rbp 
             401f01      3 INSTR BELONGTO 401f00 
             401f01      3 INSTR DEADREGS  EFLAGS ZZ mov     rbp, rsp 
-            401f04     12 DATAREF STACK 174 esp + 168 CHILDOF 162 OFFSET 168 LOCALVAR var_A8 
-            401f04     12 DATAREF STACK 179 esp + 208 CHILDOF 162 OFFSET 208 LOCALVAR s 
-            401f04     12 DATAREF STACK 184 esp + 240 CHILDOF 162 OFFSET 240 LOCALVAR var_60 
-            401f04     12 DATAREF STACK 190 esp + 288 CHILDOF 162 OFFSET 288 LOCALVAR var_30 
-            401f04     16 DATAREF STACK 164 esp + 8 CHILDOF 162 OFFSET 8 LOCALVAR var_148 
-            401f04    336 DATAREF STACK 162 esp + 0 PARENT LocalFrame LOCALFRAME
-            401f04     48 DATAREF STACK 172 esp + 64 CHILDOF 162 OFFSET 64 LOCALVAR var_110 
-            401f04      4 DATAREF STACK 163 esp + 0 CHILDOF 162 OFFSET 0 OutArgsRegion OUTARGS
-            401f04      4 DATAREF STACK 168 esp + 48 CHILDOF 162 OFFSET 48 LOCALVAR var_120 
-            401f04      4 DATAREF STACK 169 esp + 52 CHILDOF 162 OFFSET 52 LOCALVAR var_11C 
-            401f04      4 DATAREF STACK 170 esp + 56 CHILDOF 162 OFFSET 56 LOCALVAR var_118 
-            401f04      4 DATAREF STACK 171 esp + 60 CHILDOF 162 OFFSET 60 LOCALVAR var_114 
-            401f04      4 DATAREF STACK 175 esp + 180 CHILDOF 162 OFFSET 180 LOCALVAR var_9C 
-            401f04      4 DATAREF STACK 180 esp + 220 CHILDOF 162 OFFSET 220 LOCALVAR var_74 
-            401f04      4 DATAREF STACK 181 esp + 224 CHILDOF 162 OFFSET 224 LOCALVAR var_70 
-            401f04      4 DATAREF STACK 182 esp + 228 CHILDOF 162 OFFSET 228 LOCALVAR var_6C 
-            401f04      4 DATAREF STACK 185 esp + 252 CHILDOF 162 OFFSET 252 LOCALVAR var_54 
-            401f04      4 DATAREF STACK 191 esp + 300 CHILDOF 162 OFFSET 300 LOCALVAR var_24 
-            401f04      4 DATAREF STACK 192 esp + 304 CHILDOF 162 OFFSET 304 LOCALVAR var_20 
-            401f04      4 DATAREF STACK 193 esp + 308 CHILDOF 162 OFFSET 308 LOCALVAR var_1C 
-            401f04      4 DATAREF STACK 194 esp + 312 CHILDOF 162 OFFSET 312 LOCALVAR var_18 
-            401f04      4 DATAREF STACK 195 esp + 316 CHILDOF 162 OFFSET 316 LOCALVAR var_14 
-            401f04     56 DATAREF STACK 173 esp + 112 CHILDOF 162 OFFSET 112 LOCALVAR var_E0 
+            401f04    336 DATAREF STACK 147 esp + 0 PARENT LocalFrame LOCALFRAME
+            401f04      4 DATAREF STACK 148 esp + 0 CHILDOF 147 OFFSET 0 OutArgsRegion OUTARGS
             401f04      7 INSTR BELONGTO 401f00 
             401f04      7 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 150h 
-            401f04      8 DATAREF STACK 165 esp + 24 CHILDOF 162 OFFSET 24 LOCALVAR var_138 
-            401f04      8 DATAREF STACK 166 esp + 32 CHILDOF 162 OFFSET 32 LOCALVAR var_130 
-            401f04      8 DATAREF STACK 167 esp + 40 CHILDOF 162 OFFSET 40 LOCALVAR var_128 
-            401f04      8 DATAREF STACK 176 esp + 184 CHILDOF 162 OFFSET 184 LOCALVAR var_98 
-            401f04      8 DATAREF STACK 177 esp + 192 CHILDOF 162 OFFSET 192 LOCALVAR var_90 
-            401f04      8 DATAREF STACK 178 esp + 200 CHILDOF 162 OFFSET 200 LOCALVAR var_88 
-            401f04      8 DATAREF STACK 183 esp + 232 CHILDOF 162 OFFSET 232 LOCALVAR var_68 
-            401f04      8 DATAREF STACK 186 esp + 256 CHILDOF 162 OFFSET 256 LOCALVAR var_50 
-            401f04      8 DATAREF STACK 187 esp + 264 CHILDOF 162 OFFSET 264 LOCALVAR var_48 
-            401f04      8 DATAREF STACK 188 esp + 272 CHILDOF 162 OFFSET 272 LOCALVAR var_40 
-            401f04      8 DATAREF STACK 189 esp + 280 CHILDOF 162 OFFSET 280 LOCALVAR var_38 
-            401f04      8 DATAREF STACK 196 esp + 320 CHILDOF 162 OFFSET 320 LOCALVAR var_10 
-            401f04      8 DATAREF STACK 197 esp + 328 CHILDOF 162 OFFSET 328 LOCALVAR var_8 
             401f04      8 MEMORYHOLE STACK esp + 336 CalleeSavedRegs 
             401f04      8 MEMORYHOLE STACK esp + 344 ReturnAddress 
             401f0b      7 INSTR BELONGTO 401f00 
@@ -2327,23 +2278,11 @@
             402714      1 INSTR BELONGTO 402710 
             402714      1 INSTR DEADREGS  EFLAGS RSI XMM4 ZZ push    rbx 
             402714     -3 INSTR LOCAL NoWarn push    rbx 
-            402715     12 DATAREF STACK 199 esp + 0 CHILDOF 198 OFFSET 0 OutArgsRegion OUTARGS
-            402715    136 DATAREF STACK 198 esp + 0 PARENT LocalFrame LOCALFRAME
-            402715     16 DATAREF STACK 202 esp + 32 CHILDOF 198 OFFSET 32 LOCALVAR var_70 
-            402715     16 DATAREF STACK 211 esp + 120 CHILDOF 198 OFFSET 120 LOCALVAR var_18 
+            402715     12 DATAREF STACK 150 esp + 0 CHILDOF 149 OFFSET 0 OutArgsRegion OUTARGS
+            402715    136 DATAREF STACK 149 esp + 0 PARENT LocalFrame LOCALFRAME
             402715     16 MEMORYHOLE STACK esp + 136 CalleeSavedRegs 
-            402715     20 DATAREF STACK 204 esp + 56 CHILDOF 198 OFFSET 56 LOCALVAR var_58 
-            402715      4 DATAREF STACK 205 esp + 76 CHILDOF 198 OFFSET 76 LOCALVAR var_44 
             402715      7 INSTR BELONGTO 402710 
             402715      7 INSTR DEADREGS  EFLAGS RBX RSI XMM4 ZZ sub     rsp, 88h 
-            402715      8 DATAREF STACK 200 esp + 16 CHILDOF 198 OFFSET 16 LOCALVAR var_80 
-            402715      8 DATAREF STACK 201 esp + 24 CHILDOF 198 OFFSET 24 LOCALVAR var_78 
-            402715      8 DATAREF STACK 203 esp + 48 CHILDOF 198 OFFSET 48 LOCALVAR var_60 
-            402715      8 DATAREF STACK 206 esp + 80 CHILDOF 198 OFFSET 80 LOCALVAR var_40 
-            402715      8 DATAREF STACK 207 esp + 88 CHILDOF 198 OFFSET 88 LOCALVAR var_38 
-            402715      8 DATAREF STACK 208 esp + 96 CHILDOF 198 OFFSET 96 LOCALVAR var_30 
-            402715      8 DATAREF STACK 209 esp + 104 CHILDOF 198 OFFSET 104 LOCALVAR var_28 
-            402715      8 DATAREF STACK 210 esp + 112 CHILDOF 198 OFFSET 112 LOCALVAR var_20 
             402715      8 MEMORYHOLE STACK esp + 152 ReturnAddress 
             40271c      4 INSTR BELONGTO 402710 
             40271c      4 INSTR DEADREGS  EFLAGS RBX RSI XMM4 ZZ mov     [rbp+var_58], rdi 
@@ -3016,13 +2955,7 @@
             402ba7      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
             402bac      4 INSTR BELONGTO 402b80 
             402bac      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-            402bac     56 DATAREF STACK 212 esp + 0 PARENT LocalFrame LOCALFRAME
-            402bac      8 DATAREF STACK 213 esp + 8 CHILDOF 212 OFFSET 8 LOCALVAR var_30 
-            402bac      8 DATAREF STACK 214 esp + 16 CHILDOF 212 OFFSET 16 LOCALVAR var_28 
-            402bac      8 DATAREF STACK 215 esp + 24 CHILDOF 212 OFFSET 24 LOCALVAR var_20 
-            402bac      8 DATAREF STACK 216 esp + 32 CHILDOF 212 OFFSET 32 LOCALVAR var_18 
-            402bac      8 DATAREF STACK 217 esp + 40 CHILDOF 212 OFFSET 40 LOCALVAR var_10 
-            402bac      8 DATAREF STACK 218 esp + 48 CHILDOF 212 OFFSET 48 LOCALVAR var_8 
+            402bac     56 DATAREF STACK 151 esp + 0 PARENT LocalFrame LOCALFRAME
             402bac      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             402bb0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             402bb0      3 INSTR BELONGTO 402b80 
@@ -3099,7 +3032,7 @@
             402c25     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             402c25      4 INSTR BELONGTO 402c20 
             402c25      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-            402c25      8 DATAREF STACK 219 esp + 0 PARENT LocalFrame LOCALFRAME
+            402c25      8 DATAREF STACK 152 esp + 0 PARENT LocalFrame LOCALFRAME
             402c25      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             402c29      7 INSTR BELONGTO 402c20 
             402c29      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:__CTOR_LIST__ 
@@ -3134,7 +3067,7 @@
             402c58     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET             402c65 
             402c58      4 INSTR BELONGTO 402c58 
             402c58      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-            402c58      8 DATAREF STACK 220 esp + 0 PARENT LocalFrame LOCALFRAME
+            402c58      8 DATAREF STACK 153 esp + 0 PARENT LocalFrame LOCALFRAME
             402c58      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402c5c     -1 INSTR LOCAL NoMetaUpdate call    __do_global_dtors_aux 
             402c5c      5 INSTR BELONGTO 402c58 
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 b454286fe5f5ed6704af6341654ae36757b91704..bd67835c5f032113f902ed76f18025396e8efc8f 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 @@
-0646ff8d8e7489cdeb20dca0efbd1c2a8272a07d
\ No newline at end of file
+831f69765e5bc395de3f27327555f4a3b85f5cdb
\ 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 0a40f93cb5272d8b921617d000ab32ed7b7f3b1a..898a06555b7b139f92577f691f2548d311d8d1c5 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 @@
-0e707beafbeb0a1c44edbff65978d826df6663be
\ No newline at end of file
+3f0728ae0c374c01f26b9b0b1a09321961a834d9
\ 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 bb38eebdc9d8c8ca23ff2d608ffa6a29b13bf911..a9bb9109a5feef5b212e1da6e32d4a0cc1c1b19e 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 @@
-27ab611e85f9170237ba8e2668c912ca106c8222
\ No newline at end of file
+829a93b07010d87f7f85a62c199a8260d668b739
\ 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 466f32b05439009ae630fd0187917176de838c26..acaee2e9d43d438bbc5b2071f80cc0b40b18175e 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 @@
-87d812ae6c860655923046b35df2220d50231adb
\ No newline at end of file
+1f7eadd983a631ec252e51d41c72c93e208edca4
\ 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 49799cf258722e269bf3cfe2f069816cc6867e71..9f2a54e6af8db365563edf1a59ea8eec11929832 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 @@
-4b68cf28be7b640d458fe77b9df34c6ee4e537fc
\ No newline at end of file
+12fa289d20c5f335229118732d52878fd8fe01ba
\ 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 08e65ff2cda0a955b5d6b24deba51e65d7469654..978d0b16e2e3eb9c62514ee91585b620c02aafb6 100644
--- a/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-character-map.psexe.annot
@@ -2428,26 +2428,11 @@
             406cec      1 INSTR BELONGTO 406ce0 
             406cec      1 INSTR DEADREGS  EFLAGS R12 R13 ZZ push    rbx 
             406cec     -3 INSTR LOCAL NoWarn push    rbx 
-            406ced     12 DATAREF STACK 685 esp + 64 CHILDOF 677 OFFSET 64 LOCALVAR var_A8 
-            406ced     16 DATAREF STACK 680 esp + 16 CHILDOF 677 OFFSET 16 LOCALVAR var_D8 
-            406ced     16 DATAREF STACK 693 esp + 184 CHILDOF 677 OFFSET 184 LOCALVAR var_30 
             406ced    200 DATAREF STACK 677 esp + 0 PARENT LocalFrame LOCALFRAME
             406ced     32 MEMORYHOLE STACK esp + 200 CalleeSavedRegs 
-            406ced      4 DATAREF STACK 679 esp + 12 CHILDOF 677 OFFSET 12 LOCALVAR var_DC 
-            406ced      4 DATAREF STACK 686 esp + 76 CHILDOF 677 OFFSET 76 LOCALVAR var_9C 
-            406ced      4 DATAREF STACK 690 esp + 168 CHILDOF 677 OFFSET 168 LOCALVAR var_40 
-            406ced      4 DATAREF STACK 691 esp + 172 CHILDOF 677 OFFSET 172 LOCALVAR var_3C 
-            406ced     72 DATAREF STACK 688 esp + 88 CHILDOF 677 OFFSET 88 LOCALVAR var_90 
             406ced      7 INSTR BELONGTO 406ce0 
             406ced      7 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ sub     rsp, 0C8h 
             406ced      8 DATAREF STACK 678 esp + 0 CHILDOF 677 OFFSET 0 OutArgsRegion OUTARGS
-            406ced      8 DATAREF STACK 681 esp + 32 CHILDOF 677 OFFSET 32 LOCALVAR var_C8 
-            406ced      8 DATAREF STACK 682 esp + 40 CHILDOF 677 OFFSET 40 LOCALVAR var_C0 
-            406ced      8 DATAREF STACK 683 esp + 48 CHILDOF 677 OFFSET 48 LOCALVAR var_B8 
-            406ced      8 DATAREF STACK 684 esp + 56 CHILDOF 677 OFFSET 56 LOCALVAR var_B0 
-            406ced      8 DATAREF STACK 687 esp + 80 CHILDOF 677 OFFSET 80 LOCALVAR var_98 
-            406ced      8 DATAREF STACK 689 esp + 160 CHILDOF 677 OFFSET 160 LOCALVAR var_48 
-            406ced      8 DATAREF STACK 692 esp + 176 CHILDOF 677 OFFSET 176 LOCALVAR var_38 
             406ced      8 MEMORYHOLE STACK esp + 232 ReturnAddress 
             406cf4      4 INSTR BELONGTO 406ce0 
             406cf4      4 INSTR DEADREGS  RBX R12 R13 ZZ mov     [rsp+0E8h+var_DC], edi 
@@ -2776,9 +2761,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -2800,7 +2785,7 @@
             406f58     23 FUNC GLOBAL sub_406F58 FUNC_SAFE NOFP RET             406f6e 
             406f58      4 INSTR BELONGTO 406f58 
             406f58      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            406f58      8 DATAREF STACK 694 esp + 0 PARENT LocalFrame LOCALFRAME
+            406f58      8 DATAREF STACK 679 esp + 0 PARENT LocalFrame LOCALFRAME
             406f58      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             406f5c      7 INSTR BELONGTO 406f58 
             406f5c      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -2830,7 +2815,7 @@
             406f75     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             406f75      4 INSTR BELONGTO 406f70 
             406f75      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            406f75      8 DATAREF STACK 695 esp + 0 PARENT LocalFrame LOCALFRAME
+            406f75      8 DATAREF STACK 680 esp + 0 PARENT LocalFrame LOCALFRAME
             406f75      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             406f79     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_60F940, 0 
             406f79      7 INSTR BELONGTO 406f70 
@@ -2917,7 +2902,7 @@
             40701f     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             40701f      4 INSTR BELONGTO 407010 
             40701f      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-            40701f      8 DATAREF STACK 696 esp + 0 PARENT LocalFrame LOCALFRAME
+            40701f      8 DATAREF STACK 681 esp + 0 PARENT LocalFrame LOCALFRAME
             40701f      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             407023     -1 INSTR LOCAL NoMetaUpdate cmp     esi, 5 
             407023      3 INSTR BELONGTO 407010 
@@ -3210,10 +3195,9 @@
             407590     -3 INSTR LOCAL NoWarn push    rbx 
             407591      3 INSTR BELONGTO 407590 
             407591      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rsi 
-            407594     48 DATAREF STACK 697 esp + 0 PARENT LocalFrame LOCALFRAME
+            407594     48 DATAREF STACK 682 esp + 0 PARENT LocalFrame LOCALFRAME
             407594      4 INSTR BELONGTO 407590 
             407594      4 INSTR DEADREGS  EFLAGS RSI ZZ sub     rsp, 30h 
-            407594      8 DATAREF STACK 698 esp + 40 CHILDOF 697 OFFSET 40 LOCALVAR var_10 
             407594      8 MEMORYHOLE STACK esp + 48 CalleeSavedRegs 
             407594      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             407598      3 INSTR BELONGTO 407590 
@@ -3423,8 +3407,8 @@
             407720      1 INSTR BELONGTO 407720 
             407720      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
             407720     -3 INSTR LOCAL NoWarn push    rbx 
-            407721     16 DATAREF STACK 699 esp + 0 PARENT LocalFrame LOCALFRAME
-            407721      4 DATAREF STACK 700 esp + 0 CHILDOF 699 OFFSET 0 OutArgsRegion OUTARGS
+            407721     16 DATAREF STACK 683 esp + 0 PARENT LocalFrame LOCALFRAME
+            407721      4 DATAREF STACK 684 esp + 0 CHILDOF 683 OFFSET 0 OutArgsRegion OUTARGS
             407721      4 INSTR BELONGTO 407720 
             407721      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
             407721      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -3583,10 +3567,9 @@
             407820      3 INSTR BELONGTO 407810 
             407820      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ mov     rbx, rdi 
             407823     40 MEMORYHOLE STACK esp + 48 CalleeSavedRegs 
-            407823     48 DATAREF STACK 701 esp + 0 PARENT LocalFrame LOCALFRAME
+            407823     48 DATAREF STACK 685 esp + 0 PARENT LocalFrame LOCALFRAME
             407823      4 INSTR BELONGTO 407810 
             407823      4 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ sub     rsp, 30h 
-            407823      8 DATAREF STACK 702 esp + 40 CHILDOF 701 OFFSET 40 LOCALVAR s1 
             407823      8 MEMORYHOLE STACK esp + 88 ReturnAddress 
             407827     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_instance_cast 
             407827      5 INSTR BELONGTO 407810 
@@ -4313,7 +4296,7 @@
             407e45     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             407e45      4 INSTR BELONGTO 407e40 
             407e45      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            407e45      8 DATAREF STACK 703 esp + 0 PARENT LocalFrame LOCALFRAME
+            407e45      8 DATAREF STACK 686 esp + 0 PARENT LocalFrame LOCALFRAME
             407e45      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             407e49     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
             407e49      5 INSTR BELONGTO 407e40 
@@ -4432,8 +4415,8 @@
             407f30      1 INSTR BELONGTO 407f30 
             407f30      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
             407f30     -3 INSTR LOCAL NoWarn push    rbx 
-            407f31     16 DATAREF STACK 704 esp + 0 PARENT LocalFrame LOCALFRAME
-            407f31      4 DATAREF STACK 705 esp + 0 CHILDOF 704 OFFSET 0 OutArgsRegion OUTARGS
+            407f31     16 DATAREF STACK 687 esp + 0 PARENT LocalFrame LOCALFRAME
+            407f31      4 DATAREF STACK 688 esp + 0 CHILDOF 687 OFFSET 0 OutArgsRegion OUTARGS
             407f31      4 INSTR BELONGTO 407f30 
             407f31      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
             407f31      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -4911,16 +4894,10 @@
             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 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 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 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     56 DATAREF STACK 689 esp + 0 PARENT LocalFrame LOCALFRAME
             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 
@@ -5152,11 +5129,9 @@
             4087d5      5 INSTR BELONGTO 4087d0 
             4087da      3 INSTR BELONGTO 4087d0 
             4087da      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-            4087dd     24 DATAREF STACK 713 esp + 0 PARENT LocalFrame LOCALFRAME
+            4087dd     24 DATAREF STACK 690 esp + 0 PARENT LocalFrame LOCALFRAME
             4087dd      4 INSTR BELONGTO 4087d0 
             4087dd      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 18h 
-            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 
@@ -5202,8 +5177,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 716 esp + 0 PARENT LocalFrame LOCALFRAME
-            408831      4 DATAREF STACK 717 esp + 0 CHILDOF 716 OFFSET 0 OutArgsRegion OUTARGS
+            408831     16 DATAREF STACK 691 esp + 0 PARENT LocalFrame LOCALFRAME
+            408831      4 DATAREF STACK 692 esp + 0 CHILDOF 691 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 
@@ -5300,16 +5275,10 @@
             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 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 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 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     56 DATAREF STACK 693 esp + 0 PARENT LocalFrame LOCALFRAME
             4088c0      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
             4088c4     -1 INSTR LOCAL NoMetaUpdate call    sub_408830 
             4088c4      5 INSTR BELONGTO 4088b0 
@@ -6230,13 +6199,7 @@
             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 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     56 DATAREF STACK 694 esp + 0 PARENT LocalFrame LOCALFRAME
             408f51      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             408f55     -1 INSTR LOCAL NoMetaUpdate call    sub_408830 
             408f55      5 INSTR BELONGTO 408f30 
@@ -6559,14 +6522,10 @@
             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 736 esp + 24 CHILDOF 732 OFFSET 24 LOCALVAR var_40 
-            40915a     40 DATAREF STACK 732 esp + 0 PARENT LocalFrame LOCALFRAME
+            40915a     40 DATAREF STACK 695 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 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 
@@ -7351,11 +7310,10 @@
             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 738 esp + 0 CHILDOF 737 OFFSET 0 OutArgsRegion OUTARGS
-            409684     32 DATAREF STACK 737 esp + 0 PARENT LocalFrame LOCALFRAME
+            409684     20 DATAREF STACK 697 esp + 0 CHILDOF 696 OFFSET 0 OutArgsRegion OUTARGS
+            409684     32 DATAREF STACK 696 esp + 0 PARENT LocalFrame LOCALFRAME
             409684      4 INSTR BELONGTO 409680 
             409684      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 20h 
-            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 
@@ -7486,7 +7444,7 @@
             409782      3 INSTR BELONGTO 409780 
             409785     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             409785      4 INSTR BELONGTO 409780 
-            409785      8 DATAREF STACK 740 esp + 0 PARENT LocalFrame LOCALFRAME
+            409785      8 DATAREF STACK 698 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 
@@ -7741,7 +7699,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 741 esp + 0 PARENT LocalFrame LOCALFRAME
+            409d77      8 DATAREF STACK 699 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 
@@ -7873,13 +7831,9 @@
             409e7d      5 INSTR BELONGTO 409e70 
             409e82     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             409e82      5 INSTR BELONGTO 409e70 
-            409e87     40 DATAREF STACK 742 esp + 0 PARENT LocalFrame LOCALFRAME
+            409e87     40 DATAREF STACK 700 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 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 
@@ -8230,17 +8184,9 @@
             40a167      5 INSTR BELONGTO 40a150 
             40a16c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
             40a16c      5 INSTR BELONGTO 40a150 
-            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 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     72 DATAREF STACK 701 esp + 0 PARENT LocalFrame LOCALFRAME
             40a171      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             40a175     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             40a175      5 INSTR BELONGTO 40a150 
@@ -8541,12 +8487,9 @@
             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 756 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a382     24 DATAREF STACK 702 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 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 
@@ -8645,28 +8588,11 @@
             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 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    224 DATAREF STACK 703 esp + 0 PARENT LocalFrame LOCALFRAME
             40a415     40 MEMORYHOLE STACK esp + 224 CalleeSavedRegs 
-            40a415     68 DATAREF STACK 761 esp + 0 CHILDOF 760 OFFSET 0 OutArgsRegion OUTARGS
+            40a415     68 DATAREF STACK 704 esp + 0 CHILDOF 703 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 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>" 
@@ -8915,8 +8841,7 @@
             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 780 esp + 8 CHILDOF 779 OFFSET 8 LOCALVAR var_40 
-            40a64d     24 DATAREF STACK 779 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a64d     24 DATAREF STACK 705 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 
@@ -9221,12 +9146,9 @@
             40a81a      3 INSTR BELONGTO 40a810 
             40a81d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
             40a81d      5 INSTR BELONGTO 40a810 
-            40a822     24 DATAREF STACK 781 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a822     24 DATAREF STACK 706 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 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 
@@ -9444,12 +9366,9 @@
             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 785 esp + 0 PARENT LocalFrame LOCALFRAME
+            40aa92     24 DATAREF STACK 707 esp + 0 PARENT LocalFrame LOCALFRAME
             40aa92      4 INSTR BELONGTO 40aa80 
             40aa92      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-            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 
@@ -9566,11 +9485,10 @@
             40abb0     -3 INSTR LOCAL NoWarn push    rbx 
             40abb1     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
             40abb1      3 INSTR BELONGTO 40abb0 
-            40abb4     24 DATAREF STACK 790 esp + 0 CHILDOF 789 OFFSET 0 OutArgsRegion OUTARGS
-            40abb4     32 DATAREF STACK 789 esp + 0 PARENT LocalFrame LOCALFRAME
+            40abb4     24 DATAREF STACK 709 esp + 0 CHILDOF 708 OFFSET 0 OutArgsRegion OUTARGS
+            40abb4     32 DATAREF STACK 708 esp + 0 PARENT LocalFrame LOCALFRAME
             40abb4      4 INSTR BELONGTO 40abb0 
             40abb4      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 20h 
-            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 
@@ -9676,8 +9594,7 @@
             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 792 esp + 0 PARENT LocalFrame LOCALFRAME
-            40ad14      4 DATAREF STACK 793 esp + 12 CHILDOF 792 OFFSET 12 LOCALVAR var_C 
+            40ad14     16 DATAREF STACK 710 esp + 0 PARENT LocalFrame LOCALFRAME
             40ad14      4 INSTR BELONGTO 40ad10 
             40ad14      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 10h 
             40ad14      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -9777,7 +9694,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 794 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ae95      8 DATAREF STACK 711 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 
@@ -9919,8 +9836,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 795 esp + 0 PARENT LocalFrame LOCALFRAME
-            40b0e1      4 DATAREF STACK 796 esp + 0 CHILDOF 795 OFFSET 0 OutArgsRegion OUTARGS
+            40b0e1     16 DATAREF STACK 712 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b0e1      4 DATAREF STACK 713 esp + 0 CHILDOF 712 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 
@@ -10002,7 +9919,7 @@
             40b162      3 INSTR BELONGTO 40b160 
             40b165     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             40b165      4 INSTR BELONGTO 40b160 
-            40b165      8 DATAREF STACK 797 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b165      8 DATAREF STACK 714 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 
@@ -10279,7 +10196,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 798 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b348      8 DATAREF STACK 715 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 
@@ -10424,40 +10341,10 @@
             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 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   1112 DATAREF STACK 716 esp + 0 PARENT LocalFrame LOCALFRAME
             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 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] 
@@ -11507,7 +11394,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 830 esp + 0 PARENT LocalFrame LOCALFRAME
+            40bb90      8 DATAREF STACK 717 esp + 0 PARENT LocalFrame LOCALFRAME
             40bb90      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             40bb94     -2 INSTR LOCAL n EDX ZZ  NUMVia2ndSrcIMMEDNUM mov     edx, 5          ; category 
             40bb94      5 INSTR BELONGTO 40bb90 
@@ -11565,13 +11452,7 @@
             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 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     56 DATAREF STACK 718 esp + 0 PARENT LocalFrame LOCALFRAME
             40bbec      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40bbf0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             40bbf0      3 INSTR BELONGTO 40bbc0 
@@ -11648,7 +11529,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 838 esp + 0 PARENT LocalFrame LOCALFRAME
+            40bc65      8 DATAREF STACK 719 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 
@@ -11683,7 +11564,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 839 esp + 0 PARENT LocalFrame LOCALFRAME
+            40bc98      8 DATAREF STACK 720 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 1c6da832241fc054ebaa37b1d20248424968b85f..16564e3296f79e6eb380f36d03656f72b214431f 100644
--- a/tests/commit/trimmed-sorted-save-gnome-control-center.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-control-center.psexe.annot
@@ -2336,10 +2336,8 @@
               76b3      1 INSTR BELONGTO 76b0 
               76b3      1 INSTR DEADREGS  EFLAGS R12 ZZ push    rbx 
               76b3     -3 INSTR LOCAL NoWarn push    rbx 
-              76b4     12 DATAREF STACK 586 esp + 0 CHILDOF 585 OFFSET 0 LOCALVAR var_28 
               76b4     16 DATAREF STACK 585 esp + 0 PARENT LocalFrame LOCALFRAME
               76b4     24 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
-              76b4      4 DATAREF STACK 587 esp + 12 CHILDOF 585 OFFSET 12 LOCALVAR var_1C 
               76b4      4 INSTR BELONGTO 76b0 
               76b4      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 10h 
               76b4      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -2512,9 +2510,9 @@
               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 + 0 CalleeSavedRegs 
               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 
@@ -2533,7 +2531,7 @@
               77ec     23 FUNC GLOBAL sub_77EC FUNC_SAFE NOFP RET               7802 
               77ec      4 INSTR BELONGTO 77ec 
               77ec      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-              77ec      8 DATAREF STACK 588 esp + 0 PARENT LocalFrame LOCALFRAME
+              77ec      8 DATAREF STACK 586 esp + 0 PARENT LocalFrame LOCALFRAME
               77ec      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
               77f0      7 INSTR BELONGTO 77ec 
               77f0      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -2654,7 +2652,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 589 esp + 0 PARENT LocalFrame LOCALFRAME
+              78e5      8 DATAREF STACK 587 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 
@@ -2872,10 +2870,9 @@
               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 590 esp + 0 PARENT LocalFrame LOCALFRAME
+              7d61     16 DATAREF STACK 588 esp + 0 PARENT LocalFrame LOCALFRAME
               7d61      4 INSTR BELONGTO 7d50 
               7d61      4 INSTR DEADREGS  EFLAGS RCX ZZ sub     rsp, 10h 
-              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 
@@ -2945,14 +2942,10 @@
               7db8      1 INSTR BELONGTO 7da0 
               7db8      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
               7db8     -3 INSTR LOCAL NoWarn push    rbx 
-              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 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     56 DATAREF STACK 589 esp + 0 PARENT LocalFrame LOCALFRAME
               7db9      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
               7dbd     -1 INSTR LOCAL MetadataUnused mov     rbx, [rdi+20h] 
               7dbd      4 INSTR BELONGTO 7da0 
@@ -3560,14 +3553,10 @@
               817f     -3 INSTR LOCAL NoWarn push    rbx 
               8180     -1 INSTR LOCAL MetadataUnused mov     rbx, rdx 
               8180      3 INSTR BELONGTO 8170 
-              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 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     72 DATAREF STACK 590 esp + 0 PARENT LocalFrame LOCALFRAME
               8183      8 MEMORYHOLE STACK esp + 120 ReturnAddress 
               8187     -1 INSTR LOCAL NoMetaUpdate call    _gtk_container_get_type 
               8187      5 INSTR BELONGTO 8170 
@@ -4111,13 +4100,9 @@
               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 602 esp + 0 PARENT LocalFrame LOCALFRAME
+              84b2     40 DATAREF STACK 591 esp + 0 PARENT LocalFrame LOCALFRAME
               84b2      4 INSTR BELONGTO 84a0 
               84b2      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 28h 
-              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 
@@ -4232,9 +4217,8 @@
               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 608 esp + 8 CHILDOF 607 OFFSET 8 LOCALVAR var_20 
               8558     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-              8558     24 DATAREF STACK 607 esp + 0 PARENT LocalFrame LOCALFRAME
+              8558     24 DATAREF STACK 592 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 
@@ -4757,13 +4741,10 @@
               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 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     40 DATAREF STACK 593 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 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] 
@@ -5321,11 +5302,9 @@
               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 613 esp + 0 PARENT LocalFrame LOCALFRAME
+              8df1     16 DATAREF STACK 594 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 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 
@@ -5426,14 +5405,10 @@
               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 616 esp + 0 PARENT LocalFrame LOCALFRAME
-              8ea2      4 DATAREF STACK 617 esp + 0 CHILDOF 616 OFFSET 0 OutArgsRegion OUTARGS
+              8ea2     40 DATAREF STACK 595 esp + 0 PARENT LocalFrame LOCALFRAME
+              8ea2      4 DATAREF STACK 596 esp + 0 CHILDOF 595 OFFSET 0 OutArgsRegion OUTARGS
               8ea2      4 INSTR BELONGTO 8e90 
               8ea2      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 28h 
-              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 
@@ -5662,7 +5637,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 622 esp + 0 PARENT LocalFrame LOCALFRAME
+              9055      8 DATAREF STACK 597 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 
@@ -5799,10 +5774,9 @@
               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 623 esp + 0 PARENT LocalFrame LOCALFRAME
+              9143     16 DATAREF STACK 598 esp + 0 PARENT LocalFrame LOCALFRAME
               9143      4 INSTR BELONGTO 9140 
               9143      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 10h 
-              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] 
@@ -5948,8 +5922,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 625 esp + 0 PARENT LocalFrame LOCALFRAME
-              9241      4 DATAREF STACK 626 esp + 0 CHILDOF 625 OFFSET 0 OutArgsRegion OUTARGS
+              9241     16 DATAREF STACK 599 esp + 0 PARENT LocalFrame LOCALFRAME
+              9241      4 DATAREF STACK 600 esp + 0 CHILDOF 599 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 
@@ -6207,9 +6181,9 @@
               96d4      1 INSTR BELONGTO 96d0 
               96d4     -3 INSTR LOCAL NoWarn push    rbx 
               96d5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-              96d5     24 DATAREF STACK 627 esp + 0 PARENT LocalFrame LOCALFRAME
+              96d5     24 DATAREF STACK 601 esp + 0 PARENT LocalFrame LOCALFRAME
               96d5      4 INSTR BELONGTO 96d0 
-              96d5      8 DATAREF STACK 628 esp + 0 CHILDOF 627 OFFSET 0 OutArgsRegion OUTARGS
+              96d5      8 DATAREF STACK 602 esp + 0 CHILDOF 601 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 
@@ -6294,7 +6268,7 @@
               97a2      3 INSTR BELONGTO 97a0 
               97a5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
               97a5      4 INSTR BELONGTO 97a0 
-              97a5      8 DATAREF STACK 629 esp + 0 PARENT LocalFrame LOCALFRAME
+              97a5      8 DATAREF STACK 603 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 
@@ -6612,7 +6586,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 630 esp + 0 PARENT LocalFrame LOCALFRAME
+              a010      8 DATAREF STACK 604 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 
@@ -6641,12 +6615,9 @@
               a03a      3 INSTR BELONGTO a030 
               a03d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_10], rbp 
               a03d      5 INSTR BELONGTO a030 
-              a042     24 DATAREF STACK 631 esp + 0 PARENT LocalFrame LOCALFRAME
+              a042     24 DATAREF STACK 605 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 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 
@@ -6719,7 +6690,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 635 esp + 0 PARENT LocalFrame LOCALFRAME
+              a0b8      8 DATAREF STACK 606 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 
@@ -6809,17 +6780,9 @@
               a294      5 INSTR BELONGTO a280 
               a299     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
               a299      5 INSTR BELONGTO a280 
-              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 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     72 DATAREF STACK 607 esp + 0 PARENT LocalFrame LOCALFRAME
               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] 
@@ -7086,8 +7049,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 645 esp + 0 PARENT LocalFrame LOCALFRAME
-              a4f1      4 DATAREF STACK 646 esp + 0 CHILDOF 645 OFFSET 0 OutArgsRegion OUTARGS
+              a4f1     16 DATAREF STACK 608 esp + 0 PARENT LocalFrame LOCALFRAME
+              a4f1      4 DATAREF STACK 609 esp + 0 CHILDOF 608 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 
@@ -7216,17 +7179,9 @@
               a68a      5 INSTR BELONGTO a670 
               a68f     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
               a68f      5 INSTR BELONGTO a670 
-              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 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     72 DATAREF STACK 610 esp + 0 PARENT LocalFrame LOCALFRAME
               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 
@@ -7364,7 +7319,7 @@
               a822      3 INSTR BELONGTO a820 
               a825     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
               a825      4 INSTR BELONGTO a820 
-              a825      8 DATAREF STACK 656 esp + 0 PARENT LocalFrame LOCALFRAME
+              a825      8 DATAREF STACK 611 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 
@@ -7421,7 +7376,7 @@
               a8a2      3 INSTR BELONGTO a8a0 
               a8a5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
               a8a5      4 INSTR BELONGTO a8a0 
-              a8a5      8 DATAREF STACK 657 esp + 0 PARENT LocalFrame LOCALFRAME
+              a8a5      8 DATAREF STACK 612 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 
@@ -7530,7 +7485,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 658 esp + 0 PARENT LocalFrame LOCALFRAME
+              aa70      8 DATAREF STACK 613 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 
@@ -7562,7 +7517,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 659 esp + 0 PARENT LocalFrame LOCALFRAME
+              aa95      8 DATAREF STACK 614 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 
@@ -7696,8 +7651,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 660 esp + 0 PARENT LocalFrame LOCALFRAME
-              aba1      4 DATAREF STACK 661 esp + 0 CHILDOF 660 OFFSET 0 OutArgsRegion OUTARGS
+              aba1     16 DATAREF STACK 615 esp + 0 PARENT LocalFrame LOCALFRAME
+              aba1      4 DATAREF STACK 616 esp + 0 CHILDOF 615 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 
@@ -7887,7 +7842,7 @@
               aef2      3 INSTR BELONGTO aef0 
               aef5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
               aef5      4 INSTR BELONGTO aef0 
-              aef5      8 DATAREF STACK 662 esp + 0 PARENT LocalFrame LOCALFRAME
+              aef5      8 DATAREF STACK 617 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 
@@ -7928,7 +7883,7 @@
               af52      3 INSTR BELONGTO af50 
               af55     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
               af55      4 INSTR BELONGTO af50 
-              af55      8 DATAREF STACK 663 esp + 0 PARENT LocalFrame LOCALFRAME
+              af55      8 DATAREF STACK 618 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 
@@ -8097,13 +8052,10 @@
               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 665 esp + 0 CHILDOF 664 OFFSET 0 OutArgsRegion OUTARGS
-              b232     40 DATAREF STACK 664 esp + 0 PARENT LocalFrame LOCALFRAME
+              b232     16 DATAREF STACK 620 esp + 0 CHILDOF 619 OFFSET 0 OutArgsRegion OUTARGS
+              b232     40 DATAREF STACK 619 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 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 
@@ -8304,8 +8256,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 669 esp + 0 PARENT LocalFrame LOCALFRAME
-              b581      4 DATAREF STACK 670 esp + 0 CHILDOF 669 OFFSET 0 OutArgsRegion OUTARGS
+              b581     16 DATAREF STACK 621 esp + 0 PARENT LocalFrame LOCALFRAME
+              b581      4 DATAREF STACK 622 esp + 0 CHILDOF 621 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 
@@ -8388,14 +8340,11 @@
               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 675 esp + 40 CHILDOF 671 OFFSET 40 LOCALVAR var_20 
               b615     16 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
-              b615     20 DATAREF STACK 672 esp + 0 CHILDOF 671 OFFSET 0 OutArgsRegion OUTARGS
+              b615     20 DATAREF STACK 624 esp + 0 CHILDOF 623 OFFSET 0 OutArgsRegion OUTARGS
               b615      4 INSTR BELONGTO b610 
               b615      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 38h 
-              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     56 DATAREF STACK 623 esp + 0 PARENT LocalFrame LOCALFRAME
               b615      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
               b619     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
               b619      5 INSTR BELONGTO b610 
@@ -8697,7 +8646,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 676 esp + 0 PARENT LocalFrame LOCALFRAME
+              b810      8 DATAREF STACK 625 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 
@@ -8729,13 +8678,9 @@
               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 677 esp + 0 PARENT LocalFrame LOCALFRAME
+              b841     40 DATAREF STACK 626 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 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 
@@ -8857,7 +8802,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 682 esp + 0 PARENT LocalFrame LOCALFRAME
+              b900      8 DATAREF STACK 627 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 
@@ -8879,8 +8824,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 683 esp + 0 PARENT LocalFrame LOCALFRAME
-              b924     64 DATAREF STACK 684 esp + 0 CHILDOF 683 OFFSET 0 OutArgsRegion OUTARGS
+              b924     64 DATAREF STACK 628 esp + 0 PARENT LocalFrame LOCALFRAME
+              b924     64 DATAREF STACK 629 esp + 0 CHILDOF 628 OFFSET 0 OutArgsRegion OUTARGS
               b924      8 MEMORYHOLE STACK esp + 64 CalleeSavedRegs 
               b924      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
               b928      8 INSTR BELONGTO b920 
@@ -9032,8 +8977,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 685 esp + 0 PARENT LocalFrame LOCALFRAME
-              baa1      4 DATAREF STACK 686 esp + 0 CHILDOF 685 OFFSET 0 OutArgsRegion OUTARGS
+              baa1     16 DATAREF STACK 630 esp + 0 PARENT LocalFrame LOCALFRAME
+              baa1      4 DATAREF STACK 631 esp + 0 CHILDOF 630 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 
@@ -9110,7 +9055,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 687 esp + 0 PARENT LocalFrame LOCALFRAME
+              bb30      8 DATAREF STACK 632 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 
@@ -9147,33 +9092,10 @@
               bb67      5 INSTR BELONGTO bb50 
               bb6c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
               bb6c      5 INSTR BELONGTO bb50 
-              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     12 DATAREF STACK 634 esp + 0 CHILDOF 633 OFFSET 0 OutArgsRegion OUTARGS
+              bb71    216 DATAREF STACK 633 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 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 
@@ -9567,8 +9489,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 713 esp + 0 PARENT LocalFrame LOCALFRAME
-              bf41      4 DATAREF STACK 714 esp + 0 CHILDOF 713 OFFSET 0 OutArgsRegion OUTARGS
+              bf41     16 DATAREF STACK 635 esp + 0 PARENT LocalFrame LOCALFRAME
+              bf41      4 DATAREF STACK 636 esp + 0 CHILDOF 635 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 
@@ -9652,8 +9574,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 716 esp + 0 CHILDOF 715 OFFSET 0 OutArgsRegion OUTARGS
-              bfd5     40 DATAREF STACK 715 esp + 0 PARENT LocalFrame LOCALFRAME
+              bfd5     20 DATAREF STACK 638 esp + 0 CHILDOF 637 OFFSET 0 OutArgsRegion OUTARGS
+              bfd5     40 DATAREF STACK 637 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 
@@ -9781,7 +9703,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 717 esp + 0 PARENT LocalFrame LOCALFRAME
+              c190      8 DATAREF STACK 639 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 
@@ -9806,11 +9728,9 @@
               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 718 esp + 0 PARENT LocalFrame LOCALFRAME
+              c1ba     24 DATAREF STACK 640 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 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] 
@@ -9868,8 +9788,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 721 esp + 0 PARENT LocalFrame LOCALFRAME
-              c214      4 DATAREF STACK 722 esp + 0 CHILDOF 721 OFFSET 0 OutArgsRegion OUTARGS
+              c214     16 DATAREF STACK 641 esp + 0 PARENT LocalFrame LOCALFRAME
+              c214      4 DATAREF STACK 642 esp + 0 CHILDOF 641 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 
@@ -9976,15 +9896,7 @@
               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 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    128 DATAREF STACK 643 esp + 0 PARENT LocalFrame LOCALFRAME
               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 
@@ -10644,8 +10556,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 732 esp + 0 PARENT LocalFrame LOCALFRAME
-              c951      4 DATAREF STACK 733 esp + 0 CHILDOF 732 OFFSET 0 OutArgsRegion OUTARGS
+              c951     16 DATAREF STACK 644 esp + 0 PARENT LocalFrame LOCALFRAME
+              c951      4 DATAREF STACK 645 esp + 0 CHILDOF 644 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 
@@ -10952,7 +10864,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 734 esp + 0 PARENT LocalFrame LOCALFRAME
+              cf45      8 DATAREF STACK 646 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 
@@ -11061,7 +10973,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 735 esp + 0 PARENT LocalFrame LOCALFRAME
+              d0c0      8 DATAREF STACK 647 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 
@@ -11096,7 +11008,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 736 esp + 0 PARENT LocalFrame LOCALFRAME
+              d0ea      8 DATAREF STACK 648 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] 
@@ -11196,7 +11108,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 737 esp + 0 PARENT LocalFrame LOCALFRAME
+              d175      8 DATAREF STACK 649 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] 
@@ -11319,12 +11231,8 @@
               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 738 esp + 0 PARENT LocalFrame LOCALFRAME
+              d317     40 DATAREF STACK 650 esp + 0 PARENT LocalFrame LOCALFRAME
               d317      4 INSTR BELONGTO d300 
-              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 
@@ -11419,13 +11327,7 @@
               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 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     56 DATAREF STACK 651 esp + 0 PARENT LocalFrame LOCALFRAME
               d3fc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
               d400     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
               d400      3 INSTR BELONGTO d3d0 
@@ -11502,7 +11404,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 750 esp + 0 PARENT LocalFrame LOCALFRAME
+              d475      8 DATAREF STACK 652 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 
@@ -11537,7 +11439,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 751 esp + 0 PARENT LocalFrame LOCALFRAME
+              d4a8      8 DATAREF STACK 653 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 f78d5df1297aa8b56cb68f3447ce3a7e4b4650c5..2f5200e7e6ab741380049d7ab75b5a41c4995c6f 100644
--- a/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-dictionary.psexe.annot
@@ -3532,7 +3532,6 @@
             408fd0      8 MEMORYHOLE STACK esp + 0 ReturnAddress 
             408fe0      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 16 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
             408fe0      0 FUNC MMSAFENESS SAFE
-            408fe0     12 DATAREF STACK 1182 esp + 12 CHILDOF 1180 OFFSET 12 LOCALVAR var_C 
             408fe0     24 DATAREF STACK 1180 esp + 0 PARENT LocalFrame LOCALFRAME
             408fe0      4 INSTR BELONGTO 408fe0 
             408fe0      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
@@ -3600,9 +3599,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -3624,7 +3623,7 @@
             40905c     23 FUNC GLOBAL sub_40905C FUNC_SAFE NOFP RET             409072 
             40905c      4 INSTR BELONGTO 40905c 
             40905c      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            40905c      8 DATAREF STACK 1183 esp + 0 PARENT LocalFrame LOCALFRAME
+            40905c      8 DATAREF STACK 1182 esp + 0 PARENT LocalFrame LOCALFRAME
             40905c      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             409060      7 INSTR BELONGTO 40905c 
             409060      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -3654,7 +3653,7 @@
             409085     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             409085      4 INSTR BELONGTO 409080 
             409085      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            409085      8 DATAREF STACK 1184 esp + 0 PARENT LocalFrame LOCALFRAME
+            409085      8 DATAREF STACK 1183 esp + 0 PARENT LocalFrame LOCALFRAME
             409085      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             409089     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_617E00, 0 
             409089      7 INSTR BELONGTO 409080 
@@ -4022,8 +4021,8 @@
             409660      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
             409660      0 FUNC MMSAFENESS SAFE
             409660    113 FUNC GLOBAL sub_409660 FUNC_UNSAFE NOFP RET             4096d0 
-            409660     24 DATAREF STACK 1185 esp + 0 PARENT LocalFrame LOCALFRAME
-            409660      4 DATAREF STACK 1186 esp + 0 CHILDOF 1185 OFFSET 0 OutArgsRegion OUTARGS
+            409660     24 DATAREF STACK 1184 esp + 0 PARENT LocalFrame LOCALFRAME
+            409660      4 DATAREF STACK 1185 esp + 0 CHILDOF 1184 OFFSET 0 OutArgsRegion OUTARGS
             409660      4 INSTR BELONGTO 409660 
             409660      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
             409660      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -4304,7 +4303,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 1187 esp + 0 PARENT LocalFrame LOCALFRAME
+            409840      8 DATAREF STACK 1186 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 
@@ -4371,7 +4370,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 1188 esp + 0 PARENT LocalFrame LOCALFRAME
+            4098b0      8 DATAREF STACK 1187 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 
@@ -4435,12 +4434,9 @@
             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 1189 esp + 0 PARENT LocalFrame LOCALFRAME
+            40990f     24 DATAREF STACK 1188 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 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 
@@ -4566,11 +4562,9 @@
             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 1193 esp + 0 PARENT LocalFrame LOCALFRAME
+            4099ba     24 DATAREF STACK 1189 esp + 0 PARENT LocalFrame LOCALFRAME
             4099ba      4 INSTR BELONGTO 4099b0 
             4099ba      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-            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 
@@ -4698,12 +4692,9 @@
             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 1196 esp + 0 PARENT LocalFrame LOCALFRAME
+            409a7f     24 DATAREF STACK 1190 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 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 
@@ -4913,7 +4904,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 1200 esp + 0 PARENT LocalFrame LOCALFRAME
+            409baf      8 DATAREF STACK 1191 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 
@@ -5114,12 +5105,9 @@
             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 1201 esp + 0 PARENT LocalFrame LOCALFRAME
+            409cf2     24 DATAREF STACK 1192 esp + 0 PARENT LocalFrame LOCALFRAME
             409cf2      4 INSTR BELONGTO 409ce0 
             409cf2      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-            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 
@@ -5290,15 +5278,11 @@
             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 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 1206 esp + 0 CHILDOF 1205 OFFSET 0 OutArgsRegion OUTARGS
+            409e1d      4 DATAREF STACK 1194 esp + 0 CHILDOF 1193 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 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     88 DATAREF STACK 1193 esp + 0 PARENT LocalFrame LOCALFRAME
             409e1d      8 MEMORYHOLE STACK esp + 136 ReturnAddress 
             409e21     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_view_get_type 
             409e21      5 INSTR BELONGTO 409e10 
@@ -5995,8 +5979,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 1211 esp + 0 PARENT LocalFrame LOCALFRAME
-            40acf1      4 DATAREF STACK 1212 esp + 0 CHILDOF 1211 OFFSET 0 OutArgsRegion OUTARGS
+            40acf1     16 DATAREF STACK 1195 esp + 0 PARENT LocalFrame LOCALFRAME
+            40acf1      4 DATAREF STACK 1196 esp + 0 CHILDOF 1195 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 
@@ -6078,7 +6062,7 @@
             40ad72      3 INSTR BELONGTO 40ad70 
             40ad75     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             40ad75      4 INSTR BELONGTO 40ad70 
-            40ad75      8 DATAREF STACK 1213 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ad75      8 DATAREF STACK 1197 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 
@@ -6211,13 +6195,9 @@
             40afad      5 INSTR BELONGTO 40afa0 
             40afb2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_18], rbp 
             40afb2      5 INSTR BELONGTO 40afa0 
-            40afb7     40 DATAREF STACK 1214 esp + 0 PARENT LocalFrame LOCALFRAME
+            40afb7     40 DATAREF STACK 1198 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 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 
@@ -6513,7 +6493,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 1219 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b1b0      8 DATAREF STACK 1199 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 
@@ -6605,14 +6585,10 @@
             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 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 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 1220 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b245     56 DATAREF STACK 1200 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 
@@ -7031,14 +7007,9 @@
             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 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 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     56 DATAREF STACK 1201 esp + 0 PARENT LocalFrame LOCALFRAME
             40b54a      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40b54e      3 INSTR BELONGTO 40b530 
             40b54e      3 INSTR DEADREGS  EFLAGS RDI R13 ZZ mov     rdi, rsi 
@@ -7151,12 +7122,10 @@
             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 1233 esp + 8 CHILDOF 1231 OFFSET 8 LOCALVAR var_30 
-            40b5fc     24 DATAREF STACK 1231 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b5fc     24 DATAREF STACK 1202 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 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 
@@ -7527,12 +7496,10 @@
             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 1236 esp + 8 CHILDOF 1234 OFFSET 8 LOCALVAR var_30 
-            40b82c     24 DATAREF STACK 1234 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b82c     24 DATAREF STACK 1203 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 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 
@@ -7927,8 +7894,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 1238 esp + 0 CHILDOF 1237 OFFSET 0 OutArgsRegion OUTARGS
-            40ba94     32 DATAREF STACK 1237 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ba94     20 DATAREF STACK 1205 esp + 0 CHILDOF 1204 OFFSET 0 OutArgsRegion OUTARGS
+            40ba94     32 DATAREF STACK 1204 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 
@@ -8049,16 +8016,9 @@
             40bb7d      5 INSTR BELONGTO 40bb70 
             40bb82     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             40bb82      5 INSTR BELONGTO 40bb70 
-            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 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     56 DATAREF STACK 1206 esp + 0 PARENT LocalFrame LOCALFRAME
             40bb87      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40bb8b      3 INSTR BELONGTO 40bb70 
             40bb8b      3 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     r13, r8 
@@ -8180,8 +8140,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 1247 esp + 0 PARENT LocalFrame LOCALFRAME
-            40bc51      4 DATAREF STACK 1248 esp + 0 CHILDOF 1247 OFFSET 0 OutArgsRegion OUTARGS
+            40bc51     16 DATAREF STACK 1207 esp + 0 PARENT LocalFrame LOCALFRAME
+            40bc51      4 DATAREF STACK 1208 esp + 0 CHILDOF 1207 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 
@@ -8267,7 +8227,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 1249 esp + 0 PARENT LocalFrame LOCALFRAME
+            40bcec     40 DATAREF STACK 1209 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 
@@ -8457,7 +8417,7 @@
             40bee2      3 INSTR BELONGTO 40bee0 
             40bee5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             40bee5      4 INSTR BELONGTO 40bee0 
-            40bee5      8 DATAREF STACK 1250 esp + 0 PARENT LocalFrame LOCALFRAME
+            40bee5      8 DATAREF STACK 1210 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 
@@ -8827,13 +8787,9 @@
             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 1251 esp + 0 PARENT LocalFrame LOCALFRAME
+            40c57c     40 DATAREF STACK 1211 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 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 
@@ -8886,7 +8842,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 1256 esp + 0 PARENT LocalFrame LOCALFRAME
+            40c5e0      8 DATAREF STACK 1212 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 
@@ -8923,17 +8879,9 @@
             40c61a      5 INSTR BELONGTO 40c600 
             40c61f     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_18], r13 
             40c61f      5 INSTR BELONGTO 40c600 
-            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 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     72 DATAREF STACK 1213 esp + 0 PARENT LocalFrame LOCALFRAME
             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 
@@ -9661,8 +9609,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 1266 esp + 0 PARENT LocalFrame LOCALFRAME
-            40cd04      4 DATAREF STACK 1267 esp + 0 CHILDOF 1266 OFFSET 0 OutArgsRegion OUTARGS
+            40cd04     16 DATAREF STACK 1214 esp + 0 PARENT LocalFrame LOCALFRAME
+            40cd04      4 DATAREF STACK 1215 esp + 0 CHILDOF 1214 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 
@@ -9792,13 +9740,9 @@
             40cded      5 INSTR BELONGTO 40cde0 
             40cdf2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             40cdf2      5 INSTR BELONGTO 40cde0 
-            40cdf7     40 DATAREF STACK 1268 esp + 0 PARENT LocalFrame LOCALFRAME
+            40cdf7     40 DATAREF STACK 1216 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 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 
@@ -9953,12 +9897,9 @@
             40cefa      3 INSTR BELONGTO 40cef0 
             40cefd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
             40cefd      5 INSTR BELONGTO 40cef0 
-            40cf02     24 DATAREF STACK 1273 esp + 0 PARENT LocalFrame LOCALFRAME
+            40cf02     24 DATAREF STACK 1217 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 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 
@@ -10037,8 +9978,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 1277 esp + 0 PARENT LocalFrame LOCALFRAME
-            40cf81      4 DATAREF STACK 1278 esp + 0 CHILDOF 1277 OFFSET 0 OutArgsRegion OUTARGS
+            40cf81     16 DATAREF STACK 1218 esp + 0 PARENT LocalFrame LOCALFRAME
+            40cf81      4 DATAREF STACK 1219 esp + 0 CHILDOF 1218 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 
@@ -10120,7 +10061,7 @@
             40d002      3 INSTR BELONGTO 40d000 
             40d005     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             40d005      4 INSTR BELONGTO 40d000 
-            40d005      8 DATAREF STACK 1279 esp + 0 PARENT LocalFrame LOCALFRAME
+            40d005      8 DATAREF STACK 1220 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 
@@ -10472,7 +10413,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 1280 esp + 0 PARENT LocalFrame LOCALFRAME
+            40d8d8      8 DATAREF STACK 1221 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 
@@ -10873,18 +10814,10 @@
             40de87      3 INSTR BELONGTO 40de70 
             40de8a     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
             40de8a      5 INSTR BELONGTO 40de70 
-            40de8f      4 DATAREF STACK 1282 esp + 0 CHILDOF 1281 OFFSET 0 OutArgsRegion OUTARGS
+            40de8f      4 DATAREF STACK 1223 esp + 0 CHILDOF 1222 OFFSET 0 OutArgsRegion OUTARGS
             40de8f      4 INSTR BELONGTO 40de70 
             40de8f      4 INSTR DEADREGS  EFLAGS R13 R14 ZZ sub     rsp, 48h 
-            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     72 DATAREF STACK 1222 esp + 0 PARENT LocalFrame LOCALFRAME
             40de8f      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             40de93     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             40de93      3 INSTR BELONGTO 40de70 
@@ -11115,12 +11048,10 @@
             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 1293 esp + 8 CHILDOF 1291 OFFSET 8 LOCALVAR var_30 
-            40e009     24 DATAREF STACK 1291 esp + 0 PARENT LocalFrame LOCALFRAME
+            40e009     24 DATAREF STACK 1224 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 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 
@@ -11469,7 +11400,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 1294 esp + 0 PARENT LocalFrame LOCALFRAME
+            40e248      8 DATAREF STACK 1225 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] 
@@ -11722,14 +11653,9 @@
             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 1295 esp + 0 PARENT LocalFrame LOCALFRAME
+            40e66f     40 DATAREF STACK 1226 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 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] 
@@ -11916,12 +11842,9 @@
             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 1301 esp + 0 PARENT LocalFrame LOCALFRAME
+            40e7d2     24 DATAREF STACK 1227 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 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 
@@ -12043,12 +11966,9 @@
             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 1305 esp + 0 PARENT LocalFrame LOCALFRAME
+            40e8a2     24 DATAREF STACK 1228 esp + 0 PARENT LocalFrame LOCALFRAME
             40e8a2      4 INSTR BELONGTO 40e890 
             40e8a2      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-            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] 
@@ -12197,12 +12117,8 @@
             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 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     56 DATAREF STACK 1229 esp + 0 PARENT LocalFrame LOCALFRAME
+            40e9c7      8 DATAREF STACK 1230 esp + 0 CHILDOF 1229 OFFSET 0 OutArgsRegion OUTARGS
             40e9c7      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40e9cb     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40e9cb      3 INSTR BELONGTO 40e9b0 
@@ -12355,12 +12271,9 @@
             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 1315 esp + 0 PARENT LocalFrame LOCALFRAME
+            40eac2     24 DATAREF STACK 1231 esp + 0 PARENT LocalFrame LOCALFRAME
             40eac2      4 INSTR BELONGTO 40eab0 
             40eac2      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-            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] 
@@ -13098,12 +13011,8 @@
             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 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     56 DATAREF STACK 1232 esp + 0 PARENT LocalFrame LOCALFRAME
+            40f027      8 DATAREF STACK 1233 esp + 0 CHILDOF 1232 OFFSET 0 OutArgsRegion OUTARGS
             40f027      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40f02b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40f02b      3 INSTR BELONGTO 40f010 
@@ -13260,12 +13169,8 @@
             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 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     56 DATAREF STACK 1234 esp + 0 PARENT LocalFrame LOCALFRAME
+            40f127      8 DATAREF STACK 1235 esp + 0 CHILDOF 1234 OFFSET 0 OutArgsRegion OUTARGS
             40f127      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40f12b     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
             40f12b      3 INSTR BELONGTO 40f110 
@@ -13416,8 +13321,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 1331 esp + 0 PARENT LocalFrame LOCALFRAME
-            40f221      4 DATAREF STACK 1332 esp + 0 CHILDOF 1331 OFFSET 0 OutArgsRegion OUTARGS
+            40f221     16 DATAREF STACK 1236 esp + 0 PARENT LocalFrame LOCALFRAME
+            40f221      4 DATAREF STACK 1237 esp + 0 CHILDOF 1236 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 
@@ -13505,7 +13410,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 1333 esp + 0 PARENT LocalFrame LOCALFRAME
+            40f2a7      8 DATAREF STACK 1238 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 
@@ -13696,7 +13601,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 1334 esp + 0 PARENT LocalFrame LOCALFRAME
+            40f458      8 DATAREF STACK 1239 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 
@@ -13802,7 +13707,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 1335 esp + 0 PARENT LocalFrame LOCALFRAME
+            40f4f8      8 DATAREF STACK 1240 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 
@@ -14087,13 +13992,9 @@
             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 1336 esp + 0 PARENT LocalFrame LOCALFRAME
+            40f6e2     40 DATAREF STACK 1241 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 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 
@@ -14556,12 +14457,9 @@
             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 1341 esp + 0 PARENT LocalFrame LOCALFRAME
+            40f9d2     24 DATAREF STACK 1242 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 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 
@@ -14752,7 +14650,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 1345 esp + 0 PARENT LocalFrame LOCALFRAME
+            40fb15      8 DATAREF STACK 1243 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 
@@ -14879,7 +14777,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 1346 esp + 0 PARENT LocalFrame LOCALFRAME
+            40fbe5      8 DATAREF STACK 1244 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 
@@ -14978,12 +14876,9 @@
             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 1347 esp + 0 PARENT LocalFrame LOCALFRAME
+            40fc92     24 DATAREF STACK 1245 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 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 
@@ -15363,11 +15258,9 @@
             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 1351 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ff0d     24 DATAREF STACK 1246 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 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 
@@ -15461,7 +15354,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 1354 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ffa8      8 DATAREF STACK 1247 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 
@@ -15561,7 +15454,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 1355 esp + 0 PARENT LocalFrame LOCALFRAME
+            410035      8 DATAREF STACK 1248 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 
@@ -15657,7 +15550,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 1356 esp + 0 PARENT LocalFrame LOCALFRAME
+            4100c5      8 DATAREF STACK 1249 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 
@@ -15758,20 +15651,10 @@
             410167      5 INSTR BELONGTO 410150 
             41016c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
             41016c      5 INSTR BELONGTO 410150 
-            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    104 DATAREF STACK 1250 esp + 0 PARENT LocalFrame LOCALFRAME
+            410171      4 DATAREF STACK 1251 esp + 0 CHILDOF 1250 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 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 
@@ -16806,9 +16689,8 @@
             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 1370 esp + 8 CHILDOF 1369 OFFSET 8 LOCALVAR var_20 
             411618     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            411618     24 DATAREF STACK 1369 esp + 0 PARENT LocalFrame LOCALFRAME
+            411618     24 DATAREF STACK 1252 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 
@@ -16935,8 +16817,7 @@
             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 1371 esp + 0 PARENT LocalFrame LOCALFRAME
-            411718     24 DATAREF STACK 1372 esp + 0 CHILDOF 1371 OFFSET 0 LOCALVAR var_28 
+            411718     24 DATAREF STACK 1253 esp + 0 PARENT LocalFrame LOCALFRAME
             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 
@@ -17103,7 +16984,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 1373 esp + 0 PARENT LocalFrame LOCALFRAME
+            4118b5      8 DATAREF STACK 1254 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 
@@ -17378,7 +17259,7 @@
             411dc2      3 INSTR BELONGTO 411dc0 
             411dc5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             411dc5      4 INSTR BELONGTO 411dc0 
-            411dc5      8 DATAREF STACK 1374 esp + 0 PARENT LocalFrame LOCALFRAME
+            411dc5      8 DATAREF STACK 1255 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 
@@ -17509,7 +17390,7 @@
             411f82      3 INSTR BELONGTO 411f80 
             411f85     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             411f85      4 INSTR BELONGTO 411f80 
-            411f85      8 DATAREF STACK 1375 esp + 0 PARENT LocalFrame LOCALFRAME
+            411f85      8 DATAREF STACK 1256 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 
@@ -17572,17 +17453,10 @@
             41202a      5 INSTR BELONGTO 412010 
             41202f     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
             41202f      5 INSTR BELONGTO 412010 
-            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    120 DATAREF STACK 1257 esp + 0 PARENT LocalFrame LOCALFRAME
+            412034     48 DATAREF STACK 1258 esp + 0 CHILDOF 1257 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 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 
@@ -17927,12 +17801,9 @@
             41228d      3 INSTR BELONGTO 412280 
             412290     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
             412290      5 INSTR BELONGTO 412280 
-            412295     24 DATAREF STACK 1385 esp + 0 PARENT LocalFrame LOCALFRAME
+            412295     24 DATAREF STACK 1259 esp + 0 PARENT LocalFrame LOCALFRAME
             412295      4 INSTR BELONGTO 412280 
             412295      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-            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 
@@ -18053,7 +17924,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 1389 esp + 0 PARENT LocalFrame LOCALFRAME
+            41234b      8 DATAREF STACK 1260 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 
@@ -18113,7 +17984,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 1390 esp + 0 PARENT LocalFrame LOCALFRAME
+            4123a0      8 DATAREF STACK 1261 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 
@@ -18146,10 +18017,9 @@
             4123d4      1 INSTR BELONGTO 4123d0 
             4123d4      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             4123d4     -3 INSTR LOCAL NoWarn push    rbx 
-            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 1392 esp + 0 CHILDOF 1391 OFFSET 0 OutArgsRegion OUTARGS
-            4123d5     40 DATAREF STACK 1391 esp + 0 PARENT LocalFrame LOCALFRAME
+            4123d5     20 DATAREF STACK 1263 esp + 0 CHILDOF 1262 OFFSET 0 OutArgsRegion OUTARGS
+            4123d5     40 DATAREF STACK 1262 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 
@@ -18428,13 +18298,7 @@
             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 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     56 DATAREF STACK 1264 esp + 0 PARENT LocalFrame LOCALFRAME
             41263c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             412640     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             412640      3 INSTR BELONGTO 412610 
@@ -18511,7 +18375,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 1401 esp + 0 PARENT LocalFrame LOCALFRAME
+            4126b5      8 DATAREF STACK 1265 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 
@@ -18546,7 +18410,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 1402 esp + 0 PARENT LocalFrame LOCALFRAME
+            4126e8      8 DATAREF STACK 1266 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 9473298de1d440c9c772d5ab93320f20bd4d9650..41f31109032bc6516926795fba706a278ed7b045 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
@@ -818,9 +818,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -954,7 +954,6 @@
             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 212 esp + 8 CHILDOF 211 OFFSET 8 LOCALVAR var_20 
             40210b     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
             40210b     24 DATAREF STACK 211 esp + 0 PARENT LocalFrame LOCALFRAME
             40210b      4 INSTR BELONGTO 402100 
@@ -1132,27 +1131,10 @@
             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 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    136 DATAREF STACK 212 esp + 0 PARENT LocalFrame LOCALFRAME
             40221d     48 MEMORYHOLE STACK esp + 136 CalleeSavedRegs 
-            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 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 
@@ -2286,8 +2268,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 232 esp + 0 CHILDOF 231 OFFSET 0 OutArgsRegion OUTARGS
-            4032d0     40 DATAREF STACK 231 esp + 0 PARENT LocalFrame LOCALFRAME
+            4032d0     32 DATAREF STACK 214 esp + 0 CHILDOF 213 OFFSET 0 OutArgsRegion OUTARGS
+            4032d0     40 DATAREF STACK 213 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 
@@ -2359,7 +2341,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 233 esp + 0 PARENT LocalFrame LOCALFRAME
+            403335      8 DATAREF STACK 215 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 
@@ -2436,7 +2418,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 234 esp + 0 PARENT LocalFrame LOCALFRAME
+            403395      8 DATAREF STACK 216 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 
@@ -2513,7 +2495,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 235 esp + 0 PARENT LocalFrame LOCALFRAME
+            4033f5      8 DATAREF STACK 217 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 
@@ -2808,7 +2790,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 236 esp + 0 PARENT LocalFrame LOCALFRAME
+            40359c      8 DATAREF STACK 218 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 
@@ -2898,13 +2880,7 @@
             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 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     56 DATAREF STACK 219 esp + 0 PARENT LocalFrame LOCALFRAME
             40362c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             403630     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             403630      3 INSTR BELONGTO 403600 
@@ -2981,7 +2957,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 244 esp + 0 PARENT LocalFrame LOCALFRAME
+            4036a5      8 DATAREF STACK 220 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 
@@ -3016,7 +2992,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 245 esp + 0 PARENT LocalFrame LOCALFRAME
+            4036d8      8 DATAREF STACK 221 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 2ca3e416d8d81e2f688dd16c4fc3094a1ae8b770..ba55cb1419e7ec7a6a744849a8caff57133a8d69 100644
--- a/tests/commit/trimmed-sorted-save-gnome-font-viewer.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-font-viewer.psexe.annot
@@ -936,30 +936,11 @@
             402d59      1 INSTR BELONGTO 402d50 
             402d59      1 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ push    rbx 
             402d59     -3 INSTR LOCAL NoWarn push    rbx 
-            402d5a     12 DATAREF STACK 197 esp + 64 CHILDOF 189 OFFSET 64 LOCALVAR var_C8 
-            402d5a     16 DATAREF STACK 203 esp + 160 CHILDOF 189 OFFSET 160 LOCALVAR var_68 
-            402d5a     16 DATAREF STACK 209 esp + 200 CHILDOF 189 OFFSET 200 LOCALVAR var_40 
             402d5a    216 DATAREF STACK 189 esp + 0 PARENT LocalFrame LOCALFRAME
-            402d5a      2 DATAREF STACK 205 esp + 180 CHILDOF 189 OFFSET 180 LOCALVAR var_54 
-            402d5a      2 DATAREF STACK 206 esp + 182 CHILDOF 189 OFFSET 182 LOCALVAR var_52 
             402d5a     48 MEMORYHOLE STACK esp + 216 CalleeSavedRegs 
-            402d5a      4 DATAREF STACK 198 esp + 76 CHILDOF 189 OFFSET 76 LOCALVAR var_BC 
-            402d5a      4 DATAREF STACK 204 esp + 176 CHILDOF 189 OFFSET 176 LOCALVAR var_58 
-            402d5a     56 DATAREF STACK 200 esp + 88 CHILDOF 189 OFFSET 88 LOCALVAR var_B0 
             402d5a      7 INSTR BELONGTO 402d50 
             402d5a      7 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ sub     rsp, 0D8h 
             402d5a      8 DATAREF STACK 190 esp + 0 CHILDOF 189 OFFSET 0 OutArgsRegion OUTARGS
-            402d5a      8 DATAREF STACK 191 esp + 16 CHILDOF 189 OFFSET 16 LOCALVAR var_F8 
-            402d5a      8 DATAREF STACK 192 esp + 24 CHILDOF 189 OFFSET 24 LOCALVAR var_F0 
-            402d5a      8 DATAREF STACK 193 esp + 32 CHILDOF 189 OFFSET 32 LOCALVAR var_E8 
-            402d5a      8 DATAREF STACK 194 esp + 40 CHILDOF 189 OFFSET 40 LOCALVAR var_E0 
-            402d5a      8 DATAREF STACK 195 esp + 48 CHILDOF 189 OFFSET 48 LOCALVAR var_D8 
-            402d5a      8 DATAREF STACK 196 esp + 56 CHILDOF 189 OFFSET 56 LOCALVAR var_D0 
-            402d5a      8 DATAREF STACK 199 esp + 80 CHILDOF 189 OFFSET 80 LOCALVAR var_B8 
-            402d5a      8 DATAREF STACK 201 esp + 144 CHILDOF 189 OFFSET 144 LOCALVAR var_78 
-            402d5a      8 DATAREF STACK 202 esp + 152 CHILDOF 189 OFFSET 152 LOCALVAR var_70 
-            402d5a      8 DATAREF STACK 207 esp + 184 CHILDOF 189 OFFSET 184 LOCALVAR var_50 
-            402d5a      8 DATAREF STACK 208 esp + 192 CHILDOF 189 OFFSET 192 LOCALVAR var_48 
             402d5a      8 MEMORYHOLE STACK esp + 264 ReturnAddress 
             402d61     -1 INSTR LOCAL MetadataUnused mov     [rsp+108h+var_BC], edi 
             402d61      4 INSTR BELONGTO 402d50 
@@ -2415,9 +2396,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -2439,7 +2420,7 @@
             4036d8     23 FUNC GLOBAL sub_4036D8 FUNC_SAFE NOFP RET             4036ee 
             4036d8      4 INSTR BELONGTO 4036d8 
             4036d8      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            4036d8      8 DATAREF STACK 210 esp + 0 PARENT LocalFrame LOCALFRAME
+            4036d8      8 DATAREF STACK 191 esp + 0 PARENT LocalFrame LOCALFRAME
             4036d8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4036dc      7 INSTR BELONGTO 4036d8 
             4036dc      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -2469,7 +2450,7 @@
             4036f5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             4036f5      4 INSTR BELONGTO 4036f0 
             4036f5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            4036f5      8 DATAREF STACK 211 esp + 0 PARENT LocalFrame LOCALFRAME
+            4036f5      8 DATAREF STACK 192 esp + 0 PARENT LocalFrame LOCALFRAME
             4036f5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4036f9     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_6053D0, 0 
             4036f9      7 INSTR BELONGTO 4036f0 
@@ -2631,19 +2612,9 @@
             4038b1      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], r13
             4038b6      3 INSTR BELONGTO 403890 
             4038b6      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     r15, rdi 
-            4038b9    136 DATAREF STACK 212 esp + 0 PARENT LocalFrame LOCALFRAME
-            4038b9     32 DATAREF STACK 215 esp + 16 CHILDOF 212 OFFSET 16 LOCALVAR var_78 
-            4038b9     40 DATAREF STACK 216 esp + 48 CHILDOF 212 OFFSET 48 LOCALVAR var_58 
+            4038b9    136 DATAREF STACK 193 esp + 0 PARENT LocalFrame LOCALFRAME
             4038b9      7 INSTR BELONGTO 403890 
             4038b9      7 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 ZZ sub     rsp, 88h 
-            4038b9      8 DATAREF STACK 213 esp + 0 CHILDOF 212 OFFSET 0 LOCALVAR var_88 
-            4038b9      8 DATAREF STACK 214 esp + 8 CHILDOF 212 OFFSET 8 LOCALVAR var_80 
-            4038b9      8 DATAREF STACK 217 esp + 88 CHILDOF 212 OFFSET 88 LOCALVAR var_30 
-            4038b9      8 DATAREF STACK 218 esp + 96 CHILDOF 212 OFFSET 96 LOCALVAR var_28 
-            4038b9      8 DATAREF STACK 219 esp + 104 CHILDOF 212 OFFSET 104 LOCALVAR var_20 
-            4038b9      8 DATAREF STACK 220 esp + 112 CHILDOF 212 OFFSET 112 LOCALVAR var_18 
-            4038b9      8 DATAREF STACK 221 esp + 120 CHILDOF 212 OFFSET 120 LOCALVAR var_10 
-            4038b9      8 DATAREF STACK 222 esp + 128 CHILDOF 212 OFFSET 128 LOCALVAR var_8 
             4038b9      8 MEMORYHOLE STACK esp + 136 ReturnAddress 
             4038c0     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; nmemb 
             4038c0      5 INSTR BELONGTO 403890 
@@ -2870,9 +2841,7 @@
             403a40      1 INSTR BELONGTO 403a20 
             403a40      1 INSTR DEADREGS  EFLAGS R14 XMM0 ZZ push    rbx 
             403a40     -3 INSTR LOCAL NoWarn push    rbx 
-            403a41     12 DATAREF STACK 224 esp + 0 CHILDOF 223 OFFSET 0 LOCALVAR var_48 
-            403a41     12 DATAREF STACK 225 esp + 12 CHILDOF 223 OFFSET 12 LOCALVAR var_3C 
-            403a41     24 DATAREF STACK 223 esp + 0 PARENT LocalFrame LOCALFRAME
+            403a41     24 DATAREF STACK 194 esp + 0 PARENT LocalFrame LOCALFRAME
             403a41     48 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
             403a41      4 INSTR BELONGTO 403a20 
             403a41      4 INSTR DEADREGS  EFLAGS RBX R14 XMM0 ZZ sub     rsp, 18h 
@@ -3405,20 +3374,9 @@
             403f3a      3 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ mov     rbx, rdi 
             403f3d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
             403f3d      5 INSTR BELONGTO 403f30 
-            403f42    104 DATAREF STACK 226 esp + 0 PARENT LocalFrame LOCALFRAME
-            403f42     16 DATAREF STACK 227 esp + 0 CHILDOF 226 OFFSET 0 LOCALVAR var_68 
-            403f42     16 DATAREF STACK 229 esp + 40 CHILDOF 226 OFFSET 40 LOCALVAR var_40 
-            403f42     24 DATAREF STACK 228 esp + 16 CHILDOF 226 OFFSET 16 LOCALVAR var_58 
-            403f42      2 DATAREF STACK 232 esp + 68 CHILDOF 226 OFFSET 68 LOCALVAR var_24 
-            403f42      2 DATAREF STACK 233 esp + 70 CHILDOF 226 OFFSET 70 LOCALVAR var_22 
-            403f42      4 DATAREF STACK 231 esp + 64 CHILDOF 226 OFFSET 64 LOCALVAR var_28 
+            403f42    104 DATAREF STACK 195 esp + 0 PARENT LocalFrame LOCALFRAME
             403f42      4 INSTR BELONGTO 403f30 
             403f42      4 INSTR DEADREGS  EFLAGS R12 XMM0 ZZ sub     rsp, 68h 
-            403f42      8 DATAREF STACK 230 esp + 56 CHILDOF 226 OFFSET 56 LOCALVAR var_30 
-            403f42      8 DATAREF STACK 234 esp + 72 CHILDOF 226 OFFSET 72 LOCALVAR var_20 
-            403f42      8 DATAREF STACK 235 esp + 80 CHILDOF 226 OFFSET 80 LOCALVAR var_18 
-            403f42      8 DATAREF STACK 236 esp + 88 CHILDOF 226 OFFSET 88 LOCALVAR var_10 
-            403f42      8 DATAREF STACK 237 esp + 96 CHILDOF 226 OFFSET 96 LOCALVAR var_8 
             403f42      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
             403f46      3 INSTR BELONGTO 403f30 
             403f46      3 INSTR DEADREGS  EFLAGS R12 XMM0 ZZ mov     r12, rsi 
@@ -3522,7 +3480,7 @@
             403ffb     32 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             403ffb      4 INSTR BELONGTO 403ff0 
             403ffb      4 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ sub     rsp, 8 
-            403ffb      8 DATAREF STACK 238 esp + 0 PARENT LocalFrame LOCALFRAME
+            403ffb      8 DATAREF STACK 196 esp + 0 PARENT LocalFrame LOCALFRAME
             403ffb      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             403fff     -1 INSTR LOCAL NoMetaUpdate call    _pango_language_get_sample_string 
             403fff      5 INSTR BELONGTO 403ff0 
@@ -3621,7 +3579,7 @@
             404088     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             404088      4 INSTR BELONGTO 404080 
             404088      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-            404088      8 DATAREF STACK 239 esp + 0 PARENT LocalFrame LOCALFRAME
+            404088      8 DATAREF STACK 197 esp + 0 PARENT LocalFrame LOCALFRAME
             404088      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             40408c     -1 INSTR LOCAL NoMetaUpdate test    byte ptr [rdi+10h], 1 
             40408c      4 INSTR BELONGTO 404080 
@@ -3909,13 +3867,7 @@
             4044f7      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
             4044fc      4 INSTR BELONGTO 4044d0 
             4044fc      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-            4044fc     56 DATAREF STACK 240 esp + 0 PARENT LocalFrame LOCALFRAME
-            4044fc      8 DATAREF STACK 241 esp + 8 CHILDOF 240 OFFSET 8 LOCALVAR var_30 
-            4044fc      8 DATAREF STACK 242 esp + 16 CHILDOF 240 OFFSET 16 LOCALVAR var_28 
-            4044fc      8 DATAREF STACK 243 esp + 24 CHILDOF 240 OFFSET 24 LOCALVAR var_20 
-            4044fc      8 DATAREF STACK 244 esp + 32 CHILDOF 240 OFFSET 32 LOCALVAR var_18 
-            4044fc      8 DATAREF STACK 245 esp + 40 CHILDOF 240 OFFSET 40 LOCALVAR var_10 
-            4044fc      8 DATAREF STACK 246 esp + 48 CHILDOF 240 OFFSET 48 LOCALVAR var_8 
+            4044fc     56 DATAREF STACK 198 esp + 0 PARENT LocalFrame LOCALFRAME
             4044fc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             404500     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             404500      3 INSTR BELONGTO 4044d0 
@@ -3992,7 +3944,7 @@
             404575     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             404575      4 INSTR BELONGTO 404570 
             404575      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-            404575      8 DATAREF STACK 247 esp + 0 PARENT LocalFrame LOCALFRAME
+            404575      8 DATAREF STACK 199 esp + 0 PARENT LocalFrame LOCALFRAME
             404575      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             404579      7 INSTR BELONGTO 404570 
             404579      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_604D98 
@@ -4027,7 +3979,7 @@
             4045a8     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET             4045b5 
             4045a8      4 INSTR BELONGTO 4045a8 
             4045a8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-            4045a8      8 DATAREF STACK 248 esp + 0 PARENT LocalFrame LOCALFRAME
+            4045a8      8 DATAREF STACK 200 esp + 0 PARENT LocalFrame LOCALFRAME
             4045a8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4045ac     -1 INSTR LOCAL NoMetaUpdate call    sub_4036F0 
             4045ac      5 INSTR BELONGTO 4045a8 
diff --git a/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot
index c8a1c90e1b9f1b0336b8841a28e26fb8b3e8f31d..d8bfd6d0994559863984b34d71d183e5d48615ed 100644
--- a/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-help.psexe.annot
@@ -1876,9 +1876,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -2091,10 +2091,6 @@
             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 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 
@@ -2174,10 +2170,9 @@
             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 503 esp + 24 CHILDOF 501 OFFSET 24 LOCALVAR var_20 
             405235     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-            405235     20 DATAREF STACK 502 esp + 0 CHILDOF 501 OFFSET 0 OutArgsRegion OUTARGS
-            405235     40 DATAREF STACK 501 esp + 0 PARENT LocalFrame LOCALFRAME
+            405235     20 DATAREF STACK 498 esp + 0 CHILDOF 497 OFFSET 0 OutArgsRegion OUTARGS
+            405235     40 DATAREF STACK 497 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 
@@ -2339,13 +2334,10 @@
             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 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     48 DATAREF STACK 499 esp + 0 PARENT LocalFrame LOCALFRAME
+            405491      4 DATAREF STACK 500 esp + 0 CHILDOF 499 OFFSET 0 OutArgsRegion OUTARGS
             405491      4 INSTR BELONGTO 405490 
             405491      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 30h 
-            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 
@@ -2452,7 +2444,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 509 esp + 0 PARENT LocalFrame LOCALFRAME
+            405558      8 DATAREF STACK 501 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 
@@ -2567,7 +2559,7 @@
             4056e2      3 INSTR BELONGTO 4056e0 
             4056e5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             4056e5      4 INSTR BELONGTO 4056e0 
-            4056e5      8 DATAREF STACK 510 esp + 0 PARENT LocalFrame LOCALFRAME
+            4056e5      8 DATAREF STACK 502 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 
@@ -2651,13 +2643,9 @@
             40581d      5 INSTR BELONGTO 405810 
             405822     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             405822      5 INSTR BELONGTO 405810 
-            405827     40 DATAREF STACK 511 esp + 0 PARENT LocalFrame LOCALFRAME
+            405827     40 DATAREF STACK 503 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 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 
@@ -2839,13 +2827,9 @@
             405acd      5 INSTR BELONGTO 405ac0 
             405ad2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             405ad2      5 INSTR BELONGTO 405ac0 
-            405ad7     40 DATAREF STACK 516 esp + 0 PARENT LocalFrame LOCALFRAME
+            405ad7     40 DATAREF STACK 504 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 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 
@@ -2982,9 +2966,8 @@
             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 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     24 DATAREF STACK 505 esp + 0 PARENT LocalFrame LOCALFRAME
+            405bb0      4 DATAREF STACK 506 esp + 0 CHILDOF 505 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 
@@ -3065,7 +3048,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 524 esp + 0 PARENT LocalFrame LOCALFRAME
+            405c2d      8 DATAREF STACK 507 esp + 0 PARENT LocalFrame LOCALFRAME
             405c2d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             405c31     -1 INSTR LOCAL NoMetaUpdate call    _getenv 
             405c31      5 INSTR BELONGTO 405c20 
@@ -3137,14 +3120,9 @@
             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 525 esp + 0 PARENT LocalFrame LOCALFRAME
+            405caf     40 DATAREF STACK 508 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 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 
@@ -3337,12 +3315,10 @@
             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 533 esp + 8 CHILDOF 531 OFFSET 8 LOCALVAR var_30 
-            405def     24 DATAREF STACK 531 esp + 0 PARENT LocalFrame LOCALFRAME
+            405def     24 DATAREF STACK 509 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 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 
@@ -3550,14 +3526,10 @@
             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 534 esp + 0 PARENT LocalFrame LOCALFRAME
+            405f1d    160 DATAREF STACK 510 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 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 
@@ -3773,14 +3745,10 @@
             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 539 esp + 0 PARENT LocalFrame LOCALFRAME
+            406097    160 DATAREF STACK 511 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 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 
@@ -4132,14 +4100,10 @@
             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 544 esp + 0 PARENT LocalFrame LOCALFRAME
+            4064d1    160 DATAREF STACK 512 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 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 
@@ -4418,7 +4382,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 549 esp + 0 PARENT LocalFrame LOCALFRAME
+            4066d0      8 DATAREF STACK 513 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 
@@ -4449,13 +4413,10 @@
             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 550 esp + 0 PARENT LocalFrame LOCALFRAME
+            4066fa    160 DATAREF STACK 514 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 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 
@@ -4616,13 +4577,10 @@
             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 554 esp + 0 PARENT LocalFrame LOCALFRAME
-            406815     16 DATAREF STACK 557 esp + 152 CHILDOF 554 OFFSET 152 LOCALVAR var_20 
+            406815    168 DATAREF STACK 515 esp + 0 PARENT LocalFrame LOCALFRAME
             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 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 
@@ -4746,7 +4704,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 558 esp + 0 PARENT LocalFrame LOCALFRAME
+            4068f0      8 DATAREF STACK 516 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 
@@ -4859,8 +4817,7 @@
             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 559 esp + 0 PARENT LocalFrame LOCALFRAME
-            406a70      4 DATAREF STACK 560 esp + 12 CHILDOF 559 OFFSET 12 LOCALVAR var_C 
+            406a70     16 DATAREF STACK 517 esp + 0 PARENT LocalFrame LOCALFRAME
             406a70      4 INSTR BELONGTO 406a60 
             406a70      4 INSTR DEADREGS  EFLAGS RCX ZZ sub     rsp, 10h 
             406a70      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -4913,9 +4870,8 @@
             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 562 esp + 8 CHILDOF 561 OFFSET 8 LOCALVAR var_20 
             406abe     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            406abe     24 DATAREF STACK 561 esp + 0 PARENT LocalFrame LOCALFRAME
+            406abe     24 DATAREF STACK 518 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 
@@ -5013,11 +4969,9 @@
             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 563 esp + 0 PARENT LocalFrame LOCALFRAME
+            406b4d     24 DATAREF STACK 519 esp + 0 PARENT LocalFrame LOCALFRAME
             406b4d      4 INSTR BELONGTO 406b40 
             406b4d      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
-            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 
@@ -5082,8 +5036,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 566 esp + 0 PARENT LocalFrame LOCALFRAME
-            406bc1      4 DATAREF STACK 567 esp + 0 CHILDOF 566 OFFSET 0 OutArgsRegion OUTARGS
+            406bc1     16 DATAREF STACK 520 esp + 0 PARENT LocalFrame LOCALFRAME
+            406bc1      4 DATAREF STACK 521 esp + 0 CHILDOF 520 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 
@@ -5170,10 +5124,9 @@
             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 568 esp + 0 PARENT LocalFrame LOCALFRAME
+            406c47     32 DATAREF STACK 522 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 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 
@@ -5477,7 +5430,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 570 esp + 0 PARENT LocalFrame LOCALFRAME
+            406e25      8 DATAREF STACK 523 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 
@@ -5597,14 +5550,9 @@
             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 571 esp + 0 PARENT LocalFrame LOCALFRAME
+            406ee2     40 DATAREF STACK 524 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 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 
@@ -5716,19 +5664,10 @@
             406f92      5 INSTR BELONGTO 406f80 
             406f97     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
             406f97      5 INSTR BELONGTO 406f80 
-            406f9c    104 DATAREF STACK 577 esp + 0 PARENT LocalFrame LOCALFRAME
-            406f9c     32 DATAREF STACK 578 esp + 0 CHILDOF 577 OFFSET 0 OutArgsRegion OUTARGS
+            406f9c    104 DATAREF STACK 525 esp + 0 PARENT LocalFrame LOCALFRAME
+            406f9c     32 DATAREF STACK 526 esp + 0 CHILDOF 525 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 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 
@@ -5905,9 +5844,8 @@
             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 589 esp + 8 CHILDOF 588 OFFSET 8 LOCALVAR var_20 
             4070c5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            4070c5     24 DATAREF STACK 588 esp + 0 PARENT LocalFrame LOCALFRAME
+            4070c5     24 DATAREF STACK 527 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 
@@ -5993,14 +5931,7 @@
             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 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     56 DATAREF STACK 528 esp + 0 PARENT LocalFrame LOCALFRAME
             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 
@@ -6551,18 +6482,11 @@
             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 606 esp + 72 CHILDOF 598 OFFSET 72 LOCALVAR var_40 
             407c40     48 MEMORYHOLE STACK esp + 88 CalleeSavedRegs 
-            407c40      4 DATAREF STACK 599 esp + 0 CHILDOF 598 OFFSET 0 OutArgsRegion OUTARGS
+            407c40      4 DATAREF STACK 530 esp + 0 CHILDOF 529 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 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     88 DATAREF STACK 529 esp + 0 PARENT LocalFrame LOCALFRAME
             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 
@@ -7032,7 +6956,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 607 esp + 0 PARENT LocalFrame LOCALFRAME
+            4080a5      8 DATAREF STACK 531 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 
@@ -7252,7 +7176,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 608 esp + 0 PARENT LocalFrame LOCALFRAME
+            408455      8 DATAREF STACK 532 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 
@@ -7404,17 +7328,10 @@
             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 616 esp + 24 CHILDOF 609 OFFSET 24 LOCALVAR var_20 
             4085a5     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-            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     40 DATAREF STACK 533 esp + 0 PARENT LocalFrame LOCALFRAME
             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 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 
@@ -7668,14 +7585,10 @@
             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 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 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     56 DATAREF STACK 534 esp + 0 PARENT LocalFrame LOCALFRAME
             4087c0      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
             4087c4     -1 INSTR LOCAL NoMetaUpdate call    sub_406BC0 
             4087c4      5 INSTR BELONGTO 4087b0 
@@ -8135,14 +8048,9 @@
             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 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 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     56 DATAREF STACK 535 esp + 0 PARENT LocalFrame LOCALFRAME
             408c0c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             408c10      3 INSTR BELONGTO 408bf0 
             408c10      3 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ mov     rbx, rdi 
@@ -8327,7 +8235,7 @@
             408e82      3 INSTR BELONGTO 408e80 
             408e85     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             408e85      4 INSTR BELONGTO 408e80 
-            408e85      8 DATAREF STACK 628 esp + 0 PARENT LocalFrame LOCALFRAME
+            408e85      8 DATAREF STACK 536 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 
@@ -8537,11 +8445,9 @@
             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 629 esp + 0 PARENT LocalFrame LOCALFRAME
+            40915a     24 DATAREF STACK 537 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 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 
@@ -8625,10 +8531,9 @@
             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 632 esp + 0 PARENT LocalFrame LOCALFRAME
+            4092b4     16 DATAREF STACK 538 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 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 
@@ -8688,12 +8593,9 @@
             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 634 esp + 0 PARENT LocalFrame LOCALFRAME
+            409312     24 DATAREF STACK 539 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 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 
@@ -8757,13 +8659,7 @@
             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 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     56 DATAREF STACK 540 esp + 0 PARENT LocalFrame LOCALFRAME
             40937c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             409380     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             409380      3 INSTR BELONGTO 409350 
@@ -8840,7 +8736,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 645 esp + 0 PARENT LocalFrame LOCALFRAME
+            4093f5      8 DATAREF STACK 541 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 
@@ -8875,7 +8771,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 646 esp + 0 PARENT LocalFrame LOCALFRAME
+            409428      8 DATAREF STACK 542 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 1b4ea795d56a7482956ae19a3ad21c335d055a05..e6d92422c26269806033e4b03fa17eabf8ecd381 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring-3.psexe.annot
@@ -444,8 +444,6 @@
             401385      1 INSTR BELONGTO 401380 
             401385      1 INSTR DEADREGS  EFLAGS R12 R13 ZZ push    rbx 
             401385     -3 INSTR LOCAL NoWarn push    rbx 
-            401386     12 DATAREF STACK 143 esp + 0 CHILDOF 142 OFFSET 0 LOCALVAR var_38 
-            401386     12 DATAREF STACK 144 esp + 12 CHILDOF 142 OFFSET 12 LOCALVAR var_2C 
             401386     24 DATAREF STACK 142 esp + 0 PARENT LocalFrame LOCALFRAME
             401386     32 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
             401386      4 INSTR BELONGTO 401380 
@@ -605,9 +603,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -629,7 +627,7 @@
             401498     23 FUNC GLOBAL sub_401498 FUNC_SAFE NOFP RET             4014ae 
             401498      4 INSTR BELONGTO 401498 
             401498      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            401498      8 DATAREF STACK 145 esp + 0 PARENT LocalFrame LOCALFRAME
+            401498      8 DATAREF STACK 143 esp + 0 PARENT LocalFrame LOCALFRAME
             401498      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             40149c      7 INSTR BELONGTO 401498 
             40149c      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -659,7 +657,7 @@
             4014b5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             4014b5      4 INSTR BELONGTO 4014b0 
             4014b5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            4014b5      8 DATAREF STACK 146 esp + 0 PARENT LocalFrame LOCALFRAME
+            4014b5      8 DATAREF STACK 144 esp + 0 PARENT LocalFrame LOCALFRAME
             4014b5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4014b9     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_603280, 0 
             4014b9      7 INSTR BELONGTO 4014b0 
@@ -820,24 +818,11 @@
             4015c3     -3 INSTR LOCAL NoWarn push    rbx 
             4015c4      3 INSTR BELONGTO 4015c0 
             4015c4      3 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     rbx, rdi 
-            4015c7     16 DATAREF STACK 149 esp + 32 CHILDOF 147 OFFSET 32 LOCALVAR var_C8 
-            4015c7     16 DATAREF STACK 154 esp + 80 CHILDOF 147 OFFSET 80 LOCALVAR var_98 
-            4015c7     16 DATAREF STACK 155 esp + 96 CHILDOF 147 OFFSET 96 LOCALVAR var_88 
-            4015c7     16 DATAREF STACK 156 esp + 112 CHILDOF 147 OFFSET 112 LOCALVAR var_78 
-            4015c7     16 DATAREF STACK 157 esp + 128 CHILDOF 147 OFFSET 128 LOCALVAR var_68 
-            4015c7     16 DATAREF STACK 158 esp + 144 CHILDOF 147 OFFSET 144 LOCALVAR var_58 
-            4015c7     16 DATAREF STACK 159 esp + 160 CHILDOF 147 OFFSET 160 LOCALVAR var_48 
-            4015c7     16 DATAREF STACK 160 esp + 176 CHILDOF 147 OFFSET 176 LOCALVAR var_38 
-            4015c7     16 DATAREF STACK 161 esp + 192 CHILDOF 147 OFFSET 192 LOCALVAR var_28 
-            4015c7    208 DATAREF STACK 147 esp + 0 PARENT LocalFrame LOCALFRAME
+            4015c7    208 DATAREF STACK 145 esp + 0 PARENT LocalFrame LOCALFRAME
             4015c7     24 MEMORYHOLE STACK esp + 208 CalleeSavedRegs 
-            4015c7     32 DATAREF STACK 148 esp + 0 CHILDOF 147 OFFSET 0 OutArgsRegion OUTARGS
+            4015c7     32 DATAREF STACK 146 esp + 0 CHILDOF 145 OFFSET 0 OutArgsRegion OUTARGS
             4015c7      7 INSTR BELONGTO 4015c0 
             4015c7      7 INSTR DEADREGS  EFLAGS RDI R12 ZZ sub     rsp, 0D0h 
-            4015c7      8 DATAREF STACK 150 esp + 48 CHILDOF 147 OFFSET 48 LOCALVAR var_B8 
-            4015c7      8 DATAREF STACK 151 esp + 56 CHILDOF 147 OFFSET 56 LOCALVAR var_B0 
-            4015c7      8 DATAREF STACK 152 esp + 64 CHILDOF 147 OFFSET 64 LOCALVAR var_A8 
-            4015c7      8 DATAREF STACK 153 esp + 72 CHILDOF 147 OFFSET 72 LOCALVAR var_A0 
             4015c7      8 MEMORYHOLE STACK esp + 232 ReturnAddress 
             4015ce     -1 INSTR LOCAL NoMetaUpdate test    al, al 
             4015ce      2 INSTR BELONGTO 4015c0 
@@ -998,14 +983,10 @@
             4016f2      5 INSTR BELONGTO 4016e0 
             4016f7      5 INSTR BELONGTO 4016e0 
             4016f7      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     edi, offset aGnomeKeyringTo; "- Gnome Keyring Tool" 
-            4016fc     16 DATAREF STACK 163 esp + 0 CHILDOF 162 OFFSET 0 OutArgsRegion OUTARGS
+            4016fc     16 DATAREF STACK 148 esp + 0 CHILDOF 147 OFFSET 0 OutArgsRegion OUTARGS
             4016fc      4 INSTR BELONGTO 4016e0 
             4016fc      4 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ sub     rsp, 38h 
-            4016fc     56 DATAREF STACK 162 esp + 0 PARENT LocalFrame LOCALFRAME
-            4016fc      8 DATAREF STACK 164 esp + 24 CHILDOF 162 OFFSET 24 LOCALVAR var_20 
-            4016fc      8 DATAREF STACK 165 esp + 32 CHILDOF 162 OFFSET 32 LOCALVAR var_18 
-            4016fc      8 DATAREF STACK 166 esp + 40 CHILDOF 162 OFFSET 40 LOCALVAR var_10 
-            4016fc      8 DATAREF STACK 167 esp + 48 CHILDOF 162 OFFSET 48 LOCALVAR var_8 
+            4016fc     56 DATAREF STACK 147 esp + 0 PARENT LocalFrame LOCALFRAME
             4016fc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             401700      3 INSTR BELONGTO 4016e0 
             401700      3 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ mov     r13, rdx 
@@ -1098,14 +1079,11 @@
             40178b      1 INSTR BELONGTO 401780 
             40178b      1 INSTR DEADREGS  EFLAGS RSI R8 ZZ push    rbx 
             40178b     -3 INSTR LOCAL NoWarn push    rbx 
-            40178c     16 DATAREF STACK 172 esp + 40 CHILDOF 168 OFFSET 40 LOCALVAR var_20 
             40178c     16 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
-            40178c     24 DATAREF STACK 169 esp + 0 CHILDOF 168 OFFSET 0 OutArgsRegion OUTARGS
+            40178c     24 DATAREF STACK 150 esp + 0 CHILDOF 149 OFFSET 0 OutArgsRegion OUTARGS
             40178c      4 INSTR BELONGTO 401780 
             40178c      4 INSTR DEADREGS  EFLAGS RBX RSI R8 ZZ sub     rsp, 38h 
-            40178c     56 DATAREF STACK 168 esp + 0 PARENT LocalFrame LOCALFRAME
-            40178c      8 DATAREF STACK 170 esp + 24 CHILDOF 168 OFFSET 24 LOCALVAR var_30 
-            40178c      8 DATAREF STACK 171 esp + 32 CHILDOF 168 OFFSET 32 LOCALVAR var_28 
+            40178c     56 DATAREF STACK 149 esp + 0 PARENT LocalFrame LOCALFRAME
             40178c      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             401790      5 INSTR BELONGTO 401780 
             401790      5 INSTR DEADREGS  EFLAGS RBX RSI R8 ZZ lea     r8, [rsp+48h+var_28] 
@@ -1296,14 +1274,10 @@
             4018ce      1 INSTR BELONGTO 4018c0 
             4018ce      1 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ push    rbx 
             4018ce     -3 INSTR LOCAL NoWarn push    rbx 
-            4018cf     12 DATAREF STACK 175 esp + 16 CHILDOF 173 OFFSET 16 LOCALVAR var_58 
-            4018cf     12 DATAREF STACK 176 esp + 28 CHILDOF 173 OFFSET 28 LOCALVAR var_4C 
-            4018cf     16 DATAREF STACK 177 esp + 40 CHILDOF 173 OFFSET 40 LOCALVAR var_40 
             4018cf     48 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
             4018cf      4 INSTR BELONGTO 4018c0 
             4018cf      4 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ sub     rsp, 38h 
-            4018cf     56 DATAREF STACK 173 esp + 0 PARENT LocalFrame LOCALFRAME
-            4018cf      8 DATAREF STACK 174 esp + 8 CHILDOF 173 OFFSET 8 LOCALVAR var_60 
+            4018cf     56 DATAREF STACK 151 esp + 0 PARENT LocalFrame LOCALFRAME
             4018cf      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
             4018d3     -1 INSTR LOCAL MetadataUnused mov     [rsp+68h+var_4C], edi 
             4018d3      4 INSTR BELONGTO 4018c0 
@@ -1604,7 +1578,7 @@
             401ac0      0 FUNC MMSAFENESS SAFE
             401ac0      4 INSTR BELONGTO 401ac0 
             401ac0      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ sub     rsp, 8 
-            401ac0      8 DATAREF STACK 178 esp + 0 PARENT LocalFrame LOCALFRAME
+            401ac0      8 DATAREF STACK 152 esp + 0 PARENT LocalFrame LOCALFRAME
             401ac0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             401ac0     94 FUNC GLOBAL sub_401AC0 FUNC_UNSAFE NOFP RET             401b1d 
             401ac4     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -1975,13 +1949,7 @@
             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 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     56 DATAREF STACK 153 esp + 0 PARENT LocalFrame LOCALFRAME
             401f3c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             401f40     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             401f40      3 INSTR BELONGTO 401f10 
@@ -2058,7 +2026,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 186 esp + 0 PARENT LocalFrame LOCALFRAME
+            401fb5      8 DATAREF STACK 154 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 
@@ -2093,7 +2061,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 187 esp + 0 PARENT LocalFrame LOCALFRAME
+            401fe8      8 DATAREF STACK 155 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 9362e0118d18a7a3955122df7e5815e44e3053f0..97246027ed7d8a2538858acb88e94c0a66965ede 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 @@
-b46f88cd988f67c734a7a6f85575ef6801cde12c
\ No newline at end of file
+b4e3874d7a8a852bc97e241d85700cb159a1c222
\ 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 1b4ea795d56a7482956ae19a3ad21c335d055a05..e6d92422c26269806033e4b03fa17eabf8ecd381 100644
--- a/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-keyring.psexe.annot
@@ -444,8 +444,6 @@
             401385      1 INSTR BELONGTO 401380 
             401385      1 INSTR DEADREGS  EFLAGS R12 R13 ZZ push    rbx 
             401385     -3 INSTR LOCAL NoWarn push    rbx 
-            401386     12 DATAREF STACK 143 esp + 0 CHILDOF 142 OFFSET 0 LOCALVAR var_38 
-            401386     12 DATAREF STACK 144 esp + 12 CHILDOF 142 OFFSET 12 LOCALVAR var_2C 
             401386     24 DATAREF STACK 142 esp + 0 PARENT LocalFrame LOCALFRAME
             401386     32 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
             401386      4 INSTR BELONGTO 401380 
@@ -605,9 +603,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -629,7 +627,7 @@
             401498     23 FUNC GLOBAL sub_401498 FUNC_SAFE NOFP RET             4014ae 
             401498      4 INSTR BELONGTO 401498 
             401498      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            401498      8 DATAREF STACK 145 esp + 0 PARENT LocalFrame LOCALFRAME
+            401498      8 DATAREF STACK 143 esp + 0 PARENT LocalFrame LOCALFRAME
             401498      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             40149c      7 INSTR BELONGTO 401498 
             40149c      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -659,7 +657,7 @@
             4014b5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             4014b5      4 INSTR BELONGTO 4014b0 
             4014b5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            4014b5      8 DATAREF STACK 146 esp + 0 PARENT LocalFrame LOCALFRAME
+            4014b5      8 DATAREF STACK 144 esp + 0 PARENT LocalFrame LOCALFRAME
             4014b5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4014b9     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_603280, 0 
             4014b9      7 INSTR BELONGTO 4014b0 
@@ -820,24 +818,11 @@
             4015c3     -3 INSTR LOCAL NoWarn push    rbx 
             4015c4      3 INSTR BELONGTO 4015c0 
             4015c4      3 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     rbx, rdi 
-            4015c7     16 DATAREF STACK 149 esp + 32 CHILDOF 147 OFFSET 32 LOCALVAR var_C8 
-            4015c7     16 DATAREF STACK 154 esp + 80 CHILDOF 147 OFFSET 80 LOCALVAR var_98 
-            4015c7     16 DATAREF STACK 155 esp + 96 CHILDOF 147 OFFSET 96 LOCALVAR var_88 
-            4015c7     16 DATAREF STACK 156 esp + 112 CHILDOF 147 OFFSET 112 LOCALVAR var_78 
-            4015c7     16 DATAREF STACK 157 esp + 128 CHILDOF 147 OFFSET 128 LOCALVAR var_68 
-            4015c7     16 DATAREF STACK 158 esp + 144 CHILDOF 147 OFFSET 144 LOCALVAR var_58 
-            4015c7     16 DATAREF STACK 159 esp + 160 CHILDOF 147 OFFSET 160 LOCALVAR var_48 
-            4015c7     16 DATAREF STACK 160 esp + 176 CHILDOF 147 OFFSET 176 LOCALVAR var_38 
-            4015c7     16 DATAREF STACK 161 esp + 192 CHILDOF 147 OFFSET 192 LOCALVAR var_28 
-            4015c7    208 DATAREF STACK 147 esp + 0 PARENT LocalFrame LOCALFRAME
+            4015c7    208 DATAREF STACK 145 esp + 0 PARENT LocalFrame LOCALFRAME
             4015c7     24 MEMORYHOLE STACK esp + 208 CalleeSavedRegs 
-            4015c7     32 DATAREF STACK 148 esp + 0 CHILDOF 147 OFFSET 0 OutArgsRegion OUTARGS
+            4015c7     32 DATAREF STACK 146 esp + 0 CHILDOF 145 OFFSET 0 OutArgsRegion OUTARGS
             4015c7      7 INSTR BELONGTO 4015c0 
             4015c7      7 INSTR DEADREGS  EFLAGS RDI R12 ZZ sub     rsp, 0D0h 
-            4015c7      8 DATAREF STACK 150 esp + 48 CHILDOF 147 OFFSET 48 LOCALVAR var_B8 
-            4015c7      8 DATAREF STACK 151 esp + 56 CHILDOF 147 OFFSET 56 LOCALVAR var_B0 
-            4015c7      8 DATAREF STACK 152 esp + 64 CHILDOF 147 OFFSET 64 LOCALVAR var_A8 
-            4015c7      8 DATAREF STACK 153 esp + 72 CHILDOF 147 OFFSET 72 LOCALVAR var_A0 
             4015c7      8 MEMORYHOLE STACK esp + 232 ReturnAddress 
             4015ce     -1 INSTR LOCAL NoMetaUpdate test    al, al 
             4015ce      2 INSTR BELONGTO 4015c0 
@@ -998,14 +983,10 @@
             4016f2      5 INSTR BELONGTO 4016e0 
             4016f7      5 INSTR BELONGTO 4016e0 
             4016f7      5 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 ZZ mov     edi, offset aGnomeKeyringTo; "- Gnome Keyring Tool" 
-            4016fc     16 DATAREF STACK 163 esp + 0 CHILDOF 162 OFFSET 0 OutArgsRegion OUTARGS
+            4016fc     16 DATAREF STACK 148 esp + 0 CHILDOF 147 OFFSET 0 OutArgsRegion OUTARGS
             4016fc      4 INSTR BELONGTO 4016e0 
             4016fc      4 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ sub     rsp, 38h 
-            4016fc     56 DATAREF STACK 162 esp + 0 PARENT LocalFrame LOCALFRAME
-            4016fc      8 DATAREF STACK 164 esp + 24 CHILDOF 162 OFFSET 24 LOCALVAR var_20 
-            4016fc      8 DATAREF STACK 165 esp + 32 CHILDOF 162 OFFSET 32 LOCALVAR var_18 
-            4016fc      8 DATAREF STACK 166 esp + 40 CHILDOF 162 OFFSET 40 LOCALVAR var_10 
-            4016fc      8 DATAREF STACK 167 esp + 48 CHILDOF 162 OFFSET 48 LOCALVAR var_8 
+            4016fc     56 DATAREF STACK 147 esp + 0 PARENT LocalFrame LOCALFRAME
             4016fc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             401700      3 INSTR BELONGTO 4016e0 
             401700      3 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ mov     r13, rdx 
@@ -1098,14 +1079,11 @@
             40178b      1 INSTR BELONGTO 401780 
             40178b      1 INSTR DEADREGS  EFLAGS RSI R8 ZZ push    rbx 
             40178b     -3 INSTR LOCAL NoWarn push    rbx 
-            40178c     16 DATAREF STACK 172 esp + 40 CHILDOF 168 OFFSET 40 LOCALVAR var_20 
             40178c     16 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
-            40178c     24 DATAREF STACK 169 esp + 0 CHILDOF 168 OFFSET 0 OutArgsRegion OUTARGS
+            40178c     24 DATAREF STACK 150 esp + 0 CHILDOF 149 OFFSET 0 OutArgsRegion OUTARGS
             40178c      4 INSTR BELONGTO 401780 
             40178c      4 INSTR DEADREGS  EFLAGS RBX RSI R8 ZZ sub     rsp, 38h 
-            40178c     56 DATAREF STACK 168 esp + 0 PARENT LocalFrame LOCALFRAME
-            40178c      8 DATAREF STACK 170 esp + 24 CHILDOF 168 OFFSET 24 LOCALVAR var_30 
-            40178c      8 DATAREF STACK 171 esp + 32 CHILDOF 168 OFFSET 32 LOCALVAR var_28 
+            40178c     56 DATAREF STACK 149 esp + 0 PARENT LocalFrame LOCALFRAME
             40178c      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             401790      5 INSTR BELONGTO 401780 
             401790      5 INSTR DEADREGS  EFLAGS RBX RSI R8 ZZ lea     r8, [rsp+48h+var_28] 
@@ -1296,14 +1274,10 @@
             4018ce      1 INSTR BELONGTO 4018c0 
             4018ce      1 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ push    rbx 
             4018ce     -3 INSTR LOCAL NoWarn push    rbx 
-            4018cf     12 DATAREF STACK 175 esp + 16 CHILDOF 173 OFFSET 16 LOCALVAR var_58 
-            4018cf     12 DATAREF STACK 176 esp + 28 CHILDOF 173 OFFSET 28 LOCALVAR var_4C 
-            4018cf     16 DATAREF STACK 177 esp + 40 CHILDOF 173 OFFSET 40 LOCALVAR var_40 
             4018cf     48 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
             4018cf      4 INSTR BELONGTO 4018c0 
             4018cf      4 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ sub     rsp, 38h 
-            4018cf     56 DATAREF STACK 173 esp + 0 PARENT LocalFrame LOCALFRAME
-            4018cf      8 DATAREF STACK 174 esp + 8 CHILDOF 173 OFFSET 8 LOCALVAR var_60 
+            4018cf     56 DATAREF STACK 151 esp + 0 PARENT LocalFrame LOCALFRAME
             4018cf      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
             4018d3     -1 INSTR LOCAL MetadataUnused mov     [rsp+68h+var_4C], edi 
             4018d3      4 INSTR BELONGTO 4018c0 
@@ -1604,7 +1578,7 @@
             401ac0      0 FUNC MMSAFENESS SAFE
             401ac0      4 INSTR BELONGTO 401ac0 
             401ac0      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI R8 ZZ sub     rsp, 8 
-            401ac0      8 DATAREF STACK 178 esp + 0 PARENT LocalFrame LOCALFRAME
+            401ac0      8 DATAREF STACK 152 esp + 0 PARENT LocalFrame LOCALFRAME
             401ac0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             401ac0     94 FUNC GLOBAL sub_401AC0 FUNC_UNSAFE NOFP RET             401b1d 
             401ac4     -2 INSTR LOCAL n R8 ZZ  AlwaysNUM xor     r8d, r8d 
@@ -1975,13 +1949,7 @@
             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 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     56 DATAREF STACK 153 esp + 0 PARENT LocalFrame LOCALFRAME
             401f3c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             401f40     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             401f40      3 INSTR BELONGTO 401f10 
@@ -2058,7 +2026,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 186 esp + 0 PARENT LocalFrame LOCALFRAME
+            401fb5      8 DATAREF STACK 154 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 
@@ -2093,7 +2061,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 187 esp + 0 PARENT LocalFrame LOCALFRAME
+            401fe8      8 DATAREF STACK 155 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 f1cb911897ef9aabe6fcfd9e984884f3cc35252c..fa09b50ba05723881360472c325158a097587ae3 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 @@
-7fc7428ad89fac9e49f0b634a0e952a786223d56
\ No newline at end of file
+e37211330fab27df2bb9d87a4bc54d5c1ea1d87f
\ 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 8e1ddce4e378575d41799d66adfab8017112fd5a..93fd7705ca50d6e3ff5597e603782458321b332e 100644
--- a/tests/commit/trimmed-sorted-save-gnome-open.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-open.psexe.annot
@@ -160,7 +160,6 @@
             400af9     24 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
             400af9      4 INSTR BELONGTO 400af0 
             400af9      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 10h 
-            400af9      8 DATAREF STACK 40 esp + 8 CHILDOF 39 OFFSET 8 LOCALVAR var_20 
             400af9      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             400afd     -1 INSTR LOCAL NoMetaUpdate cmp     edi, 1 
             400afd      3 INSTR BELONGTO 400af0 
@@ -365,9 +364,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -389,7 +388,7 @@
             400c4c     23 FUNC GLOBAL sub_400C4C FUNC_SAFE NOFP RET             400c62 
             400c4c      4 INSTR BELONGTO 400c4c 
             400c4c      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            400c4c      8 DATAREF STACK 41 esp + 0 PARENT LocalFrame LOCALFRAME
+            400c4c      8 DATAREF STACK 40 esp + 0 PARENT LocalFrame LOCALFRAME
             400c4c      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             400c50      7 INSTR BELONGTO 400c4c 
             400c50      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -419,7 +418,7 @@
             400c75     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             400c75      4 INSTR BELONGTO 400c70 
             400c75      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            400c75      8 DATAREF STACK 42 esp + 0 PARENT LocalFrame LOCALFRAME
+            400c75      8 DATAREF STACK 41 esp + 0 PARENT LocalFrame LOCALFRAME
             400c75      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             400c79     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_602088, 0 
             400c79      7 INSTR BELONGTO 400c70 
@@ -513,13 +512,7 @@
             400d37      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
             400d3c      4 INSTR BELONGTO 400d10 
             400d3c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-            400d3c     56 DATAREF STACK 43 esp + 0 PARENT LocalFrame LOCALFRAME
-            400d3c      8 DATAREF STACK 44 esp + 8 CHILDOF 43 OFFSET 8 LOCALVAR var_30 
-            400d3c      8 DATAREF STACK 45 esp + 16 CHILDOF 43 OFFSET 16 LOCALVAR var_28 
-            400d3c      8 DATAREF STACK 46 esp + 24 CHILDOF 43 OFFSET 24 LOCALVAR var_20 
-            400d3c      8 DATAREF STACK 47 esp + 32 CHILDOF 43 OFFSET 32 LOCALVAR var_18 
-            400d3c      8 DATAREF STACK 48 esp + 40 CHILDOF 43 OFFSET 40 LOCALVAR var_10 
-            400d3c      8 DATAREF STACK 49 esp + 48 CHILDOF 43 OFFSET 48 LOCALVAR var_8 
+            400d3c     56 DATAREF STACK 42 esp + 0 PARENT LocalFrame LOCALFRAME
             400d3c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             400d40     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             400d40      3 INSTR BELONGTO 400d10 
@@ -596,7 +589,7 @@
             400db5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             400db5      4 INSTR BELONGTO 400db0 
             400db5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-            400db5      8 DATAREF STACK 50 esp + 0 PARENT LocalFrame LOCALFRAME
+            400db5      8 DATAREF STACK 43 esp + 0 PARENT LocalFrame LOCALFRAME
             400db5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             400db9      7 INSTR BELONGTO 400db0 
             400db9      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_601DD8 
@@ -631,7 +624,7 @@
             400de8     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET             400df5 
             400de8      4 INSTR BELONGTO 400de8 
             400de8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-            400de8      8 DATAREF STACK 51 esp + 0 PARENT LocalFrame LOCALFRAME
+            400de8      8 DATAREF STACK 44 esp + 0 PARENT LocalFrame LOCALFRAME
             400de8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             400dec     -1 INSTR LOCAL NoMetaUpdate call    sub_400C70 
             400dec      5 INSTR BELONGTO 400de8 
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 54b878a656a8dcd76a81c17e238648298d0f12d5..7b14d72b82e98df18f7ad01927510f4220f6b754 100644
--- a/tests/commit/trimmed-sorted-save-gnome-power-statistics.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-power-statistics.psexe.annot
@@ -1900,10 +1900,8 @@
             4049d3      1 INSTR BELONGTO 4049d0 
             4049d3      1 INSTR DEADREGS  EFLAGS R12 ZZ push    rbx 
             4049d3     -3 INSTR LOCAL NoWarn push    rbx 
-            4049d4     12 DATAREF STACK 682 esp + 0 CHILDOF 681 OFFSET 0 LOCALVAR var_28 
             4049d4     16 DATAREF STACK 681 esp + 0 PARENT LocalFrame LOCALFRAME
             4049d4     24 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
-            4049d4      4 DATAREF STACK 683 esp + 12 CHILDOF 681 OFFSET 12 LOCALVAR var_1C 
             4049d4      4 INSTR BELONGTO 4049d0 
             4049d4      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 10h 
             4049d4      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -2090,9 +2088,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -2114,7 +2112,7 @@
             404b18     23 FUNC GLOBAL sub_404B18 FUNC_SAFE NOFP RET             404b2e 
             404b18      4 INSTR BELONGTO 404b18 
             404b18      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            404b18      8 DATAREF STACK 684 esp + 0 PARENT LocalFrame LOCALFRAME
+            404b18      8 DATAREF STACK 682 esp + 0 PARENT LocalFrame LOCALFRAME
             404b18      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             404b1c      7 INSTR BELONGTO 404b18 
             404b1c      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -2144,7 +2142,7 @@
             404b35     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             404b35      4 INSTR BELONGTO 404b30 
             404b35      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            404b35      8 DATAREF STACK 685 esp + 0 PARENT LocalFrame LOCALFRAME
+            404b35      8 DATAREF STACK 683 esp + 0 PARENT LocalFrame LOCALFRAME
             404b35      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             404b39     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_60F6A8, 0 
             404b39      7 INSTR BELONGTO 404b30 
@@ -2218,8 +2216,7 @@
             404bd0      3 INSTR BELONGTO 404bd0 
             404bd3     -1 INSTR LOCAL NoMetaUpdate mulss   xmm0, xmm0 
             404bd3      4 INSTR BELONGTO 404bd0 
-            404bd7     24 DATAREF STACK 686 esp + 0 PARENT LocalFrame LOCALFRAME
-            404bd7     24 DATAREF STACK 687 esp + 0 CHILDOF 686 OFFSET 0 LOCALVAR var_18 
+            404bd7     24 DATAREF STACK 684 esp + 0 PARENT LocalFrame LOCALFRAME
             404bd7      4 INSTR BELONGTO 404bd0 
             404bd7      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
             404bd7      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -2331,7 +2328,7 @@
             404c90      4 INSTR BELONGTO 404c90 
             404c90      4 INSTR DEADREGS  EFLAGS RCX ZZ sub     rsp, 8 
             404c90     56 FUNC GLOBAL sub_404C90 FUNC_UNSAFE NOFP RET             404cc7 
-            404c90      8 DATAREF STACK 688 esp + 0 PARENT LocalFrame LOCALFRAME
+            404c90      8 DATAREF STACK 685 esp + 0 PARENT LocalFrame LOCALFRAME
             404c90      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             404c94      2 INSTR BELONGTO 404c90 
             404c94      2 INSTR DEADREGS  EFLAGS RCX ZZ mov     ecx, esi 
@@ -2425,11 +2422,8 @@
             404d3c      1 INSTR BELONGTO 404d30 
             404d3c      1 INSTR DEADREGS  EFLAGS R12 R14 R15 ZZ push    rbx 
             404d3c     -3 INSTR LOCAL NoWarn push    rbx 
-            404d3d     16 DATAREF STACK 692 esp + 24 CHILDOF 689 OFFSET 24 LOCALVAR var_40 
-            404d3d     20 DATAREF STACK 690 esp + 0 CHILDOF 689 OFFSET 0 LOCALVAR var_58 
-            404d3d     40 DATAREF STACK 689 esp + 0 PARENT LocalFrame LOCALFRAME
+            404d3d     40 DATAREF STACK 686 esp + 0 PARENT LocalFrame LOCALFRAME
             404d3d     48 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-            404d3d      4 DATAREF STACK 691 esp + 20 CHILDOF 689 OFFSET 20 LOCALVAR var_44 
             404d3d      4 INSTR BELONGTO 404d30 
             404d3d      4 INSTR DEADREGS  EFLAGS RBX R12 R14 R15 ZZ sub     rsp, 28h 
             404d3d      8 MEMORYHOLE STACK esp + 88 ReturnAddress 
@@ -2688,12 +2682,9 @@
             404f2c     -3 INSTR LOCAL NoWarn push    rbx 
             404f2d     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
             404f2d      3 INSTR BELONGTO 404f20 
-            404f30     16 DATAREF STACK 696 esp + 8 CHILDOF 693 OFFSET 8 LOCALVAR var_40 
             404f30     -1 INSTR LOCAL SafeFrameAlloc sub     rsp, 18h 
-            404f30     24 DATAREF STACK 693 esp + 0 PARENT LocalFrame LOCALFRAME
+            404f30     24 DATAREF STACK 687 esp + 0 PARENT LocalFrame LOCALFRAME
             404f30     48 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            404f30      4 DATAREF STACK 694 esp + 0 CHILDOF 693 OFFSET 0 LOCALVAR var_48 
-            404f30      4 DATAREF STACK 695 esp + 4 CHILDOF 693 OFFSET 4 LOCALVAR var_44 
             404f30      4 INSTR BELONGTO 404f20 
             404f30      4 INSTR DEADREGS  EFLAGS RCX RDX R12 R14 R15 ZZ sub     rsp, 18h 
             404f30      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
@@ -2870,18 +2861,10 @@
             405079     -3 INSTR LOCAL NoWarn push    rbx 
             40507a     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
             40507a      3 INSTR BELONGTO 405070 
-            40507d    136 DATAREF STACK 697 esp + 0 PARENT LocalFrame LOCALFRAME
-            40507d     16 DATAREF STACK 699 esp + 16 CHILDOF 697 OFFSET 16 LOCALVAR var_A8 
-            40507d     16 DATAREF STACK 705 esp + 120 CHILDOF 697 OFFSET 120 LOCALVAR var_40 
-            40507d     24 DATAREF STACK 700 esp + 32 CHILDOF 697 OFFSET 32 LOCALVAR var_98 
-            40507d     24 DATAREF STACK 702 esp + 64 CHILDOF 697 OFFSET 64 LOCALVAR var_78 
-            40507d     24 DATAREF STACK 704 esp + 96 CHILDOF 697 OFFSET 96 LOCALVAR var_58 
+            40507d    136 DATAREF STACK 688 esp + 0 PARENT LocalFrame LOCALFRAME
             40507d     48 MEMORYHOLE STACK esp + 136 CalleeSavedRegs 
-            40507d      4 DATAREF STACK 698 esp + 12 CHILDOF 697 OFFSET 12 LOCALVAR var_AC 
             40507d      7 INSTR BELONGTO 405070 
             40507d      7 INSTR DEADREGS  EFLAGS R13 R14 R15 XMM1 ZZ sub     rsp, 88h 
-            40507d      8 DATAREF STACK 701 esp + 56 CHILDOF 697 OFFSET 56 LOCALVAR var_80 
-            40507d      8 DATAREF STACK 703 esp + 88 CHILDOF 697 OFFSET 88 LOCALVAR var_60 
             40507d      8 MEMORYHOLE STACK esp + 184 ReturnAddress 
             405084     -1 INSTR LOCAL NoMetaUpdate test    sil, 1 
             405084      4 INSTR BELONGTO 405070 
@@ -3331,8 +3314,7 @@
             4055f5     -1 INSTR LOCAL NoMetaUpdate jmp     loc_4053B0 
             405600      0 FUNC FRAMERESTORE 0 0 16 1 0 0 2 0 16 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
             405600      0 FUNC MMSAFENESS SAFE
-            405600     16 DATAREF STACK 707 esp + 8 CHILDOF 706 OFFSET 8 LOCALVAR var_10 
-            405600     24 DATAREF STACK 706 esp + 0 PARENT LocalFrame LOCALFRAME
+            405600     24 DATAREF STACK 689 esp + 0 PARENT LocalFrame LOCALFRAME
             405600      4 INSTR BELONGTO 405600 
             405600      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ sub     rsp, 18h 
             405600      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -3387,8 +3369,7 @@
             405670      0 FUNC FRAMERESTORE 0 0 16 1 0 0 2 0 16 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
             405670      0 FUNC MMSAFENESS SAFE
             405670    141 FUNC GLOBAL sub_405670 FUNC_UNSAFE NOFP RET             4056fc 
-            405670     16 DATAREF STACK 709 esp + 8 CHILDOF 708 OFFSET 8 LOCALVAR var_10 
-            405670     24 DATAREF STACK 708 esp + 0 PARENT LocalFrame LOCALFRAME
+            405670     24 DATAREF STACK 690 esp + 0 PARENT LocalFrame LOCALFRAME
             405670      4 INSTR BELONGTO 405670 
             405670      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI ZZ sub     rsp, 18h 
             405670      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -3467,13 +3448,10 @@
             405705      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
             40570a      3 INSTR BELONGTO 405700 
             40570a      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-            40570d     40 DATAREF STACK 712 esp + 16 CHILDOF 710 OFFSET 16 LOCALVAR var_38 
-            40570d      4 DATAREF STACK 711 esp + 0 CHILDOF 710 OFFSET 0 OutArgsRegion OUTARGS
+            40570d      4 DATAREF STACK 692 esp + 0 CHILDOF 691 OFFSET 0 OutArgsRegion OUTARGS
             40570d      4 INSTR BELONGTO 405700 
             40570d      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 48h 
-            40570d     72 DATAREF STACK 710 esp + 0 PARENT LocalFrame LOCALFRAME
-            40570d      8 DATAREF STACK 713 esp + 56 CHILDOF 710 OFFSET 56 LOCALVAR var_10 
-            40570d      8 DATAREF STACK 714 esp + 64 CHILDOF 710 OFFSET 64 LOCALVAR var_8 
+            40570d     72 DATAREF STACK 691 esp + 0 PARENT LocalFrame LOCALFRAME
             40570d      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             405711      7 INSTR BELONGTO 405700 
             405711      7 INSTR DEADREGS  EFLAGS RDI ZZ mov     rdi, cs:qword_60F6E8 
@@ -3527,8 +3505,7 @@
             405760     -1 INSTR LOCAL NoMetaUpdate cvtsi2ss xmm0, edi 
             405760    434 FUNC GLOBAL sub_405760 FUNC_UNSAFE NOFP RET             405911 
             405760      4 INSTR BELONGTO 405760 
-            405764     24 DATAREF STACK 715 esp + 0 PARENT LocalFrame LOCALFRAME
-            405764     24 DATAREF STACK 716 esp + 0 CHILDOF 715 OFFSET 0 LOCALVAR var_18 
+            405764     24 DATAREF STACK 693 esp + 0 PARENT LocalFrame LOCALFRAME
             405764      4 INSTR BELONGTO 405760 
             405764      4 INSTR DEADREGS  EFLAGS RDX RSI RDI ZZ sub     rsp, 18h 
             405764      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -3738,14 +3715,10 @@
             40592f     -3 INSTR LOCAL NoWarn push    rbx 
             405930      3 INSTR BELONGTO 405920 
             405930      3 INSTR DEADREGS  EFLAGS RAX RDX RBX RDI R8 R9 R10 R11 R13 R14 R15 ZZ mov     rbx, rsi 
-            405933     12 DATAREF STACK 718 esp + 0 CHILDOF 717 OFFSET 0 LOCALVAR var_58 
-            405933     16 DATAREF STACK 721 esp + 24 CHILDOF 717 OFFSET 24 LOCALVAR var_40 
-            405933     40 DATAREF STACK 717 esp + 0 PARENT LocalFrame LOCALFRAME
+            405933     40 DATAREF STACK 694 esp + 0 PARENT LocalFrame LOCALFRAME
             405933     48 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-            405933      4 DATAREF STACK 719 esp + 12 CHILDOF 717 OFFSET 12 LOCALVAR var_4C 
             405933      4 INSTR BELONGTO 405920 
             405933      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI R8 R9 R10 R11 R13 R14 R15 ZZ sub     rsp, 28h 
-            405933      8 DATAREF STACK 720 esp + 16 CHILDOF 717 OFFSET 16 LOCALVAR var_48 
             405933      8 MEMORYHOLE STACK esp + 88 ReturnAddress 
             405937     -1 INSTR LOCAL MetadataUnused mov     [rsp+58h+var_4C], ecx 
             405937      4 INSTR BELONGTO 405920 
@@ -4069,11 +4042,10 @@
             405b34      1 INSTR BELONGTO 405b30 
             405b34      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             405b34     -3 INSTR LOCAL NoWarn push    rbx 
-            405b35     16 DATAREF STACK 723 esp + 40 CHILDOF 722 OFFSET 40 LOCALVAR var_20 
             405b35     16 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
             405b35      4 INSTR BELONGTO 405b30 
             405b35      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 38h 
-            405b35     56 DATAREF STACK 722 esp + 0 PARENT LocalFrame LOCALFRAME
+            405b35     56 DATAREF STACK 695 esp + 0 PARENT LocalFrame LOCALFRAME
             405b35      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             405b39      9 INSTR BELONGTO 405b30 
             405b39      9 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+48h+var_20], 0 
@@ -4246,21 +4218,11 @@
             405c49      1 INSTR BELONGTO 405c40 
             405c49      1 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ push    rbx 
             405c49     -3 INSTR LOCAL NoWarn push    rbx 
-            405c4a    136 DATAREF STACK 724 esp + 0 PARENT LocalFrame LOCALFRAME
-            405c4a     16 DATAREF STACK 731 esp + 48 CHILDOF 724 OFFSET 48 LOCALVAR var_88 
-            405c4a     16 DATAREF STACK 735 esp + 120 CHILDOF 724 OFFSET 120 LOCALVAR var_40 
-            405c4a     40 DATAREF STACK 734 esp + 80 CHILDOF 724 OFFSET 80 LOCALVAR var_68 
+            405c4a    136 DATAREF STACK 696 esp + 0 PARENT LocalFrame LOCALFRAME
             405c4a     48 MEMORYHOLE STACK esp + 136 CalleeSavedRegs 
-            405c4a      4 DATAREF STACK 725 esp + 0 CHILDOF 724 OFFSET 0 OutArgsRegion OUTARGS
+            405c4a      4 DATAREF STACK 697 esp + 0 CHILDOF 696 OFFSET 0 OutArgsRegion OUTARGS
             405c4a      7 INSTR BELONGTO 405c40 
             405c4a      7 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ sub     rsp, 88h 
-            405c4a      8 DATAREF STACK 726 esp + 8 CHILDOF 724 OFFSET 8 LOCALVAR var_B0 
-            405c4a      8 DATAREF STACK 727 esp + 16 CHILDOF 724 OFFSET 16 LOCALVAR var_A8 
-            405c4a      8 DATAREF STACK 728 esp + 24 CHILDOF 724 OFFSET 24 LOCALVAR var_A0 
-            405c4a      8 DATAREF STACK 729 esp + 32 CHILDOF 724 OFFSET 32 LOCALVAR var_98 
-            405c4a      8 DATAREF STACK 730 esp + 40 CHILDOF 724 OFFSET 40 LOCALVAR var_90 
-            405c4a      8 DATAREF STACK 732 esp + 64 CHILDOF 724 OFFSET 64 LOCALVAR s 
-            405c4a      8 DATAREF STACK 733 esp + 72 CHILDOF 724 OFFSET 72 LOCALVAR var_70 
             405c4a      8 MEMORYHOLE STACK esp + 184 ReturnAddress 
             405c51      9 INSTR BELONGTO 405c40 
             405c51      9 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     [rsp+0B8h+var_40], 0 
@@ -5554,7 +5516,7 @@
             406550     41 FUNC GLOBAL sub_406550 FUNC_UNSAFE NOFP RET             406578 
             406550      4 INSTR BELONGTO 406550 
             406550      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ sub     rsp, 8 
-            406550      8 DATAREF STACK 736 esp + 0 PARENT LocalFrame LOCALFRAME
+            406550      8 DATAREF STACK 698 esp + 0 PARENT LocalFrame LOCALFRAME
             406550      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             406554      7 INSTR BELONGTO 406550 
             406554      7 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     rdi, cs:qword_60F6B8 
@@ -5883,34 +5845,10 @@
             4067a0     -3 INSTR LOCAL NoWarn push    rbx 
             4067a1      3 INSTR BELONGTO 4067a0 
             4067a1      3 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rbx, rdi 
-            4067a4     12 DATAREF STACK 753 esp + 424 CHILDOF 737 OFFSET 424 LOCALVAR var_140 
-            4067a4    264 DATAREF STACK 761 esp + 464 CHILDOF 737 OFFSET 464 LOCALVAR s 
-            4067a4    304 DATAREF STACK 738 esp + 0 CHILDOF 737 OFFSET 0 OutArgsRegion OUTARGS
-            4067a4      4 DATAREF STACK 754 esp + 436 CHILDOF 737 OFFSET 436 LOCALVAR var_134 
-            4067a4      4 DATAREF STACK 755 esp + 440 CHILDOF 737 OFFSET 440 LOCALVAR var_130 
-            4067a4      4 DATAREF STACK 756 esp + 444 CHILDOF 737 OFFSET 444 LOCALVAR var_12C 
-            4067a4      4 DATAREF STACK 757 esp + 448 CHILDOF 737 OFFSET 448 LOCALVAR var_128 
-            4067a4      4 DATAREF STACK 758 esp + 452 CHILDOF 737 OFFSET 452 LOCALVAR var_124 
-            4067a4      4 DATAREF STACK 759 esp + 456 CHILDOF 737 OFFSET 456 LOCALVAR var_120 
-            4067a4      4 DATAREF STACK 760 esp + 460 CHILDOF 737 OFFSET 460 LOCALVAR var_11C 
-            4067a4    736 DATAREF STACK 737 esp + 0 PARENT LocalFrame LOCALFRAME
+            4067a4    304 DATAREF STACK 700 esp + 0 CHILDOF 699 OFFSET 0 OutArgsRegion OUTARGS
+            4067a4    736 DATAREF STACK 699 esp + 0 PARENT LocalFrame LOCALFRAME
             4067a4      7 INSTR BELONGTO 4067a0 
             4067a4      7 INSTR DEADREGS  EFLAGS RAX RDI ZZ sub     rsp, 2E0h 
-            4067a4      8 DATAREF STACK 739 esp + 312 CHILDOF 737 OFFSET 312 LOCALVAR timer 
-            4067a4      8 DATAREF STACK 740 esp + 320 CHILDOF 737 OFFSET 320 LOCALVAR var_1A8 
-            4067a4      8 DATAREF STACK 741 esp + 328 CHILDOF 737 OFFSET 328 LOCALVAR var_1A0 
-            4067a4      8 DATAREF STACK 742 esp + 336 CHILDOF 737 OFFSET 336 LOCALVAR var_198 
-            4067a4      8 DATAREF STACK 743 esp + 344 CHILDOF 737 OFFSET 344 LOCALVAR var_190 
-            4067a4      8 DATAREF STACK 744 esp + 352 CHILDOF 737 OFFSET 352 LOCALVAR var_188 
-            4067a4      8 DATAREF STACK 745 esp + 360 CHILDOF 737 OFFSET 360 LOCALVAR var_180 
-            4067a4      8 DATAREF STACK 746 esp + 368 CHILDOF 737 OFFSET 368 LOCALVAR var_178 
-            4067a4      8 DATAREF STACK 747 esp + 376 CHILDOF 737 OFFSET 376 LOCALVAR var_170 
-            4067a4      8 DATAREF STACK 748 esp + 384 CHILDOF 737 OFFSET 384 LOCALVAR var_168 
-            4067a4      8 DATAREF STACK 749 esp + 392 CHILDOF 737 OFFSET 392 LOCALVAR var_160 
-            4067a4      8 DATAREF STACK 750 esp + 400 CHILDOF 737 OFFSET 400 LOCALVAR var_158 
-            4067a4      8 DATAREF STACK 751 esp + 408 CHILDOF 737 OFFSET 408 LOCALVAR var_150 
-            4067a4      8 DATAREF STACK 752 esp + 416 CHILDOF 737 OFFSET 416 LOCALVAR var_148 
-            4067a4      8 DATAREF STACK 762 esp + 728 CHILDOF 737 OFFSET 728 LOCALVAR var_10 
             4067a4      8 MEMORYHOLE STACK esp + 736 CalleeSavedRegs 
             4067a4      8 MEMORYHOLE STACK esp + 744 ReturnAddress 
             4067ab      7 INSTR BELONGTO 4067a0 
@@ -7979,11 +7917,9 @@
             407a85      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
             407a8a      3 INSTR BELONGTO 407a80 
             407a8a      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rsi 
-            407a8d     24 DATAREF STACK 763 esp + 0 PARENT LocalFrame LOCALFRAME
+            407a8d     24 DATAREF STACK 701 esp + 0 PARENT LocalFrame LOCALFRAME
             407a8d      4 INSTR BELONGTO 407a80 
             407a8d      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-            407a8d      8 DATAREF STACK 764 esp + 8 CHILDOF 763 OFFSET 8 LOCALVAR var_10 
-            407a8d      8 DATAREF STACK 765 esp + 16 CHILDOF 763 OFFSET 16 LOCALVAR var_8 
             407a8d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             407a91     -1 INSTR LOCAL MetadataUnused mov     rbp, rsi 
             407a91      3 INSTR BELONGTO 407a80 
@@ -8305,13 +8241,7 @@
             407ccc      5 INSTR BELONGTO 407cb0 
             407cd1      4 INSTR BELONGTO 407cb0 
             407cd1      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 38h 
-            407cd1     56 DATAREF STACK 766 esp + 0 PARENT LocalFrame LOCALFRAME
-            407cd1      8 DATAREF STACK 767 esp + 8 CHILDOF 766 OFFSET 8 LOCALVAR var_30 
-            407cd1      8 DATAREF STACK 768 esp + 16 CHILDOF 766 OFFSET 16 LOCALVAR var_28 
-            407cd1      8 DATAREF STACK 769 esp + 24 CHILDOF 766 OFFSET 24 LOCALVAR var_20 
-            407cd1      8 DATAREF STACK 770 esp + 32 CHILDOF 766 OFFSET 32 LOCALVAR var_18 
-            407cd1      8 DATAREF STACK 771 esp + 40 CHILDOF 766 OFFSET 40 LOCALVAR var_10 
-            407cd1      8 DATAREF STACK 772 esp + 48 CHILDOF 766 OFFSET 48 LOCALVAR var_8 
+            407cd1     56 DATAREF STACK 702 esp + 0 PARENT LocalFrame LOCALFRAME
             407cd1      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             407cd5     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_get_type 
             407cd5      5 INSTR BELONGTO 407cb0 
@@ -8616,13 +8546,7 @@
             407f1c      5 INSTR BELONGTO 407f00 
             407f21      4 INSTR BELONGTO 407f00 
             407f21      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 38h 
-            407f21     56 DATAREF STACK 773 esp + 0 PARENT LocalFrame LOCALFRAME
-            407f21      8 DATAREF STACK 774 esp + 8 CHILDOF 773 OFFSET 8 LOCALVAR var_30 
-            407f21      8 DATAREF STACK 775 esp + 16 CHILDOF 773 OFFSET 16 LOCALVAR var_28 
-            407f21      8 DATAREF STACK 776 esp + 24 CHILDOF 773 OFFSET 24 LOCALVAR var_20 
-            407f21      8 DATAREF STACK 777 esp + 32 CHILDOF 773 OFFSET 32 LOCALVAR var_18 
-            407f21      8 DATAREF STACK 778 esp + 40 CHILDOF 773 OFFSET 40 LOCALVAR var_10 
-            407f21      8 DATAREF STACK 779 esp + 48 CHILDOF 773 OFFSET 48 LOCALVAR var_8 
+            407f21     56 DATAREF STACK 703 esp + 0 PARENT LocalFrame LOCALFRAME
             407f21      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             407f25     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_text_get_type 
             407f25      5 INSTR BELONGTO 407f00 
@@ -9085,10 +9009,9 @@
             408270      1 INSTR DEADREGS  EFLAGS RDX RSI ZZ push    rbx 
             408270    241 FUNC GLOBAL sub_408270 FUNC_UNSAFE NOFP RET             408360 
             408270     -3 INSTR LOCAL NoWarn push    rbx 
-            408271     48 DATAREF STACK 780 esp + 0 PARENT LocalFrame LOCALFRAME
+            408271     48 DATAREF STACK 704 esp + 0 PARENT LocalFrame LOCALFRAME
             408271      4 INSTR BELONGTO 408270 
             408271      4 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ sub     rsp, 30h 
-            408271      8 DATAREF STACK 781 esp + 40 CHILDOF 780 OFFSET 40 LOCALVAR var_10 
             408271      8 MEMORYHOLE STACK esp + 48 CalleeSavedRegs 
             408271      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             408275      5 INSTR BELONGTO 408270 
@@ -9294,22 +9217,10 @@
             4084b9      5 INSTR BELONGTO 4084a0 
             4084be     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
             4084be      5 INSTR BELONGTO 4084a0 
-            4084c3     12 DATAREF STACK 789 esp + 92 CHILDOF 782 OFFSET 92 LOCALVAR var_3C 
-            4084c3    152 DATAREF STACK 782 esp + 0 PARENT LocalFrame LOCALFRAME
-            4084c3     32 DATAREF STACK 783 esp + 0 CHILDOF 782 OFFSET 0 OutArgsRegion OUTARGS
-            4084c3     40 DATAREF STACK 784 esp + 32 CHILDOF 782 OFFSET 32 LOCALVAR var_78 
-            4084c3      4 DATAREF STACK 786 esp + 80 CHILDOF 782 OFFSET 80 LOCALVAR var_48 
-            4084c3      4 DATAREF STACK 787 esp + 84 CHILDOF 782 OFFSET 84 LOCALVAR var_44 
-            4084c3      4 DATAREF STACK 788 esp + 88 CHILDOF 782 OFFSET 88 LOCALVAR var_40 
+            4084c3    152 DATAREF STACK 705 esp + 0 PARENT LocalFrame LOCALFRAME
+            4084c3     32 DATAREF STACK 706 esp + 0 CHILDOF 705 OFFSET 0 OutArgsRegion OUTARGS
             4084c3      7 INSTR BELONGTO 4084a0 
             4084c3      7 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 R14 R15 ZZ sub     rsp, 98h 
-            4084c3      8 DATAREF STACK 785 esp + 72 CHILDOF 782 OFFSET 72 LOCALVAR var_50 
-            4084c3      8 DATAREF STACK 790 esp + 104 CHILDOF 782 OFFSET 104 LOCALVAR var_30 
-            4084c3      8 DATAREF STACK 791 esp + 112 CHILDOF 782 OFFSET 112 LOCALVAR var_28 
-            4084c3      8 DATAREF STACK 792 esp + 120 CHILDOF 782 OFFSET 120 LOCALVAR var_20 
-            4084c3      8 DATAREF STACK 793 esp + 128 CHILDOF 782 OFFSET 128 LOCALVAR var_18 
-            4084c3      8 DATAREF STACK 794 esp + 136 CHILDOF 782 OFFSET 136 LOCALVAR var_10 
-            4084c3      8 DATAREF STACK 795 esp + 144 CHILDOF 782 OFFSET 144 LOCALVAR var_8 
             4084c3      8 MEMORYHOLE STACK esp + 152 ReturnAddress 
             4084ca      5 INSTR BELONGTO 4084a0 
             4084ca      5 INSTR DEADREGS  EFLAGS RAX RDX RSI R12 R13 R14 R15 ZZ lea     rdx, [rsp+98h+var_48] 
@@ -10395,7 +10306,7 @@
             409900     33 FUNC GLOBAL sub_409900 FUNC_UNSAFE NOFP RET             409920 
             409900      4 INSTR BELONGTO 409900 
             409900      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 8 
-            409900      8 DATAREF STACK 796 esp + 0 PARENT LocalFrame LOCALFRAME
+            409900      8 DATAREF STACK 707 esp + 0 PARENT LocalFrame LOCALFRAME
             409900      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             409904     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ch 
             409904      5 INSTR BELONGTO 409900 
@@ -10526,8 +10437,7 @@
             409ba1      1 INSTR DEADREGS  EFLAGS RDX RSI ZZ push    rbx 
             409ba1     -3 INSTR LOCAL NoWarn push    rbx 
             409ba2     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            409ba2     24 DATAREF STACK 797 esp + 0 PARENT LocalFrame LOCALFRAME
-            409ba2     24 DATAREF STACK 798 esp + 0 CHILDOF 797 OFFSET 0 LOCALVAR var_28 
+            409ba2     24 DATAREF STACK 708 esp + 0 PARENT LocalFrame LOCALFRAME
             409ba2      4 INSTR BELONGTO 409ba0 
             409ba2      4 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ sub     rsp, 18h 
             409ba2      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -10933,14 +10843,9 @@
             409e20      5 INSTR BELONGTO 409e00 
             409e25     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
             409e25      5 INSTR BELONGTO 409e00 
-            409e2a     40 DATAREF STACK 799 esp + 0 PARENT LocalFrame LOCALFRAME
+            409e2a     40 DATAREF STACK 709 esp + 0 PARENT LocalFrame LOCALFRAME
             409e2a      4 INSTR BELONGTO 409e00 
             409e2a      4 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 XMM0 XMM1 ZZ sub     rsp, 28h 
-            409e2a      8 DATAREF STACK 800 esp + 0 CHILDOF 799 OFFSET 0 LOCALVAR var_28 
-            409e2a      8 DATAREF STACK 801 esp + 8 CHILDOF 799 OFFSET 8 LOCALVAR var_20 
-            409e2a      8 DATAREF STACK 802 esp + 16 CHILDOF 799 OFFSET 16 LOCALVAR var_18 
-            409e2a      8 DATAREF STACK 803 esp + 24 CHILDOF 799 OFFSET 24 LOCALVAR var_10 
-            409e2a      8 DATAREF STACK 804 esp + 32 CHILDOF 799 OFFSET 32 LOCALVAR var_8 
             409e2a      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             409e2e      3 INSTR BELONGTO 409e00 
             409e2e      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 XMM0 XMM1 ZZ mov     rbx, rdi 
@@ -11053,13 +10958,10 @@
             409ef7     -3 INSTR LOCAL NoWarn push    rbx 
             409ef8      3 INSTR BELONGTO 409ef0 
             409ef8      3 INSTR DEADREGS  EFLAGS RBX XMM3 ZZ mov     rbx, rdi 
-            409efb     16 DATAREF STACK 806 esp + 0 CHILDOF 805 OFFSET 0 LOCALVAR var_48 
-            409efb     16 DATAREF STACK 807 esp + 16 CHILDOF 805 OFFSET 16 LOCALVAR var_38 
             409efb     16 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
-            409efb     24 DATAREF STACK 808 esp + 32 CHILDOF 805 OFFSET 32 LOCALVAR var_28 
             409efb      4 INSTR BELONGTO 409ef0 
             409efb      4 INSTR DEADREGS  EFLAGS XMM3 ZZ sub     rsp, 38h 
-            409efb     56 DATAREF STACK 805 esp + 0 PARENT LocalFrame LOCALFRAME
+            409efb     56 DATAREF STACK 710 esp + 0 PARENT LocalFrame LOCALFRAME
             409efb      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             409eff     -1 INSTR LOCAL MetadataUnused movss   xmm2, cs:dword_40D3C8 
             409eff      8 INSTR BELONGTO 409ef0 
@@ -11176,8 +11078,7 @@
             409fe1      2 INSTR BELONGTO 409fe0 
             409fe1      2 INSTR DEADREGS  EFLAGS RBX ZZ xor     ebx, ebx 
             409fe1     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
-            409fe3     16 DATAREF STACK 809 esp + 0 PARENT LocalFrame LOCALFRAME
-            409fe3     16 DATAREF STACK 810 esp + 0 CHILDOF 809 OFFSET 0 LOCALVAR var_18 
+            409fe3     16 DATAREF STACK 711 esp + 0 PARENT LocalFrame LOCALFRAME
             409fe3      4 INSTR BELONGTO 409fe0 
             409fe3      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 10h 
             409fe3      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -11257,8 +11158,7 @@
             40a061      2 INSTR BELONGTO 40a060 
             40a061      2 INSTR DEADREGS  EFLAGS RBX ZZ xor     ebx, ebx 
             40a061     -2 INSTR LOCAL n EBX ZZ  AlwaysNUM xor     ebx, ebx 
-            40a063     16 DATAREF STACK 811 esp + 0 PARENT LocalFrame LOCALFRAME
-            40a063     16 DATAREF STACK 812 esp + 0 CHILDOF 811 OFFSET 0 LOCALVAR var_18 
+            40a063     16 DATAREF STACK 712 esp + 0 PARENT LocalFrame LOCALFRAME
             40a063      4 INSTR BELONGTO 40a060 
             40a063      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 10h 
             40a063      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -11335,8 +11235,8 @@
             40a0e0      1 INSTR BELONGTO 40a0e0 
             40a0e0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
             40a0e0     -3 INSTR LOCAL NoWarn push    rbx 
-            40a0e1     16 DATAREF STACK 813 esp + 0 PARENT LocalFrame LOCALFRAME
-            40a0e1      4 DATAREF STACK 814 esp + 0 CHILDOF 813 OFFSET 0 OutArgsRegion OUTARGS
+            40a0e1     16 DATAREF STACK 713 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a0e1      4 DATAREF STACK 714 esp + 0 CHILDOF 713 OFFSET 0 OutArgsRegion OUTARGS
             40a0e1      4 INSTR BELONGTO 40a0e0 
             40a0e1      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
             40a0e1      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -12715,7 +12615,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 815 esp + 0 PARENT LocalFrame LOCALFRAME
+            40bbf0      8 DATAREF STACK 715 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 
@@ -12760,13 +12660,7 @@
             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 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     56 DATAREF STACK 716 esp + 0 PARENT LocalFrame LOCALFRAME
             40bc3c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40bc40     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             40bc40      3 INSTR BELONGTO 40bc10 
@@ -12843,7 +12737,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 823 esp + 0 PARENT LocalFrame LOCALFRAME
+            40bcb5      8 DATAREF STACK 717 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 
@@ -12878,7 +12772,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 824 esp + 0 PARENT LocalFrame LOCALFRAME
+            40bce8      8 DATAREF STACK 718 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 1247f9d2fc19e2ce97597cc27bdd4533165cdf78..44856f89957ab0bcc033ef4dabbf90a84a281a8a 100644
--- a/tests/commit/trimmed-sorted-save-gnome-screensaver-command.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-screensaver-command.psexe.annot
@@ -394,9 +394,6 @@
             400fe1      1 INSTR BELONGTO 400fe0 
             400fe1      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             400fe1     -3 INSTR LOCAL NoWarn push    rbx 
-            400fe2     12 DATAREF STACK 165 esp + 0 CHILDOF 164 OFFSET 0 LOCALVAR var_38 
-            400fe2     12 DATAREF STACK 166 esp + 12 CHILDOF 164 OFFSET 12 LOCALVAR var_2C 
-            400fe2     16 DATAREF STACK 167 esp + 24 CHILDOF 164 OFFSET 24 LOCALVAR var_20 
             400fe2     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
             400fe2     40 DATAREF STACK 164 esp + 0 PARENT LocalFrame LOCALFRAME
             400fe2      4 INSTR BELONGTO 400fe0 
@@ -648,9 +645,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -672,7 +669,7 @@
             401184     23 FUNC GLOBAL sub_401184 FUNC_SAFE NOFP RET             40119a 
             401184      4 INSTR BELONGTO 401184 
             401184      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            401184      8 DATAREF STACK 168 esp + 0 PARENT LocalFrame LOCALFRAME
+            401184      8 DATAREF STACK 165 esp + 0 PARENT LocalFrame LOCALFRAME
             401184      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             401188      7 INSTR BELONGTO 401184 
             401188      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -702,7 +699,7 @@
             4011a5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             4011a5      4 INSTR BELONGTO 4011a0 
             4011a5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            4011a5      8 DATAREF STACK 169 esp + 0 PARENT LocalFrame LOCALFRAME
+            4011a5      8 DATAREF STACK 166 esp + 0 PARENT LocalFrame LOCALFRAME
             4011a5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4011a9     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_6032C0, 0 
             4011a9      7 INSTR BELONGTO 4011a0 
@@ -784,15 +781,10 @@
             40124c      5 INSTR BELONGTO 401240 
             401251     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             401251      5 INSTR BELONGTO 401240 
-            401256     16 DATAREF STACK 172 esp + 24 CHILDOF 170 OFFSET 24 LOCALVAR var_30 
             401256      4 INSTR BELONGTO 401240 
             401256      4 INSTR DEADREGS  EFLAGS RDX R12 R13 ZZ sub     rsp, 48h 
-            401256     72 DATAREF STACK 170 esp + 0 PARENT LocalFrame LOCALFRAME
-            401256      8 DATAREF STACK 171 esp + 0 CHILDOF 170 OFFSET 0 OutArgsRegion OUTARGS
-            401256      8 DATAREF STACK 173 esp + 40 CHILDOF 170 OFFSET 40 LOCALVAR var_20 
-            401256      8 DATAREF STACK 174 esp + 48 CHILDOF 170 OFFSET 48 LOCALVAR var_18 
-            401256      8 DATAREF STACK 175 esp + 56 CHILDOF 170 OFFSET 56 LOCALVAR var_10 
-            401256      8 DATAREF STACK 176 esp + 64 CHILDOF 170 OFFSET 64 LOCALVAR var_8 
+            401256     72 DATAREF STACK 167 esp + 0 PARENT LocalFrame LOCALFRAME
+            401256      8 DATAREF STACK 168 esp + 0 CHILDOF 167 OFFSET 0 OutArgsRegion OUTARGS
             401256      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             40125a     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             40125a      3 INSTR BELONGTO 401240 
@@ -1030,15 +1022,10 @@
             4013dc      5 PTRIMMEDESP STACK -32 displ mov     [rsp+var_20], rbx
             4013e1     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             4013e1      5 INSTR BELONGTO 4013d0 
-            4013e6     16 DATAREF STACK 179 esp + 24 CHILDOF 177 OFFSET 24 LOCALVAR var_30 
             4013e6      4 INSTR BELONGTO 4013d0 
             4013e6      4 INSTR DEADREGS  EFLAGS RDX RBX RSI R12 R13 ZZ sub     rsp, 48h 
-            4013e6     72 DATAREF STACK 177 esp + 0 PARENT LocalFrame LOCALFRAME
-            4013e6      8 DATAREF STACK 178 esp + 0 CHILDOF 177 OFFSET 0 OutArgsRegion OUTARGS
-            4013e6      8 DATAREF STACK 180 esp + 40 CHILDOF 177 OFFSET 40 LOCALVAR var_20 
-            4013e6      8 DATAREF STACK 181 esp + 48 CHILDOF 177 OFFSET 48 LOCALVAR var_18 
-            4013e6      8 DATAREF STACK 182 esp + 56 CHILDOF 177 OFFSET 56 LOCALVAR var_10 
-            4013e6      8 DATAREF STACK 183 esp + 64 CHILDOF 177 OFFSET 64 LOCALVAR var_8 
+            4013e6     72 DATAREF STACK 169 esp + 0 PARENT LocalFrame LOCALFRAME
+            4013e6      8 DATAREF STACK 170 esp + 0 CHILDOF 169 OFFSET 0 OutArgsRegion OUTARGS
             4013e6      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             4013ea     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             4013ea      3 INSTR BELONGTO 4013d0 
@@ -1246,16 +1233,11 @@
             401521     -3 INSTR LOCAL NoWarn push    rbx 
             401522      3 INSTR BELONGTO 401520 
             401522      3 INSTR DEADREGS  EFLAGS RBX R10 ZZ mov     rbx, rdi 
-            401525     12 DATAREF STACK 185 esp + 0 CHILDOF 184 OFFSET 0 OutArgsRegion OUTARGS
-            401525     12 DATAREF STACK 190 esp + 60 CHILDOF 184 OFFSET 60 LOCALVAR var_1C 
+            401525     12 DATAREF STACK 172 esp + 0 CHILDOF 171 OFFSET 0 OutArgsRegion OUTARGS
             401525     16 MEMORYHOLE STACK esp + 72 CalleeSavedRegs 
-            401525     24 DATAREF STACK 188 esp + 32 CHILDOF 184 OFFSET 32 LOCALVAR var_38 
-            401525      4 DATAREF STACK 189 esp + 56 CHILDOF 184 OFFSET 56 LOCALVAR var_20 
             401525      4 INSTR BELONGTO 401520 
             401525      4 INSTR DEADREGS  EFLAGS R10 ZZ sub     rsp, 48h 
-            401525     72 DATAREF STACK 184 esp + 0 PARENT LocalFrame LOCALFRAME
-            401525      8 DATAREF STACK 186 esp + 16 CHILDOF 184 OFFSET 16 LOCALVAR var_48 
-            401525      8 DATAREF STACK 187 esp + 24 CHILDOF 184 OFFSET 24 LOCALVAR var_40 
+            401525     72 DATAREF STACK 171 esp + 0 PARENT LocalFrame LOCALFRAME
             401525      8 MEMORYHOLE STACK esp + 88 ReturnAddress 
             401529      7 INSTR BELONGTO 401520 
             401529      7 INSTR DEADREGS  EFLAGS R10 ZZ mov     r10d, cs:dword_6032E0 
@@ -1724,13 +1706,7 @@
             401877      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
             40187c      4 INSTR BELONGTO 401850 
             40187c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-            40187c     56 DATAREF STACK 191 esp + 0 PARENT LocalFrame LOCALFRAME
-            40187c      8 DATAREF STACK 192 esp + 8 CHILDOF 191 OFFSET 8 LOCALVAR var_30 
-            40187c      8 DATAREF STACK 193 esp + 16 CHILDOF 191 OFFSET 16 LOCALVAR var_28 
-            40187c      8 DATAREF STACK 194 esp + 24 CHILDOF 191 OFFSET 24 LOCALVAR var_20 
-            40187c      8 DATAREF STACK 195 esp + 32 CHILDOF 191 OFFSET 32 LOCALVAR var_18 
-            40187c      8 DATAREF STACK 196 esp + 40 CHILDOF 191 OFFSET 40 LOCALVAR var_10 
-            40187c      8 DATAREF STACK 197 esp + 48 CHILDOF 191 OFFSET 48 LOCALVAR var_8 
+            40187c     56 DATAREF STACK 173 esp + 0 PARENT LocalFrame LOCALFRAME
             40187c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             401880     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             401880      3 INSTR BELONGTO 401850 
@@ -1807,7 +1783,7 @@
             4018f5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             4018f5      4 INSTR BELONGTO 4018f0 
             4018f5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-            4018f5      8 DATAREF STACK 198 esp + 0 PARENT LocalFrame LOCALFRAME
+            4018f5      8 DATAREF STACK 174 esp + 0 PARENT LocalFrame LOCALFRAME
             4018f5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4018f9      7 INSTR BELONGTO 4018f0 
             4018f9      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_602DF8 
@@ -1842,7 +1818,7 @@
             401928     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET             401935 
             401928      4 INSTR BELONGTO 401928 
             401928      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-            401928      8 DATAREF STACK 199 esp + 0 PARENT LocalFrame LOCALFRAME
+            401928      8 DATAREF STACK 175 esp + 0 PARENT LocalFrame LOCALFRAME
             401928      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             40192c     -1 INSTR LOCAL NoMetaUpdate call    sub_4011A0 
             40192c      5 INSTR BELONGTO 401928 
diff --git a/tests/commit/trimmed-sorted-save-gnome-screensaver.psexe.annot.REMOVED.git-id b/tests/commit/trimmed-sorted-save-gnome-screensaver.psexe.annot.REMOVED.git-id
index ed57d6a02b2c9257c00e09d876642b8712f5d9fc..044d1d0378bbc537055ed3e70de4768f006ba9f7 100644
--- a/tests/commit/trimmed-sorted-save-gnome-screensaver.psexe.annot.REMOVED.git-id
+++ b/tests/commit/trimmed-sorted-save-gnome-screensaver.psexe.annot.REMOVED.git-id
@@ -1 +1 @@
-20f37c4b6fd214c3237e92b9918f0869d8d2f662
\ No newline at end of file
+0069b60430f52e172e83ea785404f1c7526925c9
\ No newline at end of file
diff --git a/tests/commit/trimmed-sorted-save-gnome-screenshot.psexe.annot b/tests/commit/trimmed-sorted-save-gnome-screenshot.psexe.annot
index 71f0522a2949fdfbc0edcad7db799e7f92b57914..db9c2f561680f86a125f7e678f8d9e7747b3acec 100644
--- a/tests/commit/trimmed-sorted-save-gnome-screenshot.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-screenshot.psexe.annot
@@ -2617,9 +2617,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -2780,8 +2780,6 @@
             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 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 
@@ -2825,7 +2823,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 560 esp + 0 PARENT LocalFrame LOCALFRAME
+            407780      8 DATAREF STACK 558 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 
@@ -2843,8 +2841,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 561 esp + 0 PARENT LocalFrame LOCALFRAME
-            4077a0      4 DATAREF STACK 562 esp + 0 CHILDOF 561 OFFSET 0 OutArgsRegion OUTARGS
+            4077a0     24 DATAREF STACK 559 esp + 0 PARENT LocalFrame LOCALFRAME
+            4077a0      4 DATAREF STACK 560 esp + 0 CHILDOF 559 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 
@@ -2922,12 +2920,9 @@
             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 563 esp + 0 PARENT LocalFrame LOCALFRAME
+            407832     24 DATAREF STACK 561 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 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 
@@ -3022,8 +3017,7 @@
             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 567 esp + 0 PARENT LocalFrame LOCALFRAME
-            4078c4     16 DATAREF STACK 568 esp + 0 CHILDOF 567 OFFSET 0 LOCALVAR var_18 
+            4078c4     16 DATAREF STACK 562 esp + 0 PARENT LocalFrame LOCALFRAME
             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 
@@ -3184,13 +3178,9 @@
             407b6a      5 INSTR BELONGTO 407b60 
             407b6f     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             407b6f      5 INSTR BELONGTO 407b60 
-            407b74     40 DATAREF STACK 569 esp + 0 PARENT LocalFrame LOCALFRAME
+            407b74     40 DATAREF STACK 563 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 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 
@@ -3317,7 +3307,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 574 esp + 0 PARENT LocalFrame LOCALFRAME
+            407c50      8 DATAREF STACK 564 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 
@@ -3349,7 +3339,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 575 esp + 0 PARENT LocalFrame LOCALFRAME
+            407c75      8 DATAREF STACK 565 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 
@@ -3441,9 +3431,8 @@
             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 577 esp + 8 CHILDOF 576 OFFSET 8 LOCALVAR var_20 
             407d18     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            407d18     24 DATAREF STACK 576 esp + 0 PARENT LocalFrame LOCALFRAME
+            407d18     24 DATAREF STACK 566 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 
@@ -3666,7 +3655,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 578 esp + 0 PARENT LocalFrame LOCALFRAME
+            407e90      8 DATAREF STACK 567 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 
@@ -3722,9 +3711,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 580 esp + 0 CHILDOF 579 OFFSET 0 OutArgsRegion OUTARGS
+            407ee5     16 DATAREF STACK 569 esp + 0 CHILDOF 568 OFFSET 0 OutArgsRegion OUTARGS
             407ee5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            407ee5     24 DATAREF STACK 579 esp + 0 PARENT LocalFrame LOCALFRAME
+            407ee5     24 DATAREF STACK 568 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 
@@ -3914,18 +3903,9 @@
             40817c      5 INSTR BELONGTO 408160 
             408181     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
             408181      5 INSTR BELONGTO 408160 
-            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 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     88 DATAREF STACK 570 esp + 0 PARENT LocalFrame LOCALFRAME
             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 
@@ -4504,11 +4484,9 @@
             408aa0      5 INSTR BELONGTO 408aa0 
             408aa5     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], rbp 
             408aa5      5 INSTR BELONGTO 408aa0 
-            408aaa     24 DATAREF STACK 591 esp + 0 PARENT LocalFrame LOCALFRAME
+            408aaa     24 DATAREF STACK 571 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 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 
@@ -4648,8 +4626,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 594 esp + 0 PARENT LocalFrame LOCALFRAME
-            408cd1      4 DATAREF STACK 595 esp + 0 CHILDOF 594 OFFSET 0 OutArgsRegion OUTARGS
+            408cd1     16 DATAREF STACK 572 esp + 0 PARENT LocalFrame LOCALFRAME
+            408cd1      4 DATAREF STACK 573 esp + 0 CHILDOF 572 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 
@@ -4726,7 +4704,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 596 esp + 0 PARENT LocalFrame LOCALFRAME
+            408d50      8 DATAREF STACK 574 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 
@@ -4832,7 +4810,7 @@
             408f32      3 INSTR BELONGTO 408f30 
             408f35     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             408f35      4 INSTR BELONGTO 408f30 
-            408f35      8 DATAREF STACK 597 esp + 0 PARENT LocalFrame LOCALFRAME
+            408f35      8 DATAREF STACK 575 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 
@@ -4927,7 +4905,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 598 esp + 0 PARENT LocalFrame LOCALFRAME
+            408ff0      8 DATAREF STACK 576 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 
@@ -5147,7 +5125,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 599 esp + 0 PARENT LocalFrame LOCALFRAME
+            4093d0      8 DATAREF STACK 577 esp + 0 PARENT LocalFrame LOCALFRAME
             4093d0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4093d4     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [rdx+10h] 
             4093d4      3 INSTR BELONGTO 4093d0 
@@ -5246,7 +5224,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 600 esp + 0 PARENT LocalFrame LOCALFRAME
+            409490      8 DATAREF STACK 578 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 
@@ -5303,16 +5281,11 @@
             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 607 esp + 48 CHILDOF 601 OFFSET 48 LOCALVAR var_38 
             4094fe     40 MEMORYHOLE STACK esp + 64 CalleeSavedRegs 
-            4094fe      4 DATAREF STACK 602 esp + 0 CHILDOF 601 OFFSET 0 OutArgsRegion OUTARGS
+            4094fe      4 DATAREF STACK 580 esp + 0 CHILDOF 579 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 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     64 DATAREF STACK 579 esp + 0 PARENT LocalFrame LOCALFRAME
             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 
@@ -5732,18 +5705,10 @@
             409798      5 INSTR BELONGTO 409780 
             40979d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
             40979d      5 INSTR BELONGTO 409780 
-            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 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     72 DATAREF STACK 581 esp + 0 PARENT LocalFrame LOCALFRAME
             4097a2      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
-            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 
@@ -6044,7 +6009,6 @@
             4099d0      0 FUNC MMSAFENESS SAFE
             4099d0    171 FUNC GLOBAL sub_4099D0 FUNC_UNSAFE NOFP RET             409a7a 
             4099d0      1 INSTR BELONGTO 4099d0 
-            4099d0      8 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
             4099d0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4099d1      7 INSTR BELONGTO 4099d0 
             4099d8     -1 INSTR LOCAL NoMetaUpdate test    rbx, rbx 
@@ -6176,16 +6140,10 @@
             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 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 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     72 DATAREF STACK 582 esp + 0 PARENT LocalFrame LOCALFRAME
             409be0      8 MEMORYHOLE STACK esp + 120 ReturnAddress 
             409be4     -1 INSTR LOCAL NoMetaUpdate call    _g_file_new_for_uri 
             409be4      5 INSTR BELONGTO 409bd0 
@@ -6917,11 +6875,9 @@
             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 624 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a07a     24 DATAREF STACK 583 esp + 0 PARENT LocalFrame LOCALFRAME
             40a07a      4 INSTR BELONGTO 40a070 
             40a07a      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-            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 
@@ -6985,10 +6941,9 @@
             40a0d0     -3 INSTR LOCAL NoWarn push    rbx 
             40a0d1     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
             40a0d1      3 INSTR BELONGTO 40a0d0 
-            40a0d4     16 DATAREF STACK 627 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a0d4     16 DATAREF STACK 584 esp + 0 PARENT LocalFrame LOCALFRAME
             40a0d4      4 INSTR BELONGTO 40a0d0 
             40a0d4      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 10h 
-            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 
@@ -7094,12 +7049,9 @@
             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 629 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a182     24 DATAREF STACK 585 esp + 0 PARENT LocalFrame LOCALFRAME
             40a182      4 INSTR BELONGTO 40a170 
             40a182      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-            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 
@@ -7195,13 +7147,9 @@
             40a20c      5 INSTR BELONGTO 40a200 
             40a211     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             40a211      5 INSTR BELONGTO 40a200 
-            40a216     40 DATAREF STACK 633 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a216     40 DATAREF STACK 586 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 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 
@@ -7296,16 +7244,9 @@
             40a2bc      5 INSTR BELONGTO 40a2a0 
             40a2c1     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_10], r14 
             40a2c1      5 INSTR BELONGTO 40a2a0 
-            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 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     72 DATAREF STACK 587 esp + 0 PARENT LocalFrame LOCALFRAME
             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 
@@ -7578,11 +7519,10 @@
             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 646 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a47e     16 DATAREF STACK 588 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 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] 
@@ -8004,12 +7944,9 @@
             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 648 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a732     24 DATAREF STACK 589 esp + 0 PARENT LocalFrame LOCALFRAME
             40a732      4 INSTR BELONGTO 40a720 
             40a732      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-            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 
@@ -8156,7 +8093,6 @@
             40a8b0     -3 INSTR LOCAL NoWarn push    rbx 
             40a8b1      3 INSTR BELONGTO 40a8b0 
             40a8b4      4 INSTR BELONGTO 40a8b0 
-            40a8b4      8 MEMORYHOLE STACK esp + 48 CalleeSavedRegs 
             40a8b4      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40a8b8      3 INSTR BELONGTO 40a8b0 
             40a8b8      3 PTRIMMEDESP STACK 0 displ mov     rsi, rsp
@@ -8272,21 +8208,11 @@
             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 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    136 DATAREF STACK 590 esp + 0 PARENT LocalFrame LOCALFRAME
             40a9ea     48 MEMORYHOLE STACK esp + 136 CalleeSavedRegs 
-            40a9ea      4 DATAREF STACK 653 esp + 0 CHILDOF 652 OFFSET 0 OutArgsRegion OUTARGS
+            40a9ea      4 DATAREF STACK 591 esp + 0 CHILDOF 590 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 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 
@@ -10439,32 +10365,10 @@
             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 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    168 DATAREF STACK 592 esp + 0 PARENT LocalFrame LOCALFRAME
             40b703     48 MEMORYHOLE STACK esp + 168 CalleeSavedRegs 
-            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 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 
@@ -10950,13 +10854,11 @@
             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 690 esp + 16 CHILDOF 687 OFFSET 16 LOCALVAR var_38 
-            40ba5b     32 DATAREF STACK 687 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ba5b     32 DATAREF STACK 593 esp + 0 PARENT LocalFrame LOCALFRAME
             40ba5b     40 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
-            40ba5b      4 DATAREF STACK 688 esp + 0 CHILDOF 687 OFFSET 0 OutArgsRegion OUTARGS
+            40ba5b      4 DATAREF STACK 594 esp + 0 CHILDOF 593 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 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 
@@ -11209,15 +11111,10 @@
             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 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 DATAREF STACK 596 esp + 0 CHILDOF 595 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 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     56 DATAREF STACK 595 esp + 0 PARENT LocalFrame LOCALFRAME
             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 
@@ -11376,17 +11273,9 @@
             40bd5a      5 INSTR BELONGTO 40bd40 
             40bd5f     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
             40bd5f      5 INSTR BELONGTO 40bd40 
-            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 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     72 DATAREF STACK 597 esp + 0 PARENT LocalFrame LOCALFRAME
             40bd64      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             40bd68     -1 INSTR LOCAL NoMetaUpdate test    esi, esi 
             40bd68      2 INSTR BELONGTO 40bd40 
@@ -11544,13 +11433,9 @@
             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 707 esp + 0 PARENT LocalFrame LOCALFRAME
+            40be82     40 DATAREF STACK 598 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 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 
@@ -11765,60 +11650,11 @@
             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 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    360 DATAREF STACK 599 esp + 0 PARENT LocalFrame LOCALFRAME
             40bfba     48 MEMORYHOLE STACK esp + 360 CalleeSavedRegs 
-            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      4 DATAREF STACK 600 esp + 0 CHILDOF 599 OFFSET 0 OutArgsRegion OUTARGS
             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 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 
@@ -13187,21 +13023,10 @@
             40ca47      5 INSTR BELONGTO 40ca30 
             40ca4c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
             40ca4c      5 INSTR BELONGTO 40ca30 
-            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     12 DATAREF STACK 602 esp + 0 CHILDOF 601 OFFSET 0 OutArgsRegion OUTARGS
+            40ca51    136 DATAREF STACK 601 esp + 0 PARENT LocalFrame LOCALFRAME
             40ca51      7 INSTR BELONGTO 40ca30 
             40ca51      7 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 88h 
-            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 
@@ -13510,14 +13335,9 @@
             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 776 esp + 0 PARENT LocalFrame LOCALFRAME
+            40cc8f     40 DATAREF STACK 603 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 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 
@@ -13737,9 +13557,8 @@
             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 783 esp + 8 CHILDOF 782 OFFSET 8 LOCALVAR var_20 
             40cdf5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            40cdf5     24 DATAREF STACK 782 esp + 0 PARENT LocalFrame LOCALFRAME
+            40cdf5     24 DATAREF STACK 604 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 
@@ -13847,13 +13666,7 @@
             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 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     56 DATAREF STACK 605 esp + 0 PARENT LocalFrame LOCALFRAME
             40ce9c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40cea0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             40cea0      3 INSTR BELONGTO 40ce70 
@@ -13930,7 +13743,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 791 esp + 0 PARENT LocalFrame LOCALFRAME
+            40cf15      8 DATAREF STACK 606 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 
@@ -13965,7 +13778,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 792 esp + 0 PARENT LocalFrame LOCALFRAME
+            40cf48      8 DATAREF STACK 607 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 b0986ad3a1206184230c7db4dd190593d69c9028..6d9d34eea21ab60c2229e0155e6051c76e34568d 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 @@
-e25ef094cb21eaa6132cddb60c18152b99b78434
\ No newline at end of file
+44593d396ed4d7c82fd60ab2f2db453da0371a1a
\ 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 c1edded35831f0132a9386bea63fcf9a31b01462..47b99d1997e087dd783748cc52d0ce038ec5d8a4 100644
--- a/tests/commit/trimmed-sorted-save-gnome-session-properties.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-session-properties.psexe.annot
@@ -1921,12 +1921,9 @@
             405410      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             405410    238 FUNC GLOBAL main FUNC_UNSAFE NOFP RET             4054fd 
             405410     -3 INSTR LOCAL NoWarn push    rbx 
-            405411     12 DATAREF STACK 538 esp + 0 CHILDOF 537 OFFSET 0 LOCALVAR var_28 
-            405411     12 DATAREF STACK 539 esp + 12 CHILDOF 537 OFFSET 12 LOCALVAR var_1C 
             405411     32 DATAREF STACK 537 esp + 0 PARENT LocalFrame LOCALFRAME
             405411      4 INSTR BELONGTO 405410 
             405411      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 20h 
-            405411      8 DATAREF STACK 540 esp + 24 CHILDOF 537 OFFSET 24 LOCALVAR var_10 
             405411      8 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
             405411      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             405415     -1 INSTR LOCAL MetadataUnused mov     [rsp+28h+var_1C], edi 
@@ -2089,9 +2086,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -2113,7 +2110,7 @@
             40552c     23 FUNC GLOBAL sub_40552C FUNC_SAFE NOFP RET             405542 
             40552c      4 INSTR BELONGTO 40552c 
             40552c      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            40552c      8 DATAREF STACK 541 esp + 0 PARENT LocalFrame LOCALFRAME
+            40552c      8 DATAREF STACK 538 esp + 0 PARENT LocalFrame LOCALFRAME
             40552c      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             405530      7 INSTR BELONGTO 40552c 
             405530      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -2143,7 +2140,7 @@
             405555     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             405555      4 INSTR BELONGTO 405550 
             405555      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            405555      8 DATAREF STACK 542 esp + 0 PARENT LocalFrame LOCALFRAME
+            405555      8 DATAREF STACK 539 esp + 0 PARENT LocalFrame LOCALFRAME
             405555      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             405559     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_60F7C8, 0 
             405559      7 INSTR BELONGTO 405550 
@@ -2221,9 +2218,8 @@
             4055f1     -3 INSTR LOCAL NoWarn push    rbx 
             4055f2      3 INSTR BELONGTO 4055f0 
             4055f2      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-            4055f5     16 DATAREF STACK 544 esp + 8 CHILDOF 543 OFFSET 8 LOCALVAR var_20 
             4055f5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            4055f5     24 DATAREF STACK 543 esp + 0 PARENT LocalFrame LOCALFRAME
+            4055f5     24 DATAREF STACK 540 esp + 0 PARENT LocalFrame LOCALFRAME
             4055f5      4 INSTR BELONGTO 4055f0 
             4055f5      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
             4055f5      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -2461,30 +2457,10 @@
             405787      5 INSTR BELONGTO 405770 
             40578c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_20], r12 
             40578c      5 INSTR BELONGTO 405770 
-            405791     12 DATAREF STACK 560 esp + 124 CHILDOF 545 OFFSET 124 LOCALVAR var_3C 
-            405791    184 DATAREF STACK 545 esp + 0 PARENT LocalFrame LOCALFRAME
-            405791     28 DATAREF STACK 554 esp + 64 CHILDOF 545 OFFSET 64 LOCALVAR var_78 
-            405791      4 DATAREF STACK 546 esp + 0 CHILDOF 545 OFFSET 0 OutArgsRegion OUTARGS
-            405791      4 DATAREF STACK 555 esp + 92 CHILDOF 545 OFFSET 92 LOCALVAR var_5C 
-            405791      4 DATAREF STACK 559 esp + 120 CHILDOF 545 OFFSET 120 LOCALVAR var_40 
+            405791    184 DATAREF STACK 541 esp + 0 PARENT LocalFrame LOCALFRAME
+            405791      4 DATAREF STACK 542 esp + 0 CHILDOF 541 OFFSET 0 OutArgsRegion OUTARGS
             405791      7 INSTR BELONGTO 405770 
             405791      7 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ sub     rsp, 0B8h 
-            405791      8 DATAREF STACK 547 esp + 8 CHILDOF 545 OFFSET 8 LOCALVAR var_B0 
-            405791      8 DATAREF STACK 548 esp + 16 CHILDOF 545 OFFSET 16 LOCALVAR var_A8 
-            405791      8 DATAREF STACK 549 esp + 24 CHILDOF 545 OFFSET 24 LOCALVAR var_A0 
-            405791      8 DATAREF STACK 550 esp + 32 CHILDOF 545 OFFSET 32 LOCALVAR var_98 
-            405791      8 DATAREF STACK 551 esp + 40 CHILDOF 545 OFFSET 40 LOCALVAR var_90 
-            405791      8 DATAREF STACK 552 esp + 48 CHILDOF 545 OFFSET 48 LOCALVAR var_88 
-            405791      8 DATAREF STACK 553 esp + 56 CHILDOF 545 OFFSET 56 LOCALVAR var_80 
-            405791      8 DATAREF STACK 556 esp + 96 CHILDOF 545 OFFSET 96 LOCALVAR var_58 
-            405791      8 DATAREF STACK 557 esp + 104 CHILDOF 545 OFFSET 104 LOCALVAR var_50 
-            405791      8 DATAREF STACK 558 esp + 112 CHILDOF 545 OFFSET 112 LOCALVAR var_48 
-            405791      8 DATAREF STACK 561 esp + 136 CHILDOF 545 OFFSET 136 LOCALVAR var_30 
-            405791      8 DATAREF STACK 562 esp + 144 CHILDOF 545 OFFSET 144 LOCALVAR var_28 
-            405791      8 DATAREF STACK 563 esp + 152 CHILDOF 545 OFFSET 152 LOCALVAR var_20 
-            405791      8 DATAREF STACK 564 esp + 160 CHILDOF 545 OFFSET 160 LOCALVAR var_18 
-            405791      8 DATAREF STACK 565 esp + 168 CHILDOF 545 OFFSET 168 LOCALVAR var_10 
-            405791      8 DATAREF STACK 566 esp + 176 CHILDOF 545 OFFSET 176 LOCALVAR var_8 
             405791      8 MEMORYHOLE STACK esp + 184 ReturnAddress 
             405798      5 INSTR BELONGTO 405770 
             405798      5 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     [rsp+0B8h+var_50], rdi 
@@ -2776,7 +2752,7 @@
             4059b5      3 INSTR BELONGTO 4059b0 
             4059b5      3 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rbx, rsi 
             4059b8     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-            4059b8     40 DATAREF STACK 567 esp + 0 PARENT LocalFrame LOCALFRAME
+            4059b8     40 DATAREF STACK 543 esp + 0 PARENT LocalFrame LOCALFRAME
             4059b8      4 INSTR BELONGTO 4059b0 
             4059b8      4 INSTR DEADREGS  EFLAGS RAX RSI ZZ sub     rsp, 28h 
             4059b8      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
@@ -2854,11 +2830,10 @@
             405a29     -3 INSTR LOCAL NoWarn push    rbx 
             405a2a      3 INSTR BELONGTO 405a20 
             405a2a      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-            405a2d     16 DATAREF STACK 568 esp + 0 PARENT LocalFrame LOCALFRAME
+            405a2d     16 DATAREF STACK 544 esp + 0 PARENT LocalFrame LOCALFRAME
             405a2d     24 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
             405a2d      4 INSTR BELONGTO 405a20 
             405a2d      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 10h 
-            405a2d      8 DATAREF STACK 569 esp + 8 CHILDOF 568 OFFSET 8 LOCALVAR var_20 
             405a2d      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             405a31     -1 INSTR LOCAL MetadataUnused mov     [rsp+28h+var_20], 0 
             405a31      9 INSTR BELONGTO 405a20 
@@ -2960,7 +2935,7 @@
             405ab5      3 INSTR BELONGTO 405ab0 
             405ab5      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rsi 
             405ab8     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-            405ab8     40 DATAREF STACK 570 esp + 0 PARENT LocalFrame LOCALFRAME
+            405ab8     40 DATAREF STACK 545 esp + 0 PARENT LocalFrame LOCALFRAME
             405ab8      4 INSTR BELONGTO 405ab0 
             405ab8      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 28h 
             405ab8      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
@@ -3025,11 +3000,10 @@
             405b05      3 INSTR BELONGTO 405b00 
             405b05      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
             405b08     16 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
-            405b08     40 DATAREF STACK 573 esp + 16 CHILDOF 571 OFFSET 16 LOCALVAR var_38 
             405b08      4 INSTR BELONGTO 405b00 
             405b08      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 38h 
-            405b08     56 DATAREF STACK 571 esp + 0 PARENT LocalFrame LOCALFRAME
-            405b08      8 DATAREF STACK 572 esp + 0 CHILDOF 571 OFFSET 0 OutArgsRegion OUTARGS
+            405b08     56 DATAREF STACK 546 esp + 0 PARENT LocalFrame LOCALFRAME
+            405b08      8 DATAREF STACK 547 esp + 0 CHILDOF 546 OFFSET 0 OutArgsRegion OUTARGS
             405b08      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             405b0c     -1 INSTR LOCAL NoMetaUpdate call    _gtk_tree_model_get_type 
             405b0c      5 INSTR BELONGTO 405b00 
@@ -3174,10 +3148,9 @@
             405d10     -3 INSTR LOCAL NoWarn push    rbx 
             405d11     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
             405d11      3 INSTR BELONGTO 405d10 
-            405d14     48 DATAREF STACK 574 esp + 0 PARENT LocalFrame LOCALFRAME
+            405d14     48 DATAREF STACK 548 esp + 0 PARENT LocalFrame LOCALFRAME
             405d14      4 INSTR BELONGTO 405d10 
             405d14      4 INSTR DEADREGS  EFLAGS RAX RDI ZZ sub     rsp, 30h 
-            405d14      8 DATAREF STACK 575 esp + 40 CHILDOF 574 OFFSET 40 LOCALVAR var_10 
             405d14      8 MEMORYHOLE STACK esp + 48 CalleeSavedRegs 
             405d14      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             405d18      4 INSTR BELONGTO 405d10 
@@ -3348,9 +3321,9 @@
             405f19     -3 INSTR LOCAL NoWarn push    rbx 
             405f1a      3 INSTR BELONGTO 405f10 
             405f1a      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdx 
-            405f1d     16 DATAREF STACK 577 esp + 0 CHILDOF 576 OFFSET 0 OutArgsRegion OUTARGS
+            405f1d     16 DATAREF STACK 550 esp + 0 CHILDOF 549 OFFSET 0 OutArgsRegion OUTARGS
             405f1d     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            405f1d     24 DATAREF STACK 576 esp + 0 PARENT LocalFrame LOCALFRAME
+            405f1d     24 DATAREF STACK 549 esp + 0 PARENT LocalFrame LOCALFRAME
             405f1d      4 INSTR BELONGTO 405f10 
             405f1d      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
             405f1d      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -3510,8 +3483,8 @@
             4061a0      1 INSTR BELONGTO 4061a0 
             4061a0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
             4061a0     -3 INSTR LOCAL NoWarn push    rbx 
-            4061a1     16 DATAREF STACK 578 esp + 0 PARENT LocalFrame LOCALFRAME
-            4061a1      4 DATAREF STACK 579 esp + 0 CHILDOF 578 OFFSET 0 OutArgsRegion OUTARGS
+            4061a1     16 DATAREF STACK 551 esp + 0 PARENT LocalFrame LOCALFRAME
+            4061a1      4 DATAREF STACK 552 esp + 0 CHILDOF 551 OFFSET 0 OutArgsRegion OUTARGS
             4061a1      4 INSTR BELONGTO 4061a0 
             4061a1      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
             4061a1      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -3621,7 +3594,7 @@
             4062d5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             4062d5      4 INSTR BELONGTO 4062d0 
             4062d5      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-            4062d5      8 DATAREF STACK 580 esp + 0 PARENT LocalFrame LOCALFRAME
+            4062d5      8 DATAREF STACK 553 esp + 0 PARENT LocalFrame LOCALFRAME
             4062d5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4062d9     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             4062d9      3 INSTR BELONGTO 4062d0 
@@ -4080,7 +4053,7 @@
             406c45     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             406c45      4 INSTR BELONGTO 406c40 
             406c45      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            406c45      8 DATAREF STACK 581 esp + 0 PARENT LocalFrame LOCALFRAME
+            406c45      8 DATAREF STACK 554 esp + 0 PARENT LocalFrame LOCALFRAME
             406c45      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             406c49     -1 INSTR LOCAL NoMetaUpdate call    _g_type_class_peek_parent 
             406c49      5 INSTR BELONGTO 406c40 
@@ -4244,12 +4217,11 @@
             406d5a      1 INSTR BELONGTO 406d50 
             406d5a      1 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ push    rbx 
             406d5a     -3 INSTR LOCAL NoWarn push    rbx 
-            406d5b     16 DATAREF STACK 582 esp + 0 PARENT LocalFrame LOCALFRAME
+            406d5b     16 DATAREF STACK 555 esp + 0 PARENT LocalFrame LOCALFRAME
             406d5b     40 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
-            406d5b      4 DATAREF STACK 583 esp + 0 CHILDOF 582 OFFSET 0 OutArgsRegion OUTARGS
+            406d5b      4 DATAREF STACK 556 esp + 0 CHILDOF 555 OFFSET 0 OutArgsRegion OUTARGS
             406d5b      4 INSTR BELONGTO 406d50 
             406d5b      4 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ sub     rsp, 10h 
-            406d5b      8 DATAREF STACK 584 esp + 8 CHILDOF 582 OFFSET 8 LOCALVAR var_30 
             406d5b      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             406d5f     -1 INSTR LOCAL NoMetaUpdate call    _gtk_window_get_type 
             406d5f      5 INSTR BELONGTO 406d50 
@@ -4644,8 +4616,8 @@
             407010      1 INSTR BELONGTO 407010 
             407010      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
             407010     -3 INSTR LOCAL NoWarn push    rbx 
-            407011     16 DATAREF STACK 585 esp + 0 PARENT LocalFrame LOCALFRAME
-            407011      4 DATAREF STACK 586 esp + 0 CHILDOF 585 OFFSET 0 OutArgsRegion OUTARGS
+            407011     16 DATAREF STACK 557 esp + 0 PARENT LocalFrame LOCALFRAME
+            407011      4 DATAREF STACK 558 esp + 0 CHILDOF 557 OFFSET 0 OutArgsRegion OUTARGS
             407011      4 INSTR BELONGTO 407010 
             407011      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
             407011      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -4751,7 +4723,7 @@
             407142      3 INSTR BELONGTO 407140 
             407145     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             407145      4 INSTR BELONGTO 407140 
-            407145      8 DATAREF STACK 587 esp + 0 PARENT LocalFrame LOCALFRAME
+            407145      8 DATAREF STACK 559 esp + 0 PARENT LocalFrame LOCALFRAME
             407145      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             407149     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             407149      3 INSTR BELONGTO 407140 
@@ -5347,13 +5319,10 @@
             407b0d      3 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 ZZ mov     rbp, rsi 
             407b10     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
             407b10      5 INSTR BELONGTO 407b00 
-            407b15     16 DATAREF STACK 589 esp + 0 CHILDOF 588 OFFSET 0 OutArgsRegion OUTARGS
-            407b15     40 DATAREF STACK 588 esp + 0 PARENT LocalFrame LOCALFRAME
+            407b15     16 DATAREF STACK 561 esp + 0 CHILDOF 560 OFFSET 0 OutArgsRegion OUTARGS
+            407b15     40 DATAREF STACK 560 esp + 0 PARENT LocalFrame LOCALFRAME
             407b15      4 INSTR BELONGTO 407b00 
             407b15      4 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 28h 
-            407b15      8 DATAREF STACK 590 esp + 16 CHILDOF 588 OFFSET 16 LOCALVAR var_18 
-            407b15      8 DATAREF STACK 591 esp + 24 CHILDOF 588 OFFSET 24 LOCALVAR var_10 
-            407b15      8 DATAREF STACK 592 esp + 32 CHILDOF 588 OFFSET 32 LOCALVAR var_8 
             407b15      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             407b19      3 INSTR BELONGTO 407b00 
             407b19      3 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI R8 R9 R10 R11 R12 ZZ mov     r12, rdx 
@@ -5430,16 +5399,10 @@
             407b8c     -3 INSTR LOCAL NoWarn push    rbx 
             407b8d      3 INSTR BELONGTO 407b80 
             407b8d      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ mov     rbx, rdi 
-            407b90     12 DATAREF STACK 598 esp + 48 CHILDOF 593 OFFSET 48 LOCALVAR var_48 
-            407b90     12 DATAREF STACK 599 esp + 60 CHILDOF 593 OFFSET 60 LOCALVAR var_3C 
-            407b90     16 DATAREF STACK 596 esp + 24 CHILDOF 593 OFFSET 24 LOCALVAR var_60 
             407b90     48 MEMORYHOLE STACK esp + 72 CalleeSavedRegs 
             407b90      4 INSTR BELONGTO 407b80 
             407b90      4 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ sub     rsp, 48h 
-            407b90     72 DATAREF STACK 593 esp + 0 PARENT LocalFrame LOCALFRAME
-            407b90      8 DATAREF STACK 594 esp + 8 CHILDOF 593 OFFSET 8 LOCALVAR var_70 
-            407b90      8 DATAREF STACK 595 esp + 16 CHILDOF 593 OFFSET 16 LOCALVAR var_68 
-            407b90      8 DATAREF STACK 597 esp + 40 CHILDOF 593 OFFSET 40 LOCALVAR var_50 
+            407b90     72 DATAREF STACK 562 esp + 0 PARENT LocalFrame LOCALFRAME
             407b90      8 MEMORYHOLE STACK esp + 120 ReturnAddress 
             407b94      5 INSTR BELONGTO 407b80 
             407b94      5 INSTR DEADREGS  EFLAGS R12 R13 R14 ZZ mov     [rsp+78h+var_68], rdx 
@@ -6187,12 +6150,9 @@
             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 600 esp + 0 PARENT LocalFrame LOCALFRAME
+            408032     24 DATAREF STACK 563 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 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] 
@@ -6292,12 +6252,9 @@
             4080da      3 INSTR BELONGTO 4080d0 
             4080dd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
             4080dd      5 INSTR BELONGTO 4080d0 
-            4080e2     24 DATAREF STACK 604 esp + 0 PARENT LocalFrame LOCALFRAME
+            4080e2     24 DATAREF STACK 564 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 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 
@@ -6452,8 +6409,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 609 esp + 0 CHILDOF 608 OFFSET 0 OutArgsRegion OUTARGS
-            4081d5     40 DATAREF STACK 608 esp + 0 PARENT LocalFrame LOCALFRAME
+            4081d5     20 DATAREF STACK 566 esp + 0 CHILDOF 565 OFFSET 0 OutArgsRegion OUTARGS
+            4081d5     40 DATAREF STACK 565 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 
@@ -6560,11 +6517,9 @@
             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 610 esp + 0 PARENT LocalFrame LOCALFRAME
+            4082aa     24 DATAREF STACK 567 esp + 0 PARENT LocalFrame LOCALFRAME
             4082aa      4 INSTR BELONGTO 4082a0 
             4082aa      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-            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 
@@ -6634,8 +6589,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 613 esp + 0 PARENT LocalFrame LOCALFRAME
-            408310      4 DATAREF STACK 614 esp + 0 CHILDOF 613 OFFSET 0 OutArgsRegion OUTARGS
+            408310     24 DATAREF STACK 568 esp + 0 PARENT LocalFrame LOCALFRAME
+            408310      4 DATAREF STACK 569 esp + 0 CHILDOF 568 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 
@@ -6717,8 +6672,7 @@
             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 616 esp + 8 CHILDOF 615 OFFSET 8 LOCALVAR var_30 
-            408399     24 DATAREF STACK 615 esp + 0 PARENT LocalFrame LOCALFRAME
+            408399     24 DATAREF STACK 570 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 
@@ -7383,7 +7337,7 @@
             408842      3 INSTR BELONGTO 408840 
             408845     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             408845      4 INSTR BELONGTO 408840 
-            408845      8 DATAREF STACK 617 esp + 0 PARENT LocalFrame LOCALFRAME
+            408845      8 DATAREF STACK 571 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 
@@ -7465,7 +7419,7 @@
             408902      3 INSTR BELONGTO 408900 
             408905     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             408905      4 INSTR BELONGTO 408900 
-            408905      8 DATAREF STACK 618 esp + 0 PARENT LocalFrame LOCALFRAME
+            408905      8 DATAREF STACK 572 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 
@@ -7982,7 +7936,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 619 esp + 0 PARENT LocalFrame LOCALFRAME
+            408c17      8 DATAREF STACK 573 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 
@@ -8512,11 +8466,9 @@
             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 620 esp + 0 PARENT LocalFrame LOCALFRAME
+            408efd     24 DATAREF STACK 574 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 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 
@@ -8660,14 +8612,9 @@
             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 623 esp + 0 PARENT LocalFrame LOCALFRAME
+            408fdf     40 DATAREF STACK 575 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 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 
@@ -8895,7 +8842,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 629 esp + 0 PARENT LocalFrame LOCALFRAME
+            409175      8 DATAREF STACK 576 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 
@@ -9067,8 +9014,7 @@
             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 631 esp + 8 CHILDOF 630 OFFSET 8 LOCALVAR var_40 
-            409283     24 DATAREF STACK 630 esp + 0 PARENT LocalFrame LOCALFRAME
+            409283     24 DATAREF STACK 577 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 
@@ -9557,12 +9503,9 @@
             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 632 esp + 0 PARENT LocalFrame LOCALFRAME
+            409602     24 DATAREF STACK 578 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 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 
@@ -9654,17 +9597,9 @@
             40969a      5 INSTR BELONGTO 409680 
             40969f     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
             40969f      5 INSTR BELONGTO 409680 
-            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 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     72 DATAREF STACK 579 esp + 0 PARENT LocalFrame LOCALFRAME
             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 
@@ -9909,11 +9844,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 645 esp + 0 PARENT LocalFrame LOCALFRAME
+            409864     16 DATAREF STACK 580 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 646 esp + 0 CHILDOF 645 OFFSET 0 OutArgsRegion OUTARGS
+            409864      8 DATAREF STACK 581 esp + 0 CHILDOF 580 OFFSET 0 OutArgsRegion OUTARGS
             409864      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             409868     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             409868      3 INSTR BELONGTO 409860 
@@ -10226,10 +10161,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 647 esp + 0 PARENT LocalFrame LOCALFRAME
+            409a51     16 DATAREF STACK 582 esp + 0 PARENT LocalFrame LOCALFRAME
             409a51      4 INSTR BELONGTO 409a40 
             409a51      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 10h 
-            409a51      8 DATAREF STACK 648 esp + 0 CHILDOF 647 OFFSET 0 OutArgsRegion OUTARGS
+            409a51      8 DATAREF STACK 583 esp + 0 CHILDOF 582 OFFSET 0 OutArgsRegion OUTARGS
             409a51      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
             409a51      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             409a55      4 INSTR BELONGTO 409a40 
@@ -10263,12 +10198,9 @@
             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 649 esp + 0 PARENT LocalFrame LOCALFRAME
+            409a82     24 DATAREF STACK 584 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 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 
@@ -10335,10 +10267,9 @@
             409ae4      1 INSTR BELONGTO 409ae0 
             409ae4      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             409ae4     -3 INSTR LOCAL NoWarn push    rbx 
-            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 654 esp + 0 CHILDOF 653 OFFSET 0 OutArgsRegion OUTARGS
-            409ae5     40 DATAREF STACK 653 esp + 0 PARENT LocalFrame LOCALFRAME
+            409ae5     20 DATAREF STACK 586 esp + 0 CHILDOF 585 OFFSET 0 OutArgsRegion OUTARGS
+            409ae5     40 DATAREF STACK 585 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 
@@ -10488,8 +10419,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 656 esp + 0 PARENT LocalFrame LOCALFRAME
-            409c10      4 DATAREF STACK 657 esp + 0 CHILDOF 656 OFFSET 0 OutArgsRegion OUTARGS
+            409c10     24 DATAREF STACK 587 esp + 0 PARENT LocalFrame LOCALFRAME
+            409c10      4 DATAREF STACK 588 esp + 0 CHILDOF 587 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 
@@ -10708,7 +10639,7 @@
             409d52      3 INSTR BELONGTO 409d50 
             409d55     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             409d55      4 INSTR BELONGTO 409d50 
-            409d55      8 DATAREF STACK 658 esp + 0 PARENT LocalFrame LOCALFRAME
+            409d55      8 DATAREF STACK 589 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 
@@ -10790,7 +10721,7 @@
             409e12      3 INSTR BELONGTO 409e10 
             409e15     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             409e15      4 INSTR BELONGTO 409e10 
-            409e15      8 DATAREF STACK 659 esp + 0 PARENT LocalFrame LOCALFRAME
+            409e15      8 DATAREF STACK 590 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 
@@ -10906,7 +10837,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 660 esp + 0 PARENT LocalFrame LOCALFRAME
+            409f07      8 DATAREF STACK 591 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 
@@ -11015,12 +10946,9 @@
             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 661 esp + 0 PARENT LocalFrame LOCALFRAME
+            409fb2     24 DATAREF STACK 592 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 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 
@@ -11188,17 +11116,9 @@
             40a0d7      5 INSTR BELONGTO 40a0c0 
             40a0dc     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
             40a0dc      5 INSTR BELONGTO 40a0c0 
-            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 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     72 DATAREF STACK 593 esp + 0 PARENT LocalFrame LOCALFRAME
             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] 
@@ -11674,19 +11594,9 @@
             40a3ca      5 INSTR BELONGTO 40a3b0 
             40a3cf     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_10], r14 
             40a3cf      5 INSTR BELONGTO 40a3b0 
-            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 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     88 DATAREF STACK 594 esp + 0 PARENT LocalFrame LOCALFRAME
             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 
@@ -12200,7 +12110,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 685 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a720      8 DATAREF STACK 595 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 
@@ -12343,13 +12253,7 @@
             40a7ed      5 INSTR BELONGTO 40a7e0 
             40a7f2      4 INSTR BELONGTO 40a7e0 
             40a7f2      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 38h 
-            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     56 DATAREF STACK 596 esp + 0 PARENT LocalFrame LOCALFRAME
             40a7f2      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40a7f6     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             40a7f6      3 INSTR BELONGTO 40a7e0 
@@ -12483,10 +12387,9 @@
             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 693 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a8cb     16 DATAREF STACK 597 esp + 0 PARENT LocalFrame LOCALFRAME
             40a8cb      4 INSTR BELONGTO 40a8c0 
             40a8cb      4 INSTR DEADREGS  EFLAGS RCX ZZ sub     rsp, 10h 
-            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 
@@ -12544,7 +12447,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 695 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a911      8 DATAREF STACK 598 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 
@@ -12840,13 +12743,9 @@
             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 696 esp + 0 PARENT LocalFrame LOCALFRAME
+            40aac9     40 DATAREF STACK 599 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 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 
@@ -12932,11 +12831,9 @@
             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 701 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ab5f     24 DATAREF STACK 600 esp + 0 PARENT LocalFrame LOCALFRAME
             40ab5f      4 INSTR BELONGTO 40ab50 
             40ab5f      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-            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 
@@ -13153,7 +13050,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 704 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ad52      8 DATAREF STACK 601 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 
@@ -13295,7 +13192,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 705 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ae32      8 DATAREF STACK 602 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 
@@ -13413,7 +13310,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 706 esp + 0 PARENT LocalFrame LOCALFRAME
+            40aed0      8 DATAREF STACK 603 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 
@@ -13766,7 +13663,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 707 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b210      8 DATAREF STACK 604 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 
@@ -13845,7 +13742,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 708 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b29a      8 DATAREF STACK 605 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 
@@ -14113,13 +14010,7 @@
             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 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     56 DATAREF STACK 606 esp + 0 PARENT LocalFrame LOCALFRAME
             40b7bc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40b7c0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             40b7c0      3 INSTR BELONGTO 40b790 
@@ -14196,7 +14087,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 716 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b835      8 DATAREF STACK 607 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 
@@ -14231,7 +14122,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 717 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b868      8 DATAREF STACK 608 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 4ab3c758d44ddbc2458fb532a6266db8427974e6..328e85665e22eef4f552eb00a82d1a4c15c0ebf1 100644
--- a/tests/commit/trimmed-sorted-save-gnome-session-quit.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-session-quit.psexe.annot
@@ -193,12 +193,9 @@
             400930    399 FUNC GLOBAL main FUNC_UNSAFE NOFP RET             400abe 
             400930     -3 INSTR LOCAL NoWarn push    rbx 
             400931     32 DATAREF STACK 85 esp + 0 PARENT LocalFrame LOCALFRAME
-            400931      4 DATAREF STACK 87 esp + 12 CHILDOF 85 OFFSET 12 LOCALVAR var_1C 
             400931      4 INSTR BELONGTO 400930 
             400931      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 20h 
             400931      8 DATAREF STACK 86 esp + 0 CHILDOF 85 OFFSET 0 OutArgsRegion OUTARGS
-            400931      8 DATAREF STACK 88 esp + 16 CHILDOF 85 OFFSET 16 LOCALVAR var_18 
-            400931      8 DATAREF STACK 89 esp + 24 CHILDOF 85 OFFSET 24 LOCALVAR var_10 
             400931      8 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
             400931      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             400935     -1 INSTR LOCAL MetadataUnused mov     [rsp+28h+var_1C], edi 
@@ -461,9 +458,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -485,7 +482,7 @@
             400aec     23 FUNC GLOBAL sub_400AEC FUNC_SAFE NOFP RET             400b02 
             400aec      4 INSTR BELONGTO 400aec 
             400aec      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            400aec      8 DATAREF STACK 90 esp + 0 PARENT LocalFrame LOCALFRAME
+            400aec      8 DATAREF STACK 87 esp + 0 PARENT LocalFrame LOCALFRAME
             400aec      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             400af0      7 INSTR BELONGTO 400aec 
             400af0      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -515,7 +512,7 @@
             400b15     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             400b15      4 INSTR BELONGTO 400b10 
             400b15      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            400b15      8 DATAREF STACK 91 esp + 0 PARENT LocalFrame LOCALFRAME
+            400b15      8 DATAREF STACK 88 esp + 0 PARENT LocalFrame LOCALFRAME
             400b15      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             400b19     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_602190, 0 
             400b19      7 INSTR BELONGTO 400b10 
@@ -591,10 +588,9 @@
             400bb1      2 INSTR BELONGTO 400bb0 
             400bb1      2 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ xor     edi, edi 
             400bb1     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            400bb3     16 DATAREF STACK 92 esp + 0 PARENT LocalFrame LOCALFRAME
+            400bb3     16 DATAREF STACK 89 esp + 0 PARENT LocalFrame LOCALFRAME
             400bb3      4 INSTR BELONGTO 400bb0 
             400bb3      4 INSTR DEADREGS  EFLAGS RBX RSI ZZ sub     rsp, 10h 
-            400bb3      8 DATAREF STACK 93 esp + 8 CHILDOF 92 OFFSET 8 LOCALVAR var_10 
             400bb3      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
             400bb3      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             400bb7      5 INSTR BELONGTO 400bb0 
@@ -719,12 +715,11 @@
             400c73      1 INSTR BELONGTO 400c70 
             400c73      1 INSTR DEADREGS  EFLAGS RSI RDI ZZ push    rbx 
             400c73     -3 INSTR LOCAL NoWarn push    rbx 
-            400c74     16 DATAREF STACK 96 esp + 24 CHILDOF 94 OFFSET 24 LOCALVAR var_20 
             400c74     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-            400c74     40 DATAREF STACK 94 esp + 0 PARENT LocalFrame LOCALFRAME
+            400c74     40 DATAREF STACK 90 esp + 0 PARENT LocalFrame LOCALFRAME
             400c74      4 INSTR BELONGTO 400c70 
             400c74      4 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ sub     rsp, 28h 
-            400c74      8 DATAREF STACK 95 esp + 0 CHILDOF 94 OFFSET 0 OutArgsRegion OUTARGS
+            400c74      8 DATAREF STACK 91 esp + 0 CHILDOF 90 OFFSET 0 OutArgsRegion OUTARGS
             400c74      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             400c78     -1 INSTR LOCAL NoMetaUpdate call    sub_400BB0 
             400c78      5 INSTR BELONGTO 400c70 
@@ -851,13 +846,7 @@
             400d37      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
             400d3c      4 INSTR BELONGTO 400d10 
             400d3c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-            400d3c     56 DATAREF STACK 97 esp + 0 PARENT LocalFrame LOCALFRAME
-            400d3c      8 DATAREF STACK 100 esp + 24 CHILDOF 97 OFFSET 24 LOCALVAR var_20 
-            400d3c      8 DATAREF STACK 101 esp + 32 CHILDOF 97 OFFSET 32 LOCALVAR var_18 
-            400d3c      8 DATAREF STACK 102 esp + 40 CHILDOF 97 OFFSET 40 LOCALVAR var_10 
-            400d3c      8 DATAREF STACK 103 esp + 48 CHILDOF 97 OFFSET 48 LOCALVAR var_8 
-            400d3c      8 DATAREF STACK 98 esp + 8 CHILDOF 97 OFFSET 8 LOCALVAR var_30 
-            400d3c      8 DATAREF STACK 99 esp + 16 CHILDOF 97 OFFSET 16 LOCALVAR var_28 
+            400d3c     56 DATAREF STACK 92 esp + 0 PARENT LocalFrame LOCALFRAME
             400d3c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             400d40     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             400d40      3 INSTR BELONGTO 400d10 
@@ -934,7 +923,7 @@
             400db5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             400db5      4 INSTR BELONGTO 400db0 
             400db5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-            400db5      8 DATAREF STACK 104 esp + 0 PARENT LocalFrame LOCALFRAME
+            400db5      8 DATAREF STACK 93 esp + 0 PARENT LocalFrame LOCALFRAME
             400db5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             400db9      7 INSTR BELONGTO 400db0 
             400db9      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_601DD8 
@@ -969,7 +958,7 @@
             400de8     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET             400df5 
             400de8      4 INSTR BELONGTO 400de8 
             400de8      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-            400de8      8 DATAREF STACK 105 esp + 0 PARENT LocalFrame LOCALFRAME
+            400de8      8 DATAREF STACK 94 esp + 0 PARENT LocalFrame LOCALFRAME
             400de8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             400dec     -1 INSTR LOCAL NoMetaUpdate call    sub_400B10 
             400dec      5 INSTR BELONGTO 400de8 
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 8edd4f5102813c7939db4068556938551223e610..db498d4ff69ac0d9d75c1ad712f27632ae45b566 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 @@
-50074a501fa9e3884891af412be29b28016db4bb
\ No newline at end of file
+68acb886daa6f84215aa8bbeff44e326ca1cf162
\ 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 eca2c97e3abc3009a667ce32c5a51b9223faf58b..d355135f08f06eada2c1b08c6bf8fe7311cb8523 100644
--- a/tests/commit/trimmed-sorted-save-gnome-settings-daemon.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-settings-daemon.psexe.annot
@@ -1111,16 +1111,11 @@
             403611      1 INSTR BELONGTO 403610 
             403611      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             403611     -3 INSTR LOCAL NoWarn push    rbx 
-            403612     12 DATAREF STACK 384 esp + 16 CHILDOF 381 OFFSET 16 LOCALVAR var_38 
-            403612     16 DATAREF STACK 387 esp + 40 CHILDOF 381 OFFSET 40 LOCALVAR var_20 
             403612     16 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
-            403612      4 DATAREF STACK 385 esp + 28 CHILDOF 381 OFFSET 28 LOCALVAR var_2C 
             403612      4 INSTR BELONGTO 403610 
             403612      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 38h 
             403612     56 DATAREF STACK 381 esp + 0 PARENT LocalFrame LOCALFRAME
             403612      8 DATAREF STACK 382 esp + 0 CHILDOF 381 OFFSET 0 OutArgsRegion OUTARGS
-            403612      8 DATAREF STACK 383 esp + 8 CHILDOF 381 OFFSET 8 LOCALVAR var_40 
-            403612      8 DATAREF STACK 386 esp + 32 CHILDOF 381 OFFSET 32 LOCALVAR var_28 
             403612      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             403616     -1 INSTR LOCAL MetadataUnused mov     [rsp+48h+var_2C], edi 
             403616      4 INSTR BELONGTO 403610 
@@ -1295,8 +1290,9 @@
             40372d      9 PTRIMMEDESP STACK 40 displ mov     [rsp+48h+var_20], 0
             403736     -1 INSTR LOCAL MetadataUnused mov     [rsp+48h+var_40], rax 
             403736      5 INSTR BELONGTO 403610 
-            40373b     -1 INSTR LOCAL MetadataUnused mov     [rsp+48h+var_48], 0 
             40373b      8 INSTR BELONGTO 403610 
+            40373b      8 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+48h+var_48], 0 
+            40373b      8 PTRIMMEDESP STACK 0 displ mov     [rsp+48h+var_48], 0
             403743     -1 INSTR LOCAL NoMetaUpdate call    _g_dbus_proxy_new_sync 
             403743      5 INSTR BELONGTO 403610 
             403743      5 INSTR DEADREGS  EFLAGS ZZ call    _g_dbus_proxy_new_sync 
@@ -1371,8 +1367,9 @@
             4037a9      5 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     edi, 2 
             4037ae     -1 INSTR LOCAL MetadataUnused mov     [rsp+48h+var_40], 0 
             4037ae      9 INSTR BELONGTO 403610 
-            4037b7     -1 INSTR LOCAL MetadataUnused mov     [rsp+48h+var_48], 0 
             4037b7      8 INSTR BELONGTO 403610 
+            4037b7      8 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+48h+var_48], 0 
+            4037b7      8 PTRIMMEDESP STACK 0 displ mov     [rsp+48h+var_48], 0
             4037bf     -1 INSTR LOCAL NoMetaUpdate call    _g_bus_own_name 
             4037bf      5 INSTR BELONGTO 403610 
             4037bf      5 INSTR DEADREGS  EFLAGS RBX ZZ call    _g_bus_own_name 
@@ -1638,9 +1635,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -1662,7 +1659,7 @@
             403984     23 FUNC GLOBAL sub_403984 FUNC_SAFE NOFP RET             40399a 
             403984      4 INSTR BELONGTO 403984 
             403984      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            403984      8 DATAREF STACK 388 esp + 0 PARENT LocalFrame LOCALFRAME
+            403984      8 DATAREF STACK 383 esp + 0 PARENT LocalFrame LOCALFRAME
             403984      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             403988      7 INSTR BELONGTO 403984 
             403988      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -1692,7 +1689,7 @@
             4039a5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             4039a5      4 INSTR BELONGTO 4039a0 
             4039a5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            4039a5      8 DATAREF STACK 389 esp + 0 PARENT LocalFrame LOCALFRAME
+            4039a5      8 DATAREF STACK 384 esp + 0 PARENT LocalFrame LOCALFRAME
             4039a5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4039a9     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_608470, 0 
             4039a9      7 INSTR BELONGTO 4039a0 
@@ -1777,8 +1774,8 @@
             403a53      2 INSTR BELONGTO 403a40 
             403a53      2 INSTR DEADREGS  EFLAGS RAX ZZ xor     eax, eax 
             403a53     -2 INSTR LOCAL n EAX ZZ  AlwaysNUM xor     eax, eax 
-            403a55     16 DATAREF STACK 390 esp + 0 PARENT LocalFrame LOCALFRAME
-            403a55     16 DATAREF STACK 391 esp + 0 CHILDOF 390 OFFSET 0 OutArgsRegion OUTARGS
+            403a55     16 DATAREF STACK 385 esp + 0 PARENT LocalFrame LOCALFRAME
+            403a55     16 DATAREF STACK 386 esp + 0 CHILDOF 385 OFFSET 0 OutArgsRegion OUTARGS
             403a55      4 INSTR BELONGTO 403a40 
             403a55      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 10h 
             403a55      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -1830,13 +1827,11 @@
             403a94     -3 INSTR LOCAL NoWarn push    rbx 
             403a95      3 INSTR BELONGTO 403a90 
             403a95      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rsi 
-            403a98     16 DATAREF STACK 395 esp + 40 CHILDOF 392 OFFSET 40 LOCALVAR var_20 
             403a98     16 MEMORYHOLE STACK esp + 56 CalleeSavedRegs 
-            403a98     24 DATAREF STACK 393 esp + 0 CHILDOF 392 OFFSET 0 OutArgsRegion OUTARGS
+            403a98     24 DATAREF STACK 388 esp + 0 CHILDOF 387 OFFSET 0 OutArgsRegion OUTARGS
             403a98      4 INSTR BELONGTO 403a90 
             403a98      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 38h 
-            403a98     56 DATAREF STACK 392 esp + 0 PARENT LocalFrame LOCALFRAME
-            403a98      8 DATAREF STACK 394 esp + 32 CHILDOF 392 OFFSET 32 LOCALVAR var_28 
+            403a98     56 DATAREF STACK 387 esp + 0 PARENT LocalFrame LOCALFRAME
             403a98      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             403a9c      9 INSTR BELONGTO 403a90 
             403a9c      9 INSTR DEADREGS  EFLAGS ZZ mov     [rsp+48h+var_28], 0 
@@ -1982,8 +1977,7 @@
             403b90      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
             403b90      0 FUNC MMSAFENESS SAFE
             403b90    116 FUNC GLOBAL sub_403B90 FUNC_UNSAFE NOFP RET             403c03 
-            403b90     16 DATAREF STACK 397 esp + 8 CHILDOF 396 OFFSET 8 LOCALVAR var_10 
-            403b90     24 DATAREF STACK 396 esp + 0 PARENT LocalFrame LOCALFRAME
+            403b90     24 DATAREF STACK 389 esp + 0 PARENT LocalFrame LOCALFRAME
             403b90      4 INSTR BELONGTO 403b90 
             403b90      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 18h 
             403b90      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -2057,7 +2051,7 @@
             403c10     32 FUNC GLOBAL sub_403C10 FUNC_UNSAFE NOFP RET             403c2f 
             403c10      4 INSTR BELONGTO 403c10 
             403c10      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ sub     rsp, 8 
-            403c10      8 DATAREF STACK 398 esp + 0 PARENT LocalFrame LOCALFRAME
+            403c10      8 DATAREF STACK 390 esp + 0 PARENT LocalFrame LOCALFRAME
             403c10      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             403c14      5 INSTR BELONGTO 403c10 
             403c14      5 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ mov     edx, offset aNameTakenOrBus; "Name taken or bus went away - shutting "... 
@@ -2084,7 +2078,7 @@
             403c30     45 FUNC GLOBAL sub_403C30 FUNC_UNSAFE NOFP RET             403c5c 
             403c30      4 INSTR BELONGTO 403c30 
             403c30      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ sub     rsp, 8 
-            403c30      8 DATAREF STACK 399 esp + 0 PARENT LocalFrame LOCALFRAME
+            403c30      8 DATAREF STACK 391 esp + 0 PARENT LocalFrame LOCALFRAME
             403c30      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             403c34      2 INSTR BELONGTO 403c30 
             403c34      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     eax, eax 
@@ -2118,7 +2112,7 @@
             403c60     35 FUNC GLOBAL sub_403C60 FUNC_UNSAFE NOFP RET             403c82 
             403c60      4 INSTR BELONGTO 403c60 
             403c60      4 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ sub     rsp, 8 
-            403c60      8 DATAREF STACK 400 esp + 0 PARENT LocalFrame LOCALFRAME
+            403c60      8 DATAREF STACK 392 esp + 0 PARENT LocalFrame LOCALFRAME
             403c60      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             403c64      2 INSTR BELONGTO 403c60 
             403c64      2 INSTR DEADREGS  EFLAGS RAX RDX RSI RDI ZZ xor     eax, eax 
@@ -2150,7 +2144,7 @@
             403c90     30 FUNC GLOBAL handler FUNC_UNSAFE NOFP RET             403cad 
             403c90      4 INSTR BELONGTO 403c90 
             403c90      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 8 
-            403c90      8 DATAREF STACK 401 esp + 0 PARENT LocalFrame LOCALFRAME
+            403c90      8 DATAREF STACK 393 esp + 0 PARENT LocalFrame LOCALFRAME
             403c90      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             403c94      6 INSTR BELONGTO 403c90 
             403c94      6 INSTR DEADREGS  EFLAGS RDI ZZ mov     edi, cs:fd      ; fd 
@@ -2177,7 +2171,6 @@
             403cd1      1 INSTR BELONGTO 403cd0 
             403cd1     -3 INSTR LOCAL NoWarn push    rbx 
             403cd2      3 INSTR BELONGTO 403cd0 
-            403cd5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
             403cd5      4 INSTR BELONGTO 403cd0 
             403cd5      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             403cd9     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
@@ -2310,7 +2303,7 @@
             403e20      4 INSTR BELONGTO 403e20 
             403e20      4 INSTR DEADREGS  EFLAGS RSI RDI ZZ sub     rsp, 8 
             403e20     70 FUNC GLOBAL sub_403E20 FUNC_UNSAFE NOFP RET             403e65 
-            403e20      8 DATAREF STACK 402 esp + 0 PARENT LocalFrame LOCALFRAME
+            403e20      8 DATAREF STACK 394 esp + 0 PARENT LocalFrame LOCALFRAME
             403e20      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             403e24      5 INSTR BELONGTO 403e20 
             403e24      5 INSTR DEADREGS  EFLAGS RSI RDI ZZ mov     esi, offset aSessionover; "SessionOver" 
@@ -2361,7 +2354,7 @@
             403e72     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             403e72      4 INSTR BELONGTO 403e70 
             403e72      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            403e72      8 DATAREF STACK 403 esp + 0 PARENT LocalFrame LOCALFRAME
+            403e72      8 DATAREF STACK 395 esp + 0 PARENT LocalFrame LOCALFRAME
             403e72      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             403e76     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             403e76      3 INSTR BELONGTO 403e70 
@@ -2521,11 +2514,10 @@
             403f61      3 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, rsi 
             403f64      3 INSTR BELONGTO 403f60 
             403f64      3 INSTR DEADREGS  EFLAGS RBX RSI ZZ mov     rbx, rdx 
-            403f67     32 DATAREF STACK 404 esp + 0 PARENT LocalFrame LOCALFRAME
+            403f67     32 DATAREF STACK 396 esp + 0 PARENT LocalFrame LOCALFRAME
             403f67      4 INSTR BELONGTO 403f60 
             403f67      4 INSTR DEADREGS  EFLAGS RSI ZZ sub     rsp, 20h 
-            403f67      8 DATAREF STACK 405 esp + 0 CHILDOF 404 OFFSET 0 OutArgsRegion OUTARGS
-            403f67      8 DATAREF STACK 406 esp + 24 CHILDOF 404 OFFSET 24 LOCALVAR var_10 
+            403f67      8 DATAREF STACK 397 esp + 0 CHILDOF 396 OFFSET 0 OutArgsRegion OUTARGS
             403f67      8 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
             403f67      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             403f6b      5 INSTR BELONGTO 403f60 
@@ -2824,8 +2816,8 @@
             4042a0      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
             4042a0      0 FUNC MMSAFENESS SAFE
             4042a0    113 FUNC GLOBAL gnome_settings_manager_get_type FUNC_UNSAFE NOFP RET             404310 
-            4042a0     24 DATAREF STACK 407 esp + 0 PARENT LocalFrame LOCALFRAME
-            4042a0      4 DATAREF STACK 408 esp + 0 CHILDOF 407 OFFSET 0 OutArgsRegion OUTARGS
+            4042a0     24 DATAREF STACK 398 esp + 0 PARENT LocalFrame LOCALFRAME
+            4042a0      4 DATAREF STACK 399 esp + 0 CHILDOF 398 OFFSET 0 OutArgsRegion OUTARGS
             4042a0      4 INSTR BELONGTO 4042a0 
             4042a0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
             4042a0      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -2944,7 +2936,7 @@
             4043f0     35 FUNC GLOBAL gnome_settings_manager_error_quark FUNC_UNSAFE NOFP RET             404412 
             4043f0      4 INSTR BELONGTO 4043f0 
             4043f0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            4043f0      8 DATAREF STACK 409 esp + 0 PARENT LocalFrame LOCALFRAME
+            4043f0      8 DATAREF STACK 400 esp + 0 PARENT LocalFrame LOCALFRAME
             4043f0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4043f4      6 INSTR BELONGTO 4043f0 
             4043f4      6 INSTR DEADREGS  EFLAGS RAX ZZ mov     eax, cs:dword_6084B0 
@@ -3000,8 +2992,7 @@
             404439     -2 INSTR LOCAL n ESI ZZ  NUMVia2ndSrcIMMEDNUM mov     esi, 80h 
             404439      5 INSTR BELONGTO 404420 
             404439      5 INSTR DEADREGS  EFLAGS RSI R13 R14 R15 ZZ mov     esi, 80h 
-            40443e     16 DATAREF STACK 411 esp + 8 CHILDOF 410 OFFSET 8 LOCALVAR var_40 
-            40443e     24 DATAREF STACK 410 esp + 0 PARENT LocalFrame LOCALFRAME
+            40443e     24 DATAREF STACK 401 esp + 0 PARENT LocalFrame LOCALFRAME
             40443e     48 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
             40443e      4 INSTR BELONGTO 404420 
             40443e      4 INSTR DEADREGS  EFLAGS R13 R14 R15 ZZ sub     rsp, 18h 
@@ -3453,11 +3444,9 @@
             404715      5 INSTR BELONGTO 404710 
             40471a     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
             40471a      3 INSTR BELONGTO 404710 
-            40471d     24 DATAREF STACK 412 esp + 0 PARENT LocalFrame LOCALFRAME
+            40471d     24 DATAREF STACK 402 esp + 0 PARENT LocalFrame LOCALFRAME
             40471d      4 INSTR BELONGTO 404710 
             40471d      4 INSTR DEADREGS  EFLAGS RAX RDX RDI ZZ sub     rsp, 18h 
-            40471d      8 DATAREF STACK 413 esp + 8 CHILDOF 412 OFFSET 8 LOCALVAR var_10 
-            40471d      8 DATAREF STACK 414 esp + 16 CHILDOF 412 OFFSET 16 LOCALVAR var_8 
             40471d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             404721     -1 INSTR LOCAL MetadataUnused mov     rbp, rsi 
             404721      3 INSTR BELONGTO 404710 
@@ -3505,13 +3494,9 @@
             404762      2 INSTR BELONGTO 404750 
             404762      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R12 ZZ xor     edi, edi 
             404762     -2 INSTR LOCAL n EDI ZZ  AlwaysNUM xor     edi, edi 
-            404764     40 DATAREF STACK 415 esp + 0 PARENT LocalFrame LOCALFRAME
+            404764     40 DATAREF STACK 403 esp + 0 PARENT LocalFrame LOCALFRAME
             404764      4 INSTR BELONGTO 404750 
             404764      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R12 ZZ sub     rsp, 28h 
-            404764      8 DATAREF STACK 416 esp + 8 CHILDOF 415 OFFSET 8 LOCALVAR var_20 
-            404764      8 DATAREF STACK 417 esp + 16 CHILDOF 415 OFFSET 16 LOCALVAR var_18 
-            404764      8 DATAREF STACK 418 esp + 24 CHILDOF 415 OFFSET 24 LOCALVAR var_10 
-            404764      8 DATAREF STACK 419 esp + 32 CHILDOF 415 OFFSET 32 LOCALVAR var_8 
             404764      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             404768      2 INSTR BELONGTO 404750 
             404768      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R12 ZZ xor     eax, eax 
@@ -3728,13 +3713,9 @@
             4048e0      5 INSTR BELONGTO 4048e0 
             4048e5     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], rbp 
             4048e5      5 INSTR BELONGTO 4048e0 
-            4048ea     24 DATAREF STACK 420 esp + 0 PARENT LocalFrame LOCALFRAME
-            4048ea      4 DATAREF STACK 421 esp + 0 CHILDOF 420 OFFSET 0 LOCALVAR SMP_IDA_FixVar0 
-            4048ea      4 DATAREF STACK 422 esp + 4 CHILDOF 420 OFFSET 4 LOCALVAR SMP_IDA_FixVar4 
+            4048ea     24 DATAREF STACK 404 esp + 0 PARENT LocalFrame LOCALFRAME
             4048ea      4 INSTR BELONGTO 4048e0 
             4048ea      4 INSTR DEADREGS  EFLAGS RBX RDI ZZ sub     rsp, 18h 
-            4048ea      8 DATAREF STACK 423 esp + 8 CHILDOF 420 OFFSET 8 LOCALVAR var_10 
-            4048ea      8 DATAREF STACK 424 esp + 16 CHILDOF 420 OFFSET 16 LOCALVAR var_8 
             4048ea      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4048ee      7 INSTR BELONGTO 4048e0 
             4048ee      7 INSTR DEADREGS  EFLAGS RBX RDI ZZ mov     rdi, cs:qword_6084B8 
@@ -3874,8 +3855,8 @@
             404a00      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
             404a00      0 FUNC MMSAFENESS SAFE
             404a00    113 FUNC GLOBAL gnome_settings_plugin_get_type FUNC_UNSAFE NOFP RET             404a70 
-            404a00     24 DATAREF STACK 425 esp + 0 PARENT LocalFrame LOCALFRAME
-            404a00      4 DATAREF STACK 426 esp + 0 CHILDOF 425 OFFSET 0 OutArgsRegion OUTARGS
+            404a00     24 DATAREF STACK 405 esp + 0 PARENT LocalFrame LOCALFRAME
+            404a00      4 DATAREF STACK 406 esp + 0 CHILDOF 405 OFFSET 0 OutArgsRegion OUTARGS
             404a00      4 INSTR BELONGTO 404a00 
             404a00      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
             404a00      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -3948,10 +3929,8 @@
             404a85      5 INSTR BELONGTO 404a80 
             404a85      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
             404a8a      3 INSTR BELONGTO 404a80 
-            404a8d     24 DATAREF STACK 427 esp + 0 PARENT LocalFrame LOCALFRAME
+            404a8d     24 DATAREF STACK 407 esp + 0 PARENT LocalFrame LOCALFRAME
             404a8d      4 INSTR BELONGTO 404a80 
-            404a8d      8 DATAREF STACK 428 esp + 8 CHILDOF 427 OFFSET 8 LOCALVAR var_10 
-            404a8d      8 DATAREF STACK 429 esp + 16 CHILDOF 427 OFFSET 16 LOCALVAR var_8 
             404a8d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             404a91     -1 INSTR LOCAL NoMetaUpdate call    gnome_settings_plugin_get_type 
             404a91      5 INSTR BELONGTO 404a80 
@@ -4007,10 +3986,8 @@
             404b05      5 INSTR BELONGTO 404b00 
             404b05      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
             404b0a      3 INSTR BELONGTO 404b00 
-            404b0d     24 DATAREF STACK 430 esp + 0 PARENT LocalFrame LOCALFRAME
+            404b0d     24 DATAREF STACK 408 esp + 0 PARENT LocalFrame LOCALFRAME
             404b0d      4 INSTR BELONGTO 404b00 
-            404b0d      8 DATAREF STACK 431 esp + 8 CHILDOF 430 OFFSET 8 LOCALVAR var_10 
-            404b0d      8 DATAREF STACK 432 esp + 16 CHILDOF 430 OFFSET 16 LOCALVAR var_8 
             404b0d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             404b11     -1 INSTR LOCAL NoMetaUpdate call    gnome_settings_plugin_get_type 
             404b11      5 INSTR BELONGTO 404b00 
@@ -4070,8 +4047,8 @@
             404b84      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             404b84     -3 INSTR LOCAL NoWarn push    rbx 
             404b85     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-            404b85     20 DATAREF STACK 434 esp + 0 CHILDOF 433 OFFSET 0 OutArgsRegion OUTARGS
-            404b85     40 DATAREF STACK 433 esp + 0 PARENT LocalFrame LOCALFRAME
+            404b85     20 DATAREF STACK 410 esp + 0 CHILDOF 409 OFFSET 0 OutArgsRegion OUTARGS
+            404b85     40 DATAREF STACK 409 esp + 0 PARENT LocalFrame LOCALFRAME
             404b85      4 INSTR BELONGTO 404b80 
             404b85      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 28h 
             404b85      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
@@ -4170,8 +4147,8 @@
             404c40      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
             404c40      0 FUNC MMSAFENESS SAFE
             404c40    113 FUNC GLOBAL gnome_settings_plugin_info_get_type FUNC_UNSAFE NOFP RET             404cb0 
-            404c40     24 DATAREF STACK 435 esp + 0 PARENT LocalFrame LOCALFRAME
-            404c40      4 DATAREF STACK 436 esp + 0 CHILDOF 435 OFFSET 0 OutArgsRegion OUTARGS
+            404c40     24 DATAREF STACK 411 esp + 0 PARENT LocalFrame LOCALFRAME
+            404c40      4 DATAREF STACK 412 esp + 0 CHILDOF 411 OFFSET 0 OutArgsRegion OUTARGS
             404c40      4 INSTR BELONGTO 404c40 
             404c40      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
             404c40      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -4246,7 +4223,7 @@
             404cc4     -3 INSTR LOCAL NoWarn push    rbx 
             404cc5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             404cc5      4 INSTR BELONGTO 404cc0 
-            404cc5      8 DATAREF STACK 437 esp + 0 PARENT LocalFrame LOCALFRAME
+            404cc5      8 DATAREF STACK 413 esp + 0 PARENT LocalFrame LOCALFRAME
             404cc5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             404cc9     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             404cc9      3 INSTR BELONGTO 404cc0 
@@ -4406,13 +4383,9 @@
             404e3d      5 INSTR BELONGTO 404e30 
             404e42     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             404e42      5 INSTR BELONGTO 404e30 
-            404e47     40 DATAREF STACK 438 esp + 0 PARENT LocalFrame LOCALFRAME
+            404e47     40 DATAREF STACK 414 esp + 0 PARENT LocalFrame LOCALFRAME
             404e47      4 INSTR BELONGTO 404e30 
             404e47      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 28h 
-            404e47      8 DATAREF STACK 439 esp + 8 CHILDOF 438 OFFSET 8 LOCALVAR var_20 
-            404e47      8 DATAREF STACK 440 esp + 16 CHILDOF 438 OFFSET 16 LOCALVAR var_18 
-            404e47      8 DATAREF STACK 441 esp + 24 CHILDOF 438 OFFSET 24 LOCALVAR var_10 
-            404e47      8 DATAREF STACK 442 esp + 32 CHILDOF 438 OFFSET 32 LOCALVAR var_8 
             404e47      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             404e4b     -1 INSTR LOCAL NoMetaUpdate call    gnome_settings_plugin_info_get_type 
             404e4b      5 INSTR BELONGTO 404e30 
@@ -4885,7 +4858,7 @@
             405145     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             405145      4 INSTR BELONGTO 405140 
             405145      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-            405145      8 DATAREF STACK 443 esp + 0 PARENT LocalFrame LOCALFRAME
+            405145      8 DATAREF STACK 415 esp + 0 PARENT LocalFrame LOCALFRAME
             405145      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             405149      4 INSTR BELONGTO 405140 
             405149      4 INSTR DEADREGS  EFLAGS ZZ mov     rbp, [rdi+18h] 
@@ -4978,7 +4951,7 @@
             4051d5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             4051d5      4 INSTR BELONGTO 4051d0 
             4051d5      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-            4051d5      8 DATAREF STACK 444 esp + 0 PARENT LocalFrame LOCALFRAME
+            4051d5      8 DATAREF STACK 416 esp + 0 PARENT LocalFrame LOCALFRAME
             4051d5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4051d9     -1 INSTR LOCAL NoMetaUpdate call    gnome_settings_plugin_info_get_type 
             4051d9      5 INSTR BELONGTO 4051d0 
@@ -5095,13 +5068,9 @@
             40526d      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], rbp
             405272     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             405272      5 INSTR BELONGTO 405260 
-            405277     40 DATAREF STACK 445 esp + 0 PARENT LocalFrame LOCALFRAME
+            405277     40 DATAREF STACK 417 esp + 0 PARENT LocalFrame LOCALFRAME
             405277      4 INSTR BELONGTO 405260 
             405277      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 R13 ZZ sub     rsp, 28h 
-            405277      8 DATAREF STACK 446 esp + 8 CHILDOF 445 OFFSET 8 LOCALVAR var_20 
-            405277      8 DATAREF STACK 447 esp + 16 CHILDOF 445 OFFSET 16 LOCALVAR var_18 
-            405277      8 DATAREF STACK 448 esp + 24 CHILDOF 445 OFFSET 24 LOCALVAR var_10 
-            405277      8 DATAREF STACK 449 esp + 32 CHILDOF 445 OFFSET 32 LOCALVAR var_8 
             405277      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             40527b     -1 INSTR LOCAL NoMetaUpdate call    gnome_settings_plugin_info_get_type 
             40527b      5 INSTR BELONGTO 405260 
@@ -6170,11 +6139,9 @@
             4058e5      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
             4058ea      3 INSTR BELONGTO 4058e0 
             4058ea      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
-            4058ed     24 DATAREF STACK 450 esp + 0 PARENT LocalFrame LOCALFRAME
+            4058ed     24 DATAREF STACK 418 esp + 0 PARENT LocalFrame LOCALFRAME
             4058ed      4 INSTR BELONGTO 4058e0 
             4058ed      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
-            4058ed      8 DATAREF STACK 451 esp + 8 CHILDOF 450 OFFSET 8 LOCALVAR var_10 
-            4058ed      8 DATAREF STACK 452 esp + 16 CHILDOF 450 OFFSET 16 LOCALVAR var_8 
             4058ed      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4058f1      2 INSTR BELONGTO 4058e0 
             4058f1      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 ZZ mov     ebp, esi 
@@ -6257,8 +6224,8 @@
             4059f0      1 INSTR BELONGTO 4059f0 
             4059f0      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
             4059f0     -3 INSTR LOCAL NoWarn push    rbx 
-            4059f1     16 DATAREF STACK 453 esp + 0 PARENT LocalFrame LOCALFRAME
-            4059f1      4 DATAREF STACK 454 esp + 0 CHILDOF 453 OFFSET 0 OutArgsRegion OUTARGS
+            4059f1     16 DATAREF STACK 419 esp + 0 PARENT LocalFrame LOCALFRAME
+            4059f1      4 DATAREF STACK 420 esp + 0 CHILDOF 419 OFFSET 0 OutArgsRegion OUTARGS
             4059f1      4 INSTR BELONGTO 4059f0 
             4059f1      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 10h 
             4059f1      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -6391,9 +6358,8 @@
             405ac4      1 INSTR BELONGTO 405ac0 
             405ac4      1 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ push    rbx 
             405ac4     -3 INSTR LOCAL NoWarn push    rbx 
-            405ac5     16 DATAREF STACK 456 esp + 8 CHILDOF 455 OFFSET 8 LOCALVAR var_20 
             405ac5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            405ac5     24 DATAREF STACK 455 esp + 0 PARENT LocalFrame LOCALFRAME
+            405ac5     24 DATAREF STACK 421 esp + 0 PARENT LocalFrame LOCALFRAME
             405ac5      4 INSTR BELONGTO 405ac0 
             405ac5      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 18h 
             405ac5      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -6607,7 +6573,7 @@
             405bf2      3 INSTR BELONGTO 405bf0 
             405bf5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             405bf5      4 INSTR BELONGTO 405bf0 
-            405bf5      8 DATAREF STACK 457 esp + 0 PARENT LocalFrame LOCALFRAME
+            405bf5      8 DATAREF STACK 422 esp + 0 PARENT LocalFrame LOCALFRAME
             405bf5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             405bf9     -1 INSTR LOCAL NoMetaUpdate call    gnome_settings_module_get_type 
             405bf9      5 INSTR BELONGTO 405bf0 
@@ -6773,7 +6739,7 @@
             405cf7     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             405cf7      4 INSTR BELONGTO 405cf0 
             405cf7      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-            405cf7      8 DATAREF STACK 458 esp + 0 PARENT LocalFrame LOCALFRAME
+            405cf7      8 DATAREF STACK 423 esp + 0 PARENT LocalFrame LOCALFRAME
             405cf7      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             405cfb     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             405cfb      3 INSTR BELONGTO 405cf0 
@@ -6861,13 +6827,7 @@
             405d77      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
             405d7c      4 INSTR BELONGTO 405d50 
             405d7c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-            405d7c     56 DATAREF STACK 459 esp + 0 PARENT LocalFrame LOCALFRAME
-            405d7c      8 DATAREF STACK 460 esp + 8 CHILDOF 459 OFFSET 8 LOCALVAR var_30 
-            405d7c      8 DATAREF STACK 461 esp + 16 CHILDOF 459 OFFSET 16 LOCALVAR var_28 
-            405d7c      8 DATAREF STACK 462 esp + 24 CHILDOF 459 OFFSET 24 LOCALVAR var_20 
-            405d7c      8 DATAREF STACK 463 esp + 32 CHILDOF 459 OFFSET 32 LOCALVAR var_18 
-            405d7c      8 DATAREF STACK 464 esp + 40 CHILDOF 459 OFFSET 40 LOCALVAR var_10 
-            405d7c      8 DATAREF STACK 465 esp + 48 CHILDOF 459 OFFSET 48 LOCALVAR var_8 
+            405d7c     56 DATAREF STACK 424 esp + 0 PARENT LocalFrame LOCALFRAME
             405d7c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             405d80     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             405d80      3 INSTR BELONGTO 405d50 
@@ -6944,7 +6904,7 @@
             405df5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             405df5      4 INSTR BELONGTO 405df0 
             405df5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-            405df5      8 DATAREF STACK 466 esp + 0 PARENT LocalFrame LOCALFRAME
+            405df5      8 DATAREF STACK 425 esp + 0 PARENT LocalFrame LOCALFRAME
             405df5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             405df9      7 INSTR BELONGTO 405df0 
             405df9      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_607D98 
@@ -6979,7 +6939,7 @@
             405e28     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET             405e35 
             405e28      4 INSTR BELONGTO 405e28 
             405e28      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-            405e28      8 DATAREF STACK 467 esp + 0 PARENT LocalFrame LOCALFRAME
+            405e28      8 DATAREF STACK 426 esp + 0 PARENT LocalFrame LOCALFRAME
             405e28      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             405e2c     -1 INSTR LOCAL NoMetaUpdate call    sub_4039A0 
             405e2c      5 INSTR BELONGTO 405e28 
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 cb76cdd14e379bd904f6e195e0db77b0f820a238..6f17ba002a336ee1d6dcfc615c2354106dffcfdf 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 1242 esp + 0 PARENT LocalFrame LOCALFRAME
-             10191      4 DATAREF STACK 1243 esp + 0 CHILDOF 1242 OFFSET 0 OutArgsRegion OUTARGS
+             10191     16 DATAREF STACK 1155 esp + 0 PARENT LocalFrame LOCALFRAME
+             10191      4 DATAREF STACK 1156 esp + 0 CHILDOF 1155 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 1244 esp + 0 PARENT LocalFrame LOCALFRAME
+             10225      8 DATAREF STACK 1157 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,7 @@
              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 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     56 DATAREF STACK 1158 esp + 0 PARENT LocalFrame LOCALFRAME
              10ca3      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
              10ca7     -1 INSTR LOCAL NoMetaUpdate call    sub_10190 
              10ca7      5 INSTR BELONGTO 10c80 
@@ -2296,7 +2290,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 1252 esp + 0 PARENT LocalFrame LOCALFRAME
+             11007      8 DATAREF STACK 1159 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 +2386,7 @@
              110a0     -3 INSTR LOCAL NoWarn push    rbx 
              110a1     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
              110a1      3 INSTR BELONGTO 110a0 
-             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     16 DATAREF STACK 1160 esp + 0 PARENT LocalFrame LOCALFRAME
              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 +2466,10 @@
              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 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 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     72 DATAREF STACK 1161 esp + 0 PARENT LocalFrame LOCALFRAME
              1111b      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
              1111f     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
              1111f      3 INSTR BELONGTO 11110 
@@ -3017,8 +3005,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 1262 esp + 0 CHILDOF 1261 OFFSET 0 OutArgsRegion OUTARGS
-             11568     40 DATAREF STACK 1261 esp + 0 PARENT LocalFrame LOCALFRAME
+             11568     24 DATAREF STACK 1163 esp + 0 CHILDOF 1162 OFFSET 0 OutArgsRegion OUTARGS
+             11568     40 DATAREF STACK 1162 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 +3769,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 1263 esp + 0 PARENT LocalFrame LOCALFRAME
-             122e5      4 DATAREF STACK 1264 esp + 0 CHILDOF 1263 OFFSET 0 OutArgsRegion OUTARGS
+             122e5     24 DATAREF STACK 1164 esp + 0 PARENT LocalFrame LOCALFRAME
+             122e5      4 DATAREF STACK 1165 esp + 0 CHILDOF 1164 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 +4006,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 1265 esp + 0 PARENT LocalFrame LOCALFRAME
-             124c0      4 DATAREF STACK 1266 esp + 0 CHILDOF 1265 OFFSET 0 OutArgsRegion OUTARGS
+             124c0     24 DATAREF STACK 1166 esp + 0 PARENT LocalFrame LOCALFRAME
+             124c0      4 DATAREF STACK 1167 esp + 0 CHILDOF 1166 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 +4129,7 @@
              126d2      3 INSTR BELONGTO 126d0 
              126d5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
              126d5      4 INSTR BELONGTO 126d0 
-             126d5      8 DATAREF STACK 1267 esp + 0 PARENT LocalFrame LOCALFRAME
+             126d5      8 DATAREF STACK 1168 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 +4385,9 @@
              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 1268 esp + 0 PARENT LocalFrame LOCALFRAME
+             12a52     24 DATAREF STACK 1169 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 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 +4506,9 @@
              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 1272 esp + 0 PARENT LocalFrame LOCALFRAME
+             12b72     24 DATAREF STACK 1170 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 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 
@@ -4833,7 +4815,6 @@
              12e33      1 INSTR BELONGTO 12e30 
              12e33     -3 INSTR LOCAL NoWarn push    rbx 
              12e34      3 INSTR BELONGTO 12e30 
-             12e37     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
              12e37      4 INSTR BELONGTO 12e30 
              12e37      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
              12e3b     -1 INSTR LOCAL NoMetaUpdate call    sub_124C0 
@@ -5142,7 +5123,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 1276 esp + 0 PARENT LocalFrame LOCALFRAME
+             132d8      8 DATAREF STACK 1171 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 +5228,9 @@
              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 1277 esp + 0 PARENT LocalFrame LOCALFRAME
+             1338a     24 DATAREF STACK 1172 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 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 +5291,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 1280 esp + 0 PARENT LocalFrame LOCALFRAME
+             133e5      8 DATAREF STACK 1173 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 +5430,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 1281 esp + 0 PARENT LocalFrame LOCALFRAME
-             13651      4 DATAREF STACK 1282 esp + 0 CHILDOF 1281 OFFSET 0 OutArgsRegion OUTARGS
+             13651     16 DATAREF STACK 1174 esp + 0 PARENT LocalFrame LOCALFRAME
+             13651      4 DATAREF STACK 1175 esp + 0 CHILDOF 1174 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 +5560,10 @@
              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 1284 esp + 0 CHILDOF 1283 OFFSET 0 OutArgsRegion OUTARGS
-             137d2     40 DATAREF STACK 1283 esp + 0 PARENT LocalFrame LOCALFRAME
+             137d2     16 DATAREF STACK 1177 esp + 0 CHILDOF 1176 OFFSET 0 OutArgsRegion OUTARGS
+             137d2     40 DATAREF STACK 1176 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 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 +5631,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 1288 esp + 0 PARENT LocalFrame LOCALFRAME
+             13845      8 DATAREF STACK 1178 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 +5770,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 1289 esp + 0 PARENT LocalFrame LOCALFRAME
-             13ab1      4 DATAREF STACK 1290 esp + 0 CHILDOF 1289 OFFSET 0 OutArgsRegion OUTARGS
+             13ab1     16 DATAREF STACK 1179 esp + 0 PARENT LocalFrame LOCALFRAME
+             13ab1      4 DATAREF STACK 1180 esp + 0 CHILDOF 1179 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 +5900,10 @@
              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 1292 esp + 0 CHILDOF 1291 OFFSET 0 OutArgsRegion OUTARGS
-             13c32     40 DATAREF STACK 1291 esp + 0 PARENT LocalFrame LOCALFRAME
+             13c32     16 DATAREF STACK 1182 esp + 0 CHILDOF 1181 OFFSET 0 OutArgsRegion OUTARGS
+             13c32     40 DATAREF STACK 1181 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 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 +5971,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 1296 esp + 0 PARENT LocalFrame LOCALFRAME
+             13ca5      8 DATAREF STACK 1183 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 +6076,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 1297 esp + 0 PARENT LocalFrame LOCALFRAME
-             13e31      4 DATAREF STACK 1298 esp + 0 CHILDOF 1297 OFFSET 0 OutArgsRegion OUTARGS
+             13e31     16 DATAREF STACK 1184 esp + 0 PARENT LocalFrame LOCALFRAME
+             13e31      4 DATAREF STACK 1185 esp + 0 CHILDOF 1184 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 +6206,10 @@
              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 1300 esp + 0 CHILDOF 1299 OFFSET 0 OutArgsRegion OUTARGS
-             13fb2     40 DATAREF STACK 1299 esp + 0 PARENT LocalFrame LOCALFRAME
+             13fb2     16 DATAREF STACK 1187 esp + 0 CHILDOF 1186 OFFSET 0 OutArgsRegion OUTARGS
+             13fb2     40 DATAREF STACK 1186 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 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 +6279,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 1304 esp + 0 PARENT LocalFrame LOCALFRAME
+             14045      8 DATAREF STACK 1188 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 +6339,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 1305 esp + 0 PARENT LocalFrame LOCALFRAME
-             140b1      4 DATAREF STACK 1306 esp + 0 CHILDOF 1305 OFFSET 0 OutArgsRegion OUTARGS
+             140b1     16 DATAREF STACK 1189 esp + 0 PARENT LocalFrame LOCALFRAME
+             140b1      4 DATAREF STACK 1190 esp + 0 CHILDOF 1189 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 +6469,10 @@
              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 1308 esp + 0 CHILDOF 1307 OFFSET 0 OutArgsRegion OUTARGS
-             14232     40 DATAREF STACK 1307 esp + 0 PARENT LocalFrame LOCALFRAME
+             14232     16 DATAREF STACK 1192 esp + 0 CHILDOF 1191 OFFSET 0 OutArgsRegion OUTARGS
+             14232     40 DATAREF STACK 1191 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 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 +6540,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 1312 esp + 0 PARENT LocalFrame LOCALFRAME
+             142a5      8 DATAREF STACK 1193 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 +6674,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 1313 esp + 0 PARENT LocalFrame LOCALFRAME
-             14481      4 DATAREF STACK 1314 esp + 0 CHILDOF 1313 OFFSET 0 OutArgsRegion OUTARGS
+             14481     16 DATAREF STACK 1194 esp + 0 PARENT LocalFrame LOCALFRAME
+             14481      4 DATAREF STACK 1195 esp + 0 CHILDOF 1194 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 +6912,10 @@
              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 1316 esp + 0 CHILDOF 1315 OFFSET 0 OutArgsRegion OUTARGS
+             14912     32 DATAREF STACK 1197 esp + 0 CHILDOF 1196 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 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     56 DATAREF STACK 1196 esp + 0 PARENT LocalFrame LOCALFRAME
              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 +7005,7 @@
              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 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     56 DATAREF STACK 1198 esp + 0 PARENT LocalFrame LOCALFRAME
              149bc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
              149c0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
              149c0      3 INSTR BELONGTO 14990 
@@ -7124,7 +7082,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 1327 esp + 0 PARENT LocalFrame LOCALFRAME
+             14a35      8 DATAREF STACK 1199 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 +7117,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 1328 esp + 0 PARENT LocalFrame LOCALFRAME
+             14a68      8 DATAREF STACK 1200 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 
@@ -8833,14 +8791,10 @@
               6b51      1 INSTR BELONGTO 6b50 
               6b51      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
               6b51     -3 INSTR LOCAL NoWarn push    rbx 
-              6b52     12 DATAREF STACK 1077 esp + 0 CHILDOF 1076 OFFSET 0 LOCALVAR var_38 
-              6b52     16 DATAREF STACK 1080 esp + 24 CHILDOF 1076 OFFSET 24 LOCALVAR var_20 
               6b52     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
               6b52     40 DATAREF STACK 1076 esp + 0 PARENT LocalFrame LOCALFRAME
-              6b52      4 DATAREF STACK 1078 esp + 12 CHILDOF 1076 OFFSET 12 LOCALVAR var_2C 
               6b52      4 INSTR BELONGTO 6b50 
               6b52      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 28h 
-              6b52      8 DATAREF STACK 1079 esp + 16 CHILDOF 1076 OFFSET 16 LOCALVAR var_28 
               6b52      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
               6b56     -1 INSTR LOCAL MetadataUnused mov     [rsp+38h+var_2C], edi 
               6b56      4 INSTR BELONGTO 6b50 
@@ -9122,9 +9076,9 @@
               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 + 0 CalleeSavedRegs 
               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 
@@ -9143,7 +9097,7 @@
               6d64     23 FUNC GLOBAL sub_6D64 FUNC_SAFE NOFP RET               6d7a 
               6d64      4 INSTR BELONGTO 6d64 
               6d64      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-              6d64      8 DATAREF STACK 1081 esp + 0 PARENT LocalFrame LOCALFRAME
+              6d64      8 DATAREF STACK 1077 esp + 0 PARENT LocalFrame LOCALFRAME
               6d64      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
               6d68      7 INSTR BELONGTO 6d64 
               6d68      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -9265,18 +9219,9 @@
               6e47      5 INSTR BELONGTO 6e30 
               6e4c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
               6e4c      5 INSTR BELONGTO 6e30 
-              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 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     88 DATAREF STACK 1078 esp + 0 PARENT LocalFrame LOCALFRAME
               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] 
@@ -9626,7 +9571,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 1092 esp + 0 PARENT LocalFrame LOCALFRAME
+              7105      8 DATAREF STACK 1079 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 
@@ -9800,7 +9745,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 1093 esp + 0 PARENT LocalFrame LOCALFRAME
+              7215      8 DATAREF STACK 1080 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 
@@ -9947,7 +9892,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 1094 esp + 0 PARENT LocalFrame LOCALFRAME
+              7328      8 DATAREF STACK 1081 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 
@@ -10019,11 +9964,9 @@
               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 1095 esp + 0 PARENT LocalFrame LOCALFRAME
+              739a     24 DATAREF STACK 1082 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 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 
@@ -10061,7 +10004,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 1098 esp + 0 PARENT LocalFrame LOCALFRAME
+              73e0      8 DATAREF STACK 1083 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 
@@ -10189,7 +10132,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 1099 esp + 0 PARENT LocalFrame LOCALFRAME
+              7698      8 DATAREF STACK 1084 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 
@@ -10293,11 +10236,9 @@
               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 1100 esp + 0 PARENT LocalFrame LOCALFRAME
+              773a     24 DATAREF STACK 1085 esp + 0 PARENT LocalFrame LOCALFRAME
               773a      4 INSTR BELONGTO 7730 
               773a      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-              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 
@@ -10397,8 +10338,7 @@
               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 1103 esp + 0 PARENT LocalFrame LOCALFRAME
-              783f      4 DATAREF STACK 1104 esp + 12 CHILDOF 1103 OFFSET 12 LOCALVAR var_C 
+              783f     16 DATAREF STACK 1086 esp + 0 PARENT LocalFrame LOCALFRAME
               783f      4 INSTR BELONGTO 7830 
               783f      4 INSTR DEADREGS  EFLAGS RDX ZZ sub     rsp, 10h 
               783f      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -10544,8 +10484,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 1105 esp + 0 PARENT LocalFrame LOCALFRAME
-              7b31      4 DATAREF STACK 1106 esp + 0 CHILDOF 1105 OFFSET 0 OutArgsRegion OUTARGS
+              7b31     16 DATAREF STACK 1087 esp + 0 PARENT LocalFrame LOCALFRAME
+              7b31      4 DATAREF STACK 1088 esp + 0 CHILDOF 1087 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 
@@ -10672,7 +10612,7 @@
               7d02      3 INSTR BELONGTO 7d00 
               7d05     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
               7d05      4 INSTR BELONGTO 7d00 
-              7d05      8 DATAREF STACK 1107 esp + 0 PARENT LocalFrame LOCALFRAME
+              7d05      8 DATAREF STACK 1089 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 
@@ -10943,12 +10883,9 @@
               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 1108 esp + 0 PARENT LocalFrame LOCALFRAME
+              8252     24 DATAREF STACK 1090 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 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 
@@ -11042,10 +10979,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 1112 esp + 0 PARENT LocalFrame LOCALFRAME
+              8308     24 DATAREF STACK 1091 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 1113 esp + 0 CHILDOF 1112 OFFSET 0 OutArgsRegion OUTARGS
+              8308      8 DATAREF STACK 1092 esp + 0 CHILDOF 1091 OFFSET 0 OutArgsRegion OUTARGS
               8308      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
               830c     -1 INSTR LOCAL NoMetaUpdate call    sub_7B30 
               830c      5 INSTR BELONGTO 8300 
@@ -11337,11 +11274,9 @@
               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 1114 esp + 0 PARENT LocalFrame LOCALFRAME
+              860a     24 DATAREF STACK 1093 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 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 
@@ -11715,8 +11650,7 @@
               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 1118 esp + 8 CHILDOF 1117 OFFSET 8 LOCALVAR var_10 
-              8890     24 DATAREF STACK 1117 esp + 0 PARENT LocalFrame LOCALFRAME
+              8890     24 DATAREF STACK 1094 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 
@@ -11757,8 +11691,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 1119 esp + 0 PARENT LocalFrame LOCALFRAME
-              88f0      4 DATAREF STACK 1120 esp + 0 CHILDOF 1119 OFFSET 0 OutArgsRegion OUTARGS
+              88f0     24 DATAREF STACK 1095 esp + 0 PARENT LocalFrame LOCALFRAME
+              88f0      4 DATAREF STACK 1096 esp + 0 CHILDOF 1095 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 
@@ -11861,7 +11795,7 @@
               8a92      3 INSTR BELONGTO 8a90 
               8a95     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
               8a95      4 INSTR BELONGTO 8a90 
-              8a95      8 DATAREF STACK 1121 esp + 0 PARENT LocalFrame LOCALFRAME
+              8a95      8 DATAREF STACK 1097 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 
@@ -12144,8 +12078,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 1122 esp + 0 PARENT LocalFrame LOCALFRAME
-              8e25      4 DATAREF STACK 1123 esp + 0 CHILDOF 1122 OFFSET 0 OutArgsRegion OUTARGS
+              8e25     24 DATAREF STACK 1098 esp + 0 PARENT LocalFrame LOCALFRAME
+              8e25      4 DATAREF STACK 1099 esp + 0 CHILDOF 1098 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 
@@ -12658,8 +12592,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 1124 esp + 0 PARENT LocalFrame LOCALFRAME
-              9250      4 DATAREF STACK 1125 esp + 0 CHILDOF 1124 OFFSET 0 OutArgsRegion OUTARGS
+              9250     24 DATAREF STACK 1100 esp + 0 PARENT LocalFrame LOCALFRAME
+              9250      4 DATAREF STACK 1101 esp + 0 CHILDOF 1100 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 
@@ -12817,7 +12751,7 @@
               95a2      3 INSTR BELONGTO 95a0 
               95a5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
               95a5      4 INSTR BELONGTO 95a0 
-              95a5      8 DATAREF STACK 1126 esp + 0 PARENT LocalFrame LOCALFRAME
+              95a5      8 DATAREF STACK 1102 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 
@@ -13378,7 +13312,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 1127 esp + 0 PARENT LocalFrame LOCALFRAME
+              9a57    152 DATAREF STACK 1103 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 
@@ -13697,12 +13631,9 @@
               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 1128 esp + 0 PARENT LocalFrame LOCALFRAME
+              9d12     24 DATAREF STACK 1104 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 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 
@@ -13804,12 +13735,9 @@
               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 1132 esp + 0 PARENT LocalFrame LOCALFRAME
+              9dc2     24 DATAREF STACK 1105 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 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 
@@ -14032,12 +13960,9 @@
               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 1136 esp + 0 PARENT LocalFrame LOCALFRAME
+              9f32     24 DATAREF STACK 1106 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 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 
@@ -14143,12 +14068,9 @@
               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 1140 esp + 0 PARENT LocalFrame LOCALFRAME
+              9ff2     24 DATAREF STACK 1107 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 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 
@@ -14270,7 +14192,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 1144 esp + 0 PARENT LocalFrame LOCALFRAME
+              a107      8 DATAREF STACK 1108 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 
@@ -14380,7 +14302,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 1145 esp + 0 PARENT LocalFrame LOCALFRAME
+              a1f7      8 DATAREF STACK 1109 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 
@@ -14535,12 +14457,9 @@
               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 1146 esp + 0 PARENT LocalFrame LOCALFRAME
+              a2f2     24 DATAREF STACK 1110 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 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 
@@ -14688,12 +14607,9 @@
               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 1150 esp + 0 PARENT LocalFrame LOCALFRAME
+              a4e2     24 DATAREF STACK 1111 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 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 
@@ -14799,12 +14715,9 @@
               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 1154 esp + 0 PARENT LocalFrame LOCALFRAME
+              a5a2     24 DATAREF STACK 1112 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 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 
@@ -14921,11 +14834,9 @@
               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 1158 esp + 0 PARENT LocalFrame LOCALFRAME
+              a6bd     24 DATAREF STACK 1113 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 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 
@@ -15434,7 +15345,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 1161 esp + 0 PARENT LocalFrame LOCALFRAME
+              af08      8 DATAREF STACK 1114 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 
@@ -15561,7 +15472,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 1162 esp + 0 PARENT LocalFrame LOCALFRAME
+              b017      8 DATAREF STACK 1115 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 
@@ -15650,11 +15561,9 @@
               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 1164 esp + 8 CHILDOF 1163 OFFSET 8 LOCALVAR var_20 
-              b0a4     32 DATAREF STACK 1163 esp + 0 PARENT LocalFrame LOCALFRAME
+              b0a4     32 DATAREF STACK 1116 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 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 
@@ -15777,8 +15686,7 @@
               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 1167 esp + 8 CHILDOF 1166 OFFSET 8 LOCALVAR var_10 
-              b170     24 DATAREF STACK 1166 esp + 0 PARENT LocalFrame LOCALFRAME
+              b170     24 DATAREF STACK 1117 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 
@@ -15828,11 +15736,8 @@
               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 1168 esp + 0 PARENT LocalFrame LOCALFRAME
+              b1d2     24 DATAREF STACK 1118 esp + 0 PARENT LocalFrame LOCALFRAME
               b1d2      4 INSTR BELONGTO b1c0 
-              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 
@@ -15954,11 +15859,10 @@
               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 1173 esp + 0 CHILDOF 1172 OFFSET 0 OutArgsRegion OUTARGS
-              b2b4     32 DATAREF STACK 1172 esp + 0 PARENT LocalFrame LOCALFRAME
+              b2b4     20 DATAREF STACK 1120 esp + 0 CHILDOF 1119 OFFSET 0 OutArgsRegion OUTARGS
+              b2b4     32 DATAREF STACK 1119 esp + 0 PARENT LocalFrame LOCALFRAME
               b2b4      4 INSTR BELONGTO b2b0 
               b2b4      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 20h 
-              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 
@@ -16031,8 +15935,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 1175 esp + 0 PARENT LocalFrame LOCALFRAME
-              b340      4 DATAREF STACK 1176 esp + 0 CHILDOF 1175 OFFSET 0 OutArgsRegion OUTARGS
+              b340     24 DATAREF STACK 1121 esp + 0 PARENT LocalFrame LOCALFRAME
+              b340      4 DATAREF STACK 1122 esp + 0 CHILDOF 1121 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 
@@ -16312,11 +16216,9 @@
               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 1177 esp + 0 PARENT LocalFrame LOCALFRAME
+              b65d     24 DATAREF STACK 1123 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 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 
@@ -16750,13 +16652,9 @@
               b93d      5 INSTR BELONGTO b930 
               b942     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_10], r12 
               b942      5 INSTR BELONGTO b930 
-              b947     40 DATAREF STACK 1180 esp + 0 PARENT LocalFrame LOCALFRAME
+              b947     40 DATAREF STACK 1124 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 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 
@@ -16928,13 +16826,9 @@
               baad      5 INSTR BELONGTO baa0 
               bab2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_10], r12 
               bab2      5 INSTR BELONGTO baa0 
-              bab7     40 DATAREF STACK 1185 esp + 0 PARENT LocalFrame LOCALFRAME
+              bab7     40 DATAREF STACK 1125 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 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 
@@ -17103,12 +16997,9 @@
               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 1190 esp + 0 PARENT LocalFrame LOCALFRAME
+              bbe5     24 DATAREF STACK 1126 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 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 
@@ -17189,13 +17080,9 @@
               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 1194 esp + 0 PARENT LocalFrame LOCALFRAME
+              bc74     40 DATAREF STACK 1127 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 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 
@@ -17437,12 +17324,9 @@
               be2a      3 INSTR BELONGTO be20 
               be2d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
               be2d      5 INSTR BELONGTO be20 
-              be32     24 DATAREF STACK 1199 esp + 0 PARENT LocalFrame LOCALFRAME
+              be32     24 DATAREF STACK 1128 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 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 
@@ -17587,7 +17471,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 1203 esp + 0 PARENT LocalFrame LOCALFRAME
+              bf68      8 DATAREF STACK 1129 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 
@@ -17778,7 +17662,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 1204 esp + 0 PARENT LocalFrame LOCALFRAME
+              c088      8 DATAREF STACK 1130 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 
@@ -17944,10 +17828,9 @@
               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 1207 esp + 24 CHILDOF 1205 OFFSET 24 LOCALVAR var_20 
               c185     16 MEMORYHOLE STACK esp + 40 CalleeSavedRegs 
-              c185     20 DATAREF STACK 1206 esp + 0 CHILDOF 1205 OFFSET 0 OutArgsRegion OUTARGS
-              c185     40 DATAREF STACK 1205 esp + 0 PARENT LocalFrame LOCALFRAME
+              c185     20 DATAREF STACK 1132 esp + 0 CHILDOF 1131 OFFSET 0 OutArgsRegion OUTARGS
+              c185     40 DATAREF STACK 1131 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 
@@ -18309,7 +18192,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 1208 esp + 0 PARENT LocalFrame LOCALFRAME
+              c460      8 DATAREF STACK 1133 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] 
@@ -18591,14 +18474,9 @@
               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 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 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     56 DATAREF STACK 1134 esp + 0 PARENT LocalFrame LOCALFRAME
               c8ca      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
               c8ce      3 INSTR BELONGTO c8b0 
               c8ce      3 INSTR DEADREGS  EFLAGS RDI R13 ZZ mov     rdi, rsi 
@@ -18724,9 +18602,7 @@
               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 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     64 DATAREF STACK 1135 esp + 0 PARENT LocalFrame LOCALFRAME
               c994      8 MEMORYHOLE STACK esp + 64 CalleeSavedRegs 
               c994      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
               c998      3 INSTR BELONGTO c990 
@@ -18779,7 +18655,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 1218 esp + 0 PARENT LocalFrame LOCALFRAME
+              c9e0      8 DATAREF STACK 1136 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 
@@ -18841,7 +18717,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 1219 esp + 0 PARENT LocalFrame LOCALFRAME
+              ca50      8 DATAREF STACK 1137 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 
@@ -18903,7 +18779,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 1220 esp + 0 PARENT LocalFrame LOCALFRAME
+              cac0      8 DATAREF STACK 1138 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 
@@ -18965,7 +18841,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 1221 esp + 0 PARENT LocalFrame LOCALFRAME
+              cb30      8 DATAREF STACK 1139 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 
@@ -19027,7 +18903,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 1222 esp + 0 PARENT LocalFrame LOCALFRAME
+              cba0      8 DATAREF STACK 1140 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 
@@ -19089,7 +18965,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 1223 esp + 0 PARENT LocalFrame LOCALFRAME
+              cc10      8 DATAREF STACK 1141 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 
@@ -19303,8 +19179,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 1224 esp + 0 PARENT LocalFrame LOCALFRAME
-              cf60      4 DATAREF STACK 1225 esp + 0 CHILDOF 1224 OFFSET 0 OutArgsRegion OUTARGS
+              cf60     24 DATAREF STACK 1142 esp + 0 PARENT LocalFrame LOCALFRAME
+              cf60      4 DATAREF STACK 1143 esp + 0 CHILDOF 1142 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 
@@ -19385,7 +19261,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 1226 esp + 0 PARENT LocalFrame LOCALFRAME
+              cfe8      8 DATAREF STACK 1144 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 
@@ -20464,7 +20340,7 @@
               e812      3 INSTR BELONGTO e810 
               e815     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
               e815      4 INSTR BELONGTO e810 
-              e815      8 DATAREF STACK 1227 esp + 0 PARENT LocalFrame LOCALFRAME
+              e815      8 DATAREF STACK 1145 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 
@@ -20538,7 +20414,7 @@
               e8d2      3 INSTR BELONGTO e8d0 
               e8d5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
               e8d5      4 INSTR BELONGTO e8d0 
-              e8d5      8 DATAREF STACK 1228 esp + 0 PARENT LocalFrame LOCALFRAME
+              e8d5      8 DATAREF STACK 1146 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 
@@ -21160,10 +21036,9 @@
               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 1229 esp + 0 PARENT LocalFrame LOCALFRAME
+              f484     16 DATAREF STACK 1147 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 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 
@@ -21271,7 +21146,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 1231 esp + 0 PARENT LocalFrame LOCALFRAME
+              f575      8 DATAREF STACK 1148 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 
@@ -21495,9 +21370,7 @@
               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 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     64 DATAREF STACK 1149 esp + 0 PARENT LocalFrame LOCALFRAME
               f6e4      8 MEMORYHOLE STACK esp + 64 CalleeSavedRegs 
               f6e4      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
               f6e8     -1 INSTR LOCAL NoMetaUpdate call    sub_CF60 
@@ -21732,7 +21605,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 1235 esp + 0 PARENT LocalFrame LOCALFRAME
+              f920      8 DATAREF STACK 1150 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 
@@ -21765,11 +21638,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 1236 esp + 0 PARENT LocalFrame LOCALFRAME
+              f967     16 DATAREF STACK 1151 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 1237 esp + 0 CHILDOF 1236 OFFSET 0 OutArgsRegion OUTARGS
+              f967      8 DATAREF STACK 1152 esp + 0 CHILDOF 1151 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] 
@@ -21978,12 +21851,10 @@
               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 1240 esp + 8 CHILDOF 1238 OFFSET 8 LOCALVAR var_40 
-              faa2     24 DATAREF STACK 1238 esp + 0 PARENT LocalFrame LOCALFRAME
+              faa2     24 DATAREF STACK 1153 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 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] 
@@ -22733,7 +22604,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 1241 esp + 0 PARENT LocalFrame LOCALFRAME
+              ff15      8 DATAREF STACK 1154 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 77a320f9cce3c36f882f1fd24006a1b272554778..9b035c020fe1964c1bd7c7663b3e05cdd4b8cdc0 100644
--- a/tests/commit/trimmed-sorted-save-gnome-sound-recorder.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-sound-recorder.psexe.annot
@@ -2502,17 +2502,10 @@
             406698      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             406698     -3 INSTR LOCAL NoWarn push    rbx 
             406699    136 DATAREF STACK 771 esp + 0 PARENT LocalFrame LOCALFRAME
-            406699     16 DATAREF STACK 774 esp + 16 CHILDOF 771 OFFSET 16 LOCALVAR var_88 
-            406699     16 DATAREF STACK 779 esp + 120 CHILDOF 771 OFFSET 120 LOCALVAR var_20 
             406699     16 MEMORYHOLE STACK esp + 136 CalleeSavedRegs 
-            406699      4 DATAREF STACK 773 esp + 12 CHILDOF 771 OFFSET 12 LOCALVAR var_8C 
-            406699     64 DATAREF STACK 777 esp + 48 CHILDOF 771 OFFSET 48 LOCALVAR var_68 
             406699      7 INSTR BELONGTO 406690 
             406699      7 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 88h 
             406699      8 DATAREF STACK 772 esp + 0 CHILDOF 771 OFFSET 0 OutArgsRegion OUTARGS
-            406699      8 DATAREF STACK 775 esp + 32 CHILDOF 771 OFFSET 32 LOCALVAR var_78 
-            406699      8 DATAREF STACK 776 esp + 40 CHILDOF 771 OFFSET 40 LOCALVAR var_70 
-            406699      8 DATAREF STACK 778 esp + 112 CHILDOF 771 OFFSET 112 LOCALVAR var_28 
             406699      8 MEMORYHOLE STACK esp + 152 ReturnAddress 
             4066a0      4 INSTR BELONGTO 406690 
             4066a0      4 INSTR DEADREGS  RBX ZZ mov     [rsp+98h+var_8C], edi 
@@ -2778,9 +2771,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -2802,7 +2795,7 @@
             40687c     23 FUNC GLOBAL sub_40687C FUNC_SAFE NOFP RET             406892 
             40687c      4 INSTR BELONGTO 40687c 
             40687c      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            40687c      8 DATAREF STACK 780 esp + 0 PARENT LocalFrame LOCALFRAME
+            40687c      8 DATAREF STACK 773 esp + 0 PARENT LocalFrame LOCALFRAME
             40687c      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             406880      7 INSTR BELONGTO 40687c 
             406880      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -2832,7 +2825,7 @@
             4068a5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             4068a5      4 INSTR BELONGTO 4068a0 
             4068a5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            4068a5      8 DATAREF STACK 781 esp + 0 PARENT LocalFrame LOCALFRAME
+            4068a5      8 DATAREF STACK 774 esp + 0 PARENT LocalFrame LOCALFRAME
             4068a5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4068a9     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_6108F0, 0 
             4068a9      7 INSTR BELONGTO 4068a0 
@@ -2904,7 +2897,7 @@
             406940     49 FUNC GLOBAL sub_406940 FUNC_UNSAFE NOFP RET             406970 
             406940      4 INSTR BELONGTO 406940 
             406940      4 INSTR DEADREGS  EFLAGS RSI ZZ sub     rsp, 8 
-            406940      8 DATAREF STACK 782 esp + 0 PARENT LocalFrame LOCALFRAME
+            406940      8 DATAREF STACK 775 esp + 0 PARENT LocalFrame LOCALFRAME
             406940      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             406944      3 INSTR BELONGTO 406940 
             406944      3 INSTR DEADREGS  EFLAGS RSI ZZ mov     rsi, rdi 
@@ -2991,7 +2984,7 @@
             4069b2     -1 INSTR LOCAL SafeFrameAlloc sub     rsp, 8 
             4069b2      4 INSTR BELONGTO 4069b0 
             4069b2      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            4069b2      8 DATAREF STACK 783 esp + 0 PARENT LocalFrame LOCALFRAME
+            4069b2      8 DATAREF STACK 776 esp + 0 PARENT LocalFrame LOCALFRAME
             4069b2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4069b6     -1 INSTR LOCAL MetadataUnused mov     rbx, cs:qword_610908 
             4069b6      7 INSTR BELONGTO 4069b0 
@@ -3065,17 +3058,10 @@
             406a0f      1 INSTR BELONGTO 406a00 
             406a0f      1 INSTR DEADREGS  EFLAGS RDI ZZ push    rbx 
             406a0f     -3 INSTR LOCAL NoWarn push    rbx 
-            406a10     16 DATAREF STACK 785 esp + 0 CHILDOF 784 OFFSET 0 LOCALVAR var_68 
-            406a10     16 DATAREF STACK 791 esp + 72 CHILDOF 784 OFFSET 72 LOCALVAR var_20 
             406a10     16 MEMORYHOLE STACK esp + 88 CalleeSavedRegs 
-            406a10     24 DATAREF STACK 789 esp + 40 CHILDOF 784 OFFSET 40 LOCALVAR var_40 
             406a10      4 INSTR BELONGTO 406a00 
             406a10      4 INSTR DEADREGS  EFLAGS RBX RDI ZZ sub     rsp, 58h 
-            406a10     88 DATAREF STACK 784 esp + 0 PARENT LocalFrame LOCALFRAME
-            406a10      8 DATAREF STACK 786 esp + 16 CHILDOF 784 OFFSET 16 LOCALVAR var_58 
-            406a10      8 DATAREF STACK 787 esp + 24 CHILDOF 784 OFFSET 24 LOCALVAR var_50 
-            406a10      8 DATAREF STACK 788 esp + 32 CHILDOF 784 OFFSET 32 LOCALVAR var_48 
-            406a10      8 DATAREF STACK 790 esp + 64 CHILDOF 784 OFFSET 64 LOCALVAR var_28 
+            406a10     88 DATAREF STACK 777 esp + 0 PARENT LocalFrame LOCALFRAME
             406a10      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
             406a14      3 INSTR BELONGTO 406a00 
             406a14      3 INSTR DEADREGS  RBX RDI ZZ mov     rdi, rsp 
@@ -3235,7 +3221,7 @@
             406b02     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             406b02      4 INSTR BELONGTO 406b00 
             406b02      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            406b02      8 DATAREF STACK 792 esp + 0 PARENT LocalFrame LOCALFRAME
+            406b02      8 DATAREF STACK 778 esp + 0 PARENT LocalFrame LOCALFRAME
             406b02      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             406b06     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             406b06      3 INSTR BELONGTO 406b00 
@@ -3387,17 +3373,10 @@
             406c4d      5 INSTR BELONGTO 406c40 
             406c52     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             406c52      5 INSTR BELONGTO 406c40 
-            406c57     16 DATAREF STACK 797 esp + 24 CHILDOF 793 OFFSET 24 LOCALVAR var_30 
-            406c57      4 DATAREF STACK 794 esp + 0 CHILDOF 793 OFFSET 0 OutArgsRegion OUTARGS
+            406c57      4 DATAREF STACK 780 esp + 0 CHILDOF 779 OFFSET 0 OutArgsRegion OUTARGS
             406c57      4 INSTR BELONGTO 406c40 
             406c57      4 INSTR DEADREGS  EFLAGS R12 R13 ZZ sub     rsp, 48h 
-            406c57     72 DATAREF STACK 793 esp + 0 PARENT LocalFrame LOCALFRAME
-            406c57      8 DATAREF STACK 795 esp + 8 CHILDOF 793 OFFSET 8 LOCALVAR var_40 
-            406c57      8 DATAREF STACK 796 esp + 16 CHILDOF 793 OFFSET 16 LOCALVAR var_38 
-            406c57      8 DATAREF STACK 798 esp + 40 CHILDOF 793 OFFSET 40 LOCALVAR var_20 
-            406c57      8 DATAREF STACK 799 esp + 48 CHILDOF 793 OFFSET 48 LOCALVAR var_18 
-            406c57      8 DATAREF STACK 800 esp + 56 CHILDOF 793 OFFSET 56 LOCALVAR var_10 
-            406c57      8 DATAREF STACK 801 esp + 64 CHILDOF 793 OFFSET 64 LOCALVAR var_8 
+            406c57     72 DATAREF STACK 779 esp + 0 PARENT LocalFrame LOCALFRAME
             406c57      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             406c5b      3 INSTR BELONGTO 406c40 
             406c5b      3 INSTR DEADREGS  EFLAGS R12 R13 ZZ mov     r13, rdi 
@@ -3472,7 +3451,7 @@
             406cd2     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             406cd2      4 INSTR BELONGTO 406cd0 
             406cd2      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            406cd2      8 DATAREF STACK 802 esp + 0 PARENT LocalFrame LOCALFRAME
+            406cd2      8 DATAREF STACK 781 esp + 0 PARENT LocalFrame LOCALFRAME
             406cd2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             406cd6     -1 INSTR LOCAL NoMetaUpdate call    _gtk_label_new 
             406cd6      5 INSTR BELONGTO 406cd0 
@@ -3566,13 +3545,11 @@
             406d62      1 INSTR BELONGTO 406d50 
             406d62      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             406d62     -3 INSTR LOCAL NoWarn push    rbx 
-            406d63    120 DATAREF STACK 804 esp + 0 CHILDOF 803 OFFSET 0 OutArgsRegion OUTARGS
-            406d63    144 DATAREF STACK 803 esp + 0 PARENT LocalFrame LOCALFRAME
+            406d63    120 DATAREF STACK 783 esp + 0 CHILDOF 782 OFFSET 0 OutArgsRegion OUTARGS
+            406d63    144 DATAREF STACK 782 esp + 0 PARENT LocalFrame LOCALFRAME
             406d63     24 MEMORYHOLE STACK esp + 144 CalleeSavedRegs 
             406d63      7 INSTR BELONGTO 406d50 
             406d63      7 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 90h 
-            406d63      8 DATAREF STACK 805 esp + 128 CHILDOF 803 OFFSET 128 LOCALVAR var_28 
-            406d63      8 DATAREF STACK 806 esp + 136 CHILDOF 803 OFFSET 136 LOCALVAR var_20 
             406d63      8 MEMORYHOLE STACK esp + 168 ReturnAddress 
             406d6a      9 INSTR BELONGTO 406d50 
             406d6a      9 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+0A8h+var_58], offset aIainHolmesIain; "Iain Holmes <iain@prettypeople.org>" 
@@ -3696,9 +3673,8 @@
             406e74      1 INSTR BELONGTO 406e70 
             406e74      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             406e74     -3 INSTR LOCAL NoWarn push    rbx 
-            406e75     16 DATAREF STACK 808 esp + 8 CHILDOF 807 OFFSET 8 LOCALVAR var_20 
             406e75     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            406e75     24 DATAREF STACK 807 esp + 0 PARENT LocalFrame LOCALFRAME
+            406e75     24 DATAREF STACK 784 esp + 0 PARENT LocalFrame LOCALFRAME
             406e75      4 INSTR BELONGTO 406e70 
             406e75      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
             406e75      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -3789,10 +3765,8 @@
             406ef3     -3 INSTR LOCAL NoWarn push    rbx 
             406ef4      3 INSTR BELONGTO 406ef0 
             406ef4      3 INSTR DEADREGS  EFLAGS RDX RBX RSI ZZ mov     rbx, rdi 
-            406ef7     12 DATAREF STACK 811 esp + 12 CHILDOF 809 OFFSET 12 LOCALVAR var_1C 
             406ef7     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            406ef7     24 DATAREF STACK 809 esp + 0 PARENT LocalFrame LOCALFRAME
-            406ef7      4 DATAREF STACK 810 esp + 8 CHILDOF 809 OFFSET 8 LOCALVAR var_20 
+            406ef7     24 DATAREF STACK 785 esp + 0 PARENT LocalFrame LOCALFRAME
             406ef7      4 INSTR BELONGTO 406ef0 
             406ef7      4 INSTR DEADREGS  EFLAGS RDX RSI ZZ sub     rsp, 18h 
             406ef7      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -3908,10 +3882,10 @@
             406fa4      1 INSTR DEADREGS  EFLAGS RAX ZZ push    rbx 
             406fa4     -3 INSTR LOCAL NoWarn push    rbx 
             406fa5     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            406fa5     24 DATAREF STACK 812 esp + 0 PARENT LocalFrame LOCALFRAME
+            406fa5     24 DATAREF STACK 786 esp + 0 PARENT LocalFrame LOCALFRAME
             406fa5      4 INSTR BELONGTO 406fa0 
             406fa5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 18h 
-            406fa5      8 DATAREF STACK 813 esp + 0 CHILDOF 812 OFFSET 0 OutArgsRegion OUTARGS
+            406fa5      8 DATAREF STACK 787 esp + 0 CHILDOF 786 OFFSET 0 OutArgsRegion OUTARGS
             406fa5      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             406fa9     -1 INSTR LOCAL MetadataUnused mov     rbx, [rsi+38h] 
             406fa9      4 INSTR BELONGTO 406fa0 
@@ -4133,11 +4107,9 @@
             407140     68 FUNC GLOBAL sub_407140 FUNC_UNSAFE NOFP RET             407183 
             407145     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], rbp 
             407145      5 INSTR BELONGTO 407140 
-            40714a     24 DATAREF STACK 814 esp + 0 PARENT LocalFrame LOCALFRAME
+            40714a     24 DATAREF STACK 788 esp + 0 PARENT LocalFrame LOCALFRAME
             40714a      4 INSTR BELONGTO 407140 
             40714a      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-            40714a      8 DATAREF STACK 815 esp + 8 CHILDOF 814 OFFSET 8 LOCALVAR var_10 
-            40714a      8 DATAREF STACK 816 esp + 16 CHILDOF 814 OFFSET 16 LOCALVAR var_8 
             40714a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             40714e     -1 INSTR LOCAL MetadataUnused mov     rbp, [rsi+38h] 
             40714e      4 INSTR BELONGTO 407140 
@@ -4207,13 +4179,7 @@
             4071c5      5 INSTR BELONGTO 407190 
             4071ca      4 INSTR BELONGTO 407190 
             4071ca      4 INSTR DEADREGS  EFLAGS RBX RSI R8 R13 R14 R15 ZZ sub     rsp, 38h 
-            4071ca     56 DATAREF STACK 817 esp + 0 PARENT LocalFrame LOCALFRAME
-            4071ca      8 DATAREF STACK 818 esp + 8 CHILDOF 817 OFFSET 8 LOCALVAR var_30 
-            4071ca      8 DATAREF STACK 819 esp + 16 CHILDOF 817 OFFSET 16 LOCALVAR var_28 
-            4071ca      8 DATAREF STACK 820 esp + 24 CHILDOF 817 OFFSET 24 LOCALVAR var_20 
-            4071ca      8 DATAREF STACK 821 esp + 32 CHILDOF 817 OFFSET 32 LOCALVAR var_18 
-            4071ca      8 DATAREF STACK 822 esp + 40 CHILDOF 817 OFFSET 40 LOCALVAR var_10 
-            4071ca      8 DATAREF STACK 823 esp + 48 CHILDOF 817 OFFSET 48 LOCALVAR var_8 
+            4071ca     56 DATAREF STACK 789 esp + 0 PARENT LocalFrame LOCALFRAME
             4071ca      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             4071ce      2 INSTR BELONGTO 407190 
             4071ce      2 INSTR DEADREGS  EFLAGS RBX RSI R8 R13 R14 R15 ZZ mov     ebx, edx 
@@ -4549,16 +4515,10 @@
             4073ea      3 INSTR BELONGTO 4073e0 
             4073ed     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
             4073ed      5 INSTR BELONGTO 4073e0 
-            4073f2     12 DATAREF STACK 827 esp + 32 CHILDOF 824 OFFSET 32 LOCALVAR var_28 
-            4073f2     16 DATAREF STACK 825 esp + 0 CHILDOF 824 OFFSET 0 OutArgsRegion OUTARGS
-            4073f2     16 DATAREF STACK 826 esp + 16 CHILDOF 824 OFFSET 16 LOCALVAR var_38 
-            4073f2      4 DATAREF STACK 828 esp + 44 CHILDOF 824 OFFSET 44 LOCALVAR var_1C 
+            4073f2     16 DATAREF STACK 791 esp + 0 CHILDOF 790 OFFSET 0 OutArgsRegion OUTARGS
             4073f2      4 INSTR BELONGTO 4073e0 
             4073f2      4 INSTR DEADREGS  EFLAGS RAX R12 ZZ sub     rsp, 48h 
-            4073f2     72 DATAREF STACK 824 esp + 0 PARENT LocalFrame LOCALFRAME
-            4073f2      8 DATAREF STACK 829 esp + 48 CHILDOF 824 OFFSET 48 LOCALVAR var_18 
-            4073f2      8 DATAREF STACK 830 esp + 56 CHILDOF 824 OFFSET 56 LOCALVAR var_10 
-            4073f2      8 DATAREF STACK 831 esp + 64 CHILDOF 824 OFFSET 64 LOCALVAR var_8 
+            4073f2     72 DATAREF STACK 790 esp + 0 PARENT LocalFrame LOCALFRAME
             4073f2      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             4073f6     -1 INSTR LOCAL MetadataUnused mov     rax, [rdi+38h] 
             4073f6      4 INSTR BELONGTO 4073e0 
@@ -5000,16 +4960,10 @@
             40775d      5 INSTR BELONGTO 407750 
             407762     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             407762      5 INSTR BELONGTO 407750 
-            407767     12 DATAREF STACK 834 esp + 16 CHILDOF 832 OFFSET 16 LOCALVAR var_38 
-            407767     12 DATAREF STACK 835 esp + 28 CHILDOF 832 OFFSET 28 LOCALVAR var_2C 
-            407767     16 DATAREF STACK 833 esp + 0 CHILDOF 832 OFFSET 0 OutArgsRegion OUTARGS
+            407767     16 DATAREF STACK 793 esp + 0 CHILDOF 792 OFFSET 0 OutArgsRegion OUTARGS
             407767      4 INSTR BELONGTO 407750 
             407767      4 INSTR DEADREGS  EFLAGS RAX RDX RBX R12 R13 ZZ sub     rsp, 48h 
-            407767     72 DATAREF STACK 832 esp + 0 PARENT LocalFrame LOCALFRAME
-            407767      8 DATAREF STACK 836 esp + 40 CHILDOF 832 OFFSET 40 LOCALVAR var_20 
-            407767      8 DATAREF STACK 837 esp + 48 CHILDOF 832 OFFSET 48 LOCALVAR var_18 
-            407767      8 DATAREF STACK 838 esp + 56 CHILDOF 832 OFFSET 56 LOCALVAR var_10 
-            407767      8 DATAREF STACK 839 esp + 64 CHILDOF 832 OFFSET 64 LOCALVAR var_8 
+            407767     72 DATAREF STACK 792 esp + 0 PARENT LocalFrame LOCALFRAME
             407767      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             40776b      4 INSTR BELONGTO 407750 
             40776b      4 INSTR DEADREGS  EFLAGS RAX RDX RBX R12 R13 ZZ mov     rdx, [rdi+38h] 
@@ -5218,15 +5172,9 @@
             4078df      5 INSTR BELONGTO 4078d0 
             4078e4     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
             4078e4      5 INSTR BELONGTO 4078d0 
-            4078e9     16 DATAREF STACK 841 esp + 0 CHILDOF 840 OFFSET 0 LOCALVAR var_38 
             4078e9      4 INSTR BELONGTO 4078d0 
             4078e9      4 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 ZZ sub     rsp, 38h 
-            4078e9     56 DATAREF STACK 840 esp + 0 PARENT LocalFrame LOCALFRAME
-            4078e9      8 DATAREF STACK 842 esp + 16 CHILDOF 840 OFFSET 16 LOCALVAR var_28 
-            4078e9      8 DATAREF STACK 843 esp + 24 CHILDOF 840 OFFSET 24 LOCALVAR var_20 
-            4078e9      8 DATAREF STACK 844 esp + 32 CHILDOF 840 OFFSET 32 LOCALVAR var_18 
-            4078e9      8 DATAREF STACK 845 esp + 40 CHILDOF 840 OFFSET 40 LOCALVAR var_10 
-            4078e9      8 DATAREF STACK 846 esp + 48 CHILDOF 840 OFFSET 48 LOCALVAR var_8 
+            4078e9     56 DATAREF STACK 794 esp + 0 PARENT LocalFrame LOCALFRAME
             4078e9      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             4078ed     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rsi+28h], 8000h 
             4078ed      7 INSTR BELONGTO 4078d0 
@@ -5394,23 +5342,11 @@
             407a29      1 INSTR BELONGTO 407a20 
             407a29      1 INSTR DEADREGS  EFLAGS RSI RDI ZZ push    rbx 
             407a29     -3 INSTR LOCAL NoWarn push    rbx 
-            407a2a     16 DATAREF STACK 853 esp + 80 CHILDOF 847 OFFSET 80 LOCALVAR var_98 
-            407a2a     16 DATAREF STACK 854 esp + 96 CHILDOF 847 OFFSET 96 LOCALVAR var_88 
-            407a2a     16 DATAREF STACK 855 esp + 112 CHILDOF 847 OFFSET 112 LOCALVAR var_78 
-            407a2a     16 DATAREF STACK 856 esp + 128 CHILDOF 847 OFFSET 128 LOCALVAR var_68 
-            407a2a     16 DATAREF STACK 857 esp + 144 CHILDOF 847 OFFSET 144 LOCALVAR var_58 
-            407a2a     16 DATAREF STACK 858 esp + 160 CHILDOF 847 OFFSET 160 LOCALVAR var_48 
-            407a2a     16 DATAREF STACK 859 esp + 176 CHILDOF 847 OFFSET 176 LOCALVAR var_38 
-            407a2a     16 DATAREF STACK 860 esp + 192 CHILDOF 847 OFFSET 192 LOCALVAR var_28 
-            407a2a    208 DATAREF STACK 847 esp + 0 PARENT LocalFrame LOCALFRAME
-            407a2a     24 DATAREF STACK 849 esp + 32 CHILDOF 847 OFFSET 32 LOCALVAR var_C8 
+            407a2a    208 DATAREF STACK 795 esp + 0 PARENT LocalFrame LOCALFRAME
             407a2a     24 MEMORYHOLE STACK esp + 208 CalleeSavedRegs 
-            407a2a     32 DATAREF STACK 848 esp + 0 CHILDOF 847 OFFSET 0 OutArgsRegion OUTARGS
+            407a2a     32 DATAREF STACK 796 esp + 0 CHILDOF 795 OFFSET 0 OutArgsRegion OUTARGS
             407a2a      7 INSTR BELONGTO 407a20 
             407a2a      7 INSTR DEADREGS  EFLAGS RBX RSI RDI ZZ sub     rsp, 0D0h 
-            407a2a      8 DATAREF STACK 850 esp + 56 CHILDOF 847 OFFSET 56 LOCALVAR var_B0 
-            407a2a      8 DATAREF STACK 851 esp + 64 CHILDOF 847 OFFSET 64 LOCALVAR var_A8 
-            407a2a      8 DATAREF STACK 852 esp + 72 CHILDOF 847 OFFSET 72 LOCALVAR var_A0 
             407a2a      8 MEMORYHOLE STACK esp + 232 ReturnAddress 
             407a31     -1 INSTR LOCAL NoMetaUpdate test    al, al 
             407a31      2 INSTR BELONGTO 407a20 
@@ -5558,15 +5494,10 @@
             407b3f      5 INSTR BELONGTO 407b30 
             407b44     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             407b44      5 INSTR BELONGTO 407b30 
-            407b49    104 DATAREF STACK 861 esp + 0 PARENT LocalFrame LOCALFRAME
-            407b49     16 DATAREF STACK 863 esp + 56 CHILDOF 861 OFFSET 56 LOCALVAR var_30 
-            407b49     48 DATAREF STACK 862 esp + 0 CHILDOF 861 OFFSET 0 OutArgsRegion OUTARGS
+            407b49    104 DATAREF STACK 797 esp + 0 PARENT LocalFrame LOCALFRAME
+            407b49     48 DATAREF STACK 798 esp + 0 CHILDOF 797 OFFSET 0 OutArgsRegion OUTARGS
             407b49      4 INSTR BELONGTO 407b30 
             407b49      4 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ sub     rsp, 68h 
-            407b49      8 DATAREF STACK 864 esp + 72 CHILDOF 861 OFFSET 72 LOCALVAR var_20 
-            407b49      8 DATAREF STACK 865 esp + 80 CHILDOF 861 OFFSET 80 LOCALVAR var_18 
-            407b49      8 DATAREF STACK 866 esp + 88 CHILDOF 861 OFFSET 88 LOCALVAR var_10 
-            407b49      8 DATAREF STACK 867 esp + 96 CHILDOF 861 OFFSET 96 LOCALVAR var_8 
             407b49      8 MEMORYHOLE STACK esp + 104 ReturnAddress 
             407b4d      3 INSTR BELONGTO 407b30 
             407b4d      3 INSTR DEADREGS  EFLAGS RBX R12 R13 ZZ mov     rbp, rsi 
@@ -5811,7 +5742,7 @@
             407cdc     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             407cdc      4 INSTR BELONGTO 407cd0 
             407cdc      4 INSTR DEADREGS  EFLAGS RBX XMM0 ZZ sub     rsp, 8 
-            407cdc      8 DATAREF STACK 868 esp + 0 PARENT LocalFrame LOCALFRAME
+            407cdc      8 DATAREF STACK 799 esp + 0 PARENT LocalFrame LOCALFRAME
             407cdc      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             407ce0     -1 INSTR LOCAL NoMetaUpdate call    _g_strdup_printf 
             407ce0      5 INSTR BELONGTO 407cd0 
@@ -5901,14 +5832,10 @@
             407d4c      1 INSTR BELONGTO 407d40 
             407d4c      1 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 ZZ push    rbx 
             407d4c     -3 INSTR LOCAL NoWarn push    rbx 
-            407d4d    152 DATAREF STACK 873 esp + 32 CHILDOF 869 OFFSET 32 LOCALVAR stat_buf 
-            407d4d    184 DATAREF STACK 869 esp + 0 PARENT LocalFrame LOCALFRAME
+            407d4d    184 DATAREF STACK 800 esp + 0 PARENT LocalFrame LOCALFRAME
             407d4d     48 MEMORYHOLE STACK esp + 184 CalleeSavedRegs 
             407d4d      7 INSTR BELONGTO 407d40 
             407d4d      7 INSTR DEADREGS  EFLAGS RAX RBX RDI R12 R13 R14 R15 ZZ sub     rsp, 0B8h 
-            407d4d      8 DATAREF STACK 870 esp + 8 CHILDOF 869 OFFSET 8 LOCALVAR var_E0 
-            407d4d      8 DATAREF STACK 871 esp + 16 CHILDOF 869 OFFSET 16 LOCALVAR var_D8 
-            407d4d      8 DATAREF STACK 872 esp + 24 CHILDOF 869 OFFSET 24 LOCALVAR var_D0 
             407d4d      8 MEMORYHOLE STACK esp + 232 ReturnAddress 
             407d54      4 INSTR BELONGTO 407d40 
             407d54      4 INSTR DEADREGS  EFLAGS RAX RBX RDI R12 R13 R14 R15 ZZ mov     rax, [rsi+38h] 
@@ -7607,17 +7534,9 @@
             4087fa      5 INSTR BELONGTO 4087e0 
             4087ff     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_18], r13 
             4087ff      5 INSTR BELONGTO 4087e0 
-            408804     12 DATAREF STACK 876 esp + 12 CHILDOF 874 OFFSET 12 LOCALVAR var_3C 
-            408804      4 DATAREF STACK 875 esp + 8 CHILDOF 874 OFFSET 8 LOCALVAR var_40 
             408804      4 INSTR BELONGTO 4087e0 
             408804      4 INSTR DEADREGS  EFLAGS RBX R12 R13 R15 ZZ sub     rsp, 48h 
-            408804     72 DATAREF STACK 874 esp + 0 PARENT LocalFrame LOCALFRAME
-            408804      8 DATAREF STACK 877 esp + 24 CHILDOF 874 OFFSET 24 LOCALVAR var_30 
-            408804      8 DATAREF STACK 878 esp + 32 CHILDOF 874 OFFSET 32 LOCALVAR var_28 
-            408804      8 DATAREF STACK 879 esp + 40 CHILDOF 874 OFFSET 40 LOCALVAR var_20 
-            408804      8 DATAREF STACK 880 esp + 48 CHILDOF 874 OFFSET 48 LOCALVAR var_18 
-            408804      8 DATAREF STACK 881 esp + 56 CHILDOF 874 OFFSET 56 LOCALVAR var_10 
-            408804      8 DATAREF STACK 882 esp + 64 CHILDOF 874 OFFSET 64 LOCALVAR var_8 
+            408804     72 DATAREF STACK 801 esp + 0 PARENT LocalFrame LOCALFRAME
             408804      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             408808     -1 INSTR LOCAL NoMetaUpdate call    _gtk_combo_box_get_type 
             408808      5 INSTR BELONGTO 4087e0 
@@ -7968,8 +7887,8 @@
             408a90     -3 INSTR LOCAL NoWarn push    rbx 
             408a91      3 INSTR BELONGTO 408a90 
             408a91      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-            408a94     16 DATAREF STACK 883 esp + 0 PARENT LocalFrame LOCALFRAME
-            408a94     16 DATAREF STACK 884 esp + 0 CHILDOF 883 OFFSET 0 OutArgsRegion OUTARGS
+            408a94     16 DATAREF STACK 802 esp + 0 PARENT LocalFrame LOCALFRAME
+            408a94     16 DATAREF STACK 803 esp + 0 CHILDOF 802 OFFSET 0 OutArgsRegion OUTARGS
             408a94      4 INSTR BELONGTO 408a90 
             408a94      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 10h 
             408a94      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -8314,11 +8233,9 @@
             409075      3 INSTR BELONGTO 409070 
             409078     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], rbp 
             409078      5 INSTR BELONGTO 409070 
-            40907d     24 DATAREF STACK 885 esp + 0 PARENT LocalFrame LOCALFRAME
+            40907d     24 DATAREF STACK 804 esp + 0 PARENT LocalFrame LOCALFRAME
             40907d      4 INSTR BELONGTO 409070 
             40907d      4 INSTR DEADREGS  EFLAGS RSI ZZ sub     rsp, 18h 
-            40907d      8 DATAREF STACK 886 esp + 8 CHILDOF 885 OFFSET 8 LOCALVAR var_10 
-            40907d      8 DATAREF STACK 887 esp + 16 CHILDOF 885 OFFSET 16 LOCALVAR var_8 
             40907d      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             409081     -1 INSTR LOCAL MetadataUnused mov     rbp, rdi 
             409081      3 INSTR BELONGTO 409070 
@@ -8371,11 +8288,9 @@
             4090d5      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
             4090da      3 INSTR BELONGTO 4090d0 
             4090da      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdx 
-            4090dd     24 DATAREF STACK 888 esp + 0 PARENT LocalFrame LOCALFRAME
+            4090dd     24 DATAREF STACK 805 esp + 0 PARENT LocalFrame LOCALFRAME
             4090dd      4 INSTR BELONGTO 4090d0 
             4090dd      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
-            4090dd      8 DATAREF STACK 889 esp + 8 CHILDOF 888 OFFSET 8 LOCALVAR var_10 
-            4090dd      8 DATAREF STACK 890 esp + 16 CHILDOF 888 OFFSET 16 LOCALVAR var_8 
             4090dd      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4090e1      3 INSTR BELONGTO 4090d0 
             4090e1      3 INSTR DEADREGS  EFLAGS ZZ mov     rbp, rcx 
@@ -8534,7 +8449,7 @@
             4091e0      4 INSTR BELONGTO 4091e0 
             4091e0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
             4091e0     56 FUNC GLOBAL sub_4091E0 FUNC_UNSAFE NOFP RET             409217 
-            4091e0      8 DATAREF STACK 891 esp + 0 PARENT LocalFrame LOCALFRAME
+            4091e0      8 DATAREF STACK 806 esp + 0 PARENT LocalFrame LOCALFRAME
             4091e0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4091e4      4 INSTR BELONGTO 4091e0 
             4091e4      4 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, [rdx+38h] 
@@ -8584,14 +8499,9 @@
             40922d      5 INSTR BELONGTO 409220 
             409232     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             409232      5 INSTR BELONGTO 409220 
-            409237     12 DATAREF STACK 893 esp + 12 CHILDOF 892 OFFSET 12 LOCALVAR var_2C 
             409237      4 INSTR BELONGTO 409220 
             409237      4 INSTR DEADREGS  EFLAGS R12 R13 ZZ sub     rsp, 38h 
-            409237     56 DATAREF STACK 892 esp + 0 PARENT LocalFrame LOCALFRAME
-            409237      8 DATAREF STACK 894 esp + 24 CHILDOF 892 OFFSET 24 LOCALVAR var_20 
-            409237      8 DATAREF STACK 895 esp + 32 CHILDOF 892 OFFSET 32 LOCALVAR var_18 
-            409237      8 DATAREF STACK 896 esp + 40 CHILDOF 892 OFFSET 40 LOCALVAR var_10 
-            409237      8 DATAREF STACK 897 esp + 48 CHILDOF 892 OFFSET 48 LOCALVAR var_8 
+            409237     56 DATAREF STACK 807 esp + 0 PARENT LocalFrame LOCALFRAME
             409237      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40923b     -1 INSTR LOCAL MetadataUnused mov     rbp, rdi 
             40923b      3 INSTR BELONGTO 409220 
@@ -8876,10 +8786,10 @@
             409410     -3 INSTR LOCAL NoWarn push    rbx 
             409411     -1 INSTR LOCAL MetadataUnused mov     rbx, rdx 
             409411      3 INSTR BELONGTO 409410 
-            409414     16 DATAREF STACK 898 esp + 0 PARENT LocalFrame LOCALFRAME
+            409414     16 DATAREF STACK 808 esp + 0 PARENT LocalFrame LOCALFRAME
             409414      4 INSTR BELONGTO 409410 
             409414      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 10h 
-            409414      8 DATAREF STACK 899 esp + 0 CHILDOF 898 OFFSET 0 OutArgsRegion OUTARGS
+            409414      8 DATAREF STACK 809 esp + 0 CHILDOF 808 OFFSET 0 OutArgsRegion OUTARGS
             409414      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
             409414      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             409418     -1 INSTR LOCAL MetadataUnused mov     rax, [rdx+38h] 
@@ -8962,10 +8872,10 @@
             4094b5      3 INSTR BELONGTO 4094b0 
             4094b5      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdx 
             4094b8     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            4094b8     24 DATAREF STACK 900 esp + 0 PARENT LocalFrame LOCALFRAME
+            4094b8     24 DATAREF STACK 810 esp + 0 PARENT LocalFrame LOCALFRAME
             4094b8      4 INSTR BELONGTO 4094b0 
             4094b8      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
-            4094b8      8 DATAREF STACK 901 esp + 0 CHILDOF 900 OFFSET 0 OutArgsRegion OUTARGS
+            4094b8      8 DATAREF STACK 811 esp + 0 CHILDOF 810 OFFSET 0 OutArgsRegion OUTARGS
             4094b8      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             4094bc     -1 INSTR LOCAL NoMetaUpdate call    _gtk_menu_item_get_type 
             4094bc      5 INSTR BELONGTO 4094b0 
@@ -9072,7 +8982,7 @@
             40954a     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             40954a      4 INSTR BELONGTO 409540 
             40954a      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            40954a      8 DATAREF STACK 902 esp + 0 PARENT LocalFrame LOCALFRAME
+            40954a      8 DATAREF STACK 812 esp + 0 PARENT LocalFrame LOCALFRAME
             40954a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             40954e     -1 INSTR LOCAL NoMetaUpdate call    _g_type_check_class_cast 
             40954e      5 INSTR BELONGTO 409540 
@@ -9186,12 +9096,8 @@
             409617      3 INSTR DEADREGS  EFLAGS RDI R12 R13 ZZ mov     r12, rsi 
             40961a      4 INSTR BELONGTO 409600 
             40961a      4 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ sub     rsp, 38h 
-            40961a     56 DATAREF STACK 903 esp + 0 PARENT LocalFrame LOCALFRAME
-            40961a      8 DATAREF STACK 904 esp + 0 CHILDOF 903 OFFSET 0 OutArgsRegion OUTARGS
-            40961a      8 DATAREF STACK 905 esp + 24 CHILDOF 903 OFFSET 24 LOCALVAR var_20 
-            40961a      8 DATAREF STACK 906 esp + 32 CHILDOF 903 OFFSET 32 LOCALVAR var_18 
-            40961a      8 DATAREF STACK 907 esp + 40 CHILDOF 903 OFFSET 40 LOCALVAR var_10 
-            40961a      8 DATAREF STACK 908 esp + 48 CHILDOF 903 OFFSET 48 LOCALVAR var_8 
+            40961a     56 DATAREF STACK 813 esp + 0 PARENT LocalFrame LOCALFRAME
+            40961a      8 DATAREF STACK 814 esp + 0 CHILDOF 813 OFFSET 0 OutArgsRegion OUTARGS
             40961a      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40961e      3 INSTR BELONGTO 409600 
             40961e      3 INSTR DEADREGS  EFLAGS RSI RDI R13 ZZ mov     r13, rcx 
@@ -9260,12 +9166,9 @@
             40967f      5 INSTR BELONGTO 409670 
             409684     -1 INSTR LOCAL MetadataUnused mov     rbp, rdi 
             409684      3 INSTR BELONGTO 409670 
-            409687     24 DATAREF STACK 909 esp + 0 PARENT LocalFrame LOCALFRAME
+            409687     24 DATAREF STACK 815 esp + 0 PARENT LocalFrame LOCALFRAME
             409687      4 INSTR BELONGTO 409670 
             409687      4 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ sub     rsp, 18h 
-            409687      8 DATAREF STACK 910 esp + 0 CHILDOF 909 OFFSET 0 LOCALVAR var_18 
-            409687      8 DATAREF STACK 911 esp + 8 CHILDOF 909 OFFSET 8 LOCALVAR var_10 
-            409687      8 DATAREF STACK 912 esp + 16 CHILDOF 909 OFFSET 16 LOCALVAR var_8 
             409687      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             40968b      5 INSTR BELONGTO 409670 
             40968b      5 INSTR DEADREGS  EFLAGS RBX RDI R12 ZZ mov     edi, offset aGconfaudiosrc; "gconfaudiosrc" 
@@ -9768,7 +9671,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 913 esp + 0 PARENT LocalFrame LOCALFRAME
+            4099ed      8 DATAREF STACK 816 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 
@@ -9861,8 +9764,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 914 esp + 0 PARENT LocalFrame LOCALFRAME
-            409a66     16 DATAREF STACK 915 esp + 0 CHILDOF 914 OFFSET 0 OutArgsRegion OUTARGS
+            409a66     16 DATAREF STACK 817 esp + 0 PARENT LocalFrame LOCALFRAME
+            409a66     16 DATAREF STACK 818 esp + 0 CHILDOF 817 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 
@@ -9910,13 +9813,10 @@
             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 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      2 DATAREF STACK 820 esp + 0 CHILDOF 819 OFFSET 0 OutArgsRegion OUTARGS
             409ab0      4 INSTR BELONGTO 409ab0 
             409ab0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 58h 
-            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     88 DATAREF STACK 819 esp + 0 PARENT LocalFrame LOCALFRAME
             409ab0      8 MEMORYHOLE STACK esp + 88 ReturnAddress 
             409ab0     93 FUNC GLOBAL sub_409AB0 FUNC_UNSAFE NOFP RET             409b0c 
             409ab4      7 INSTR BELONGTO 409ab0 
@@ -10553,10 +10453,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 921 esp + 0 PARENT LocalFrame LOCALFRAME
+            40aae4     16 DATAREF STACK 821 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 922 esp + 0 CHILDOF 921 OFFSET 0 OutArgsRegion OUTARGS
+            40aae4      8 DATAREF STACK 822 esp + 0 CHILDOF 821 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 
@@ -10659,12 +10559,10 @@
             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 925 esp + 8 CHILDOF 923 OFFSET 8 LOCALVAR var_30 
-            40ab7c     24 DATAREF STACK 923 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ab7c     24 DATAREF STACK 823 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 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 
@@ -11154,15 +11052,10 @@
             40aebd      5 INSTR BELONGTO 40aeb0 
             40aec2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             40aec2      5 INSTR BELONGTO 40aeb0 
-            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     16 DATAREF STACK 825 esp + 0 CHILDOF 824 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 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     72 DATAREF STACK 824 esp + 0 PARENT LocalFrame LOCALFRAME
             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 
@@ -11644,10 +11537,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 933 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b235     24 DATAREF STACK 826 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 934 esp + 0 CHILDOF 933 OFFSET 0 OutArgsRegion OUTARGS
+            40b235      8 DATAREF STACK 827 esp + 0 CHILDOF 826 OFFSET 0 OutArgsRegion OUTARGS
             40b235      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             40b239     -1 INSTR LOCAL NoMetaUpdate call    sub_409AB0 
             40b239      5 INSTR BELONGTO 40b230 
@@ -11789,15 +11682,10 @@
             40b33d      5 INSTR BELONGTO 40b330 
             40b342     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             40b342      5 INSTR BELONGTO 40b330 
-            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     16 DATAREF STACK 829 esp + 0 CHILDOF 828 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 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     72 DATAREF STACK 828 esp + 0 PARENT LocalFrame LOCALFRAME
             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 
@@ -12249,7 +12137,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 942 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b669      8 DATAREF STACK 830 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 
@@ -12547,18 +12435,11 @@
             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 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     16 DATAREF STACK 832 esp + 0 CHILDOF 831 OFFSET 0 OutArgsRegion OUTARGS
             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 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     88 DATAREF STACK 831 esp + 0 PARENT LocalFrame LOCALFRAME
             40b86d      8 MEMORYHOLE STACK esp + 136 ReturnAddress 
             40b871     -1 INSTR LOCAL NoMetaUpdate call    sub_409AB0 
             40b871      5 INSTR BELONGTO 40b860 
@@ -13600,12 +13481,11 @@
             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 952 esp + 0 PARENT LocalFrame LOCALFRAME
+            40bf40     16 DATAREF STACK 833 esp + 0 PARENT LocalFrame LOCALFRAME
             40bf40     40 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
-            40bf40      4 DATAREF STACK 953 esp + 0 CHILDOF 952 OFFSET 0 OutArgsRegion OUTARGS
+            40bf40      4 DATAREF STACK 834 esp + 0 CHILDOF 833 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 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 
@@ -13904,21 +13784,10 @@
             40c127      5 INSTR BELONGTO 40c110 
             40c12c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
             40c12c      5 INSTR BELONGTO 40c110 
-            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    120 DATAREF STACK 835 esp + 0 PARENT LocalFrame LOCALFRAME
+            40c131     16 DATAREF STACK 836 esp + 0 CHILDOF 835 OFFSET 0 OutArgsRegion OUTARGS
             40c131      4 INSTR BELONGTO 40c110 
             40c131      4 INSTR DEADREGS  EFLAGS RAX RDI R12 R13 R14 R15 ZZ sub     rsp, 78h 
-            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] 
@@ -14728,17 +14597,10 @@
             40c707      5 INSTR BELONGTO 40c6f0 
             40c70c     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r15 
             40c70c      5 INSTR BELONGTO 40c6f0 
-            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 DATAREF STACK 838 esp + 0 CHILDOF 837 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 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     72 DATAREF STACK 837 esp + 0 PARENT LocalFrame LOCALFRAME
             40c711      8 MEMORYHOLE STACK esp + 72 ReturnAddress 
             40c715     -1 INSTR LOCAL NoMetaUpdate call    sub_409AB0 
             40c715      5 INSTR BELONGTO 40c6f0 
@@ -15095,10 +14957,9 @@
             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 977 esp + 0 PARENT LocalFrame LOCALFRAME
+            40c974     16 DATAREF STACK 839 esp + 0 PARENT LocalFrame LOCALFRAME
             40c974      4 INSTR BELONGTO 40c970 
             40c974      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 10h 
-            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 
@@ -15311,7 +15172,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 979 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ce39      8 DATAREF STACK 840 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 
@@ -15516,13 +15377,7 @@
             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 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     56 DATAREF STACK 841 esp + 0 PARENT LocalFrame LOCALFRAME
             40cfbc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40cfc0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             40cfc0      3 INSTR BELONGTO 40cf90 
@@ -15599,7 +15454,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 987 esp + 0 PARENT LocalFrame LOCALFRAME
+            40d035      8 DATAREF STACK 842 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 
@@ -15634,7 +15489,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 988 esp + 0 PARENT LocalFrame LOCALFRAME
+            40d068      8 DATAREF STACK 843 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 af1b5aa1cf84a6a2c5273a6c9f6cd71d3858f2b8..12c2c94a814c780ebe2299c1a7faaf3098e7d9a9 100644
--- a/tests/commit/trimmed-sorted-save-gnome-system-log.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-system-log.psexe.annot
@@ -3746,7 +3746,6 @@
             409b97      3 INSTR BELONGTO 409b96 
             409b97      3 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI ZZ mov     rbx, rdi 
             409b9a     16 DATAREF STACK 1110 esp + 0 PARENT LocalFrame LOCALFRAME
-            409b9a      1 DATAREF STACK 1111 esp + 15 CHILDOF 1110 OFFSET 15 LOCALVAR var_9 
             409b9a      4 INSTR BELONGTO 409b96 
             409b9a      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ sub     rsp, 10h 
             409b9a      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -3795,22 +3794,10 @@
             409bd0      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             409bd0     -3 INSTR LOCAL NoWarn push    rbx 
             409bd0    496 FUNC GLOBAL main FUNC_UNSAFE NOFP RET             409dbf 
-            409bd1     16 DATAREF STACK 1120 esp + 48 CHILDOF 1112 OFFSET 48 LOCALVAR var_88 
-            409bd1     16 DATAREF STACK 1121 esp + 64 CHILDOF 1112 OFFSET 64 LOCALVAR var_78 
-            409bd1     16 DATAREF STACK 1123 esp + 88 CHILDOF 1112 OFFSET 88 LOCALVAR var_60 
-            409bd1    176 DATAREF STACK 1112 esp + 0 PARENT LocalFrame LOCALFRAME
-            409bd1      4 DATAREF STACK 1114 esp + 12 CHILDOF 1112 OFFSET 12 LOCALVAR var_AC 
-            409bd1      4 DATAREF STACK 1116 esp + 24 CHILDOF 1112 OFFSET 24 LOCALVAR var_A0 
-            409bd1      4 DATAREF STACK 1117 esp + 28 CHILDOF 1112 OFFSET 28 LOCALVAR var_9C 
-            409bd1     64 DATAREF STACK 1124 esp + 104 CHILDOF 1112 OFFSET 104 LOCALVAR var_50 
+            409bd1    176 DATAREF STACK 1111 esp + 0 PARENT LocalFrame LOCALFRAME
             409bd1      7 INSTR BELONGTO 409bd0 
             409bd1      7 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 0B0h 
-            409bd1      8 DATAREF STACK 1113 esp + 0 CHILDOF 1112 OFFSET 0 OutArgsRegion OUTARGS
-            409bd1      8 DATAREF STACK 1115 esp + 16 CHILDOF 1112 OFFSET 16 LOCALVAR var_A8 
-            409bd1      8 DATAREF STACK 1118 esp + 32 CHILDOF 1112 OFFSET 32 LOCALVAR var_98 
-            409bd1      8 DATAREF STACK 1119 esp + 40 CHILDOF 1112 OFFSET 40 LOCALVAR var_90 
-            409bd1      8 DATAREF STACK 1122 esp + 80 CHILDOF 1112 OFFSET 80 LOCALVAR var_68 
-            409bd1      8 DATAREF STACK 1125 esp + 168 CHILDOF 1112 OFFSET 168 LOCALVAR var_10 
+            409bd1      8 DATAREF STACK 1112 esp + 0 CHILDOF 1111 OFFSET 0 OutArgsRegion OUTARGS
             409bd1      8 MEMORYHOLE STACK esp + 176 CalleeSavedRegs 
             409bd1      8 MEMORYHOLE STACK esp + 184 ReturnAddress 
             409bd8      4 INSTR BELONGTO 409bd0 
@@ -4103,9 +4090,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -4127,7 +4114,7 @@
             409dec     23 FUNC GLOBAL sub_409DEC FUNC_SAFE NOFP RET             409e02 
             409dec      4 INSTR BELONGTO 409dec 
             409dec      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            409dec      8 DATAREF STACK 1126 esp + 0 PARENT LocalFrame LOCALFRAME
+            409dec      8 DATAREF STACK 1113 esp + 0 PARENT LocalFrame LOCALFRAME
             409dec      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             409df0      7 INSTR BELONGTO 409dec 
             409df0      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -4157,7 +4144,7 @@
             409e15     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             409e15      4 INSTR BELONGTO 409e10 
             409e15      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            409e15      8 DATAREF STACK 1127 esp + 0 PARENT LocalFrame LOCALFRAME
+            409e15      8 DATAREF STACK 1114 esp + 0 PARENT LocalFrame LOCALFRAME
             409e15      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             409e19     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_61A288, 0 
             409e19      7 INSTR BELONGTO 409e10 
@@ -4252,12 +4239,10 @@
             409ec6      1 INSTR BELONGTO 409eb0 
             409ec6      1 INSTR DEADREGS  EFLAGS RAX R12 R13 R14 ZZ push    rbx 
             409ec6     -3 INSTR LOCAL NoWarn push    rbx 
-            409ec7     16 DATAREF STACK 1130 esp + 8200 CHILDOF 1128 OFFSET 8200 LOCALVAR var_40 
             409ec7     48 MEMORYHOLE STACK esp + 8216 CalleeSavedRegs 
             409ec7      7 INSTR BELONGTO 409eb0 
             409ec7      7 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 R14 ZZ sub     rsp, 2018h 
-            409ec7   8200 DATAREF STACK 1129 esp + 0 CHILDOF 1128 OFFSET 0 LOCALVAR var_2048 
-            409ec7   8216 DATAREF STACK 1128 esp + 0 PARENT LocalFrame LOCALFRAME
+            409ec7   8216 DATAREF STACK 1115 esp + 0 PARENT LocalFrame LOCALFRAME
             409ec7      8 MEMORYHOLE STACK esp + 8264 ReturnAddress 
             409ece     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, fs:28h 
             409ece      9 INSTR BELONGTO 409eb0 
@@ -4569,7 +4554,7 @@
             40a2c0     31 FUNC GLOBAL sub_40A2C0 FUNC_UNSAFE NOFP RET             40a2de 
             40a2c0      4 INSTR BELONGTO 40a2c0 
             40a2c0      4 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ sub     rsp, 8 
-            40a2c0      8 DATAREF STACK 1131 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a2c0      8 DATAREF STACK 1116 esp + 0 PARENT LocalFrame LOCALFRAME
             40a2c0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             40a2c4      6 INSTR BELONGTO 40a2c0 
             40a2c4      6 INSTR DEADREGS  EFLAGS RAX RCX RSI RDI ZZ mov     esi, cs:dword_61A2A8 
@@ -4603,8 +4588,8 @@
             40a2e0     -3 INSTR LOCAL NoWarn push    rbx 
             40a2e1      3 INSTR BELONGTO 40a2e0 
             40a2e1      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-            40a2e4     20 DATAREF STACK 1133 esp + 0 CHILDOF 1132 OFFSET 0 OutArgsRegion OUTARGS
-            40a2e4     32 DATAREF STACK 1132 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a2e4     20 DATAREF STACK 1118 esp + 0 CHILDOF 1117 OFFSET 0 OutArgsRegion OUTARGS
+            40a2e4     32 DATAREF STACK 1117 esp + 0 PARENT LocalFrame LOCALFRAME
             40a2e4      4 INSTR BELONGTO 40a2e0 
             40a2e4      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 20h 
             40a2e4      8 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
@@ -4672,8 +4657,8 @@
             40a360      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
             40a360      0 FUNC MMSAFENESS SAFE
             40a360    113 FUNC GLOBAL sub_40A360 FUNC_UNSAFE NOFP RET             40a3d0 
-            40a360     24 DATAREF STACK 1134 esp + 0 PARENT LocalFrame LOCALFRAME
-            40a360      4 DATAREF STACK 1135 esp + 0 CHILDOF 1134 OFFSET 0 OutArgsRegion OUTARGS
+            40a360     24 DATAREF STACK 1119 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a360      4 DATAREF STACK 1120 esp + 0 CHILDOF 1119 OFFSET 0 OutArgsRegion OUTARGS
             40a360      4 INSTR BELONGTO 40a360 
             40a360      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
             40a360      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -4748,7 +4733,7 @@
             40a3e2      3 INSTR BELONGTO 40a3e0 
             40a3e5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             40a3e5      4 INSTR BELONGTO 40a3e0 
-            40a3e5      8 DATAREF STACK 1136 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a3e5      8 DATAREF STACK 1121 esp + 0 PARENT LocalFrame LOCALFRAME
             40a3e5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             40a3e9     -1 INSTR LOCAL NoMetaUpdate call    sub_40A360 
             40a3e9      5 INSTR BELONGTO 40a3e0 
@@ -4801,12 +4786,9 @@
             40a495      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], rbx
             40a49a     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
             40a49a      5 INSTR BELONGTO 40a490 
-            40a49f     24 DATAREF STACK 1137 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a49f     24 DATAREF STACK 1122 esp + 0 PARENT LocalFrame LOCALFRAME
             40a49f      4 INSTR BELONGTO 40a490 
             40a49f      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 18h 
-            40a49f      8 DATAREF STACK 1138 esp + 0 CHILDOF 1137 OFFSET 0 LOCALVAR var_18 
-            40a49f      8 DATAREF STACK 1139 esp + 8 CHILDOF 1137 OFFSET 8 LOCALVAR var_10 
-            40a49f      8 DATAREF STACK 1140 esp + 16 CHILDOF 1137 OFFSET 16 LOCALVAR var_8 
             40a49f      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             40a4a3      7 INSTR BELONGTO 40a490 
             40a4a3      7 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     rbp, cs:qword_61A2B0 
@@ -4927,12 +4909,8 @@
             40a582      5 INSTR BELONGTO 40a570 
             40a587      4 INSTR BELONGTO 40a570 
             40a587      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 R13 ZZ sub     rsp, 38h 
-            40a587     56 DATAREF STACK 1141 esp + 0 PARENT LocalFrame LOCALFRAME
-            40a587      8 DATAREF STACK 1142 esp + 0 CHILDOF 1141 OFFSET 0 OutArgsRegion OUTARGS
-            40a587      8 DATAREF STACK 1143 esp + 24 CHILDOF 1141 OFFSET 24 LOCALVAR var_20 
-            40a587      8 DATAREF STACK 1144 esp + 32 CHILDOF 1141 OFFSET 32 LOCALVAR var_18 
-            40a587      8 DATAREF STACK 1145 esp + 40 CHILDOF 1141 OFFSET 40 LOCALVAR var_10 
-            40a587      8 DATAREF STACK 1146 esp + 48 CHILDOF 1141 OFFSET 48 LOCALVAR var_8 
+            40a587     56 DATAREF STACK 1123 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a587      8 DATAREF STACK 1124 esp + 0 CHILDOF 1123 OFFSET 0 OutArgsRegion OUTARGS
             40a587      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40a58b      3 INSTR BELONGTO 40a570 
             40a58b      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RBX RDI R8 R9 R10 R11 R13 ZZ mov     rbp, rsi 
@@ -5135,12 +5113,9 @@
             40a6da      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
             40a6dd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
             40a6dd      5 INSTR BELONGTO 40a6d0 
-            40a6e2     24 DATAREF STACK 1147 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a6e2     24 DATAREF STACK 1125 esp + 0 PARENT LocalFrame LOCALFRAME
             40a6e2      4 INSTR BELONGTO 40a6d0 
             40a6e2      4 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-            40a6e2      8 DATAREF STACK 1148 esp + 0 CHILDOF 1147 OFFSET 0 LOCALVAR var_18 
-            40a6e2      8 DATAREF STACK 1149 esp + 8 CHILDOF 1147 OFFSET 8 LOCALVAR var_10 
-            40a6e2      8 DATAREF STACK 1150 esp + 16 CHILDOF 1147 OFFSET 16 LOCALVAR var_8 
             40a6e2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             40a6e6      3 INSTR BELONGTO 40a6d0 
             40a6e6      3 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ mov     r12, rsi 
@@ -5255,7 +5230,7 @@
             40a798     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             40a798      4 INSTR BELONGTO 40a790 
             40a798      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-            40a798      8 DATAREF STACK 1151 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a798      8 DATAREF STACK 1126 esp + 0 PARENT LocalFrame LOCALFRAME
             40a798      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             40a79c     -1 INSTR LOCAL NoMetaUpdate call    sub_40A360 
             40a79c      5 INSTR BELONGTO 40a790 
@@ -5356,7 +5331,7 @@
             40a840     36 FUNC GLOBAL sub_40A840 FUNC_UNSAFE NOFP NORET             40a863 
             40a840      4 INSTR BELONGTO 40a840 
             40a840      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-            40a840      8 DATAREF STACK 1152 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a840      8 DATAREF STACK 1127 esp + 0 PARENT LocalFrame LOCALFRAME
             40a840      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             40a844     -1 INSTR LOCAL NoMetaUpdate call    _g_get_application_name 
             40a844      5 INSTR BELONGTO 40a840 
@@ -5429,8 +5404,8 @@
             40a9b0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 8 0 0 9 0 0 10 0 0 11 0 0 12 0 0 13 0 0 14 0 0 15 0 0 ZZ
             40a9b0      0 FUNC MMSAFENESS SAFE
             40a9b0    113 FUNC GLOBAL sub_40A9B0 FUNC_UNSAFE NOFP RET             40aa20 
-            40a9b0     24 DATAREF STACK 1153 esp + 0 PARENT LocalFrame LOCALFRAME
-            40a9b0      4 DATAREF STACK 1154 esp + 0 CHILDOF 1153 OFFSET 0 OutArgsRegion OUTARGS
+            40a9b0     24 DATAREF STACK 1128 esp + 0 PARENT LocalFrame LOCALFRAME
+            40a9b0      4 DATAREF STACK 1129 esp + 0 CHILDOF 1128 OFFSET 0 OutArgsRegion OUTARGS
             40a9b0      4 INSTR BELONGTO 40a9b0 
             40a9b0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 18h 
             40a9b0      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
@@ -5505,7 +5480,7 @@
             40aa32      3 INSTR BELONGTO 40aa30 
             40aa35     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             40aa35      4 INSTR BELONGTO 40aa30 
-            40aa35      8 DATAREF STACK 1155 esp + 0 PARENT LocalFrame LOCALFRAME
+            40aa35      8 DATAREF STACK 1130 esp + 0 PARENT LocalFrame LOCALFRAME
             40aa35      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             40aa39     -1 INSTR LOCAL NoMetaUpdate call    sub_40A9B0 
             40aa39      5 INSTR BELONGTO 40aa30 
@@ -5555,7 +5530,7 @@
             40aaf0      4 INSTR BELONGTO 40aaf0 
             40aaf0      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
             40aaf0     53 FUNC GLOBAL sub_40AAF0 FUNC_UNSAFE NOFP RET             40ab24 
-            40aaf0      8 DATAREF STACK 1156 esp + 0 PARENT LocalFrame LOCALFRAME
+            40aaf0      8 DATAREF STACK 1131 esp + 0 PARENT LocalFrame LOCALFRAME
             40aaf0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             40aaf4      7 INSTR BELONGTO 40aaf0 
             40aaf4      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:qword_61A2E0 
@@ -5607,14 +5582,9 @@
             40ab47      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RDI R8 R9 R10 R11 R12 R13 ZZ mov     r12, rsi 
             40ab4a     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
             40ab4a      5 INSTR BELONGTO 40ab30 
-            40ab4f     40 DATAREF STACK 1157 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ab4f     40 DATAREF STACK 1132 esp + 0 PARENT LocalFrame LOCALFRAME
             40ab4f      4 INSTR BELONGTO 40ab30 
             40ab4f      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R13 R14 ZZ sub     rsp, 28h 
-            40ab4f      8 DATAREF STACK 1158 esp + 0 CHILDOF 1157 OFFSET 0 LOCALVAR var_28 
-            40ab4f      8 DATAREF STACK 1159 esp + 8 CHILDOF 1157 OFFSET 8 LOCALVAR var_20 
-            40ab4f      8 DATAREF STACK 1160 esp + 16 CHILDOF 1157 OFFSET 16 LOCALVAR var_18 
-            40ab4f      8 DATAREF STACK 1161 esp + 24 CHILDOF 1157 OFFSET 24 LOCALVAR var_10 
-            40ab4f      8 DATAREF STACK 1162 esp + 32 CHILDOF 1157 OFFSET 32 LOCALVAR var_8 
             40ab4f      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             40ab53     -1 INSTR LOCAL NoMetaUpdate call    sub_40A9B0 
             40ab53      5 INSTR BELONGTO 40ab30 
@@ -5783,13 +5753,7 @@
             40ac6f      5 INSTR BELONGTO 40ac50 
             40ac74      4 INSTR BELONGTO 40ac50 
             40ac74      4 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ sub     rsp, 38h 
-            40ac74     56 DATAREF STACK 1163 esp + 0 PARENT LocalFrame LOCALFRAME
-            40ac74      8 DATAREF STACK 1164 esp + 8 CHILDOF 1163 OFFSET 8 LOCALVAR var_30 
-            40ac74      8 DATAREF STACK 1165 esp + 16 CHILDOF 1163 OFFSET 16 LOCALVAR var_28 
-            40ac74      8 DATAREF STACK 1166 esp + 24 CHILDOF 1163 OFFSET 24 LOCALVAR var_20 
-            40ac74      8 DATAREF STACK 1167 esp + 32 CHILDOF 1163 OFFSET 32 LOCALVAR var_18 
-            40ac74      8 DATAREF STACK 1168 esp + 40 CHILDOF 1163 OFFSET 40 LOCALVAR var_10 
-            40ac74      8 DATAREF STACK 1169 esp + 48 CHILDOF 1163 OFFSET 48 LOCALVAR var_8 
+            40ac74     56 DATAREF STACK 1133 esp + 0 PARENT LocalFrame LOCALFRAME
             40ac74      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             40ac78     -2 INSTR LOCAL n R12 ZZ  NumericDEFs mov     r12d, edx 
             40ac78      3 INSTR BELONGTO 40ac50 
@@ -6047,12 +6011,9 @@
             40af8a      3 INSTR DEADREGS  EFLAGS RAX RCX RBX R8 R9 R10 R11 ZZ mov     rbx, rdi 
             40af8d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
             40af8d      5 INSTR BELONGTO 40af80 
-            40af92     24 DATAREF STACK 1170 esp + 0 PARENT LocalFrame LOCALFRAME
+            40af92     24 DATAREF STACK 1134 esp + 0 PARENT LocalFrame LOCALFRAME
             40af92      4 INSTR BELONGTO 40af80 
             40af92      4 INSTR DEADREGS  EFLAGS RAX RCX RDI R8 R9 R10 R11 R12 ZZ sub     rsp, 18h 
-            40af92      8 DATAREF STACK 1171 esp + 0 CHILDOF 1170 OFFSET 0 LOCALVAR var_18 
-            40af92      8 DATAREF STACK 1172 esp + 8 CHILDOF 1170 OFFSET 8 LOCALVAR var_10 
-            40af92      8 DATAREF STACK 1173 esp + 16 CHILDOF 1170 OFFSET 16 LOCALVAR var_8 
             40af92      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             40af96     -1 INSTR LOCAL MetadataUnused mov     rbp, rsi 
             40af96      3 INSTR BELONGTO 40af80 
@@ -6511,7 +6472,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 1174 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b2b8      8 DATAREF STACK 1135 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 
@@ -6603,9 +6564,8 @@
             40b34d      5 INSTR BELONGTO 40d6c0 
             40b34d      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ mov     [rsp+var_10], r12 
             40b34d      5 PTRIMMEDESP STACK -16 displ mov     [rsp+var_10], r12
+            40b352     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             40b352      5 INSTR BELONGTO 40d6c0 
-            40b352      5 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 R12 ZZ mov     [rsp+var_8], r13 
-            40b352      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], r13
             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 
             40b35b     -1 INSTR LOCAL NoMetaUpdate call    sub_40A9B0 
@@ -6742,11 +6702,9 @@
             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 1175 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b43d     24 DATAREF STACK 1136 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 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 
@@ -6844,16 +6802,9 @@
             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 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    104 DATAREF STACK 1137 esp + 0 PARENT LocalFrame LOCALFRAME
             40b4df      4 INSTR BELONGTO 40b4c0 
             40b4df      4 INSTR DEADREGS  EFLAGS R13 R14 ZZ sub     rsp, 68h 
-            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 
@@ -7002,11 +6953,9 @@
             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 1186 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b5ca     24 DATAREF STACK 1138 esp + 0 PARENT LocalFrame LOCALFRAME
             40b5ca      4 INSTR BELONGTO 40b5c0 
             40b5ca      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-            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 
@@ -7070,7 +7019,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 1189 esp + 0 PARENT LocalFrame LOCALFRAME
+            40b624      8 DATAREF STACK 1139 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 
@@ -7133,20 +7082,10 @@
             40b669     -3 INSTR LOCAL NoWarn push    rbx 
             40b66a     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
             40b66a      3 INSTR BELONGTO 40b660 
-            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 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 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     88 DATAREF STACK 1140 esp + 0 PARENT LocalFrame LOCALFRAME
             40b66d      8 MEMORYHOLE STACK esp + 136 ReturnAddress 
             40b671     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             40b671      3 INSTR BELONGTO 40b660 
@@ -7707,10 +7646,9 @@
             40ba2a     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
             40ba2a      3 INSTR BELONGTO 40ba20 
             40ba2d     24 MEMORYHOLE STACK esp + 48 CalleeSavedRegs 
-            40ba2d     48 DATAREF STACK 1201 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ba2d     48 DATAREF STACK 1141 esp + 0 PARENT LocalFrame LOCALFRAME
             40ba2d      4 INSTR BELONGTO 40ba20 
             40ba2d      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 30h 
-            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 
@@ -7841,14 +7779,9 @@
             40badf     -3 INSTR LOCAL NoWarn push    rbx 
             40bae0     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
             40bae0      3 INSTR BELONGTO 40bad0 
-            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    312 DATAREF STACK 1142 esp + 0 PARENT LocalFrame LOCALFRAME
             40bae3     48 MEMORYHOLE STACK esp + 312 CalleeSavedRegs 
-            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      4 DATAREF STACK 1143 esp + 0 CHILDOF 1142 OFFSET 0 OutArgsRegion OUTARGS
             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 
@@ -8098,10 +8031,9 @@
             40bc94      1 INSTR BELONGTO 40bc90 
             40bc94      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             40bc94     -3 INSTR LOCAL NoWarn push    rbx 
-            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 1211 esp + 0 CHILDOF 1210 OFFSET 0 OutArgsRegion OUTARGS
-            40bc95     40 DATAREF STACK 1210 esp + 0 PARENT LocalFrame LOCALFRAME
+            40bc95     20 DATAREF STACK 1145 esp + 0 CHILDOF 1144 OFFSET 0 OutArgsRegion OUTARGS
+            40bc95     40 DATAREF STACK 1144 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 
@@ -8212,9 +8144,8 @@
             40bd64     -3 INSTR LOCAL NoWarn push    rbx 
             40bd65     -1 INSTR LOCAL MetadataUnused mov     rbx, rcx 
             40bd65      3 INSTR BELONGTO 40bd60 
-            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 1213 esp + 0 PARENT LocalFrame LOCALFRAME
+            40bd68     24 DATAREF STACK 1146 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 
@@ -8394,8 +8325,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 1215 esp + 0 PARENT LocalFrame LOCALFRAME
-            40c028      4 DATAREF STACK 1216 esp + 0 CHILDOF 1215 OFFSET 0 OutArgsRegion OUTARGS
+            40c028     24 DATAREF STACK 1147 esp + 0 PARENT LocalFrame LOCALFRAME
+            40c028      4 DATAREF STACK 1148 esp + 0 CHILDOF 1147 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 
@@ -8498,12 +8429,10 @@
             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 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 DATAREF STACK 1150 esp + 0 CHILDOF 1149 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 1217 esp + 0 PARENT LocalFrame LOCALFRAME
+            40c0ba     80 DATAREF STACK 1149 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] 
@@ -8711,19 +8640,11 @@
             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 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    136 DATAREF STACK 1151 esp + 0 PARENT LocalFrame LOCALFRAME
             40c2e5     16 MEMORYHOLE STACK esp + 136 CalleeSavedRegs 
-            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      4 DATAREF STACK 1152 esp + 0 CHILDOF 1151 OFFSET 0 OutArgsRegion OUTARGS
             40c2e5      7 INSTR BELONGTO 40c2e0 
             40c2e5      7 INSTR DEADREGS  EFLAGS RDX RSI ZZ sub     rsp, 88h 
-            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] 
@@ -9017,8 +8938,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 1231 esp + 0 PARENT LocalFrame LOCALFRAME
-            40c4d1      4 DATAREF STACK 1232 esp + 0 CHILDOF 1231 OFFSET 0 OutArgsRegion OUTARGS
+            40c4d1     16 DATAREF STACK 1153 esp + 0 PARENT LocalFrame LOCALFRAME
+            40c4d1      4 DATAREF STACK 1154 esp + 0 CHILDOF 1153 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 
@@ -9100,7 +9021,7 @@
             40c552      3 INSTR BELONGTO 40c550 
             40c555     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             40c555      4 INSTR BELONGTO 40c550 
-            40c555      8 DATAREF STACK 1233 esp + 0 PARENT LocalFrame LOCALFRAME
+            40c555      8 DATAREF STACK 1155 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 
@@ -9216,7 +9137,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 1234 esp + 0 PARENT LocalFrame LOCALFRAME
+            40c820      8 DATAREF STACK 1156 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 
@@ -9245,12 +9166,9 @@
             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 1235 esp + 0 PARENT LocalFrame LOCALFRAME
+            40c852     24 DATAREF STACK 1157 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 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 
@@ -9404,13 +9322,9 @@
             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 1239 esp + 0 PARENT LocalFrame LOCALFRAME
+            40c96f     40 DATAREF STACK 1158 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 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 
@@ -9501,12 +9415,10 @@
             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 1244 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ca0d     40 DATAREF STACK 1159 esp + 0 PARENT LocalFrame LOCALFRAME
             40ca0d      4 INSTR BELONGTO 40ca00 
             40ca0d      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 28h 
-            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 DATAREF STACK 1160 esp + 0 CHILDOF 1159 OFFSET 0 OutArgsRegion OUTARGS
             40ca0d      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
             40ca11      3 INSTR BELONGTO 40ca00 
             40ca11      3 INSTR DEADREGS  EFLAGS ZZ mov     rbp, rdx 
@@ -9638,14 +9550,10 @@
             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 1248 esp + 0 PARENT LocalFrame LOCALFRAME
+            40cacf    104 DATAREF STACK 1161 esp + 0 PARENT LocalFrame LOCALFRAME
             40cacf     48 MEMORYHOLE STACK esp + 104 CalleeSavedRegs 
-            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 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 
@@ -9888,11 +9796,9 @@
             40cc60      5 INSTR BELONGTO 40cc60 
             40cc65     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], rbp 
             40cc65      5 INSTR BELONGTO 40cc60 
-            40cc6a     24 DATAREF STACK 1253 esp + 0 PARENT LocalFrame LOCALFRAME
+            40cc6a     24 DATAREF STACK 1162 esp + 0 PARENT LocalFrame LOCALFRAME
             40cc6a      4 INSTR BELONGTO 40cc60 
             40cc6a      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-            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] 
@@ -9932,26 +9838,10 @@
             40ccb2      5 INSTR BELONGTO 40cca0 
             40ccb7     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r14 
             40ccb7      5 INSTR BELONGTO 40cca0 
-            40ccbc    168 DATAREF STACK 1256 esp + 0 PARENT LocalFrame LOCALFRAME
-            40ccbc     36 DATAREF STACK 1257 esp + 0 CHILDOF 1256 OFFSET 0 OutArgsRegion OUTARGS
+            40ccbc    168 DATAREF STACK 1163 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ccbc     36 DATAREF STACK 1164 esp + 0 CHILDOF 1163 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 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 
@@ -10174,9 +10064,8 @@
             40cea4      1 INSTR BELONGTO 40cea0 
             40cea4      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             40cea4     -3 INSTR LOCAL NoWarn push    rbx 
-            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 1274 esp + 0 PARENT LocalFrame LOCALFRAME
+            40cea5     24 DATAREF STACK 1165 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 
@@ -10268,12 +10157,9 @@
             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 1276 esp + 0 PARENT LocalFrame LOCALFRAME
+            40cf32     24 DATAREF STACK 1166 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 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 
@@ -10390,10 +10276,9 @@
             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 1280 esp + 0 PARENT LocalFrame LOCALFRAME
+            40cfe4    160 DATAREF STACK 1167 esp + 0 PARENT LocalFrame LOCALFRAME
             40cfe4      7 INSTR BELONGTO 40cfe0 
             40cfe4      7 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 0A0h 
-            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 
@@ -10457,11 +10342,10 @@
             40d041     -3 INSTR LOCAL NoWarn push    rbx 
             40d042     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
             40d042      3 INSTR BELONGTO 40d040 
-            40d045    168 DATAREF STACK 1282 esp + 0 PARENT LocalFrame LOCALFRAME
+            40d045    168 DATAREF STACK 1168 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 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 
@@ -10544,7 +10428,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 1284 esp + 0 PARENT LocalFrame LOCALFRAME
+            40d0c5      8 DATAREF STACK 1169 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 
@@ -10613,14 +10497,10 @@
             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 1285 esp + 0 PARENT LocalFrame LOCALFRAME
-            40d142      4 DATAREF STACK 1286 esp + 0 CHILDOF 1285 OFFSET 0 OutArgsRegion OUTARGS
+            40d142     40 DATAREF STACK 1170 esp + 0 PARENT LocalFrame LOCALFRAME
+            40d142      4 DATAREF STACK 1171 esp + 0 CHILDOF 1170 OFFSET 0 OutArgsRegion OUTARGS
             40d142      4 INSTR BELONGTO 40d130 
             40d142      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 28h 
-            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 
@@ -10825,11 +10705,9 @@
             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 1291 esp + 0 PARENT LocalFrame LOCALFRAME
+            40d2bf     24 DATAREF STACK 1172 esp + 0 PARENT LocalFrame LOCALFRAME
             40d2bf      4 INSTR BELONGTO 40d2b0 
             40d2bf      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-            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 
@@ -10902,13 +10780,9 @@
             40d33d      5 INSTR BELONGTO 40d330 
             40d342     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             40d342      5 INSTR BELONGTO 40d330 
-            40d347     40 DATAREF STACK 1294 esp + 0 PARENT LocalFrame LOCALFRAME
+            40d347     40 DATAREF STACK 1173 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 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 
@@ -11063,12 +10937,9 @@
             40d45a      3 INSTR BELONGTO 40d450 
             40d45d     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
             40d45d      5 INSTR BELONGTO 40d450 
-            40d462     24 DATAREF STACK 1299 esp + 0 PARENT LocalFrame LOCALFRAME
+            40d462     24 DATAREF STACK 1174 esp + 0 PARENT LocalFrame LOCALFRAME
             40d462      4 INSTR BELONGTO 40d450 
             40d462      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-            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 
@@ -11191,11 +11062,10 @@
             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 1303 esp + 0 PARENT LocalFrame LOCALFRAME
+            40d5b0    168 DATAREF STACK 1175 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 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 
@@ -11310,7 +11180,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 1305 esp + 0 PARENT LocalFrame LOCALFRAME
+            40d660      8 DATAREF STACK 1176 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 
@@ -11515,17 +11385,10 @@
             40d95c     -3 INSTR LOCAL NoWarn push    rbx 
             40d95d     -1 INSTR LOCAL MetadataUnused mov     ebx, esi 
             40d95d      2 INSTR BELONGTO 40d950 
-            40d95f    360 DATAREF STACK 1306 esp + 0 PARENT LocalFrame LOCALFRAME
+            40d95f    360 DATAREF STACK 1177 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 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 
@@ -12071,8 +11934,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 1314 esp + 0 PARENT LocalFrame LOCALFRAME
-            40df91      4 DATAREF STACK 1315 esp + 0 CHILDOF 1314 OFFSET 0 OutArgsRegion OUTARGS
+            40df91     16 DATAREF STACK 1178 esp + 0 PARENT LocalFrame LOCALFRAME
+            40df91      4 DATAREF STACK 1179 esp + 0 CHILDOF 1178 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 
@@ -12194,16 +12057,11 @@
             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 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 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     72 DATAREF STACK 1180 esp + 0 PARENT LocalFrame LOCALFRAME
+            40e05d      8 DATAREF STACK 1181 esp + 0 CHILDOF 1180 OFFSET 0 OutArgsRegion OUTARGS
             40e05d      8 MEMORYHOLE STACK esp + 120 ReturnAddress 
             40e061     -1 INSTR LOCAL NoMetaUpdate call    sub_40DF90 
             40e061      5 INSTR BELONGTO 40e050 
@@ -13112,13 +12970,9 @@
             40ef8d      5 INSTR BELONGTO 40ef80 
             40ef92     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             40ef92      5 INSTR BELONGTO 40ef80 
-            40ef97     40 DATAREF STACK 1323 esp + 0 PARENT LocalFrame LOCALFRAME
+            40ef97     40 DATAREF STACK 1182 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 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 
@@ -13404,8 +13258,7 @@
             40f4ec     -3 INSTR LOCAL NoWarn push    rbx 
             40f4ed     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
             40f4ed      3 INSTR BELONGTO 40f4e0 
-            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     24 DATAREF STACK 1183 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 
@@ -13650,12 +13503,9 @@
             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 1330 esp + 0 PARENT LocalFrame LOCALFRAME
+            40f67a     24 DATAREF STACK 1184 esp + 0 PARENT LocalFrame LOCALFRAME
             40f67a      4 INSTR BELONGTO 40f660 
             40f67a      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 18h 
-            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 
@@ -13827,8 +13677,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 1335 esp + 0 CHILDOF 1334 OFFSET 0 OutArgsRegion OUTARGS
-            40f844     32 DATAREF STACK 1334 esp + 0 PARENT LocalFrame LOCALFRAME
+            40f844     20 DATAREF STACK 1186 esp + 0 CHILDOF 1185 OFFSET 0 OutArgsRegion OUTARGS
+            40f844     32 DATAREF STACK 1185 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 
@@ -14203,8 +14053,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 1336 esp + 0 PARENT LocalFrame LOCALFRAME
-            410040      4 DATAREF STACK 1337 esp + 0 CHILDOF 1336 OFFSET 0 OutArgsRegion OUTARGS
+            410040     24 DATAREF STACK 1187 esp + 0 PARENT LocalFrame LOCALFRAME
+            410040      4 DATAREF STACK 1188 esp + 0 CHILDOF 1187 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 
@@ -14361,7 +14211,7 @@
             4102e4     -3 INSTR LOCAL NoWarn push    rbx 
             4102e5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             4102e5      4 INSTR BELONGTO 4102e0 
-            4102e5      8 DATAREF STACK 1338 esp + 0 PARENT LocalFrame LOCALFRAME
+            4102e5      8 DATAREF STACK 1189 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 
@@ -14496,13 +14346,9 @@
             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 1339 esp + 0 PARENT LocalFrame LOCALFRAME
+            41042a     40 DATAREF STACK 1190 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 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 
@@ -14592,14 +14438,9 @@
             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 1344 esp + 0 PARENT LocalFrame LOCALFRAME
+            41053f     40 DATAREF STACK 1191 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 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 
@@ -15288,8 +15129,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 1351 esp + 0 CHILDOF 1350 OFFSET 0 OutArgsRegion OUTARGS
-            4109c5     40 DATAREF STACK 1350 esp + 0 PARENT LocalFrame LOCALFRAME
+            4109c5     20 DATAREF STACK 1193 esp + 0 CHILDOF 1192 OFFSET 0 OutArgsRegion OUTARGS
+            4109c5     40 DATAREF STACK 1192 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 
@@ -15509,7 +15350,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 1352 esp + 0 PARENT LocalFrame LOCALFRAME
+            410c40      8 DATAREF STACK 1194 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 
@@ -15546,8 +15387,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 1353 esp + 0 PARENT LocalFrame LOCALFRAME
-            410c81      4 DATAREF STACK 1354 esp + 0 CHILDOF 1353 OFFSET 0 OutArgsRegion OUTARGS
+            410c81     16 DATAREF STACK 1195 esp + 0 PARENT LocalFrame LOCALFRAME
+            410c81      4 DATAREF STACK 1196 esp + 0 CHILDOF 1195 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 
@@ -15844,7 +15685,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 1355 esp + 0 PARENT LocalFrame LOCALFRAME
+            411210      8 DATAREF STACK 1197 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 
@@ -15876,7 +15717,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 1356 esp + 0 PARENT LocalFrame LOCALFRAME
+            411235      8 DATAREF STACK 1198 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 
@@ -16250,7 +16091,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 1357 esp + 0 PARENT LocalFrame LOCALFRAME
+            411465      8 DATAREF STACK 1199 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 
@@ -16327,19 +16168,12 @@
             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 1363 esp + 72 CHILDOF 1358 OFFSET 72 LOCALVAR var_30 
             4114cd     24 MEMORYHOLE STACK esp + 96 CalleeSavedRegs 
-            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     48 DATAREF STACK 1201 esp + 0 CHILDOF 1200 OFFSET 0 OutArgsRegion OUTARGS
             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 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 1358 esp + 0 PARENT LocalFrame LOCALFRAME
+            4114cd     96 DATAREF STACK 1200 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 
@@ -16614,10 +16448,9 @@
             4116c4      1 INSTR BELONGTO 4116c0 
             4116c4      1 INSTR DEADREGS  EFLAGS ZZ push    rbx 
             4116c4     -3 INSTR LOCAL NoWarn push    rbx 
-            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 1368 esp + 0 CHILDOF 1367 OFFSET 0 OutArgsRegion OUTARGS
-            4116c5     40 DATAREF STACK 1367 esp + 0 PARENT LocalFrame LOCALFRAME
+            4116c5     20 DATAREF STACK 1203 esp + 0 CHILDOF 1202 OFFSET 0 OutArgsRegion OUTARGS
+            4116c5     40 DATAREF STACK 1202 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 
@@ -16763,8 +16596,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 1370 esp + 0 PARENT LocalFrame LOCALFRAME
-            411810      4 DATAREF STACK 1371 esp + 0 CHILDOF 1370 OFFSET 0 OutArgsRegion OUTARGS
+            411810     24 DATAREF STACK 1204 esp + 0 PARENT LocalFrame LOCALFRAME
+            411810      4 DATAREF STACK 1205 esp + 0 CHILDOF 1204 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 
@@ -16839,7 +16672,7 @@
             411892      3 INSTR BELONGTO 411890 
             411895     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             411895      4 INSTR BELONGTO 411890 
-            411895      8 DATAREF STACK 1372 esp + 0 PARENT LocalFrame LOCALFRAME
+            411895      8 DATAREF STACK 1206 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 
@@ -16947,7 +16780,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 1373 esp + 0 PARENT LocalFrame LOCALFRAME
+            411b00      8 DATAREF STACK 1207 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 
@@ -16991,12 +16824,9 @@
             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 1374 esp + 0 PARENT LocalFrame LOCALFRAME
+            411b52     24 DATAREF STACK 1208 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 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 
@@ -17088,12 +16918,9 @@
             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 1378 esp + 0 PARENT LocalFrame LOCALFRAME
+            411bf2     24 DATAREF STACK 1209 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 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 
@@ -17645,8 +17472,7 @@
             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 1383 esp + 8 CHILDOF 1382 OFFSET 8 LOCALVAR var_40 
-            411f80     24 DATAREF STACK 1382 esp + 0 PARENT LocalFrame LOCALFRAME
+            411f80     24 DATAREF STACK 1210 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 
@@ -17883,7 +17709,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 1384 esp + 0 PARENT LocalFrame LOCALFRAME
+            4120f7      8 DATAREF STACK 1211 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 
@@ -18036,11 +17862,9 @@
             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 1385 esp + 0 PARENT LocalFrame LOCALFRAME
+            4121fd     24 DATAREF STACK 1212 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 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 
@@ -18176,10 +18000,9 @@
             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 1388 esp + 0 PARENT LocalFrame LOCALFRAME
+            4122f4     16 DATAREF STACK 1213 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 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 
@@ -18261,11 +18084,9 @@
             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 1390 esp + 0 PARENT LocalFrame LOCALFRAME
+            41238d     24 DATAREF STACK 1214 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 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 
@@ -18346,9 +18167,8 @@
             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 1394 esp + 8 CHILDOF 1393 OFFSET 8 LOCALVAR var_20 
             412418     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            412418     24 DATAREF STACK 1393 esp + 0 PARENT LocalFrame LOCALFRAME
+            412418     24 DATAREF STACK 1215 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 
@@ -18495,11 +18315,9 @@
             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 1395 esp + 0 PARENT LocalFrame LOCALFRAME
+            41250d     24 DATAREF STACK 1216 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 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 
@@ -18576,7 +18394,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 1398 esp + 0 PARENT LocalFrame LOCALFRAME
+            412585      8 DATAREF STACK 1217 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 
@@ -18691,8 +18509,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 1399 esp + 0 PARENT LocalFrame LOCALFRAME
-            412660      4 DATAREF STACK 1400 esp + 0 CHILDOF 1399 OFFSET 0 OutArgsRegion OUTARGS
+            412660     24 DATAREF STACK 1218 esp + 0 PARENT LocalFrame LOCALFRAME
+            412660      4 DATAREF STACK 1219 esp + 0 CHILDOF 1218 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 
@@ -18848,7 +18666,7 @@
             412912      3 INSTR BELONGTO 412910 
             412915     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             412915      4 INSTR BELONGTO 412910 
-            412915      8 DATAREF STACK 1401 esp + 0 PARENT LocalFrame LOCALFRAME
+            412915      8 DATAREF STACK 1220 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 
@@ -18920,11 +18738,9 @@
             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 1402 esp + 0 PARENT LocalFrame LOCALFRAME
+            4129ad     24 DATAREF STACK 1221 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 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 
@@ -18969,9 +18785,8 @@
             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 1406 esp + 8 CHILDOF 1405 OFFSET 8 LOCALVAR var_20 
             4129f8     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            4129f8     24 DATAREF STACK 1405 esp + 0 PARENT LocalFrame LOCALFRAME
+            4129f8     24 DATAREF STACK 1222 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 
@@ -19218,13 +19033,11 @@
             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 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 1408 esp + 0 CHILDOF 1407 OFFSET 0 OutArgsRegion OUTARGS
+            412bbd      4 DATAREF STACK 1224 esp + 0 CHILDOF 1223 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 1407 esp + 0 PARENT LocalFrame LOCALFRAME
+            412bbd     72 DATAREF STACK 1223 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 
@@ -19377,11 +19190,9 @@
             412ca5      5 INSTR BELONGTO 412ca0 
             412caa     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
             412caa      3 INSTR BELONGTO 412ca0 
-            412cad     24 DATAREF STACK 1411 esp + 0 PARENT LocalFrame LOCALFRAME
+            412cad     24 DATAREF STACK 1225 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 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 
@@ -19427,11 +19238,9 @@
             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 1414 esp + 0 PARENT LocalFrame LOCALFRAME
+            412cf4     48 DATAREF STACK 1226 esp + 0 PARENT LocalFrame LOCALFRAME
             412cf4      4 INSTR BELONGTO 412cf0 
             412cf4      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 30h 
-            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 
@@ -19559,29 +19368,11 @@
             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 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    168 DATAREF STACK 1227 esp + 0 PARENT LocalFrame LOCALFRAME
+            412da5     16 DATAREF STACK 1228 esp + 0 CHILDOF 1227 OFFSET 0 OutArgsRegion OUTARGS
             412da5     48 MEMORYHOLE STACK esp + 168 CalleeSavedRegs 
-            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 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] 
@@ -20447,11 +20238,9 @@
             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 1437 esp + 0 PARENT LocalFrame LOCALFRAME
+            4133a4     48 DATAREF STACK 1229 esp + 0 PARENT LocalFrame LOCALFRAME
             4133a4      4 INSTR BELONGTO 4133a0 
             4133a4      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 30h 
-            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 
@@ -20751,8 +20540,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 1440 esp + 0 PARENT LocalFrame LOCALFRAME
-            4139a1      4 DATAREF STACK 1441 esp + 0 CHILDOF 1440 OFFSET 0 OutArgsRegion OUTARGS
+            4139a1     16 DATAREF STACK 1230 esp + 0 PARENT LocalFrame LOCALFRAME
+            4139a1      4 DATAREF STACK 1231 esp + 0 CHILDOF 1230 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 
@@ -21017,7 +20806,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 1442 esp + 0 PARENT LocalFrame LOCALFRAME
+            413ed0      8 DATAREF STACK 1232 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 
@@ -21091,13 +20880,7 @@
             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 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     56 DATAREF STACK 1233 esp + 0 PARENT LocalFrame LOCALFRAME
             413fdc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             413fe0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             413fe0      3 INSTR BELONGTO 413fb0 
@@ -21174,7 +20957,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 1450 esp + 0 PARENT LocalFrame LOCALFRAME
+            414055      8 DATAREF STACK 1234 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 
@@ -21209,7 +20992,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 1451 esp + 0 PARENT LocalFrame LOCALFRAME
+            414088      8 DATAREF STACK 1235 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 08b8da6293ace543baccb6ffdbfd156aeef45a26..e53b06046c883e4dac1e30925e08246916edc4ae 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 @@
-15ad6e469ab3266ac3973207238cb43144569d4f
\ No newline at end of file
+40216a9a1865338542126b68e33d28847ec86901
\ 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 b6b83ed02b6a87f4dd06d1f807c4a595363fa1bf..7a1c52d4f925840c32510174d07ea17c6075edfe 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 @@
-b3746d19136020db4aaf025d7b838f363ae2f09a
\ No newline at end of file
+884391846456a42b56e0c276638bbd85c1a11bd4
\ 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 bb38eebdc9d8c8ca23ff2d608ffa6a29b13bf911..a9bb9109a5feef5b212e1da6e32d4a0cc1c1b19e 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 @@
-27ab611e85f9170237ba8e2668c912ca106c8222
\ No newline at end of file
+829a93b07010d87f7f85a62c199a8260d668b739
\ 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 5e0569c3f6548aefc6f2e31dbba090ff3a2e5d3e..5492b76bf3e485494dd79e066b6a796677113868 100644
--- a/tests/commit/trimmed-sorted-save-gnome-thumbnail-font.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-gnome-thumbnail-font.psexe.annot
@@ -802,38 +802,10 @@
             4017d0      1 INSTR BELONGTO 4017c0 
             4017d0      1 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ push    rbx 
             4017d0     -3 INSTR LOCAL NoWarn push    rbx 
-            4017d1     12 DATAREF STACK 406 esp + 16 CHILDOF 404 OFFSET 16 LOCALVAR var_148 
-            4017d1     12 DATAREF STACK 429 esp + 264 CHILDOF 404 OFFSET 264 LOCALVAR var_50 
-            4017d1     12 DATAREF STACK 432 esp + 284 CHILDOF 404 OFFSET 284 LOCALVAR var_3C 
-            4017d1     16 DATAREF STACK 420 esp + 128 CHILDOF 404 OFFSET 128 LOCALVAR var_D8 
-            4017d1     16 DATAREF STACK 422 esp + 152 CHILDOF 404 OFFSET 152 LOCALVAR var_C0 
             4017d1    296 DATAREF STACK 404 esp + 0 PARENT LocalFrame LOCALFRAME
             4017d1     48 MEMORYHOLE STACK esp + 296 CalleeSavedRegs 
-            4017d1      4 DATAREF STACK 407 esp + 28 CHILDOF 404 OFFSET 28 LOCALVAR var_13C 
-            4017d1      4 DATAREF STACK 430 esp + 276 CHILDOF 404 OFFSET 276 LOCALVAR var_44 
-            4017d1      4 DATAREF STACK 431 esp + 280 CHILDOF 404 OFFSET 280 LOCALVAR var_40 
-            4017d1     56 DATAREF STACK 423 esp + 168 CHILDOF 404 OFFSET 168 LOCALVAR var_B0 
             4017d1      7 INSTR BELONGTO 4017c0 
             4017d1      7 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ sub     rsp, 128h 
-            4017d1      8 DATAREF STACK 405 esp + 8 CHILDOF 404 OFFSET 8 LOCALVAR var_150 
-            4017d1      8 DATAREF STACK 408 esp + 32 CHILDOF 404 OFFSET 32 LOCALVAR var_138 
-            4017d1      8 DATAREF STACK 409 esp + 40 CHILDOF 404 OFFSET 40 LOCALVAR var_130 
-            4017d1      8 DATAREF STACK 410 esp + 48 CHILDOF 404 OFFSET 48 LOCALVAR var_128 
-            4017d1      8 DATAREF STACK 411 esp + 56 CHILDOF 404 OFFSET 56 LOCALVAR var_120 
-            4017d1      8 DATAREF STACK 412 esp + 64 CHILDOF 404 OFFSET 64 LOCALVAR var_118 
-            4017d1      8 DATAREF STACK 413 esp + 72 CHILDOF 404 OFFSET 72 LOCALVAR var_110 
-            4017d1      8 DATAREF STACK 414 esp + 80 CHILDOF 404 OFFSET 80 LOCALVAR var_108 
-            4017d1      8 DATAREF STACK 415 esp + 88 CHILDOF 404 OFFSET 88 LOCALVAR var_100 
-            4017d1      8 DATAREF STACK 416 esp + 96 CHILDOF 404 OFFSET 96 LOCALVAR var_F8 
-            4017d1      8 DATAREF STACK 417 esp + 104 CHILDOF 404 OFFSET 104 LOCALVAR var_F0 
-            4017d1      8 DATAREF STACK 418 esp + 112 CHILDOF 404 OFFSET 112 LOCALVAR var_E8 
-            4017d1      8 DATAREF STACK 419 esp + 120 CHILDOF 404 OFFSET 120 LOCALVAR var_E0 
-            4017d1      8 DATAREF STACK 421 esp + 144 CHILDOF 404 OFFSET 144 LOCALVAR var_C8 
-            4017d1      8 DATAREF STACK 424 esp + 224 CHILDOF 404 OFFSET 224 LOCALVAR var_78 
-            4017d1      8 DATAREF STACK 425 esp + 232 CHILDOF 404 OFFSET 232 LOCALVAR var_70 
-            4017d1      8 DATAREF STACK 426 esp + 240 CHILDOF 404 OFFSET 240 LOCALVAR var_68 
-            4017d1      8 DATAREF STACK 427 esp + 248 CHILDOF 404 OFFSET 248 LOCALVAR var_60 
-            4017d1      8 DATAREF STACK 428 esp + 256 CHILDOF 404 OFFSET 256 LOCALVAR var_58 
             4017d1      8 MEMORYHOLE STACK esp + 344 ReturnAddress 
             4017d8      4 INSTR BELONGTO 4017c0 
             4017d8      4 INSTR DEADREGS  RBX R12 R13 R14 R15 ZZ mov     [rsp+158h+var_13C], edi 
@@ -2074,9 +2046,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -2098,7 +2070,7 @@
             4020d8     23 FUNC GLOBAL sub_4020D8 FUNC_SAFE NOFP RET             4020ee 
             4020d8      4 INSTR BELONGTO 4020d8 
             4020d8      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            4020d8      8 DATAREF STACK 433 esp + 0 PARENT LocalFrame LOCALFRAME
+            4020d8      8 DATAREF STACK 405 esp + 0 PARENT LocalFrame LOCALFRAME
             4020d8      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4020dc      7 INSTR BELONGTO 4020d8 
             4020dc      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -2128,7 +2100,7 @@
             4020f5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             4020f5      4 INSTR BELONGTO 4020f0 
             4020f5      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            4020f5      8 DATAREF STACK 434 esp + 0 PARENT LocalFrame LOCALFRAME
+            4020f5      8 DATAREF STACK 406 esp + 0 PARENT LocalFrame LOCALFRAME
             4020f5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4020f9     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_6041F0, 0 
             4020f9      7 INSTR BELONGTO 4020f0 
@@ -2290,19 +2262,9 @@
             4022b1      5 PTRIMMEDESP STACK -24 displ mov     [rsp+var_18], r13
             4022b6      3 INSTR BELONGTO 402290 
             4022b6      3 INSTR DEADREGS  EFLAGS RBX R12 R13 R14 R15 ZZ mov     r15, rdi 
-            4022b9    136 DATAREF STACK 435 esp + 0 PARENT LocalFrame LOCALFRAME
-            4022b9     32 DATAREF STACK 438 esp + 16 CHILDOF 435 OFFSET 16 LOCALVAR var_78 
-            4022b9     40 DATAREF STACK 439 esp + 48 CHILDOF 435 OFFSET 48 LOCALVAR var_58 
+            4022b9    136 DATAREF STACK 407 esp + 0 PARENT LocalFrame LOCALFRAME
             4022b9      7 INSTR BELONGTO 402290 
             4022b9      7 INSTR DEADREGS  EFLAGS RBX RDI R12 R13 R14 ZZ sub     rsp, 88h 
-            4022b9      8 DATAREF STACK 436 esp + 0 CHILDOF 435 OFFSET 0 LOCALVAR var_88 
-            4022b9      8 DATAREF STACK 437 esp + 8 CHILDOF 435 OFFSET 8 LOCALVAR var_80 
-            4022b9      8 DATAREF STACK 440 esp + 88 CHILDOF 435 OFFSET 88 LOCALVAR var_30 
-            4022b9      8 DATAREF STACK 441 esp + 96 CHILDOF 435 OFFSET 96 LOCALVAR var_28 
-            4022b9      8 DATAREF STACK 442 esp + 104 CHILDOF 435 OFFSET 104 LOCALVAR var_20 
-            4022b9      8 DATAREF STACK 443 esp + 112 CHILDOF 435 OFFSET 112 LOCALVAR var_18 
-            4022b9      8 DATAREF STACK 444 esp + 120 CHILDOF 435 OFFSET 120 LOCALVAR var_10 
-            4022b9      8 DATAREF STACK 445 esp + 128 CHILDOF 435 OFFSET 128 LOCALVAR var_8 
             4022b9      8 MEMORYHOLE STACK esp + 136 ReturnAddress 
             4022c0     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1          ; nmemb 
             4022c0      5 INSTR BELONGTO 402290 
@@ -2516,18 +2478,9 @@
             40243d      5 INSTR BELONGTO 402420 
             402442      3 INSTR BELONGTO 402420 
             402442      3 INSTR DEADREGS  EFLAGS R12 R13 R14 R15 ZZ mov     rbp, rdi 
-            402445     12 DATAREF STACK 448 esp + 16 CHILDOF 446 OFFSET 16 LOCALVAR var_48 
-            402445     12 DATAREF STACK 449 esp + 28 CHILDOF 446 OFFSET 28 LOCALVAR var_3C 
             402445      4 INSTR BELONGTO 402420 
             402445      4 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ sub     rsp, 58h 
-            402445     88 DATAREF STACK 446 esp + 0 PARENT LocalFrame LOCALFRAME
-            402445      8 DATAREF STACK 447 esp + 8 CHILDOF 446 OFFSET 8 LOCALVAR var_50 
-            402445      8 DATAREF STACK 450 esp + 40 CHILDOF 446 OFFSET 40 LOCALVAR var_30 
-            402445      8 DATAREF STACK 451 esp + 48 CHILDOF 446 OFFSET 48 LOCALVAR var_28 
-            402445      8 DATAREF STACK 452 esp + 56 CHILDOF 446 OFFSET 56 LOCALVAR var_20 
-            402445      8 DATAREF STACK 453 esp + 64 CHILDOF 446 OFFSET 64 LOCALVAR var_18 
-            402445      8 DATAREF STACK 454 esp + 72 CHILDOF 446 OFFSET 72 LOCALVAR var_10 
-            402445      8 DATAREF STACK 455 esp + 80 CHILDOF 446 OFFSET 80 LOCALVAR var_8 
+            402445     88 DATAREF STACK 408 esp + 0 PARENT LocalFrame LOCALFRAME
             402445      8 MEMORYHOLE STACK esp + 88 ReturnAddress 
             402449      3 INSTR BELONGTO 402420 
             402449      3 INSTR DEADREGS  EFLAGS RDI R12 R13 R14 R15 ZZ mov     rdi, rsi 
@@ -2917,16 +2870,10 @@
             4026ed      5 INSTR BELONGTO 4026e0 
             4026f2     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r13 
             4026f2      5 INSTR BELONGTO 4026e0 
-            4026f7    200 DATAREF STACK 456 esp + 0 PARENT LocalFrame LOCALFRAME
-            4026f7     24 DATAREF STACK 458 esp + 144 CHILDOF 456 OFFSET 144 LOCALVAR rlimits 
+            4026f7    200 DATAREF STACK 409 esp + 0 PARENT LocalFrame LOCALFRAME
             4026f7      7 INSTR BELONGTO 4026e0 
             4026f7      7 INSTR DEADREGS  EFLAGS R12 R13 ZZ sub     rsp, 0C8h 
-            4026f7      8 DATAREF STACK 459 esp + 168 CHILDOF 456 OFFSET 168 LOCALVAR var_20 
-            4026f7      8 DATAREF STACK 460 esp + 176 CHILDOF 456 OFFSET 176 LOCALVAR var_18 
-            4026f7      8 DATAREF STACK 461 esp + 184 CHILDOF 456 OFFSET 184 LOCALVAR var_10 
-            4026f7      8 DATAREF STACK 462 esp + 192 CHILDOF 456 OFFSET 192 LOCALVAR var_8 
             4026f7      8 MEMORYHOLE STACK esp + 200 ReturnAddress 
-            4026f7     96 DATAREF STACK 457 esp + 48 CHILDOF 456 OFFSET 48 LOCALVAR var_98 
             4026fe     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             4026fe      3 INSTR BELONGTO 4026e0 
             402701     -2 INSTR LOCAL n R12 ZZ  NumericDEFs mov     r12d, esi 
@@ -3105,13 +3052,7 @@
             402867      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
             40286c      4 INSTR BELONGTO 402840 
             40286c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-            40286c     56 DATAREF STACK 463 esp + 0 PARENT LocalFrame LOCALFRAME
-            40286c      8 DATAREF STACK 464 esp + 8 CHILDOF 463 OFFSET 8 LOCALVAR var_30 
-            40286c      8 DATAREF STACK 465 esp + 16 CHILDOF 463 OFFSET 16 LOCALVAR var_28 
-            40286c      8 DATAREF STACK 466 esp + 24 CHILDOF 463 OFFSET 24 LOCALVAR var_20 
-            40286c      8 DATAREF STACK 467 esp + 32 CHILDOF 463 OFFSET 32 LOCALVAR var_18 
-            40286c      8 DATAREF STACK 468 esp + 40 CHILDOF 463 OFFSET 40 LOCALVAR var_10 
-            40286c      8 DATAREF STACK 469 esp + 48 CHILDOF 463 OFFSET 48 LOCALVAR var_8 
+            40286c     56 DATAREF STACK 410 esp + 0 PARENT LocalFrame LOCALFRAME
             40286c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             402870     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             402870      3 INSTR BELONGTO 402840 
@@ -3188,7 +3129,7 @@
             4028e5     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             4028e5      4 INSTR BELONGTO 4028e0 
             4028e5      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-            4028e5      8 DATAREF STACK 470 esp + 0 PARENT LocalFrame LOCALFRAME
+            4028e5      8 DATAREF STACK 411 esp + 0 PARENT LocalFrame LOCALFRAME
             4028e5      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4028e9      7 INSTR BELONGTO 4028e0 
             4028e9      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_603DC8 
@@ -3223,7 +3164,7 @@
             402918     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET             402925 
             402918      4 INSTR BELONGTO 402918 
             402918      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-            402918      8 DATAREF STACK 471 esp + 0 PARENT LocalFrame LOCALFRAME
+            402918      8 DATAREF STACK 412 esp + 0 PARENT LocalFrame LOCALFRAME
             402918      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             40291c     -1 INSTR LOCAL NoMetaUpdate call    sub_4020F0 
             40291c      5 INSTR BELONGTO 402918 
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 5fb76a3ea6d0e73657309b3b28e39047615e2df5..d84cb7dfbd7d2607e8ffb2bf47bc2c6c6fa9f40d 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 @@
-1cb3cf667adce5d918c269530a97f20a867c050f
\ No newline at end of file
+0900c7a4294e2c7bb7e37b7ac0a81c5f45949012
\ 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 3a068654d695cbae25a3bad38a965e3fac3c11a5..0eadb94014ede8af0c5f76bdc8365a62ad735ec7 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 @@
-c8c278b93f52b7821b147c6246aa07b13cf3008f
\ No newline at end of file
+956230162437e12e5bc805d586620748e25b9bb8
\ 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 dd4689517274949189a641a44d59e0c47cfa6aab..7ad8232d08eed4fb9e57318ae143d31af5dc5676 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 @@
-5166336686061fcd535d549229a006db70634890
\ No newline at end of file
+71348d28cbad3cc6a7c5e4a4f502f2aef0d2ea07
\ 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 0e200f0815e1565979d7f73eae78eec14ae5ef61..416b703a685da5d1c106922ce0c03436818c54ec 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 @@
-58f26b399ca4d130b48b11ed75d49507f6154f6d
\ No newline at end of file
+12224a7df970cfa7e4550bc27bee690fb8bc27fb
\ 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 ebed59dd026d12f7e51e8bd8b868828c1b6c4415..545360afc14c928caf2e900786fcd9e37f7885cc 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 @@
-027c1c28a35562a04e54e3559ebb2487ccb14d10
\ No newline at end of file
+00e31d280569163226f5de2bf327e29e8d3c463c
\ 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 fd01fce6093da57221a21692e3117654ed16c63e..2cc1697461bc28482e21193d23cd11f109e2a6e9 100644
--- a/tests/commit/trimmed-sorted-save-malloc.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-malloc.psexe.annot
@@ -179,10 +179,13 @@
            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     12 DATAREF STACK 45 esp + 0 PARENT LocalFrame LOCALFRAME
+           8048547      4 DATAREF STACK 46 esp + 0 CHILDOF 45 OFFSET 0 OutArgsRegion OUTARGS
            8048547      4 MEMORYHOLE STACK esp + 32 ReturnAddress 
            8048547      5 INSTR BELONGTO 8048530 
            8048547      5 INSTR DEADREGS  EFLAGS ESI ZZ push    offset main     ; main 
+           8048547      8 MEMORYHOLE STACK esp + 20 CalleeSavedRegs 
+           8048547      8 MEMORYHOLE STACK esp + 4 CalleeSavedRegs 
            804854c     -1 INSTR LOCAL NoMetaUpdate call    ___libc_start_main 
            804854c      5 INSTR BELONGTO 8048530 
            804854c      5 INSTR DEADREGS  EFLAGS ESI ZZ call    ___libc_start_main 
@@ -201,7 +204,7 @@
            8048563     -3 INSTR LOCAL NoWarn push    ebx 
            8048564      3 INSTR BELONGTO 8048560 
            8048564      3 INSTR DEADREGS  EFLAGS EBX ZZ sub     esp, 4 
-           8048564      4 DATAREF STACK 45 esp + 0 PARENT LocalFrame LOCALFRAME
+           8048564      4 DATAREF STACK 47 esp + 0 PARENT LocalFrame LOCALFRAME
            8048564      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
            8048564      8 MEMORYHOLE STACK esp + 4 CalleeSavedRegs 
            8048567     -1 INSTR LOCAL NoMetaUpdate cmp     ds:completed_6159, 0 
@@ -255,10 +258,10 @@
            80485c0     -3 INSTR LOCAL NoWarn push    ebp 
            80485c1      2 INSTR BELONGTO 80485c0 
            80485c1      2 INSTR DEADREGS  EFLAGS EAX ZZ mov     ebp, esp 
-           80485c3     24 DATAREF STACK 46 esp + 0 PARENT LocalFrame LOCALFRAME
+           80485c3     24 DATAREF STACK 48 esp + 0 PARENT LocalFrame LOCALFRAME
            80485c3      3 INSTR BELONGTO 80485c0 
            80485c3      3 INSTR DEADREGS  EFLAGS EAX ZZ sub     esp, 18h 
-           80485c3      4 DATAREF STACK 47 esp + 0 CHILDOF 46 OFFSET 0 OutArgsRegion OUTARGS
+           80485c3      4 DATAREF STACK 49 esp + 0 CHILDOF 48 OFFSET 0 OutArgsRegion OUTARGS
            80485c3      4 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
            80485c3      4 MEMORYHOLE STACK esp + 28 ReturnAddress 
            80485c6      5 INSTR BELONGTO 80485c0 
@@ -286,15 +289,11 @@
            80485e2     24 DEALLOC STACK esp - 24 retn
            80485f0      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 ZZ
            80485f0      0 FUNC MMSAFENESS SAFE
-           80485f0     16 DATAREF STACK 49 esp + 0 CHILDOF 48 OFFSET 0 OutArgsRegion OUTARGS
+           80485f0     16 DATAREF STACK 51 esp + 0 CHILDOF 50 OFFSET 0 OutArgsRegion OUTARGS
            80485f0    209 FUNC GLOBAL dohanoi FUNC_UNSAFE NOFP RET            80486c0 
            80485f0      3 INSTR BELONGTO 80485f0 
            80485f0      3 INSTR DEADREGS  EFLAGS EAX ZZ sub     esp, 2Ch 
-           80485f0     44 DATAREF STACK 48 esp + 0 PARENT LocalFrame LOCALFRAME
-           80485f0      4 DATAREF STACK 50 esp + 28 CHILDOF 48 OFFSET 28 LOCALVAR var_10 
-           80485f0      4 DATAREF STACK 51 esp + 32 CHILDOF 48 OFFSET 32 LOCALVAR var_C 
-           80485f0      4 DATAREF STACK 52 esp + 36 CHILDOF 48 OFFSET 36 LOCALVAR var_8 
-           80485f0      4 DATAREF STACK 53 esp + 40 CHILDOF 48 OFFSET 40 LOCALVAR var_4 
+           80485f0     44 DATAREF STACK 50 esp + 0 PARENT LocalFrame LOCALFRAME
            80485f0      4 MEMORYHOLE STACK esp + 44 ReturnAddress 
            80485f3      4 INSTR BELONGTO 80485f0 
            80485f3      4 INSTR DEADREGS  EFLAGS EAX ZZ mov     [esp+2Ch+var_10], ebx 
@@ -451,8 +450,8 @@
            80486c6      3 INSTR BELONGTO 80486c1 
            80486c6      3 INSTR DEADREGS  EFLAGS EAX EBX ESI ZZ and     esp, 0FFFFFFF0h 
            80486c9     12 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
-           80486c9     16 DATAREF STACK 54 esp + 0 PARENT LocalFrame LOCALFRAME
-           80486c9     16 DATAREF STACK 55 esp + 0 CHILDOF 54 OFFSET 0 OutArgsRegion OUTARGS
+           80486c9     16 DATAREF STACK 52 esp + 0 PARENT LocalFrame LOCALFRAME
+           80486c9     16 DATAREF STACK 53 esp + 0 CHILDOF 52 OFFSET 0 OutArgsRegion OUTARGS
            80486c9      3 INSTR BELONGTO 80486c1 
            80486c9      3 INSTR DEADREGS  EFLAGS EAX EBX ESI ZZ sub     esp, 10h 
            80486c9      4 MEMORYHOLE STACK esp + 28 ReturnAddress 
@@ -629,9 +628,9 @@
            80487f4      5 INSTR DEADREGS  EFLAGS ESI EDI ZZ call    __i686_get_pc_thunk_bx 
            80487f9     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     ebx, 17FBh 
            80487f9      6 INSTR BELONGTO 80487f0 
-           80487ff     12 DATAREF STACK 57 esp + 0 CHILDOF 56 OFFSET 0 OutArgsRegion OUTARGS
+           80487ff     12 DATAREF STACK 55 esp + 0 CHILDOF 54 OFFSET 0 OutArgsRegion OUTARGS
            80487ff     16 MEMORYHOLE STACK esp + 28 CalleeSavedRegs 
-           80487ff     28 DATAREF STACK 56 esp + 0 PARENT LocalFrame LOCALFRAME
+           80487ff     28 DATAREF STACK 54 esp + 0 PARENT LocalFrame LOCALFRAME
            80487ff      3 INSTR BELONGTO 80487f0 
            80487ff      3 INSTR DEADREGS  EFLAGS ESI EDI ZZ sub     esp, 1Ch 
            80487ff      4 MEMORYHOLE STACK esp + 44 ReturnAddress 
@@ -725,7 +724,7 @@
            8048873     -3 INSTR LOCAL NoWarn push    ebx 
            8048874      3 INSTR BELONGTO 8048870 
            8048874      3 INSTR DEADREGS  EFLAGS EAX EBX ZZ sub     esp, 4 
-           8048874      4 DATAREF STACK 58 esp + 0 PARENT LocalFrame LOCALFRAME
+           8048874      4 DATAREF STACK 56 esp + 0 PARENT LocalFrame LOCALFRAME
            8048874      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
            8048874      8 MEMORYHOLE STACK esp + 4 CalleeSavedRegs 
            8048877      5 INSTR BELONGTO 8048870 
@@ -767,7 +766,7 @@
            804889d      3 INSTR DEADREGS  EFLAGS EBX ZZ sub     esp, 8 
            804889d      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
            804889d      4 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
-           804889d      8 DATAREF STACK 59 esp + 0 PARENT LocalFrame LOCALFRAME
+           804889d      8 DATAREF STACK 57 esp + 0 PARENT LocalFrame LOCALFRAME
            80488a0     -1 INSTR LOCAL NoMetaUpdate call    $+5 
            80488a0      5 INSTR BELONGTO 804889c 
            80488a5      1 INSTR BELONGTO 804889c 
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 aefd762cf629167b4f5d38dea93f9ee226ccccf5..2093af27bec25917f38d940d1af5389219e508ef 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 @@
-c500e0bc9bf8fd4a0a120eab6dc2a5dbeeeacf21
\ No newline at end of file
+eb911ce15393177470f0d2b9a01232165ea016b0
\ 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 c1c523cabf485c213c1e188304363395a1b1c2fc..a565d43d835de48d0f381932194b39e433748a52 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 @@
-7993c2840abc64f103db954ae5538ed11d12e67d
\ No newline at end of file
+233a5a6d4fc6307d4152a0aecb9729af4944fee0
\ 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 26d6e1782d934bae48e5efc062d39285cb012d16..c1749668b6751bc4ccfbed2201abd709f5b0cd4f 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 @@
-2b72fd3e591c8adbc5b422c1e3624ae115115245
\ No newline at end of file
+9feaeb7eb4b9cabd1744d23576f27f37c8263f75
\ 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 4bd824d4cd85f5980ff1c6f959707ec10bebc2a0..a114f8e602a124417718c7969d81d3fb8a84b365 100644
--- a/tests/commit/trimmed-sorted-save-toy.exe.annot
+++ b/tests/commit/trimmed-sorted-save-toy.exe.annot
@@ -1,592 +1,588 @@
-         0     12 DATAREF GLOBAL       14 8049640 PARENT _GLOBAL_OFFSET_TABLE_  VOID RW
-         0     18 DATAREF GLOBAL        4 8048530 PARENT s  VOID RO
-         0      1 DATAREF GLOBAL       22 8049668 PARENT completed.5758  VOID RW
-         0     22 DATAREF GLOBAL        6 8048545 PARENT aXDYDZD  VOID RO
-         0      3 DATAREF GLOBAL       23 8049669 PARENT SMP_dummy0  VOID RW
-         0      3 DATAREF GLOBAL        5 8048542 PARENT format  VOID RO
-         0      4 DATAREF GLOBAL       10 8049568 PARENT __DTOR_LIST__  VOID RW
-         0      4 DATAREF GLOBAL       11 804956c PARENT __DTOR_END__  VOID RW
-         0      4 DATAREF GLOBAL       12 8049570 PARENT __JCR_LIST__  VOID RW
-         0      4 DATAREF GLOBAL       13 804963c PARENT __gmon_start___ptr  OFFSET RW
-         0      4 DATAREF GLOBAL       15 804964c PARENT off_804964C  OFFSET RW
-         0      4 DATAREF GLOBAL       16 8049650 PARENT off_8049650  OFFSET RW
-         0      4 DATAREF GLOBAL       17 8049654 PARENT off_8049654  OFFSET RW
-         0      4 DATAREF GLOBAL        1 8048524 PARENT _fp_hw  VOID RO
-         0      4 DATAREF GLOBAL       18 8049658 PARENT off_8049658  OFFSET RW
-         0      4 DATAREF GLOBAL       19 804965c PARENT off_804965C  OFFSET RW
-         0      4 DATAREF GLOBAL       20 8049660 PARENT __data_start  VOID RW
-         0      4 DATAREF GLOBAL       21 8049664 PARENT p.5756  OFFSET RW
-         0      4 DATAREF GLOBAL        2 8048528 PARENT _IO_stdin_used  VOID RO
-         0      4 DATAREF GLOBAL        3 804852c PARENT __dso_handle  VOID RO
-         0      4 DATAREF GLOBAL        7 804855c PARENT __FRAME_END__  VOID RO
-         0      4 DATAREF GLOBAL        8 8049560 PARENT __CTOR_LIST__  VOID RW
-         0      4 DATAREF GLOBAL        9 8049564 PARENT __CTOR_END__  VOID RW
-   8048290      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 -4 0 6 0 0 7 0 0 ZZ
-   8048290      0 FUNC MMSAFENESS SAFE
-   8048290      1 INSTR BELONGTO 8048290 
-   8048290      1 INSTR DEADREGS  EFLAGS ZZ push    ebp             ; _init 
-   8048290     23 FUNC GLOBAL .init_proc FUNC_UNSAFE USEFP RET    80482a6 
-   8048290     -3 INSTR LOCAL NoWarn push    ebp             ; _init 
-   8048291      2 INSTR BELONGTO 8048290 
-   8048291      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, esp 
-   8048293      3 INSTR BELONGTO 8048290 
-   8048293      3 INSTR DEADREGS  EFLAGS ZZ sub     esp, 8 
-   8048293      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
-   8048293      4 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
-   8048293      8 DATAREF STACK 24 esp + 0 PARENT LocalFrame LOCALFRAME
-   8048296     -1 INSTR LOCAL NoMetaUpdate call    call_gmon_start 
-   8048296      5 INSTR BELONGTO 8048290 
-   8048296      5 INSTR DEADREGS  EFLAGS ZZ call    call_gmon_start 
-   804829b     -1 INSTR LOCAL NoMetaUpdate call    frame_dummy 
-   804829b      5 INSTR BELONGTO 8048290 
-   804829b      5 INSTR DEADREGS  EFLAGS EAX ECX EDX ZZ call    frame_dummy 
-   80482a0     -1 INSTR LOCAL NoMetaUpdate call    __do_global_ctors_aux 
-   80482a0      5 INSTR BELONGTO 8048290 
-   80482a0      5 INSTR DEADREGS  EFLAGS EAX ECX EDX ZZ call    __do_global_ctors_aux 
-   80482a5      1 INSTR BELONGTO 8048290 
-   80482a5      1 INSTR DEADREGS  EFLAGS ZZ leave 
-   80482a6      1 INSTR BELONGTO 8048290 
-   80482a6      1 INSTR DEADREGS  EFLAGS ZZ retn 
-   80482a6      8 DEALLOC STACK esp - 8 retn
-   80482b8      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
-   80482b8      0 FUNC MMSAFENESS UNSAFE
-   80482b8     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_804964C 
-   80482b8      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
-   80482b8      6 FUNC GLOBAL .__gmon_start__ FUNC_UNSAFE NOFP RET    80482bd 
-   80482b8      6 INSTR BELONGTO 80482b8 
-   80482c8      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
-   80482c8      0 FUNC MMSAFENESS UNSAFE
-   80482c8     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_8049650 
-   80482c8      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
-   80482c8      6 FUNC GLOBAL .__libc_start_main FUNC_UNSAFE NOFP RET    80482cd 
-   80482c8      6 INSTR BELONGTO 80482c8 
-   80482d8      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
-   80482d8      0 FUNC MMSAFENESS UNSAFE
-   80482d8     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_8049654 
-   80482d8      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
-   80482d8      6 FUNC GLOBAL .scanf FUNC_UNSAFE NOFP RET    80482dd 
-   80482d8      6 INSTR BELONGTO 80482d8 
-   80482e8      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
-   80482e8      0 FUNC MMSAFENESS UNSAFE
-   80482e8     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_8049658 
-   80482e8      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
-   80482e8      6 FUNC GLOBAL .printf FUNC_UNSAFE NOFP RET    80482ed 
-   80482e8      6 INSTR BELONGTO 80482e8 
-   80482f8      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
-   80482f8      0 FUNC MMSAFENESS UNSAFE
-   80482f8     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_804965C 
-   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 -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 
-   8048312      1 INSTR BELONGTO 8048310 
-   8048312      1 INSTR DEADREGS  EFLAGS ECX ESI ZZ pop     esi 
-   8048313      2 INSTR BELONGTO 8048310 
-   8048313      2 INSTR DEADREGS  EFLAGS ECX ZZ mov     ecx, esp 
-   8048313      2 PTRIMMEDESP STACK 0 displ mov     ecx, esp
-   8048315      3 INSTR BELONGTO 8048310 
-   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 
-   804832c      5 INSTR BELONGTO 8048310 
-   804832c      5 INSTR DEADREGS  EFLAGS ESI ZZ call    ___libc_start_main 
-   8048331      1 INSTR BELONGTO 8048310 
-   8048331      1 INSTR DEADREGS  EFLAGS EAX ECX EDX ESI ZZ hlt 
-   8048334      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 8 5 -4 0 6 0 0 7 0 0 ZZ
-   8048334      0 FUNC MMSAFENESS SAFE
-   8048334      1 INSTR BELONGTO 8048334 
-   8048334      1 INSTR DEADREGS  EFLAGS ZZ push    ebp 
-   8048334     38 FUNC GLOBAL call_gmon_start FUNC_UNSAFE USEFP RET    8048359 
-   8048334     -3 INSTR LOCAL NoWarn push    ebp 
-   8048335      2 INSTR BELONGTO 8048334 
-   8048335      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, esp 
-   8048337      1 INSTR BELONGTO 8048334 
-   8048337      1 INSTR DEADREGS  EFLAGS ZZ push    ebx 
-   8048337     -3 INSTR LOCAL NoWarn push    ebx 
-   8048338      3 INSTR BELONGTO 8048334 
-   8048338      3 INSTR DEADREGS  EFLAGS EBX ZZ sub     esp, 4 
-   8048338      4 DATAREF STACK 25 esp + 0 PARENT LocalFrame LOCALFRAME
-   8048338      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
-   8048338      8 MEMORYHOLE STACK esp + 4 CalleeSavedRegs 
-   804833b     -1 INSTR LOCAL NoMetaUpdate call    $+5 
-   804833b      5 INSTR BELONGTO 8048334 
-   8048340      1 INSTR BELONGTO 8048334 
-   8048340      1 INSTR DEADREGS  EFLAGS EDX EBX ZZ pop     ebx 
-   8048341     -1 INSTR LOCAL MetadataUnused add     ebx, 1300h 
-   8048341      6 INSTR BELONGTO 8048334 
-   8048347      6 INSTR BELONGTO 8048334 
-   8048347      6 INSTR DEADREGS  EFLAGS EDX ZZ mov     edx, ds:(__gmon_start___ptr - 8049640h)[ebx] 
-   804834d     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
-   804834d      2 INSTR BELONGTO 8048334 
-   804834f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_8048356 
-   804834f      2 INSTR BELONGTO 8048334 
-   8048351     -1 INSTR LOCAL NoMetaUpdate call    ___gmon_start__ 
-   8048351      5 INSTR BELONGTO 8048334 
-   8048351      5 INSTR DEADREGS  EFLAGS EBX ZZ call    ___gmon_start__ 
-   8048356      1 INSTR BELONGTO 8048334 
-   8048356      1 INSTR DEADREGS  EFLAGS EAX EBX ZZ pop     eax 
-   8048357      1 INSTR BELONGTO 8048334 
-   8048357      1 INSTR DEADREGS  EFLAGS EBX ZZ pop     ebx 
-   8048358      1 INSTR BELONGTO 8048334 
-   8048358      1 INSTR DEADREGS  EFLAGS ZZ leave 
-   8048359      1 INSTR BELONGTO 8048334 
-   8048359      1 INSTR DEADREGS  EFLAGS ZZ retn 
-   8048359      4 DEALLOC STACK esp - 4 retn
-   8048360      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 0 0 4 0 8 5 -4 0 6 0 0 7 0 0 ZZ
-   8048360      0 FUNC MMSAFENESS SPECSAFE
-   8048360      1 INSTR BELONGTO 8048360 
-   8048360      1 INSTR DEADREGS  EFLAGS ZZ push    ebp 
-   8048360     -3 INSTR LOCAL NoWarn push    ebp 
-   8048360     47 FUNC GLOBAL __do_global_dtors_aux FUNC_UNSAFE USEFP RET    804838e 
-   8048361      2 INSTR BELONGTO 8048360 
-   8048361      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, esp 
-   8048363      3 INSTR BELONGTO 8048360 
-   8048363      3 INSTR DEADREGS  EFLAGS ZZ sub     esp, 8 
-   8048363      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
-   8048363      4 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
-   8048363      8 DATAREF STACK 26 esp + 0 PARENT LocalFrame LOCALFRAME
-   8048366     -1 INSTR LOCAL NoMetaUpdate cmp     ds:completed_5758, 0 
-   8048366      7 INSTR BELONGTO 8048360 
-   804836d     -1 INSTR LOCAL NoMetaUpdate jz      short loc_804837B 
-   804836d      2 INSTR BELONGTO 8048360 
-   804836f     -1 INSTR LOCAL NoMetaUpdate jmp     short locret_804838D 
-   804836f      2 INSTR BELONGTO 8048360 
-   8048371     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     eax, 4 
-   8048371      3 INSTR BELONGTO 8048360 
-   8048374      5 INSTR BELONGTO 8048360 
-   8048374      5 INSTR DEADREGS  EFLAGS ZZ mov     p_5756, eax 
-   8048379     -1 INSTR LOCAL NoMetaUpdate call    edx 
-   8048379      2 INSTR BELONGTO 8048360 
-   804837b      5 INSTR BELONGTO 8048360 
-   804837b      5 INSTR DEADREGS  EFLAGS EAX EDX ZZ mov     eax, p_5756 
-   8048380      2 INSTR BELONGTO 8048360 
-   8048380      2 INSTR DEADREGS  EFLAGS EDX ZZ mov     edx, [eax] 
-   8048382     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
-   8048382      2 INSTR BELONGTO 8048360 
-   8048384     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_8048371 
-   8048384      2 INSTR BELONGTO 8048360 
-   8048386      7 INSTR BELONGTO 8048360 
-   8048386      7 INSTR DEADREGS  EFLAGS ZZ mov     ds:completed_5758, 1 
-   804838d      1 INSTR BELONGTO 8048360 
-   804838d      1 INSTR DEADREGS  EFLAGS ZZ leave 
-   804838e      1 INSTR BELONGTO 8048360 
-   804838e      1 INSTR DEADREGS  EFLAGS ZZ retn 
-   804838e      8 DEALLOC STACK esp - 8 retn
-   8048390      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 -4 0 6 0 0 7 0 0 ZZ
-   8048390      0 FUNC MMSAFENESS SPECSAFE
-   8048390      1 INSTR BELONGTO 8048390 
-   8048390      1 INSTR DEADREGS  EFLAGS EAX ZZ push    ebp 
-   8048390     35 FUNC GLOBAL frame_dummy FUNC_UNSAFE USEFP RET    80483b2 
-   8048390     -3 INSTR LOCAL NoWarn push    ebp 
-   8048391      2 INSTR BELONGTO 8048390 
-   8048391      2 INSTR DEADREGS  EFLAGS EAX ZZ mov     ebp, esp 
-   8048393      3 INSTR BELONGTO 8048390 
-   8048393      3 INSTR DEADREGS  EFLAGS EAX ZZ sub     esp, 8 
-   8048393      4 DATAREF STACK 28 esp + 0 CHILDOF 27 OFFSET 0 OutArgsRegion OUTARGS
-   8048393      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
-   8048393      4 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
-   8048393      8 DATAREF STACK 27 esp + 0 PARENT LocalFrame LOCALFRAME
-   8048396      5 INSTR BELONGTO 8048390 
-   8048396      5 INSTR DEADREGS  EFLAGS EAX ZZ mov     eax, ds:__JCR_LIST__ 
-   804839b     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
-   804839b      2 INSTR BELONGTO 8048390 
-   804839d     -1 INSTR LOCAL NoMetaUpdate jz      short locret_80483B1 
-   804839d      2 INSTR BELONGTO 8048390 
-   804839f     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
-   804839f      5 INSTR BELONGTO 8048390 
-   804839f      5 INSTR DEADREGS  EFLAGS EAX ZZ mov     eax, 0 
-   80483a4     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
-   80483a4      2 INSTR BELONGTO 8048390 
-   80483a6     -1 INSTR LOCAL NoMetaUpdate jz      short locret_80483B1 
-   80483a6      2 INSTR BELONGTO 8048390 
-   80483a8      7 INSTR BELONGTO 8048390 
-   80483a8      7 INSTR DEADREGS  EFLAGS ZZ mov     dword ptr [esp], offset __JCR_LIST__ 
-   80483a8      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [esp], offset __JCR_LIST__
-   80483af     -1 INSTR LOCAL NoMetaUpdate call    eax 
-   80483af      2 INSTR BELONGTO 8048390 
-   80483b1      1 INSTR BELONGTO 8048390 
-   80483b1      1 INSTR DEADREGS  EFLAGS ZZ leave 
-   80483b2      1 INSTR BELONGTO 8048390 
-   80483b2      1 INSTR DEADREGS  EFLAGS ZZ retn 
-   80483b2      8 DEALLOC STACK esp - 8 retn
-   80483b4      0 FUNC FRAMERESTORE 0 0 1 1 -12 8 2 0 0 3 0 0 4 0 8 5 -8 0 6 0 0 7 0 0 ZZ
-   80483b4      0 FUNC MMSAFENESS UNSAFE
-   80483b4    163 FUNC GLOBAL main FUNC_UNSAFE USEFP RET    8048456 
-   80483b4      4 INSTR BELONGTO 80483b4 
-   80483b4      4 INSTR DEADREGS  EFLAGS ECX ZZ lea     ecx, [esp+4] 
-   80483b4      4 PTRIMMEDESP STACK 4 displ lea     ecx, [esp+4]
-   80483b8      3 INSTR BELONGTO 80483b4 
-   80483b8      3 INSTR DEADREGS  EFLAGS ZZ and     esp, 0FFFFFFF0h 
-   80483bb      3 INSTR BELONGTO 80483b4 
-   80483bb      3 INSTR DEADREGS  EFLAGS ZZ push    dword ptr [ecx-4] 
-   80483bb     -3 INSTR LOCAL NoWarn push    dword ptr [ecx-4] 
-   80483be      1 INSTR BELONGTO 80483b4 
-   80483be      1 INSTR DEADREGS  EFLAGS ZZ push    ebp 
-   80483be     -3 INSTR LOCAL NoWarn push    ebp 
-   80483bf      2 INSTR BELONGTO 80483b4 
-   80483bf      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, esp 
-   80483c1      1 INSTR BELONGTO 80483b4 
-   80483c1      1 INSTR DEADREGS  EFLAGS ZZ push    ecx 
-   80483c1     -3 INSTR LOCAL NoWarn push    ecx 
-   80483c2     12 MEMORYHOLE STACK esp + 36 CalleeSavedRegs 
-   80483c2     16 DATAREF STACK 30 esp + 0 CHILDOF 29 OFFSET 0 OutArgsRegion OUTARGS
-   80483c2     36 DATAREF STACK 29 esp + 0 PARENT LocalFrame LOCALFRAME
-   80483c2      3 INSTR BELONGTO 80483b4 
-   80483c2      3 INSTR DEADREGS  EFLAGS ZZ sub     esp, 24h 
-   80483c2      4 DATAREF STACK 31 esp + 24 CHILDOF 29 OFFSET 24 LOCALVAR x 
-   80483c2      4 DATAREF STACK 32 esp + 28 CHILDOF 29 OFFSET 28 LOCALVAR y 
-   80483c2      4 DATAREF STACK 33 esp + 32 CHILDOF 29 OFFSET 32 LOCALVAR z 
-   80483c2      4 MEMORYHOLE STACK esp + 48 ReturnAddress 
-   80483c5      7 INSTR BELONGTO 80483b4 
-   80483c5      7 INSTR DEADREGS  EFLAGS ZZ mov     [ebp+y], 2 
-   80483c5      7 PTRIMMEDEBP STACK -12 displ mov     [ebp+y], 2
-   80483cc      7 INSTR BELONGTO 80483b4 
-   80483cc      7 INSTR DEADREGS  EFLAGS ZZ mov     [ebp+z], 0Dh 
-   80483cc      7 PTRIMMEDEBP STACK -8 displ mov     [ebp+z], 0Dh
-   80483d3      7 INSTR BELONGTO 80483b4 
-   80483d3      7 INSTR DEADREGS  EFLAGS ZZ mov     dword ptr [esp], offset s; "Enter an integer." 
-   80483d3      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [esp], offset s; "Enter an integer."
-   80483da     -1 INSTR LOCAL NoMetaUpdate call    _puts 
-   80483da      5 INSTR BELONGTO 80483b4 
-   80483da      5 INSTR DEADREGS  EFLAGS ZZ call    _puts 
-   80483df      3 INSTR BELONGTO 80483b4 
-   80483df      3 INSTR DEADREGS  EFLAGS EAX ZZ lea     eax, [ebp+x] 
-   80483df      3 PTRIMMEDEBP STACK -16 displ lea     eax, [ebp+x]
-   80483e2      4 INSTR BELONGTO 80483b4 
-   80483e2      4 INSTR DEADREGS  EFLAGS ZZ mov     [esp+4], eax 
-   80483e2      4 PTRIMMEDESP STACK 4 displ mov     [esp+4], eax
-   80483e6      7 INSTR BELONGTO 80483b4 
-   80483e6      7 INSTR DEADREGS  EFLAGS ZZ mov     dword ptr [esp], offset format; "%d" 
-   80483e6      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [esp], offset format; "%d"
-   80483ed     -1 INSTR LOCAL NoMetaUpdate call    _scanf 
-   80483ed      5 INSTR BELONGTO 80483b4 
-   80483ed      5 INSTR DEADREGS  EFLAGS ZZ call    _scanf 
-   80483f2     -1 INSTR LOCAL MetadataUnused mov     eax, [ebp+x] 
-   80483f2      3 INSTR BELONGTO 80483b4 
-   80483f5     -1 INSTR LOCAL NoMetaUpdate cmp     eax, [ebp+z] 
-   80483f5      3 INSTR BELONGTO 80483b4 
-   80483f5      3 PTRIMMEDEBP STACK -8 displ cmp     eax, [ebp+z]
-   80483f8     -1 INSTR LOCAL NoMetaUpdate jge     short loc_804840B 
-   80483f8      2 INSTR BELONGTO 80483b4 
-   80483fa      3 INSTR BELONGTO 80483b4 
-   80483fa      3 INSTR DEADREGS  EFLAGS EAX ECX EDX ZZ mov     eax, [ebp+x] 
-   80483fa      3 PTRIMMEDEBP STACK -16 displ mov     eax, [ebp+x]
-   80483fd     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, [ebp+z] 
-   80483fd      3 INSTR BELONGTO 80483b4 
-   80483fd      3 INSTR DEADREGS  EFLAGS ECX EDX ZZ mov     edx, [ebp+z] 
-   80483fd      3 PTRIMMEDEBP STACK -8 displ mov     edx, [ebp+z]
-   8048400      2 INSTR BELONGTO 80483b4 
-   8048400      2 INSTR DEADREGS  EFLAGS ECX ZZ mov     ecx, edx 
-   8048400     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, edx 
-   8048402     -1 INSTR LOCAL MetadataRedundant sub     ecx, eax 
-   8048402      2 INSTR BELONGTO 80483b4 
-   8048404      2 INSTR BELONGTO 80483b4 
-   8048404      2 INSTR DEADREGS  EFLAGS EAX EDX ZZ mov     eax, ecx 
-   8048404     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ecx 
-   8048406      3 INSTR BELONGTO 80483b4 
-   8048406      3 INSTR DEADREGS  EFLAGS EDX ZZ mov     [ebp+y], eax 
-   8048406      3 PTRIMMEDEBP STACK -12 displ mov     [ebp+y], eax
-   8048409     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_8048417 
-   8048409      2 INSTR BELONGTO 80483b4 
-   804840b      3 INSTR BELONGTO 80483b4 
-   804840b      3 INSTR DEADREGS  EFLAGS EAX EDX ZZ mov     eax, [ebp+x] 
-   804840b      3 PTRIMMEDEBP STACK -16 displ mov     eax, [ebp+x]
-   804840e     -1 INSTR LOCAL 2ndSrcNumeric sub     eax, [ebp+y] 
-   804840e      3 INSTR BELONGTO 80483b4 
-   804840e      3 PTRIMMEDEBP STACK -12 displ sub     eax, [ebp+y]
-   8048411     -1 INSTR LOCAL 2ndSrcNumeric add     eax, [ebp+z] 
-   8048411      3 INSTR BELONGTO 80483b4 
-   8048411      3 PTRIMMEDEBP STACK -8 displ add     eax, [ebp+z]
-   8048414      3 INSTR BELONGTO 80483b4 
-   8048414      3 INSTR DEADREGS  EFLAGS EDX ZZ mov     [ebp+y], eax 
-   8048414      3 PTRIMMEDEBP STACK -12 displ mov     [ebp+y], eax
-   8048417     -1 INSTR LOCAL MetadataUnused mov     eax, [ebp+x] 
-   8048417      3 INSTR BELONGTO 80483b4 
-   804841a     -1 INSTR LOCAL NoMetaUpdate cmp     eax, [ebp+z] 
-   804841a      3 INSTR BELONGTO 80483b4 
-   804841a      3 PTRIMMEDEBP STACK -8 displ cmp     eax, [ebp+z]
-   804841d     -1 INSTR LOCAL NoMetaUpdate jge     short loc_8048428 
-   804841d      2 INSTR BELONGTO 80483b4 
-   804841f      3 INSTR BELONGTO 80483b4 
-   804841f      3 INSTR DEADREGS  EFLAGS EAX EDX ZZ mov     eax, [ebp+x] 
-   804841f      3 PTRIMMEDEBP STACK -16 displ mov     eax, [ebp+x]
-   8048422     -1 INSTR LOCAL 2ndSrcNumeric add     eax, [ebp+y] 
-   8048422      3 INSTR BELONGTO 80483b4 
-   8048422      3 PTRIMMEDEBP STACK -12 displ add     eax, [ebp+y]
-   8048425      3 INSTR BELONGTO 80483b4 
-   8048425      3 INSTR DEADREGS  EFLAGS EDX ZZ mov     [ebp+x], eax 
-   8048425      3 PTRIMMEDEBP STACK -16 displ mov     [ebp+x], eax
-   8048428      3 INSTR BELONGTO 80483b4 
-   8048428      3 INSTR DEADREGS  EFLAGS EAX EDX ZZ mov     edx, [ebp+x] 
-   8048428      3 PTRIMMEDEBP STACK -16 displ mov     edx, [ebp+x]
-   804842b     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [ebp+z] 
-   804842b      3 INSTR BELONGTO 80483b4 
-   804842b      3 INSTR DEADREGS  EFLAGS EAX ZZ mov     eax, [ebp+z] 
-   804842b      3 PTRIMMEDEBP STACK -8 displ mov     eax, [ebp+z]
-   804842e      4 INSTR BELONGTO 80483b4 
-   804842e      4 INSTR DEADREGS  EFLAGS ZZ mov     [esp+0Ch], eax 
-   804842e      4 PTRIMMEDESP STACK 12 displ mov     [esp+0Ch], eax
-   8048432     -1 INSTR LOCAL MetadataRedundant mov     eax, [ebp+y] 
-   8048432      3 INSTR BELONGTO 80483b4 
-   8048435      4 INSTR BELONGTO 80483b4 
-   8048435      4 INSTR DEADREGS  EFLAGS ZZ mov     [esp+8], eax 
-   8048435      4 PTRIMMEDESP STACK 8 displ mov     [esp+8], eax
-   8048439      4 INSTR BELONGTO 80483b4 
-   8048439      4 INSTR DEADREGS  EFLAGS ZZ mov     [esp+4], edx 
-   8048439      4 PTRIMMEDESP STACK 4 displ mov     [esp+4], edx
-   804843d      7 INSTR BELONGTO 80483b4 
-   804843d      7 INSTR DEADREGS  EFLAGS ZZ mov     dword ptr [esp], offset aXDYDZD; "x = %d y = %d z = %d\n" 
-   804843d      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [esp], offset aXDYDZD; "x = %d y = %d z = %d\n"
-   8048444     -1 INSTR LOCAL NoMetaUpdate call    _printf 
-   8048444      5 INSTR BELONGTO 80483b4 
-   8048444      5 INSTR DEADREGS  EFLAGS ZZ call    _printf 
-   8048449     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
-   8048449      5 INSTR BELONGTO 80483b4 
-   8048449      5 INSTR DEADREGS  EFLAGS EAX ECX ZZ mov     eax, 0 
-   804844e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     esp, 24h 
-   804844e      3 INSTR BELONGTO 80483b4 
-   8048451      1 INSTR BELONGTO 80483b4 
-   8048451      1 INSTR DEADREGS  EFLAGS ECX ZZ pop     ecx 
-   8048451     36 DEALLOC STACK esp - 36 pop     ecx
-   8048452      1 INSTR BELONGTO 80483b4 
-   8048452      1 INSTR DEADREGS  EFLAGS ZZ pop     ebp 
-   8048453      3 INSTR BELONGTO 80483b4 
-   8048453      3 INSTR DEADREGS  EFLAGS ZZ lea     esp, [ecx-4] 
-   8048456      1 INSTR BELONGTO 80483b4 
-   8048456      1 INSTR DEADREGS  EFLAGS ZZ retn 
-   8048460      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 -4 0 6 0 0 7 0 0 ZZ
-   8048460      0 FUNC MMSAFENESS SAFE
-   8048460      1 INSTR BELONGTO 8048460 
-   8048460      1 INSTR DEADREGS  EFLAGS ZZ push    ebp 
-   8048460     -3 INSTR LOCAL NoWarn push    ebp 
-   8048460     -3 INSTR LOCAL NoWarn push    ebp 
-   8048460      4 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
-   8048460      4 MEMORYHOLE STACK esp + 4 ReturnAddress 
-   8048460      5 FUNC GLOBAL __libc_csu_fini FUNC_SAFE USEFP RET FUNC_LEAF    8048464 
-   8048461      2 INSTR BELONGTO 8048460 
-   8048461      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, esp 
-   8048463      1 INSTR BELONGTO 8048460 
-   8048463      1 INSTR DEADREGS  EFLAGS ZZ pop     ebp 
-   8048464      1 INSTR BELONGTO 8048460 
-   8048464      1 INSTR DEADREGS  EFLAGS ZZ retn 
-   8048464     -4 INSTR LOCAL SafeReturn retn
-   8048470      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 1 3 -16 4 4 0 8 5 -4 0 6 -12 0 7 -8 0 ZZ
-   8048470      0 FUNC MMSAFENESS SPECSAFE
-   8048470    105 FUNC GLOBAL __libc_csu_init FUNC_UNSAFE USEFP RET    80484d8 
-   8048470      1 INSTR BELONGTO 8048470 
-   8048470      1 INSTR DEADREGS  EFLAGS ZZ push    ebp 
-   8048470     -3 INSTR LOCAL NoWarn push    ebp 
-   8048471      2 INSTR BELONGTO 8048470 
-   8048471      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, esp 
-   8048473      1 INSTR BELONGTO 8048470 
-   8048473      1 INSTR DEADREGS  EFLAGS ZZ push    edi 
-   8048473     -3 INSTR LOCAL NoWarn push    edi 
-   8048474      1 INSTR BELONGTO 8048470 
-   8048474      1 INSTR DEADREGS  EFLAGS EDI ZZ push    esi 
-   8048474     -3 INSTR LOCAL NoWarn push    esi 
-   8048475      1 INSTR BELONGTO 8048470 
-   8048475      1 INSTR DEADREGS  EFLAGS ESI EDI ZZ push    ebx 
-   8048475     -3 INSTR LOCAL NoWarn push    ebx 
-   8048476     -1 INSTR LOCAL NoMetaUpdate call    __i686_get_pc_thunk_bx 
-   8048476      5 INSTR BELONGTO 8048470 
-   8048476      5 INSTR DEADREGS  EFLAGS ESI EDI ZZ call    __i686_get_pc_thunk_bx 
-   804847b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     ebx, 11C5h 
-   804847b      6 INSTR BELONGTO 8048470 
-   8048481     12 DATAREF STACK 35 esp + 0 CHILDOF 34 OFFSET 0 OutArgsRegion OUTARGS
-   8048481     16 MEMORYHOLE STACK esp + 28 CalleeSavedRegs 
-   8048481     28 DATAREF STACK 34 esp + 0 PARENT LocalFrame LOCALFRAME
-   8048481      3 INSTR BELONGTO 8048470 
-   8048481      3 INSTR DEADREGS  EFLAGS ESI EDI ZZ sub     esp, 1Ch 
-   8048481      4 DATAREF STACK 36 esp + 12 CHILDOF 34 OFFSET 12 LOCALVAR SMP_IDA_FixVar12 
-   8048481      4 DATAREF STACK 37 esp + 16 CHILDOF 34 OFFSET 16 LOCALVAR SMP_IDA_FixVar16 
-   8048481      4 DATAREF STACK 38 esp + 20 CHILDOF 34 OFFSET 20 LOCALVAR SMP_IDA_FixVar20 
-   8048481      4 DATAREF STACK 39 esp + 24 CHILDOF 34 OFFSET 24 LOCALVAR var_10 
-   8048481      4 MEMORYHOLE STACK esp + 44 ReturnAddress 
-   8048484     -1 INSTR LOCAL NoMetaUpdate call    _init_proc 
-   8048484      5 INSTR BELONGTO 8048470 
-   8048484      5 INSTR DEADREGS  EFLAGS ESI EDI ZZ call    _init_proc 
-   8048489     -2 INSTR LOCAL n EAX ZZ  NumericDEFs lea     eax, (__CTOR_LIST__ - 8049640h)[ebx] 
-   8048489      6 INSTR BELONGTO 8048470 
-   8048489      6 INSTR DEADREGS  EFLAGS EAX EDX ESI EDI ZZ lea     eax, (__CTOR_LIST__ - 8049640h)[ebx] 
-   804848f      3 INSTR BELONGTO 8048470 
-   804848f      3 INSTR DEADREGS  EFLAGS EDX ESI EDI ZZ mov     [ebp+var_10], eax 
-   804848f      3 PTRIMMEDEBP STACK -16 displ mov     [ebp+var_10], eax
-   8048492      6 INSTR BELONGTO 8048470 
-   8048492      6 INSTR DEADREGS  EFLAGS EAX EDX ESI EDI ZZ lea     eax, (__CTOR_LIST__ - 8049640h)[ebx] 
-   8048498      3 INSTR BELONGTO 8048470 
-   8048498      3 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ sub     [ebp+var_10], eax 
-   8048498      3 PTRIMMEDEBP STACK -16 displ sub     [ebp+var_10], eax
-   804849b      4 INSTR BELONGTO 8048470 
-   804849b      4 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ sar     [ebp+var_10], 2 
-   804849b      4 PTRIMMEDEBP STACK -16 displ sar     [ebp+var_10], 2
-   804849f     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, [ebp+var_10] 
-   804849f      3 INSTR BELONGTO 8048470 
-   804849f      3 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ mov     edx, [ebp+var_10] 
-   804849f      3 PTRIMMEDEBP STACK -16 displ mov     edx, [ebp+var_10]
-   80484a2     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
-   80484a2      2 INSTR BELONGTO 8048470 
-   80484a4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_80484D1 
-   80484a4      2 INSTR BELONGTO 8048470 
-   80484a6     -1 INSTR LOCAL MetadataUnused xor     edi, edi 
-   80484a6      2 INSTR BELONGTO 8048470 
-   80484a8      2 INSTR BELONGTO 8048470 
-   80484a8      2 INSTR DEADREGS  EFLAGS EBX ESI ZZ mov     esi, eax 
-   80484aa     -1 INSTR LOCAL NoMetaUpdate lea     esi, [esi+0] 
-   80484aa      6 INSTR BELONGTO 8048470 
-   80484b0      3 INSTR BELONGTO 8048470 
-   80484b0      3 INSTR DEADREGS  EFLAGS EAX EBX ZZ mov     eax, [ebp+arg_8] 
-   80484b0      3 PTRIMMEDEBP STACK 16 displ mov     eax, [ebp+arg_8]
-   80484b3     -1 INSTR LOCAL MetadataUnused add     edi, 1 
-   80484b3      3 INSTR BELONGTO 8048470 
-   80484b6      4 INSTR BELONGTO 8048470 
-   80484b6      4 INSTR DEADREGS  EFLAGS EBX ZZ mov     [esp+8], eax 
-   80484b6      4 PTRIMMEDESP STACK 8 displ mov     [esp+8], eax
-   80484ba      3 INSTR BELONGTO 8048470 
-   80484ba      3 INSTR DEADREGS  EFLAGS EAX EBX ZZ mov     eax, [ebp+arg_4] 
-   80484ba      3 PTRIMMEDEBP STACK 12 displ mov     eax, [ebp+arg_4]
-   80484bd      4 INSTR BELONGTO 8048470 
-   80484bd      4 INSTR DEADREGS  EFLAGS EBX ZZ mov     [esp+4], eax 
-   80484bd      4 PTRIMMEDESP STACK 4 displ mov     [esp+4], eax
-   80484c1      3 INSTR BELONGTO 8048470 
-   80484c1      3 INSTR DEADREGS  EFLAGS EAX EBX ZZ mov     eax, [ebp+arg_0] 
-   80484c1      3 PTRIMMEDEBP STACK 8 displ mov     eax, [ebp+arg_0]
-   80484c4      3 INSTR BELONGTO 8048470 
-   80484c4      3 INSTR DEADREGS  EFLAGS EBX ZZ mov     [esp], eax 
-   80484c4      3 PTRIMMEDESP STACK 0 displ mov     [esp], eax
-   80484c7     -1 INSTR LOCAL NoMetaUpdate call    dword ptr [esi] 
-   80484c7      2 INSTR BELONGTO 8048470 
-   80484c9     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     esi, 4 
-   80484c9      3 INSTR BELONGTO 8048470 
-   80484cc     -1 INSTR LOCAL NoMetaUpdate cmp     [ebp+var_10], edi 
-   80484cc      3 INSTR BELONGTO 8048470 
-   80484cc      3 PTRIMMEDEBP STACK -16 displ cmp     [ebp+var_10], edi
-   80484cf     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_80484B0 
-   80484cf      2 INSTR BELONGTO 8048470 
-   80484d1     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     esp, 1Ch 
-   80484d1      3 INSTR BELONGTO 8048470 
-   80484d4      1 INSTR BELONGTO 8048470 
-   80484d4      1 INSTR DEADREGS  EFLAGS EBX ESI EDI ZZ pop     ebx 
-   80484d4     28 DEALLOC STACK esp - 28 pop     ebx
-   80484d5      1 INSTR BELONGTO 8048470 
-   80484d5      1 INSTR DEADREGS  EFLAGS ESI EDI ZZ pop     esi 
-   80484d6      1 INSTR BELONGTO 8048470 
-   80484d6      1 INSTR DEADREGS  EFLAGS EDI ZZ pop     edi 
-   80484d7      1 INSTR BELONGTO 8048470 
-   80484d7      1 INSTR DEADREGS  EFLAGS ZZ pop     ebp 
-   80484d8      1 INSTR BELONGTO 8048470 
-   80484d8      1 INSTR DEADREGS  EFLAGS ZZ retn 
-   80484d9      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 ZZ
-   80484d9      0 FUNC MMSAFENESS SAFE
-   80484d9      3 INSTR BELONGTO 80484d9 
-   80484d9      3 INSTR DEADREGS  EFLAGS EBX ZZ mov     ebx, [esp+0] 
-   80484d9      3 PTRIMMEDESP STACK 0 displ mov     ebx, [esp+0]
-   80484d9      4 FUNC GLOBAL __i686.get_pc_thunk.bx FUNC_SAFE NOFP RET FUNC_LEAF    80484dc 
-   80484d9      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
-   80484dc      1 INSTR BELONGTO 80484d9 
-   80484dc      1 INSTR DEADREGS  EFLAGS ZZ retn 
-   80484dc     -4 INSTR LOCAL SafeReturn retn
-   80484e0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 8 5 -4 0 6 0 0 7 0 0 ZZ
-   80484e0      0 FUNC MMSAFENESS SPECSAFE
-   80484e0      1 INSTR BELONGTO 80484e0 
-   80484e0      1 INSTR DEADREGS  EFLAGS EAX ZZ push    ebp 
-   80484e0     -3 INSTR LOCAL NoWarn push    ebp 
-   80484e0     40 FUNC GLOBAL __do_global_ctors_aux FUNC_UNSAFE USEFP RET    8048507 
-   80484e1      2 INSTR BELONGTO 80484e0 
-   80484e1      2 INSTR DEADREGS  EFLAGS EAX ZZ mov     ebp, esp 
-   80484e3      1 INSTR BELONGTO 80484e0 
-   80484e3      1 INSTR DEADREGS  EFLAGS EAX ZZ push    ebx 
-   80484e3     -3 INSTR LOCAL NoWarn push    ebx 
-   80484e4     -1 INSTR LOCAL MetadataUnused mov     ebx, offset __CTOR_LIST__ 
-   80484e4      5 INSTR BELONGTO 80484e0 
-   80484e9      3 INSTR BELONGTO 80484e0 
-   80484e9      3 INSTR DEADREGS  EFLAGS EAX ZZ sub     esp, 4 
-   80484e9      4 DATAREF STACK 40 esp + 0 PARENT LocalFrame LOCALFRAME
-   80484e9      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
-   80484e9      8 MEMORYHOLE STACK esp + 4 CalleeSavedRegs 
-   80484ec      5 INSTR BELONGTO 80484e0 
-   80484ec      5 INSTR DEADREGS  EFLAGS EAX ZZ mov     eax, ds:__CTOR_LIST__ 
-   80484f1     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 0FFFFFFFFh 
-   80484f1      3 INSTR BELONGTO 80484e0 
-   80484f4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_8048502 
-   80484f4      2 INSTR BELONGTO 80484e0 
-   80484f6     -1 INSTR LOCAL MetadataUnused sub     ebx, 4 
-   80484f6      3 INSTR BELONGTO 80484e0 
-   80484f9     -1 INSTR LOCAL NoMetaUpdate call    eax ; __CTOR_LIST__ 
-   80484f9      2 INSTR BELONGTO 80484e0 
-   80484fb      2 INSTR BELONGTO 80484e0 
-   80484fb      2 INSTR DEADREGS  EFLAGS EAX ZZ mov     eax, [ebx] 
-   80484fd     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 0FFFFFFFFh 
-   80484fd      3 INSTR BELONGTO 80484e0 
-   8048500     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_80484F6 
-   8048500      2 INSTR BELONGTO 80484e0 
-   8048502     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     esp, 4 
-   8048502      3 INSTR BELONGTO 80484e0 
-   8048505      1 INSTR BELONGTO 80484e0 
-   8048505      1 INSTR DEADREGS  EFLAGS EBX ZZ pop     ebx 
-   8048505      4 DEALLOC STACK esp - 4 pop     ebx
-   8048506      1 INSTR BELONGTO 80484e0 
-   8048506      1 INSTR DEADREGS  EFLAGS ZZ pop     ebp 
-   8048507      1 INSTR BELONGTO 80484e0 
-   8048507      1 INSTR DEADREGS  EFLAGS ZZ retn 
-   8048508      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 -8 0 4 0 8 5 -4 0 6 0 0 7 0 0 ZZ
-   8048508      0 FUNC MMSAFENESS SAFE
-   8048508      1 INSTR BELONGTO 8048508 
-   8048508      1 INSTR DEADREGS  EFLAGS ZZ push    ebp             ; _fini 
-   8048508     28 FUNC GLOBAL .term_proc FUNC_UNSAFE USEFP RET    8048523 
-   8048508     -3 INSTR LOCAL NoWarn push    ebp             ; _fini 
-   8048509      2 INSTR BELONGTO 8048508 
-   8048509      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, esp 
-   804850b      1 INSTR BELONGTO 8048508 
-   804850b      1 INSTR DEADREGS  EFLAGS ZZ push    ebx 
-   804850b     -3 INSTR LOCAL NoWarn push    ebx 
-   804850c      3 INSTR BELONGTO 8048508 
-   804850c      3 INSTR DEADREGS  EFLAGS EBX ZZ sub     esp, 4 
-   804850c      4 DATAREF STACK 41 esp + 0 PARENT LocalFrame LOCALFRAME
-   804850c      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
-   804850c      8 MEMORYHOLE STACK esp + 4 CalleeSavedRegs 
-   804850f     -1 INSTR LOCAL NoMetaUpdate call    $+5 
-   804850f      5 INSTR BELONGTO 8048508 
-   8048514      1 INSTR BELONGTO 8048508 
-   8048514      1 INSTR DEADREGS  EFLAGS EAX ECX EDX EBX ZZ pop     ebx 
-   8048515     -1 INSTR LOCAL MetadataUnused add     ebx, 112Ch 
-   8048515      6 INSTR BELONGTO 8048508 
-   804851b     -1 INSTR LOCAL NoMetaUpdate call    __do_global_dtors_aux 
-   804851b      5 INSTR BELONGTO 8048508 
-   804851b      5 INSTR DEADREGS  EFLAGS EAX ECX EDX EBX ZZ call    __do_global_dtors_aux 
-   8048520      1 INSTR BELONGTO 8048508 
-   8048520      1 INSTR DEADREGS  EFLAGS ECX EBX ZZ pop     ecx 
-   8048521      1 INSTR BELONGTO 8048508 
-   8048521      1 INSTR DEADREGS  EFLAGS EBX ZZ pop     ebx 
-   8048522      1 INSTR BELONGTO 8048508 
-   8048522      1 INSTR DEADREGS  EFLAGS ZZ leave 
-   8048523      1 INSTR BELONGTO 8048508 
-   8048523      1 INSTR DEADREGS  EFLAGS ZZ retn 
-   8048523      4 DEALLOC STACK esp - 4 retn
+                 0     12 DATAREF GLOBAL       14 8049640 PARENT _GLOBAL_OFFSET_TABLE_  VOID RW
+                 0     18 DATAREF GLOBAL        4 8048530 PARENT s  VOID RO
+                 0      1 DATAREF GLOBAL       22 8049668 PARENT completed.5758  VOID RW
+                 0     22 DATAREF GLOBAL        6 8048545 PARENT aXDYDZD  VOID RO
+                 0      3 DATAREF GLOBAL       23 8049669 PARENT SMP_dummy0  VOID RW
+                 0      3 DATAREF GLOBAL        5 8048542 PARENT format  VOID RO
+                 0      4 DATAREF GLOBAL       10 8049568 PARENT __DTOR_LIST__  VOID RW
+                 0      4 DATAREF GLOBAL       11 804956c PARENT __DTOR_END__  VOID RW
+                 0      4 DATAREF GLOBAL       12 8049570 PARENT __JCR_LIST__  VOID RW
+                 0      4 DATAREF GLOBAL       13 804963c PARENT __gmon_start___ptr  OFFSET RW
+                 0      4 DATAREF GLOBAL       15 804964c PARENT off_804964C  OFFSET RW
+                 0      4 DATAREF GLOBAL       16 8049650 PARENT off_8049650  OFFSET RW
+                 0      4 DATAREF GLOBAL       17 8049654 PARENT off_8049654  OFFSET RW
+                 0      4 DATAREF GLOBAL        1 8048524 PARENT _fp_hw  VOID RO
+                 0      4 DATAREF GLOBAL       18 8049658 PARENT off_8049658  OFFSET RW
+                 0      4 DATAREF GLOBAL       19 804965c PARENT off_804965C  OFFSET RW
+                 0      4 DATAREF GLOBAL       20 8049660 PARENT __data_start  VOID RW
+                 0      4 DATAREF GLOBAL       21 8049664 PARENT p.5756  OFFSET RW
+                 0      4 DATAREF GLOBAL        2 8048528 PARENT _IO_stdin_used  VOID RO
+                 0      4 DATAREF GLOBAL        3 804852c PARENT __dso_handle  VOID RO
+                 0      4 DATAREF GLOBAL        7 804855c PARENT __FRAME_END__  VOID RO
+                 0      4 DATAREF GLOBAL        8 8049560 PARENT __CTOR_LIST__  VOID RW
+                 0      4 DATAREF GLOBAL        9 8049564 PARENT __CTOR_END__  VOID RW
+           8048290      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 -4 0 6 0 0 7 0 0 ZZ
+           8048290      0 FUNC MMSAFENESS SAFE
+           8048290      1 INSTR BELONGTO 8048290 
+           8048290      1 INSTR DEADREGS  EFLAGS ZZ push    ebp             ; _init 
+           8048290     23 FUNC GLOBAL .init_proc FUNC_UNSAFE USEFP RET            80482a6 
+           8048290     -3 INSTR LOCAL NoWarn push    ebp             ; _init 
+           8048291      2 INSTR BELONGTO 8048290 
+           8048291      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, esp 
+           8048293      3 INSTR BELONGTO 8048290 
+           8048293      3 INSTR DEADREGS  EFLAGS ZZ sub     esp, 8 
+           8048293      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
+           8048293      4 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
+           8048293      8 DATAREF STACK 24 esp + 0 PARENT LocalFrame LOCALFRAME
+           8048296     -1 INSTR LOCAL NoMetaUpdate call    call_gmon_start 
+           8048296      5 INSTR BELONGTO 8048290 
+           8048296      5 INSTR DEADREGS  EFLAGS ZZ call    call_gmon_start 
+           804829b     -1 INSTR LOCAL NoMetaUpdate call    frame_dummy 
+           804829b      5 INSTR BELONGTO 8048290 
+           804829b      5 INSTR DEADREGS  EFLAGS EAX ECX EDX ZZ call    frame_dummy 
+           80482a0     -1 INSTR LOCAL NoMetaUpdate call    __do_global_ctors_aux 
+           80482a0      5 INSTR BELONGTO 8048290 
+           80482a0      5 INSTR DEADREGS  EFLAGS EAX ECX EDX ZZ call    __do_global_ctors_aux 
+           80482a5      1 INSTR BELONGTO 8048290 
+           80482a5      1 INSTR DEADREGS  EFLAGS ZZ leave 
+           80482a6      1 INSTR BELONGTO 8048290 
+           80482a6      1 INSTR DEADREGS  EFLAGS ZZ retn 
+           80482a6      8 DEALLOC STACK esp - 8 retn
+           80482b8      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
+           80482b8      0 FUNC MMSAFENESS UNSAFE
+           80482b8     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_804964C 
+           80482b8      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
+           80482b8      6 FUNC GLOBAL .__gmon_start__ FUNC_UNSAFE NOFP RET            80482bd 
+           80482b8      6 INSTR BELONGTO 80482b8 
+           80482c8      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
+           80482c8      0 FUNC MMSAFENESS UNSAFE
+           80482c8     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_8049650 
+           80482c8      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
+           80482c8      6 FUNC GLOBAL .__libc_start_main FUNC_UNSAFE NOFP RET            80482cd 
+           80482c8      6 INSTR BELONGTO 80482c8 
+           80482d8      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
+           80482d8      0 FUNC MMSAFENESS UNSAFE
+           80482d8     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_8049654 
+           80482d8      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
+           80482d8      6 FUNC GLOBAL .scanf FUNC_UNSAFE NOFP RET            80482dd 
+           80482d8      6 INSTR BELONGTO 80482d8 
+           80482e8      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
+           80482e8      0 FUNC MMSAFENESS UNSAFE
+           80482e8     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_8049658 
+           80482e8      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
+           80482e8      6 FUNC GLOBAL .printf FUNC_UNSAFE NOFP RET            80482ed 
+           80482e8      6 INSTR BELONGTO 80482e8 
+           80482f8      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
+           80482f8      0 FUNC MMSAFENESS UNSAFE
+           80482f8     -1 INSTR LOCAL NoMetaUpdate jmp     ds:off_804965C 
+           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 -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 
+           8048312      1 INSTR BELONGTO 8048310 
+           8048312      1 INSTR DEADREGS  EFLAGS ECX ESI ZZ pop     esi 
+           8048313      2 INSTR BELONGTO 8048310 
+           8048313      2 INSTR DEADREGS  EFLAGS ECX ZZ mov     ecx, esp 
+           8048313      2 PTRIMMEDESP STACK 0 displ mov     ecx, esp
+           8048315      3 INSTR BELONGTO 8048310 
+           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     12 DATAREF STACK 25 esp + 0 PARENT LocalFrame LOCALFRAME
+           8048327      4 DATAREF STACK 26 esp + 0 CHILDOF 25 OFFSET 0 OutArgsRegion OUTARGS
+           8048327      4 MEMORYHOLE STACK esp + 32 ReturnAddress 
+           8048327      5 INSTR BELONGTO 8048310 
+           8048327      5 INSTR DEADREGS  EFLAGS ESI ZZ push    offset main     ; main 
+           8048327      8 MEMORYHOLE STACK esp + 20 CalleeSavedRegs 
+           8048327      8 MEMORYHOLE STACK esp + 4 CalleeSavedRegs 
+           804832c     -1 INSTR LOCAL NoMetaUpdate call    ___libc_start_main 
+           804832c      5 INSTR BELONGTO 8048310 
+           804832c      5 INSTR DEADREGS  EFLAGS ESI ZZ call    ___libc_start_main 
+           8048331      1 INSTR BELONGTO 8048310 
+           8048331      1 INSTR DEADREGS  EFLAGS EAX ECX EDX ESI ZZ hlt 
+           8048334      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 8 5 -4 0 6 0 0 7 0 0 ZZ
+           8048334      0 FUNC MMSAFENESS SAFE
+           8048334      1 INSTR BELONGTO 8048334 
+           8048334      1 INSTR DEADREGS  EFLAGS ZZ push    ebp 
+           8048334     38 FUNC GLOBAL call_gmon_start FUNC_UNSAFE USEFP RET            8048359 
+           8048334     -3 INSTR LOCAL NoWarn push    ebp 
+           8048335      2 INSTR BELONGTO 8048334 
+           8048335      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, esp 
+           8048337      1 INSTR BELONGTO 8048334 
+           8048337      1 INSTR DEADREGS  EFLAGS ZZ push    ebx 
+           8048337     -3 INSTR LOCAL NoWarn push    ebx 
+           8048338      3 INSTR BELONGTO 8048334 
+           8048338      3 INSTR DEADREGS  EFLAGS EBX ZZ sub     esp, 4 
+           8048338      4 DATAREF STACK 27 esp + 0 PARENT LocalFrame LOCALFRAME
+           8048338      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
+           8048338      8 MEMORYHOLE STACK esp + 4 CalleeSavedRegs 
+           804833b     -1 INSTR LOCAL NoMetaUpdate call    $+5 
+           804833b      5 INSTR BELONGTO 8048334 
+           8048340      1 INSTR BELONGTO 8048334 
+           8048340      1 INSTR DEADREGS  EFLAGS EDX EBX ZZ pop     ebx 
+           8048341     -1 INSTR LOCAL MetadataUnused add     ebx, 1300h 
+           8048341      6 INSTR BELONGTO 8048334 
+           8048347      6 INSTR BELONGTO 8048334 
+           8048347      6 INSTR DEADREGS  EFLAGS EDX ZZ mov     edx, ds:(__gmon_start___ptr - 8049640h)[ebx] 
+           804834d     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
+           804834d      2 INSTR BELONGTO 8048334 
+           804834f     -1 INSTR LOCAL NoMetaUpdate jz      short loc_8048356 
+           804834f      2 INSTR BELONGTO 8048334 
+           8048351     -1 INSTR LOCAL NoMetaUpdate call    ___gmon_start__ 
+           8048351      5 INSTR BELONGTO 8048334 
+           8048351      5 INSTR DEADREGS  EFLAGS EBX ZZ call    ___gmon_start__ 
+           8048356      1 INSTR BELONGTO 8048334 
+           8048356      1 INSTR DEADREGS  EFLAGS EAX EBX ZZ pop     eax 
+           8048357      1 INSTR BELONGTO 8048334 
+           8048357      1 INSTR DEADREGS  EFLAGS EBX ZZ pop     ebx 
+           8048358      1 INSTR BELONGTO 8048334 
+           8048358      1 INSTR DEADREGS  EFLAGS ZZ leave 
+           8048359      1 INSTR BELONGTO 8048334 
+           8048359      1 INSTR DEADREGS  EFLAGS ZZ retn 
+           8048359      4 DEALLOC STACK esp - 4 retn
+           8048360      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 0 0 4 0 8 5 -4 0 6 0 0 7 0 0 ZZ
+           8048360      0 FUNC MMSAFENESS SPECSAFE
+           8048360      1 INSTR BELONGTO 8048360 
+           8048360      1 INSTR DEADREGS  EFLAGS ZZ push    ebp 
+           8048360     -3 INSTR LOCAL NoWarn push    ebp 
+           8048360     47 FUNC GLOBAL __do_global_dtors_aux FUNC_UNSAFE USEFP RET            804838e 
+           8048361      2 INSTR BELONGTO 8048360 
+           8048361      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, esp 
+           8048363      3 INSTR BELONGTO 8048360 
+           8048363      3 INSTR DEADREGS  EFLAGS ZZ sub     esp, 8 
+           8048363      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
+           8048363      4 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
+           8048363      8 DATAREF STACK 28 esp + 0 PARENT LocalFrame LOCALFRAME
+           8048366     -1 INSTR LOCAL NoMetaUpdate cmp     ds:completed_5758, 0 
+           8048366      7 INSTR BELONGTO 8048360 
+           804836d     -1 INSTR LOCAL NoMetaUpdate jz      short loc_804837B 
+           804836d      2 INSTR BELONGTO 8048360 
+           804836f     -1 INSTR LOCAL NoMetaUpdate jmp     short locret_804838D 
+           804836f      2 INSTR BELONGTO 8048360 
+           8048371     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     eax, 4 
+           8048371      3 INSTR BELONGTO 8048360 
+           8048374      5 INSTR BELONGTO 8048360 
+           8048374      5 INSTR DEADREGS  EFLAGS ZZ mov     p_5756, eax 
+           8048379     -1 INSTR LOCAL NoMetaUpdate call    edx 
+           8048379      2 INSTR BELONGTO 8048360 
+           804837b      5 INSTR BELONGTO 8048360 
+           804837b      5 INSTR DEADREGS  EFLAGS EAX EDX ZZ mov     eax, p_5756 
+           8048380      2 INSTR BELONGTO 8048360 
+           8048380      2 INSTR DEADREGS  EFLAGS EDX ZZ mov     edx, [eax] 
+           8048382     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
+           8048382      2 INSTR BELONGTO 8048360 
+           8048384     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_8048371 
+           8048384      2 INSTR BELONGTO 8048360 
+           8048386      7 INSTR BELONGTO 8048360 
+           8048386      7 INSTR DEADREGS  EFLAGS ZZ mov     ds:completed_5758, 1 
+           804838d      1 INSTR BELONGTO 8048360 
+           804838d      1 INSTR DEADREGS  EFLAGS ZZ leave 
+           804838e      1 INSTR BELONGTO 8048360 
+           804838e      1 INSTR DEADREGS  EFLAGS ZZ retn 
+           804838e      8 DEALLOC STACK esp - 8 retn
+           8048390      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 -4 0 6 0 0 7 0 0 ZZ
+           8048390      0 FUNC MMSAFENESS SPECSAFE
+           8048390      1 INSTR BELONGTO 8048390 
+           8048390      1 INSTR DEADREGS  EFLAGS EAX ZZ push    ebp 
+           8048390     35 FUNC GLOBAL frame_dummy FUNC_UNSAFE USEFP RET            80483b2 
+           8048390     -3 INSTR LOCAL NoWarn push    ebp 
+           8048391      2 INSTR BELONGTO 8048390 
+           8048391      2 INSTR DEADREGS  EFLAGS EAX ZZ mov     ebp, esp 
+           8048393      3 INSTR BELONGTO 8048390 
+           8048393      3 INSTR DEADREGS  EFLAGS EAX ZZ sub     esp, 8 
+           8048393      4 DATAREF STACK 30 esp + 0 CHILDOF 29 OFFSET 0 OutArgsRegion OUTARGS
+           8048393      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
+           8048393      4 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
+           8048393      8 DATAREF STACK 29 esp + 0 PARENT LocalFrame LOCALFRAME
+           8048396      5 INSTR BELONGTO 8048390 
+           8048396      5 INSTR DEADREGS  EFLAGS EAX ZZ mov     eax, ds:__JCR_LIST__ 
+           804839b     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
+           804839b      2 INSTR BELONGTO 8048390 
+           804839d     -1 INSTR LOCAL NoMetaUpdate jz      short locret_80483B1 
+           804839d      2 INSTR BELONGTO 8048390 
+           804839f     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+           804839f      5 INSTR BELONGTO 8048390 
+           804839f      5 INSTR DEADREGS  EFLAGS EAX ZZ mov     eax, 0 
+           80483a4     -1 INSTR LOCAL NoMetaUpdate test    eax, eax 
+           80483a4      2 INSTR BELONGTO 8048390 
+           80483a6     -1 INSTR LOCAL NoMetaUpdate jz      short locret_80483B1 
+           80483a6      2 INSTR BELONGTO 8048390 
+           80483a8      7 INSTR BELONGTO 8048390 
+           80483a8      7 INSTR DEADREGS  EFLAGS ZZ mov     dword ptr [esp], offset __JCR_LIST__ 
+           80483a8      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [esp], offset __JCR_LIST__
+           80483af     -1 INSTR LOCAL NoMetaUpdate call    eax 
+           80483af      2 INSTR BELONGTO 8048390 
+           80483b1      1 INSTR BELONGTO 8048390 
+           80483b1      1 INSTR DEADREGS  EFLAGS ZZ leave 
+           80483b2      1 INSTR BELONGTO 8048390 
+           80483b2      1 INSTR DEADREGS  EFLAGS ZZ retn 
+           80483b2      8 DEALLOC STACK esp - 8 retn
+           80483b4      0 FUNC FRAMERESTORE 0 0 1 1 -12 8 2 0 0 3 0 0 4 0 8 5 -8 0 6 0 0 7 0 0 ZZ
+           80483b4      0 FUNC MMSAFENESS UNSAFE
+           80483b4    163 FUNC GLOBAL main FUNC_UNSAFE USEFP RET            8048456 
+           80483b4      4 INSTR BELONGTO 80483b4 
+           80483b4      4 INSTR DEADREGS  EFLAGS ECX ZZ lea     ecx, [esp+4] 
+           80483b4      4 PTRIMMEDESP STACK 4 displ lea     ecx, [esp+4]
+           80483b8      3 INSTR BELONGTO 80483b4 
+           80483b8      3 INSTR DEADREGS  EFLAGS ZZ and     esp, 0FFFFFFF0h 
+           80483bb      3 INSTR BELONGTO 80483b4 
+           80483bb      3 INSTR DEADREGS  EFLAGS ZZ push    dword ptr [ecx-4] 
+           80483bb     -3 INSTR LOCAL NoWarn push    dword ptr [ecx-4] 
+           80483be      1 INSTR BELONGTO 80483b4 
+           80483be      1 INSTR DEADREGS  EFLAGS ZZ push    ebp 
+           80483be     -3 INSTR LOCAL NoWarn push    ebp 
+           80483bf      2 INSTR BELONGTO 80483b4 
+           80483bf      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, esp 
+           80483c1      1 INSTR BELONGTO 80483b4 
+           80483c1      1 INSTR DEADREGS  EFLAGS ZZ push    ecx 
+           80483c1     -3 INSTR LOCAL NoWarn push    ecx 
+           80483c2     16 DATAREF STACK 32 esp + 0 CHILDOF 31 OFFSET 0 OutArgsRegion OUTARGS
+           80483c2     36 DATAREF STACK 31 esp + 0 PARENT LocalFrame LOCALFRAME
+           80483c2      3 INSTR BELONGTO 80483b4 
+           80483c2      3 INSTR DEADREGS  EFLAGS ZZ sub     esp, 24h 
+           80483c2      4 MEMORYHOLE STACK esp + 48 ReturnAddress 
+           80483c2      8 MEMORYHOLE STACK esp + 36 CalleeSavedRegs 
+           80483c5      7 INSTR BELONGTO 80483b4 
+           80483c5      7 INSTR DEADREGS  EFLAGS ZZ mov     [ebp+y], 2 
+           80483c5      7 PTRIMMEDEBP STACK -12 displ mov     [ebp+y], 2
+           80483cc      7 INSTR BELONGTO 80483b4 
+           80483cc      7 INSTR DEADREGS  EFLAGS ZZ mov     [ebp+z], 0Dh 
+           80483cc      7 PTRIMMEDEBP STACK -8 displ mov     [ebp+z], 0Dh
+           80483d3      7 INSTR BELONGTO 80483b4 
+           80483d3      7 INSTR DEADREGS  EFLAGS ZZ mov     dword ptr [esp], offset s; "Enter an integer." 
+           80483d3      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [esp], offset s; "Enter an integer."
+           80483da     -1 INSTR LOCAL NoMetaUpdate call    _puts 
+           80483da      5 INSTR BELONGTO 80483b4 
+           80483da      5 INSTR DEADREGS  EFLAGS ZZ call    _puts 
+           80483df      3 INSTR BELONGTO 80483b4 
+           80483df      3 INSTR DEADREGS  EFLAGS EAX ZZ lea     eax, [ebp+x] 
+           80483df      3 PTRIMMEDEBP STACK -16 displ lea     eax, [ebp+x]
+           80483e2      4 INSTR BELONGTO 80483b4 
+           80483e2      4 INSTR DEADREGS  EFLAGS ZZ mov     [esp+4], eax 
+           80483e2      4 PTRIMMEDESP STACK 4 displ mov     [esp+4], eax
+           80483e6      7 INSTR BELONGTO 80483b4 
+           80483e6      7 INSTR DEADREGS  EFLAGS ZZ mov     dword ptr [esp], offset format; "%d" 
+           80483e6      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [esp], offset format; "%d"
+           80483ed     -1 INSTR LOCAL NoMetaUpdate call    _scanf 
+           80483ed      5 INSTR BELONGTO 80483b4 
+           80483ed      5 INSTR DEADREGS  EFLAGS ZZ call    _scanf 
+           80483f2     -1 INSTR LOCAL MetadataUnused mov     eax, [ebp+x] 
+           80483f2      3 INSTR BELONGTO 80483b4 
+           80483f5     -1 INSTR LOCAL NoMetaUpdate cmp     eax, [ebp+z] 
+           80483f5      3 INSTR BELONGTO 80483b4 
+           80483f5      3 PTRIMMEDEBP STACK -8 displ cmp     eax, [ebp+z]
+           80483f8     -1 INSTR LOCAL NoMetaUpdate jge     short loc_804840B 
+           80483f8      2 INSTR BELONGTO 80483b4 
+           80483fa      3 INSTR BELONGTO 80483b4 
+           80483fa      3 INSTR DEADREGS  EFLAGS EAX ECX EDX ZZ mov     eax, [ebp+x] 
+           80483fa      3 PTRIMMEDEBP STACK -16 displ mov     eax, [ebp+x]
+           80483fd     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, [ebp+z] 
+           80483fd      3 INSTR BELONGTO 80483b4 
+           80483fd      3 INSTR DEADREGS  EFLAGS ECX EDX ZZ mov     edx, [ebp+z] 
+           80483fd      3 PTRIMMEDEBP STACK -8 displ mov     edx, [ebp+z]
+           8048400      2 INSTR BELONGTO 80483b4 
+           8048400      2 INSTR DEADREGS  EFLAGS ECX ZZ mov     ecx, edx 
+           8048400     -2 INSTR LOCAL n ECX ZZ  NumericDEFs mov     ecx, edx 
+           8048402     -1 INSTR LOCAL MetadataRedundant sub     ecx, eax 
+           8048402      2 INSTR BELONGTO 80483b4 
+           8048404      2 INSTR BELONGTO 80483b4 
+           8048404      2 INSTR DEADREGS  EFLAGS EAX EDX ZZ mov     eax, ecx 
+           8048404     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, ecx 
+           8048406      3 INSTR BELONGTO 80483b4 
+           8048406      3 INSTR DEADREGS  EFLAGS EDX ZZ mov     [ebp+y], eax 
+           8048406      3 PTRIMMEDEBP STACK -12 displ mov     [ebp+y], eax
+           8048409     -1 INSTR LOCAL NoMetaUpdate jmp     short loc_8048417 
+           8048409      2 INSTR BELONGTO 80483b4 
+           804840b      3 INSTR BELONGTO 80483b4 
+           804840b      3 INSTR DEADREGS  EFLAGS EAX EDX ZZ mov     eax, [ebp+x] 
+           804840b      3 PTRIMMEDEBP STACK -16 displ mov     eax, [ebp+x]
+           804840e     -1 INSTR LOCAL 2ndSrcNumeric sub     eax, [ebp+y] 
+           804840e      3 INSTR BELONGTO 80483b4 
+           804840e      3 PTRIMMEDEBP STACK -12 displ sub     eax, [ebp+y]
+           8048411     -1 INSTR LOCAL 2ndSrcNumeric add     eax, [ebp+z] 
+           8048411      3 INSTR BELONGTO 80483b4 
+           8048411      3 PTRIMMEDEBP STACK -8 displ add     eax, [ebp+z]
+           8048414      3 INSTR BELONGTO 80483b4 
+           8048414      3 INSTR DEADREGS  EFLAGS EDX ZZ mov     [ebp+y], eax 
+           8048414      3 PTRIMMEDEBP STACK -12 displ mov     [ebp+y], eax
+           8048417     -1 INSTR LOCAL MetadataUnused mov     eax, [ebp+x] 
+           8048417      3 INSTR BELONGTO 80483b4 
+           804841a     -1 INSTR LOCAL NoMetaUpdate cmp     eax, [ebp+z] 
+           804841a      3 INSTR BELONGTO 80483b4 
+           804841a      3 PTRIMMEDEBP STACK -8 displ cmp     eax, [ebp+z]
+           804841d     -1 INSTR LOCAL NoMetaUpdate jge     short loc_8048428 
+           804841d      2 INSTR BELONGTO 80483b4 
+           804841f      3 INSTR BELONGTO 80483b4 
+           804841f      3 INSTR DEADREGS  EFLAGS EAX EDX ZZ mov     eax, [ebp+x] 
+           804841f      3 PTRIMMEDEBP STACK -16 displ mov     eax, [ebp+x]
+           8048422     -1 INSTR LOCAL 2ndSrcNumeric add     eax, [ebp+y] 
+           8048422      3 INSTR BELONGTO 80483b4 
+           8048422      3 PTRIMMEDEBP STACK -12 displ add     eax, [ebp+y]
+           8048425      3 INSTR BELONGTO 80483b4 
+           8048425      3 INSTR DEADREGS  EFLAGS EDX ZZ mov     [ebp+x], eax 
+           8048425      3 PTRIMMEDEBP STACK -16 displ mov     [ebp+x], eax
+           8048428      3 INSTR BELONGTO 80483b4 
+           8048428      3 INSTR DEADREGS  EFLAGS EAX EDX ZZ mov     edx, [ebp+x] 
+           8048428      3 PTRIMMEDEBP STACK -16 displ mov     edx, [ebp+x]
+           804842b     -2 INSTR LOCAL n EAX ZZ  NumericDEFs mov     eax, [ebp+z] 
+           804842b      3 INSTR BELONGTO 80483b4 
+           804842b      3 INSTR DEADREGS  EFLAGS EAX ZZ mov     eax, [ebp+z] 
+           804842b      3 PTRIMMEDEBP STACK -8 displ mov     eax, [ebp+z]
+           804842e      4 INSTR BELONGTO 80483b4 
+           804842e      4 INSTR DEADREGS  EFLAGS ZZ mov     [esp+0Ch], eax 
+           804842e      4 PTRIMMEDESP STACK 12 displ mov     [esp+0Ch], eax
+           8048432     -1 INSTR LOCAL MetadataRedundant mov     eax, [ebp+y] 
+           8048432      3 INSTR BELONGTO 80483b4 
+           8048435      4 INSTR BELONGTO 80483b4 
+           8048435      4 INSTR DEADREGS  EFLAGS ZZ mov     [esp+8], eax 
+           8048435      4 PTRIMMEDESP STACK 8 displ mov     [esp+8], eax
+           8048439      4 INSTR BELONGTO 80483b4 
+           8048439      4 INSTR DEADREGS  EFLAGS ZZ mov     [esp+4], edx 
+           8048439      4 PTRIMMEDESP STACK 4 displ mov     [esp+4], edx
+           804843d      7 INSTR BELONGTO 80483b4 
+           804843d      7 INSTR DEADREGS  EFLAGS ZZ mov     dword ptr [esp], offset aXDYDZD; "x = %d y = %d z = %d\n" 
+           804843d      7 PTRIMMEDESP STACK 0 displ mov     dword ptr [esp], offset aXDYDZD; "x = %d y = %d z = %d\n"
+           8048444     -1 INSTR LOCAL NoMetaUpdate call    _printf 
+           8048444      5 INSTR BELONGTO 80483b4 
+           8048444      5 INSTR DEADREGS  EFLAGS ZZ call    _printf 
+           8048449     -2 INSTR LOCAL n EAX ZZ  NUMVia2ndSrcIMMEDNUM mov     eax, 0 
+           8048449      5 INSTR BELONGTO 80483b4 
+           8048449      5 INSTR DEADREGS  EFLAGS EAX ECX ZZ mov     eax, 0 
+           804844e     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     esp, 24h 
+           804844e      3 INSTR BELONGTO 80483b4 
+           8048451      1 INSTR BELONGTO 80483b4 
+           8048451      1 INSTR DEADREGS  EFLAGS ECX ZZ pop     ecx 
+           8048451     36 DEALLOC STACK esp - 36 pop     ecx
+           8048452      1 INSTR BELONGTO 80483b4 
+           8048452      1 INSTR DEADREGS  EFLAGS ZZ pop     ebp 
+           8048453      3 INSTR BELONGTO 80483b4 
+           8048453      3 INSTR DEADREGS  EFLAGS ZZ lea     esp, [ecx-4] 
+           8048456      1 INSTR BELONGTO 80483b4 
+           8048456      1 INSTR DEADREGS  EFLAGS ZZ retn 
+           8048460      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 0 0 4 0 8 5 -4 0 6 0 0 7 0 0 ZZ
+           8048460      0 FUNC MMSAFENESS SAFE
+           8048460      1 INSTR BELONGTO 8048460 
+           8048460      1 INSTR DEADREGS  EFLAGS ZZ push    ebp 
+           8048460     -3 INSTR LOCAL NoWarn push    ebp 
+           8048460     -3 INSTR LOCAL NoWarn push    ebp 
+           8048460      4 MEMORYHOLE STACK esp + 0 CalleeSavedRegs 
+           8048460      4 MEMORYHOLE STACK esp + 4 ReturnAddress 
+           8048460      5 FUNC GLOBAL __libc_csu_fini FUNC_SAFE USEFP RET FUNC_LEAF            8048464 
+           8048461      2 INSTR BELONGTO 8048460 
+           8048461      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, esp 
+           8048463      1 INSTR BELONGTO 8048460 
+           8048463      1 INSTR DEADREGS  EFLAGS ZZ pop     ebp 
+           8048464      1 INSTR BELONGTO 8048460 
+           8048464      1 INSTR DEADREGS  EFLAGS ZZ retn 
+           8048464     -4 INSTR LOCAL SafeReturn retn
+           8048470      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 1 3 -16 4 4 0 8 5 -4 0 6 -12 0 7 -8 0 ZZ
+           8048470      0 FUNC MMSAFENESS SPECSAFE
+           8048470    105 FUNC GLOBAL __libc_csu_init FUNC_UNSAFE USEFP RET            80484d8 
+           8048470      1 INSTR BELONGTO 8048470 
+           8048470      1 INSTR DEADREGS  EFLAGS ZZ push    ebp 
+           8048470     -3 INSTR LOCAL NoWarn push    ebp 
+           8048471      2 INSTR BELONGTO 8048470 
+           8048471      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, esp 
+           8048473      1 INSTR BELONGTO 8048470 
+           8048473      1 INSTR DEADREGS  EFLAGS ZZ push    edi 
+           8048473     -3 INSTR LOCAL NoWarn push    edi 
+           8048474      1 INSTR BELONGTO 8048470 
+           8048474      1 INSTR DEADREGS  EFLAGS EDI ZZ push    esi 
+           8048474     -3 INSTR LOCAL NoWarn push    esi 
+           8048475      1 INSTR BELONGTO 8048470 
+           8048475      1 INSTR DEADREGS  EFLAGS ESI EDI ZZ push    ebx 
+           8048475     -3 INSTR LOCAL NoWarn push    ebx 
+           8048476     -1 INSTR LOCAL NoMetaUpdate call    __i686_get_pc_thunk_bx 
+           8048476      5 INSTR BELONGTO 8048470 
+           8048476      5 INSTR DEADREGS  EFLAGS ESI EDI ZZ call    __i686_get_pc_thunk_bx 
+           804847b     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     ebx, 11C5h 
+           804847b      6 INSTR BELONGTO 8048470 
+           8048481     12 DATAREF STACK 34 esp + 0 CHILDOF 33 OFFSET 0 OutArgsRegion OUTARGS
+           8048481     16 MEMORYHOLE STACK esp + 28 CalleeSavedRegs 
+           8048481     28 DATAREF STACK 33 esp + 0 PARENT LocalFrame LOCALFRAME
+           8048481      3 INSTR BELONGTO 8048470 
+           8048481      3 INSTR DEADREGS  EFLAGS ESI EDI ZZ sub     esp, 1Ch 
+           8048481      4 MEMORYHOLE STACK esp + 44 ReturnAddress 
+           8048484     -1 INSTR LOCAL NoMetaUpdate call    _init_proc 
+           8048484      5 INSTR BELONGTO 8048470 
+           8048484      5 INSTR DEADREGS  EFLAGS ESI EDI ZZ call    _init_proc 
+           8048489     -2 INSTR LOCAL n EAX ZZ  NumericDEFs lea     eax, (__CTOR_LIST__ - 8049640h)[ebx] 
+           8048489      6 INSTR BELONGTO 8048470 
+           8048489      6 INSTR DEADREGS  EFLAGS EAX EDX ESI EDI ZZ lea     eax, (__CTOR_LIST__ - 8049640h)[ebx] 
+           804848f      3 INSTR BELONGTO 8048470 
+           804848f      3 INSTR DEADREGS  EFLAGS EDX ESI EDI ZZ mov     [ebp+var_10], eax 
+           804848f      3 PTRIMMEDEBP STACK -16 displ mov     [ebp+var_10], eax
+           8048492      6 INSTR BELONGTO 8048470 
+           8048492      6 INSTR DEADREGS  EFLAGS EAX EDX ESI EDI ZZ lea     eax, (__CTOR_LIST__ - 8049640h)[ebx] 
+           8048498      3 INSTR BELONGTO 8048470 
+           8048498      3 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ sub     [ebp+var_10], eax 
+           8048498      3 PTRIMMEDEBP STACK -16 displ sub     [ebp+var_10], eax
+           804849b      4 INSTR BELONGTO 8048470 
+           804849b      4 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ sar     [ebp+var_10], 2 
+           804849b      4 PTRIMMEDEBP STACK -16 displ sar     [ebp+var_10], 2
+           804849f     -2 INSTR LOCAL n EDX ZZ  NumericDEFs mov     edx, [ebp+var_10] 
+           804849f      3 INSTR BELONGTO 8048470 
+           804849f      3 INSTR DEADREGS  EFLAGS EDX EBX ESI EDI ZZ mov     edx, [ebp+var_10] 
+           804849f      3 PTRIMMEDEBP STACK -16 displ mov     edx, [ebp+var_10]
+           80484a2     -1 INSTR LOCAL NoMetaUpdate test    edx, edx 
+           80484a2      2 INSTR BELONGTO 8048470 
+           80484a4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_80484D1 
+           80484a4      2 INSTR BELONGTO 8048470 
+           80484a6     -1 INSTR LOCAL MetadataUnused xor     edi, edi 
+           80484a6      2 INSTR BELONGTO 8048470 
+           80484a8      2 INSTR BELONGTO 8048470 
+           80484a8      2 INSTR DEADREGS  EFLAGS EBX ESI ZZ mov     esi, eax 
+           80484aa     -1 INSTR LOCAL NoMetaUpdate lea     esi, [esi+0] 
+           80484aa      6 INSTR BELONGTO 8048470 
+           80484b0      3 INSTR BELONGTO 8048470 
+           80484b0      3 INSTR DEADREGS  EFLAGS EAX EBX ZZ mov     eax, [ebp+arg_8] 
+           80484b0      3 PTRIMMEDEBP STACK 16 displ mov     eax, [ebp+arg_8]
+           80484b3     -1 INSTR LOCAL MetadataUnused add     edi, 1 
+           80484b3      3 INSTR BELONGTO 8048470 
+           80484b6      4 INSTR BELONGTO 8048470 
+           80484b6      4 INSTR DEADREGS  EFLAGS EBX ZZ mov     [esp+8], eax 
+           80484b6      4 PTRIMMEDESP STACK 8 displ mov     [esp+8], eax
+           80484ba      3 INSTR BELONGTO 8048470 
+           80484ba      3 INSTR DEADREGS  EFLAGS EAX EBX ZZ mov     eax, [ebp+arg_4] 
+           80484ba      3 PTRIMMEDEBP STACK 12 displ mov     eax, [ebp+arg_4]
+           80484bd      4 INSTR BELONGTO 8048470 
+           80484bd      4 INSTR DEADREGS  EFLAGS EBX ZZ mov     [esp+4], eax 
+           80484bd      4 PTRIMMEDESP STACK 4 displ mov     [esp+4], eax
+           80484c1      3 INSTR BELONGTO 8048470 
+           80484c1      3 INSTR DEADREGS  EFLAGS EAX EBX ZZ mov     eax, [ebp+arg_0] 
+           80484c1      3 PTRIMMEDEBP STACK 8 displ mov     eax, [ebp+arg_0]
+           80484c4      3 INSTR BELONGTO 8048470 
+           80484c4      3 INSTR DEADREGS  EFLAGS EBX ZZ mov     [esp], eax 
+           80484c4      3 PTRIMMEDESP STACK 0 displ mov     [esp], eax
+           80484c7     -1 INSTR LOCAL NoMetaUpdate call    dword ptr [esi] 
+           80484c7      2 INSTR BELONGTO 8048470 
+           80484c9     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     esi, 4 
+           80484c9      3 INSTR BELONGTO 8048470 
+           80484cc     -1 INSTR LOCAL NoMetaUpdate cmp     [ebp+var_10], edi 
+           80484cc      3 INSTR BELONGTO 8048470 
+           80484cc      3 PTRIMMEDEBP STACK -16 displ cmp     [ebp+var_10], edi
+           80484cf     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_80484B0 
+           80484cf      2 INSTR BELONGTO 8048470 
+           80484d1     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     esp, 1Ch 
+           80484d1      3 INSTR BELONGTO 8048470 
+           80484d4      1 INSTR BELONGTO 8048470 
+           80484d4      1 INSTR DEADREGS  EFLAGS EBX ESI EDI ZZ pop     ebx 
+           80484d4     28 DEALLOC STACK esp - 28 pop     ebx
+           80484d5      1 INSTR BELONGTO 8048470 
+           80484d5      1 INSTR DEADREGS  EFLAGS ESI EDI ZZ pop     esi 
+           80484d6      1 INSTR BELONGTO 8048470 
+           80484d6      1 INSTR DEADREGS  EFLAGS EDI ZZ pop     edi 
+           80484d7      1 INSTR BELONGTO 8048470 
+           80484d7      1 INSTR DEADREGS  EFLAGS ZZ pop     ebp 
+           80484d8      1 INSTR BELONGTO 8048470 
+           80484d8      1 INSTR DEADREGS  EFLAGS ZZ retn 
+           80484d9      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 ZZ
+           80484d9      0 FUNC MMSAFENESS SAFE
+           80484d9      3 INSTR BELONGTO 80484d9 
+           80484d9      3 INSTR DEADREGS  EFLAGS EBX ZZ mov     ebx, [esp+0] 
+           80484d9      3 PTRIMMEDESP STACK 0 displ mov     ebx, [esp+0]
+           80484d9      4 FUNC GLOBAL __i686.get_pc_thunk.bx FUNC_SAFE NOFP RET FUNC_LEAF            80484dc 
+           80484d9      4 MEMORYHOLE STACK esp + 0 ReturnAddress 
+           80484dc      1 INSTR BELONGTO 80484d9 
+           80484dc      1 INSTR DEADREGS  EFLAGS ZZ retn 
+           80484dc     -4 INSTR LOCAL SafeReturn retn
+           80484e0      0 FUNC FRAMERESTORE 0 0 0 1 0 0 2 0 0 3 -8 0 4 0 8 5 -4 0 6 0 0 7 0 0 ZZ
+           80484e0      0 FUNC MMSAFENESS SPECSAFE
+           80484e0      1 INSTR BELONGTO 80484e0 
+           80484e0      1 INSTR DEADREGS  EFLAGS EAX ZZ push    ebp 
+           80484e0     -3 INSTR LOCAL NoWarn push    ebp 
+           80484e0     40 FUNC GLOBAL __do_global_ctors_aux FUNC_UNSAFE USEFP RET            8048507 
+           80484e1      2 INSTR BELONGTO 80484e0 
+           80484e1      2 INSTR DEADREGS  EFLAGS EAX ZZ mov     ebp, esp 
+           80484e3      1 INSTR BELONGTO 80484e0 
+           80484e3      1 INSTR DEADREGS  EFLAGS EAX ZZ push    ebx 
+           80484e3     -3 INSTR LOCAL NoWarn push    ebx 
+           80484e4     -1 INSTR LOCAL MetadataUnused mov     ebx, offset __CTOR_LIST__ 
+           80484e4      5 INSTR BELONGTO 80484e0 
+           80484e9      3 INSTR BELONGTO 80484e0 
+           80484e9      3 INSTR DEADREGS  EFLAGS EAX ZZ sub     esp, 4 
+           80484e9      4 DATAREF STACK 35 esp + 0 PARENT LocalFrame LOCALFRAME
+           80484e9      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
+           80484e9      8 MEMORYHOLE STACK esp + 4 CalleeSavedRegs 
+           80484ec      5 INSTR BELONGTO 80484e0 
+           80484ec      5 INSTR DEADREGS  EFLAGS EAX ZZ mov     eax, ds:__CTOR_LIST__ 
+           80484f1     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 0FFFFFFFFh 
+           80484f1      3 INSTR BELONGTO 80484e0 
+           80484f4     -1 INSTR LOCAL NoMetaUpdate jz      short loc_8048502 
+           80484f4      2 INSTR BELONGTO 80484e0 
+           80484f6     -1 INSTR LOCAL MetadataUnused sub     ebx, 4 
+           80484f6      3 INSTR BELONGTO 80484e0 
+           80484f9     -1 INSTR LOCAL NoMetaUpdate call    eax ; __CTOR_LIST__ 
+           80484f9      2 INSTR BELONGTO 80484e0 
+           80484fb      2 INSTR BELONGTO 80484e0 
+           80484fb      2 INSTR DEADREGS  EFLAGS EAX ZZ mov     eax, [ebx] 
+           80484fd     -1 INSTR LOCAL NoMetaUpdate cmp     eax, 0FFFFFFFFh 
+           80484fd      3 INSTR BELONGTO 80484e0 
+           8048500     -1 INSTR LOCAL NoMetaUpdate jnz     short loc_80484F6 
+           8048500      2 INSTR BELONGTO 80484e0 
+           8048502     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     esp, 4 
+           8048502      3 INSTR BELONGTO 80484e0 
+           8048505      1 INSTR BELONGTO 80484e0 
+           8048505      1 INSTR DEADREGS  EFLAGS EBX ZZ pop     ebx 
+           8048505      4 DEALLOC STACK esp - 4 pop     ebx
+           8048506      1 INSTR BELONGTO 80484e0 
+           8048506      1 INSTR DEADREGS  EFLAGS ZZ pop     ebp 
+           8048507      1 INSTR BELONGTO 80484e0 
+           8048507      1 INSTR DEADREGS  EFLAGS ZZ retn 
+           8048508      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 -8 0 4 0 8 5 -4 0 6 0 0 7 0 0 ZZ
+           8048508      0 FUNC MMSAFENESS SAFE
+           8048508      1 INSTR BELONGTO 8048508 
+           8048508      1 INSTR DEADREGS  EFLAGS ZZ push    ebp             ; _fini 
+           8048508     28 FUNC GLOBAL .term_proc FUNC_UNSAFE USEFP RET            8048523 
+           8048508     -3 INSTR LOCAL NoWarn push    ebp             ; _fini 
+           8048509      2 INSTR BELONGTO 8048508 
+           8048509      2 INSTR DEADREGS  EFLAGS ZZ mov     ebp, esp 
+           804850b      1 INSTR BELONGTO 8048508 
+           804850b      1 INSTR DEADREGS  EFLAGS ZZ push    ebx 
+           804850b     -3 INSTR LOCAL NoWarn push    ebx 
+           804850c      3 INSTR BELONGTO 8048508 
+           804850c      3 INSTR DEADREGS  EFLAGS EBX ZZ sub     esp, 4 
+           804850c      4 DATAREF STACK 36 esp + 0 PARENT LocalFrame LOCALFRAME
+           804850c      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
+           804850c      8 MEMORYHOLE STACK esp + 4 CalleeSavedRegs 
+           804850f     -1 INSTR LOCAL NoMetaUpdate call    $+5 
+           804850f      5 INSTR BELONGTO 8048508 
+           8048514      1 INSTR BELONGTO 8048508 
+           8048514      1 INSTR DEADREGS  EFLAGS EAX ECX EDX EBX ZZ pop     ebx 
+           8048515     -1 INSTR LOCAL MetadataUnused add     ebx, 112Ch 
+           8048515      6 INSTR BELONGTO 8048508 
+           804851b     -1 INSTR LOCAL NoMetaUpdate call    __do_global_dtors_aux 
+           804851b      5 INSTR BELONGTO 8048508 
+           804851b      5 INSTR DEADREGS  EFLAGS EAX ECX EDX EBX ZZ call    __do_global_dtors_aux 
+           8048520      1 INSTR BELONGTO 8048508 
+           8048520      1 INSTR DEADREGS  EFLAGS ECX EBX ZZ pop     ecx 
+           8048521      1 INSTR BELONGTO 8048508 
+           8048521      1 INSTR DEADREGS  EFLAGS EBX ZZ pop     ebx 
+           8048522      1 INSTR BELONGTO 8048508 
+           8048522      1 INSTR DEADREGS  EFLAGS ZZ leave 
+           8048523      1 INSTR BELONGTO 8048508 
+           8048523      1 INSTR DEADREGS  EFLAGS ZZ retn 
+           8048523      4 DEALLOC STACK esp - 4 retn
diff --git a/tests/commit/trimmed-sorted-save-xcalc.psexe.annot b/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
index 22d0cd789da5911db3d9a365c6b6fb69fbf6feeb..d770cc18dbfff5c8f459e94e19837b267c65b1e9 100644
--- a/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-xcalc.psexe.annot
@@ -866,11 +866,8 @@
             401819     -2 INSTR LOCAL n ESI ZZ  AlwaysNUM xor     esi, esi 
             40181b     20 DATAREF STACK 492 esp + 0 CHILDOF 491 OFFSET 0 OutArgsRegion OUTARGS
             40181b     24 MEMORYHOLE STACK esp + 96 CalleeSavedRegs 
-            40181b     40 DATAREF STACK 495 esp + 56 CHILDOF 491 OFFSET 56 LOCALVAR var_40 
-            40181b      4 DATAREF STACK 493 esp + 44 CHILDOF 491 OFFSET 44 LOCALVAR var_4C 
             40181b      4 INSTR BELONGTO 401810 
             40181b      4 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 60h 
-            40181b      8 DATAREF STACK 494 esp + 48 CHILDOF 491 OFFSET 48 LOCALVAR var_48 
             40181b      8 MEMORYHOLE STACK esp + 120 ReturnAddress 
             40181b     96 DATAREF STACK 491 esp + 0 PARENT LocalFrame LOCALFRAME
             40181f     -1 INSTR LOCAL MetadataUnused mov     [rsp+78h+var_4C], edi 
@@ -1467,9 +1464,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -1491,7 +1488,7 @@
             401d10     23 FUNC GLOBAL sub_401D10 FUNC_SAFE NOFP RET             401d26 
             401d10      4 INSTR BELONGTO 401d10 
             401d10      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            401d10      8 DATAREF STACK 496 esp + 0 PARENT LocalFrame LOCALFRAME
+            401d10      8 DATAREF STACK 493 esp + 0 PARENT LocalFrame LOCALFRAME
             401d10      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             401d14      7 INSTR BELONGTO 401d10 
             401d14      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -1521,7 +1518,7 @@
             401d35     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             401d35      4 INSTR BELONGTO 401d30 
             401d35      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            401d35      8 DATAREF STACK 497 esp + 0 PARENT LocalFrame LOCALFRAME
+            401d35      8 DATAREF STACK 494 esp + 0 PARENT LocalFrame LOCALFRAME
             401d35      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             401d39     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_6085E8, 0 
             401d39      7 INSTR BELONGTO 401d30 
@@ -1593,7 +1590,7 @@
             401dd0      4 INSTR BELONGTO 401dd0 
             401dd0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             401dd0     82 FUNC GLOBAL sub_401DD0 FUNC_UNSAFE NOFP RET             401e21 
-            401dd0      8 DATAREF STACK 498 esp + 0 PARENT LocalFrame LOCALFRAME
+            401dd0      8 DATAREF STACK 495 esp + 0 PARENT LocalFrame LOCALFRAME
             401dd0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             401dd4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 29h 
             401dd4      5 INSTR BELONGTO 401dd0 
@@ -1644,7 +1641,7 @@
             401e30      4 INSTR BELONGTO 401e30 
             401e30      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             401e30     82 FUNC GLOBAL sub_401E30 FUNC_UNSAFE NOFP RET             401e81 
-            401e30      8 DATAREF STACK 499 esp + 0 PARENT LocalFrame LOCALFRAME
+            401e30      8 DATAREF STACK 496 esp + 0 PARENT LocalFrame LOCALFRAME
             401e30      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             401e34     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Bh 
             401e34      5 INSTR BELONGTO 401e30 
@@ -1695,7 +1692,7 @@
             401e90      4 INSTR BELONGTO 401e90 
             401e90      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             401e90     82 FUNC GLOBAL sub_401E90 FUNC_UNSAFE NOFP RET             401ee1 
-            401e90      8 DATAREF STACK 500 esp + 0 PARENT LocalFrame LOCALFRAME
+            401e90      8 DATAREF STACK 497 esp + 0 PARENT LocalFrame LOCALFRAME
             401e90      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             401e94     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 8 
             401e94      5 INSTR BELONGTO 401e90 
@@ -1746,7 +1743,7 @@
             401ef0      4 INSTR BELONGTO 401ef0 
             401ef0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             401ef0     82 FUNC GLOBAL sub_401EF0 FUNC_UNSAFE NOFP RET             401f41 
-            401ef0      8 DATAREF STACK 501 esp + 0 PARENT LocalFrame LOCALFRAME
+            401ef0      8 DATAREF STACK 498 esp + 0 PARENT LocalFrame LOCALFRAME
             401ef0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             401ef4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2 
             401ef4      5 INSTR BELONGTO 401ef0 
@@ -1797,7 +1794,7 @@
             401f50      4 INSTR BELONGTO 401f50 
             401f50      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             401f50     82 FUNC GLOBAL sub_401F50 FUNC_UNSAFE NOFP RET             401fa1 
-            401f50      8 DATAREF STACK 502 esp + 0 PARENT LocalFrame LOCALFRAME
+            401f50      8 DATAREF STACK 499 esp + 0 PARENT LocalFrame LOCALFRAME
             401f50      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             401f54     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1 
             401f54      5 INSTR BELONGTO 401f50 
@@ -1848,7 +1845,7 @@
             401fb0      4 INSTR BELONGTO 401fb0 
             401fb0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             401fb0     82 FUNC GLOBAL sub_401FB0 FUNC_UNSAFE NOFP RET             402001 
-            401fb0      8 DATAREF STACK 503 esp + 0 PARENT LocalFrame LOCALFRAME
+            401fb0      8 DATAREF STACK 500 esp + 0 PARENT LocalFrame LOCALFRAME
             401fb0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             401fb4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 6 
             401fb4      5 INSTR BELONGTO 401fb0 
@@ -1899,7 +1896,7 @@
             402010      4 INSTR BELONGTO 402010 
             402010      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             402010     74 FUNC GLOBAL sub_402010 FUNC_UNSAFE NOFP RET             402059 
-            402010      8 DATAREF STACK 504 esp + 0 PARENT LocalFrame LOCALFRAME
+            402010      8 DATAREF STACK 501 esp + 0 PARENT LocalFrame LOCALFRAME
             402010      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402014      2 INSTR BELONGTO 402010 
             402014      2 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ xor     edi, edi 
@@ -1950,7 +1947,7 @@
             402060      4 INSTR BELONGTO 402060 
             402060      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             402060     82 FUNC GLOBAL sub_402060 FUNC_UNSAFE NOFP RET             4020b1 
-            402060      8 DATAREF STACK 505 esp + 0 PARENT LocalFrame LOCALFRAME
+            402060      8 DATAREF STACK 502 esp + 0 PARENT LocalFrame LOCALFRAME
             402060      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402064     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Fh 
             402064      5 INSTR BELONGTO 402060 
@@ -2001,7 +1998,7 @@
             4020c0      4 INSTR BELONGTO 4020c0 
             4020c0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             4020c0     82 FUNC GLOBAL sub_4020C0 FUNC_UNSAFE NOFP RET             402111 
-            4020c0      8 DATAREF STACK 506 esp + 0 PARENT LocalFrame LOCALFRAME
+            4020c0      8 DATAREF STACK 503 esp + 0 PARENT LocalFrame LOCALFRAME
             4020c0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4020c4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Dh 
             4020c4      5 INSTR BELONGTO 4020c0 
@@ -2052,7 +2049,7 @@
             402120      4 INSTR BELONGTO 402120 
             402120      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             402120     82 FUNC GLOBAL sub_402120 FUNC_UNSAFE NOFP RET             402171 
-            402120      8 DATAREF STACK 507 esp + 0 PARENT LocalFrame LOCALFRAME
+            402120      8 DATAREF STACK 504 esp + 0 PARENT LocalFrame LOCALFRAME
             402120      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402124     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ch 
             402124      5 INSTR BELONGTO 402120 
@@ -2103,7 +2100,7 @@
             402180      4 INSTR BELONGTO 402180 
             402180      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             402180     82 FUNC GLOBAL sub_402180 FUNC_UNSAFE NOFP RET             4021d1 
-            402180      8 DATAREF STACK 508 esp + 0 PARENT LocalFrame LOCALFRAME
+            402180      8 DATAREF STACK 505 esp + 0 PARENT LocalFrame LOCALFRAME
             402180      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402184     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 10h 
             402184      5 INSTR BELONGTO 402180 
@@ -2154,7 +2151,7 @@
             4021e0      4 INSTR BELONGTO 4021e0 
             4021e0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             4021e0     82 FUNC GLOBAL sub_4021E0 FUNC_UNSAFE NOFP RET             402231 
-            4021e0      8 DATAREF STACK 509 esp + 0 PARENT LocalFrame LOCALFRAME
+            4021e0      8 DATAREF STACK 506 esp + 0 PARENT LocalFrame LOCALFRAME
             4021e0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4021e4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 23h 
             4021e4      5 INSTR BELONGTO 4021e0 
@@ -2205,7 +2202,7 @@
             402240      4 INSTR BELONGTO 402240 
             402240      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             402240     82 FUNC GLOBAL sub_402240 FUNC_UNSAFE NOFP RET             402291 
-            402240      8 DATAREF STACK 510 esp + 0 PARENT LocalFrame LOCALFRAME
+            402240      8 DATAREF STACK 507 esp + 0 PARENT LocalFrame LOCALFRAME
             402240      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402244     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Ah 
             402244      5 INSTR BELONGTO 402240 
@@ -2256,7 +2253,7 @@
             4022a0      4 INSTR BELONGTO 4022a0 
             4022a0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             4022a0     82 FUNC GLOBAL sub_4022A0 FUNC_UNSAFE NOFP RET             4022f1 
-            4022a0      8 DATAREF STACK 511 esp + 0 PARENT LocalFrame LOCALFRAME
+            4022a0      8 DATAREF STACK 508 esp + 0 PARENT LocalFrame LOCALFRAME
             4022a0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4022a4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Ah 
             4022a4      5 INSTR BELONGTO 4022a0 
@@ -2307,7 +2304,7 @@
             402300      4 INSTR BELONGTO 402300 
             402300      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
             402300     82 FUNC GLOBAL sub_402300 FUNC_UNSAFE NOFP RET             402351 
-            402300      8 DATAREF STACK 512 esp + 0 PARENT LocalFrame LOCALFRAME
+            402300      8 DATAREF STACK 509 esp + 0 PARENT LocalFrame LOCALFRAME
             402300      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402304     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 7 
             402304      5 INSTR BELONGTO 402300 
@@ -2358,7 +2355,7 @@
             402360    103 FUNC GLOBAL sub_402360 FUNC_UNSAFE NOFP RET             4023c6 
             402360      4 INSTR BELONGTO 402360 
             402360      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-            402360      8 DATAREF STACK 513 esp + 0 PARENT LocalFrame LOCALFRAME
+            402360      8 DATAREF STACK 510 esp + 0 PARENT LocalFrame LOCALFRAME
             402360      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402364     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Eh 
             402364      5 INSTR BELONGTO 402360 
@@ -2418,7 +2415,7 @@
             4023d0    103 FUNC GLOBAL sub_4023D0 FUNC_UNSAFE NOFP RET             402436 
             4023d0      4 INSTR BELONGTO 4023d0 
             4023d0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-            4023d0      8 DATAREF STACK 514 esp + 0 PARENT LocalFrame LOCALFRAME
+            4023d0      8 DATAREF STACK 511 esp + 0 PARENT LocalFrame LOCALFRAME
             4023d0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4023d4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 14h 
             4023d4      5 INSTR BELONGTO 4023d0 
@@ -2478,7 +2475,7 @@
             402440    103 FUNC GLOBAL sub_402440 FUNC_UNSAFE NOFP RET             4024a6 
             402440      4 INSTR BELONGTO 402440 
             402440      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-            402440      8 DATAREF STACK 515 esp + 0 PARENT LocalFrame LOCALFRAME
+            402440      8 DATAREF STACK 512 esp + 0 PARENT LocalFrame LOCALFRAME
             402440      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402444     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 19h 
             402444      5 INSTR BELONGTO 402440 
@@ -2538,7 +2535,7 @@
             4024b0    103 FUNC GLOBAL sub_4024B0 FUNC_UNSAFE NOFP RET             402516 
             4024b0      4 INSTR BELONGTO 4024b0 
             4024b0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-            4024b0      8 DATAREF STACK 516 esp + 0 PARENT LocalFrame LOCALFRAME
+            4024b0      8 DATAREF STACK 513 esp + 0 PARENT LocalFrame LOCALFRAME
             4024b0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4024b4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 1Dh 
             4024b4      5 INSTR BELONGTO 4024b0 
@@ -2598,7 +2595,7 @@
             402520    103 FUNC GLOBAL sub_402520 FUNC_UNSAFE NOFP RET             402586 
             402520      4 INSTR BELONGTO 402520 
             402520      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-            402520      8 DATAREF STACK 517 esp + 0 PARENT LocalFrame LOCALFRAME
+            402520      8 DATAREF STACK 514 esp + 0 PARENT LocalFrame LOCALFRAME
             402520      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402524     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Eh 
             402524      5 INSTR BELONGTO 402520 
@@ -2658,7 +2655,7 @@
             402590    103 FUNC GLOBAL sub_402590 FUNC_UNSAFE NOFP RET             4025f6 
             402590      4 INSTR BELONGTO 402590 
             402590      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-            402590      8 DATAREF STACK 518 esp + 0 PARENT LocalFrame LOCALFRAME
+            402590      8 DATAREF STACK 515 esp + 0 PARENT LocalFrame LOCALFRAME
             402590      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402594     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 18h 
             402594      5 INSTR BELONGTO 402590 
@@ -2718,7 +2715,7 @@
             402600    103 FUNC GLOBAL sub_402600 FUNC_UNSAFE NOFP RET             402666 
             402600      4 INSTR BELONGTO 402600 
             402600      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-            402600      8 DATAREF STACK 519 esp + 0 PARENT LocalFrame LOCALFRAME
+            402600      8 DATAREF STACK 516 esp + 0 PARENT LocalFrame LOCALFRAME
             402600      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402604     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 13h 
             402604      5 INSTR BELONGTO 402600 
@@ -2778,7 +2775,7 @@
             402670    103 FUNC GLOBAL sub_402670 FUNC_UNSAFE NOFP RET             4026d6 
             402670      4 INSTR BELONGTO 402670 
             402670      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8 
-            402670      8 DATAREF STACK 520 esp + 0 PARENT LocalFrame LOCALFRAME
+            402670      8 DATAREF STACK 517 esp + 0 PARENT LocalFrame LOCALFRAME
             402670      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402674     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 22h 
             402674      5 INSTR BELONGTO 402670 
@@ -2845,7 +2842,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 521 esp + 0 PARENT LocalFrame LOCALFRAME
+            4026f0      8 DATAREF STACK 518 esp + 0 PARENT LocalFrame LOCALFRAME
             4026f0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4026f4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 0Bh 
             4026f4      5 INSTR BELONGTO 4026f0 
@@ -2893,7 +2890,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 522 esp + 0 PARENT LocalFrame LOCALFRAME
+            402740      8 DATAREF STACK 519 esp + 0 PARENT LocalFrame LOCALFRAME
             402740      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402744     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Ch 
             402744      5 INSTR BELONGTO 402740 
@@ -2941,7 +2938,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 523 esp + 0 PARENT LocalFrame LOCALFRAME
+            402790      8 DATAREF STACK 520 esp + 0 PARENT LocalFrame LOCALFRAME
             402790      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402794     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 12h 
             402794      5 INSTR BELONGTO 402790 
@@ -3023,7 +3020,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 524 esp + 0 PARENT LocalFrame LOCALFRAME
+            402830      8 DATAREF STACK 521 esp + 0 PARENT LocalFrame LOCALFRAME
             402830      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402834     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 4 
             402834      5 INSTR BELONGTO 402830 
@@ -3071,7 +3068,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 525 esp + 0 PARENT LocalFrame LOCALFRAME
+            402880      8 DATAREF STACK 522 esp + 0 PARENT LocalFrame LOCALFRAME
             402880      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402884     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 26h 
             402884      5 INSTR BELONGTO 402880 
@@ -3119,7 +3116,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 526 esp + 0 PARENT LocalFrame LOCALFRAME
+            4028d0      8 DATAREF STACK 523 esp + 0 PARENT LocalFrame LOCALFRAME
             4028d0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4028d4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 11h 
             4028d4      5 INSTR BELONGTO 4028d0 
@@ -3167,7 +3164,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 527 esp + 0 PARENT LocalFrame LOCALFRAME
+            402920      8 DATAREF STACK 524 esp + 0 PARENT LocalFrame LOCALFRAME
             402920      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402924     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 5 
             402924      5 INSTR BELONGTO 402920 
@@ -3215,7 +3212,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 528 esp + 0 PARENT LocalFrame LOCALFRAME
+            402970      8 DATAREF STACK 525 esp + 0 PARENT LocalFrame LOCALFRAME
             402970      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402974     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 27h 
             402974      5 INSTR BELONGTO 402970 
@@ -3263,7 +3260,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 529 esp + 0 PARENT LocalFrame LOCALFRAME
+            4029c0      8 DATAREF STACK 526 esp + 0 PARENT LocalFrame LOCALFRAME
             4029c0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4029c4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 28h 
             4029c4      5 INSTR BELONGTO 4029c0 
@@ -3311,7 +3308,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 530 esp + 0 PARENT LocalFrame LOCALFRAME
+            402a10      8 DATAREF STACK 527 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 
@@ -3619,7 +3616,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 531 esp + 0 PARENT LocalFrame LOCALFRAME
+            402c60      8 DATAREF STACK 528 esp + 0 PARENT LocalFrame LOCALFRAME
             402c60      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402c64     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 9 
             402c64      5 INSTR BELONGTO 402c60 
@@ -3667,7 +3664,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 532 esp + 0 PARENT LocalFrame LOCALFRAME
+            402cb0      8 DATAREF STACK 529 esp + 0 PARENT LocalFrame LOCALFRAME
             402cb0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402cb4     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 25h 
             402cb4      5 INSTR BELONGTO 402cb0 
@@ -3715,7 +3712,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 533 esp + 0 PARENT LocalFrame LOCALFRAME
+            402d00      8 DATAREF STACK 530 esp + 0 PARENT LocalFrame LOCALFRAME
             402d00      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402d04     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 3 
             402d04      5 INSTR BELONGTO 402d00 
@@ -3763,7 +3760,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 534 esp + 0 PARENT LocalFrame LOCALFRAME
+            402d50      8 DATAREF STACK 531 esp + 0 PARENT LocalFrame LOCALFRAME
             402d50      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402d54     -2 INSTR LOCAL n EDI ZZ  NUMVia2ndSrcIMMEDNUM mov     edi, 2Eh 
             402d54      5 INSTR BELONGTO 402d50 
@@ -3817,11 +3814,10 @@
             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 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 535 esp + 0 PARENT LocalFrame LOCALFRAME
+            402da7     56 DATAREF STACK 532 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 
@@ -4233,11 +4229,9 @@
             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 537 esp + 0 PARENT LocalFrame LOCALFRAME
+            40311a     24 DATAREF STACK 533 esp + 0 PARENT LocalFrame LOCALFRAME
             40311a      4 INSTR BELONGTO 403110 
             40311a      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-            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 
@@ -4441,8 +4435,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 540 esp + 0 PARENT LocalFrame LOCALFRAME
-            4032b4      2 DATAREF STACK 541 esp + 0 CHILDOF 540 OFFSET 0 OutArgsRegion OUTARGS
+            4032b4     24 DATAREF STACK 534 esp + 0 PARENT LocalFrame LOCALFRAME
+            4032b4      2 DATAREF STACK 535 esp + 0 CHILDOF 534 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 
@@ -4726,7 +4720,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 542 esp + 0 PARENT LocalFrame LOCALFRAME
+            403580      8 DATAREF STACK 536 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 
@@ -4927,12 +4921,9 @@
             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 543 esp + 0 PARENT LocalFrame LOCALFRAME
+            40376f     24 DATAREF STACK 537 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 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 
@@ -5079,11 +5070,10 @@
             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 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 547 esp + 0 PARENT LocalFrame LOCALFRAME
+            4038c0     56 DATAREF STACK 538 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 
@@ -5220,8 +5210,7 @@
             4039c2     -1 INSTR LOCAL MetadataUnused mov     ebx, edi 
             4039c2      2 INSTR BELONGTO 4039c0 
             4039c4     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            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     24 DATAREF STACK 539 esp + 0 PARENT LocalFrame LOCALFRAME
             4039c4      4 INSTR BELONGTO 4039c0 
             4039c4      4 INSTR DEADREGS  EFLAGS R9 XMM2 ZZ sub     rsp, 18h 
             4039c4      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -5488,8 +5477,7 @@
             403c30     -3 INSTR LOCAL NoWarn push    rbx 
             403c31     -1 INSTR LOCAL MetadataUnused mov     ebx, edi 
             403c31      2 INSTR BELONGTO 403c30 
-            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     16 DATAREF STACK 540 esp + 0 PARENT LocalFrame LOCALFRAME
             403c33      4 INSTR BELONGTO 403c30 
             403c33      4 INSTR DEADREGS  EFLAGS R10 XMM2 ZZ sub     rsp, 10h 
             403c33      8 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
@@ -5631,7 +5619,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 553 esp + 0 PARENT LocalFrame LOCALFRAME
+            403dc0      8 DATAREF STACK 541 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 
@@ -5672,8 +5660,7 @@
             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 554 esp + 0 PARENT LocalFrame LOCALFRAME
-            403e40     24 DATAREF STACK 555 esp + 0 CHILDOF 554 OFFSET 0 LOCALVAR var_18 
+            403e40     24 DATAREF STACK 542 esp + 0 PARENT LocalFrame LOCALFRAME
             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 
@@ -5845,7 +5832,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 556 esp + 0 PARENT LocalFrame LOCALFRAME
+            404000      8 DATAREF STACK 543 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 
@@ -5867,7 +5854,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 557 esp + 0 PARENT LocalFrame LOCALFRAME
+            404030      8 DATAREF STACK 544 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 
@@ -6118,7 +6105,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 558 esp + 0 PARENT LocalFrame LOCALFRAME
+            4042f0      8 DATAREF STACK 545 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 
@@ -6299,7 +6286,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 559 esp + 0 PARENT LocalFrame LOCALFRAME
+            4044d0      8 DATAREF STACK 546 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 
@@ -6331,11 +6318,9 @@
             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 562 esp + 16 CHILDOF 560 OFFSET 16 LOCALVAR var_18 
-            404513     32 DATAREF STACK 560 esp + 0 PARENT LocalFrame LOCALFRAME
+            404513     32 DATAREF STACK 547 esp + 0 PARENT LocalFrame LOCALFRAME
             404513      4 INSTR BELONGTO 404510 
             404513      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 20h 
-            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 
@@ -6817,7 +6802,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 563 esp + 0 PARENT LocalFrame LOCALFRAME
+            404a40      8 DATAREF STACK 548 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 
@@ -6915,7 +6900,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 564 esp + 0 PARENT LocalFrame LOCALFRAME
+            404b30      8 DATAREF STACK 549 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 
@@ -6979,8 +6964,7 @@
             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 566 esp + 8 CHILDOF 565 OFFSET 8 LOCALVAR var_10 
-            404bd0     24 DATAREF STACK 565 esp + 0 PARENT LocalFrame LOCALFRAME
+            404bd0     24 DATAREF STACK 550 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 
@@ -7066,8 +7050,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 568 esp + 0 CHILDOF 567 OFFSET 0 OutArgsRegion OUTARGS
-            404c70     24 DATAREF STACK 567 esp + 0 PARENT LocalFrame LOCALFRAME
+            404c70     16 DATAREF STACK 552 esp + 0 CHILDOF 551 OFFSET 0 OutArgsRegion OUTARGS
+            404c70     24 DATAREF STACK 551 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 
@@ -7103,11 +7087,9 @@
             404ca5      5 INSTR BELONGTO 404ca0 
             404caa     -1 INSTR LOCAL MetadataUnused movsxd  rbx, edi 
             404caa      3 INSTR BELONGTO 404ca0 
-            404cad     24 DATAREF STACK 569 esp + 0 PARENT LocalFrame LOCALFRAME
+            404cad     24 DATAREF STACK 553 esp + 0 PARENT LocalFrame LOCALFRAME
             404cad      4 INSTR BELONGTO 404ca0 
             404cad      4 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 18h 
-            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 
@@ -7178,7 +7160,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 572 esp + 0 PARENT LocalFrame LOCALFRAME
+            404d30      8 DATAREF STACK 554 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 
@@ -7258,13 +7240,7 @@
             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 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     56 DATAREF STACK 555 esp + 0 PARENT LocalFrame LOCALFRAME
             404dfc      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             404e00     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             404e00      3 INSTR BELONGTO 404dd0 
@@ -7341,7 +7317,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 580 esp + 0 PARENT LocalFrame LOCALFRAME
+            404e75      8 DATAREF STACK 556 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 
@@ -7376,7 +7352,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 581 esp + 0 PARENT LocalFrame LOCALFRAME
+            404ea8      8 DATAREF STACK 557 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 dbe099ab6d314645068342f0aedadd0a3222269b..147006103e18ee259ee61ff38acaefbd20eff9e5 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 @@
-a49f6abaf99820f2d3ff4d5e5e6c678363c3c7f5
\ No newline at end of file
+352a213bfb3e1cc815b8527fe743314d7a597e74
\ 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 940cfc61fb07c70120ca8940a6b285fb258fc450..9e7ad7b3b09f5e272543836f8d96f2158a4daec1 100644
--- a/tests/commit/trimmed-sorted-save-xeyes.psexe.annot
+++ b/tests/commit/trimmed-sorted-save-xeyes.psexe.annot
@@ -559,16 +559,10 @@
             40170a      1 INSTR BELONGTO 401700 
             40170a      1 INSTR DEADREGS  EFLAGS R12 ZZ push    rbx 
             40170a     -3 INSTR LOCAL NoWarn push    rbx 
-            40170b     16 DATAREF STACK 214 esp + 72 CHILDOF 208 OFFSET 72 LOCALVAR var_30 
             40170b     20 DATAREF STACK 209 esp + 0 CHILDOF 208 OFFSET 0 OutArgsRegion OUTARGS
             40170b     24 MEMORYHOLE STACK esp + 96 CalleeSavedRegs 
-            40170b      4 DATAREF STACK 210 esp + 44 CHILDOF 208 OFFSET 44 LOCALVAR var_4C 
             40170b      4 INSTR BELONGTO 401700 
             40170b      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 60h 
-            40170b      8 DATAREF STACK 211 esp + 48 CHILDOF 208 OFFSET 48 LOCALVAR var_48 
-            40170b      8 DATAREF STACK 212 esp + 56 CHILDOF 208 OFFSET 56 LOCALVAR var_40 
-            40170b      8 DATAREF STACK 213 esp + 64 CHILDOF 208 OFFSET 64 LOCALVAR var_38 
-            40170b      8 DATAREF STACK 215 esp + 88 CHILDOF 208 OFFSET 88 LOCALVAR var_20 
             40170b      8 MEMORYHOLE STACK esp + 120 ReturnAddress 
             40170b     96 DATAREF STACK 208 esp + 0 PARENT LocalFrame LOCALFRAME
             40170f     -1 INSTR LOCAL MetadataUnused mov     [rsp+78h+var_4C], edi 
@@ -840,9 +834,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -864,7 +858,7 @@
             401900     23 FUNC GLOBAL sub_401900 FUNC_SAFE NOFP RET             401916 
             401900      4 INSTR BELONGTO 401900 
             401900      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            401900      8 DATAREF STACK 216 esp + 0 PARENT LocalFrame LOCALFRAME
+            401900      8 DATAREF STACK 210 esp + 0 PARENT LocalFrame LOCALFRAME
             401900      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             401904      7 INSTR BELONGTO 401900 
             401904      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -894,7 +888,7 @@
             401925     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             401925      4 INSTR BELONGTO 401920 
             401925      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            401925      8 DATAREF STACK 217 esp + 0 PARENT LocalFrame LOCALFRAME
+            401925      8 DATAREF STACK 211 esp + 0 PARENT LocalFrame LOCALFRAME
             401925      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             401929     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_6056E8, 0 
             401929      7 INSTR BELONGTO 401920 
@@ -987,34 +981,11 @@
             4019ea      1 INSTR BELONGTO 4019d0 
             4019ea      1 INSTR DEADREGS  EFLAGS RCX RDX RSI R13 XMM7 ZZ push    rbx 
             4019ea     -3 INSTR LOCAL NoWarn push    rbx 
-            4019eb     16 DATAREF STACK 225 esp + 48 CHILDOF 218 OFFSET 48 LOCALVAR var_F8 
-            4019eb     16 DATAREF STACK 226 esp + 64 CHILDOF 218 OFFSET 64 LOCALVAR var_E8 
-            4019eb     16 DATAREF STACK 227 esp + 80 CHILDOF 218 OFFSET 80 LOCALVAR var_D8 
-            4019eb     16 DATAREF STACK 228 esp + 96 CHILDOF 218 OFFSET 96 LOCALVAR var_C8 
-            4019eb     16 DATAREF STACK 229 esp + 112 CHILDOF 218 OFFSET 112 LOCALVAR var_B8 
-            4019eb     16 DATAREF STACK 230 esp + 128 CHILDOF 218 OFFSET 128 LOCALVAR var_A8 
-            4019eb     16 DATAREF STACK 242 esp + 248 CHILDOF 218 OFFSET 248 LOCALVAR var_30 
-            4019eb     24 DATAREF STACK 231 esp + 144 CHILDOF 218 OFFSET 144 LOCALVAR var_98 
-            4019eb    264 DATAREF STACK 218 esp + 0 PARENT LocalFrame LOCALFRAME
+            4019eb    264 DATAREF STACK 212 esp + 0 PARENT LocalFrame LOCALFRAME
             4019eb     32 MEMORYHOLE STACK esp + 264 CalleeSavedRegs 
-            4019eb      4 DATAREF STACK 219 esp + 0 CHILDOF 218 OFFSET 0 OutArgsRegion OUTARGS
+            4019eb      4 DATAREF STACK 213 esp + 0 CHILDOF 212 OFFSET 0 OutArgsRegion OUTARGS
             4019eb      7 INSTR BELONGTO 4019d0 
             4019eb      7 INSTR DEADREGS  EFLAGS RCX RDX RBX RSI R13 XMM7 ZZ sub     rsp, 108h 
-            4019eb      8 DATAREF STACK 220 esp + 8 CHILDOF 218 OFFSET 8 LOCALVAR var_120 
-            4019eb      8 DATAREF STACK 221 esp + 16 CHILDOF 218 OFFSET 16 LOCALVAR var_118 
-            4019eb      8 DATAREF STACK 222 esp + 24 CHILDOF 218 OFFSET 24 LOCALVAR var_110 
-            4019eb      8 DATAREF STACK 223 esp + 32 CHILDOF 218 OFFSET 32 LOCALVAR var_108 
-            4019eb      8 DATAREF STACK 224 esp + 40 CHILDOF 218 OFFSET 40 LOCALVAR var_100 
-            4019eb      8 DATAREF STACK 232 esp + 168 CHILDOF 218 OFFSET 168 LOCALVAR var_80 
-            4019eb      8 DATAREF STACK 233 esp + 176 CHILDOF 218 OFFSET 176 LOCALVAR cosx 
-            4019eb      8 DATAREF STACK 234 esp + 184 CHILDOF 218 OFFSET 184 LOCALVAR sinx 
-            4019eb      8 DATAREF STACK 235 esp + 192 CHILDOF 218 OFFSET 192 LOCALVAR var_68 
-            4019eb      8 DATAREF STACK 236 esp + 200 CHILDOF 218 OFFSET 200 LOCALVAR var_60 
-            4019eb      8 DATAREF STACK 237 esp + 208 CHILDOF 218 OFFSET 208 LOCALVAR var_58 
-            4019eb      8 DATAREF STACK 238 esp + 216 CHILDOF 218 OFFSET 216 LOCALVAR var_50 
-            4019eb      8 DATAREF STACK 239 esp + 224 CHILDOF 218 OFFSET 224 LOCALVAR var_48 
-            4019eb      8 DATAREF STACK 240 esp + 232 CHILDOF 218 OFFSET 232 LOCALVAR var_40 
-            4019eb      8 DATAREF STACK 241 esp + 240 CHILDOF 218 OFFSET 240 LOCALVAR var_38 
             4019eb      8 MEMORYHOLE STACK esp + 296 ReturnAddress 
             4019f2     -1 INSTR LOCAL SafeIfNoIndexing movsd   xmm5, cs:qword_4031C8 
             4019f2      8 INSTR BELONGTO 4019d0 
@@ -1554,26 +1525,9 @@
             401f15      4 INSTR BELONGTO 401f10 
             401f19     -1 INSTR LOCAL MetadataUnused mov     rbx, rsi 
             401f19      3 INSTR BELONGTO 401f10 
-            401f1c     16 DATAREF STACK 244 esp + 0 CHILDOF 243 OFFSET 0 LOCALVAR var_F8 
-            401f1c     16 DATAREF STACK 245 esp + 16 CHILDOF 243 OFFSET 16 LOCALVAR var_E8 
-            401f1c     16 DATAREF STACK 246 esp + 32 CHILDOF 243 OFFSET 32 LOCALVAR var_D8 
-            401f1c     16 DATAREF STACK 247 esp + 48 CHILDOF 243 OFFSET 48 LOCALVAR var_C8 
-            401f1c     16 DATAREF STACK 248 esp + 64 CHILDOF 243 OFFSET 64 LOCALVAR var_B8 
-            401f1c     16 DATAREF STACK 249 esp + 80 CHILDOF 243 OFFSET 80 LOCALVAR var_A8 
-            401f1c     16 DATAREF STACK 250 esp + 96 CHILDOF 243 OFFSET 96 LOCALVAR var_98 
-            401f1c     16 DATAREF STACK 251 esp + 112 CHILDOF 243 OFFSET 112 LOCALVAR var_88 
-            401f1c     16 DATAREF STACK 252 esp + 128 CHILDOF 243 OFFSET 128 LOCALVAR var_78 
-            401f1c    240 DATAREF STACK 243 esp + 0 PARENT LocalFrame LOCALFRAME
-            401f1c     24 DATAREF STACK 256 esp + 168 CHILDOF 243 OFFSET 168 LOCALVAR var_50 
-            401f1c     24 DATAREF STACK 260 esp + 216 CHILDOF 243 OFFSET 216 LOCALVAR var_20 
+            401f1c    240 DATAREF STACK 214 esp + 0 PARENT LocalFrame LOCALFRAME
             401f1c      7 INSTR BELONGTO 401f10 
             401f1c      7 INSTR DEADREGS  EFLAGS XMM3 XMM6 XMM8 XMM9 XMM10 ZZ sub     rsp, 0F0h 
-            401f1c      8 DATAREF STACK 253 esp + 144 CHILDOF 243 OFFSET 144 LOCALVAR var_68 
-            401f1c      8 DATAREF STACK 254 esp + 152 CHILDOF 243 OFFSET 152 LOCALVAR var_60 
-            401f1c      8 DATAREF STACK 255 esp + 160 CHILDOF 243 OFFSET 160 LOCALVAR var_58 
-            401f1c      8 DATAREF STACK 257 esp + 192 CHILDOF 243 OFFSET 192 LOCALVAR cosx 
-            401f1c      8 DATAREF STACK 258 esp + 200 CHILDOF 243 OFFSET 200 LOCALVAR sinx 
-            401f1c      8 DATAREF STACK 259 esp + 208 CHILDOF 243 OFFSET 208 LOCALVAR var_28 
             401f1c      8 MEMORYHOLE STACK esp + 240 CalleeSavedRegs 
             401f1c      8 MEMORYHOLE STACK esp + 248 ReturnAddress 
             401f23     -1 INSTR LOCAL MetadataUnused movapd  xmm3, xmm1 
@@ -1968,23 +1922,12 @@
             4022e9     -3 INSTR LOCAL NoWarn push    rbx 
             4022ea     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
             4022ea      3 INSTR BELONGTO 4022e0 
-            4022ed     16 DATAREF STACK 262 esp + 0 CHILDOF 261 OFFSET 0 OutArgsRegion OUTARGS
+            4022ed     16 DATAREF STACK 216 esp + 0 CHILDOF 215 OFFSET 0 OutArgsRegion OUTARGS
             4022ed     24 MEMORYHOLE STACK esp + 96 CalleeSavedRegs 
-            4022ed      4 DATAREF STACK 272 esp + 88 CHILDOF 261 OFFSET 88 LOCALVAR var_20 
-            4022ed      4 DATAREF STACK 273 esp + 92 CHILDOF 261 OFFSET 92 LOCALVAR var_1C 
             4022ed      4 INSTR BELONGTO 4022e0 
             4022ed      4 INSTR DEADREGS  EFLAGS RSI ZZ sub     rsp, 60h 
-            4022ed      8 DATAREF STACK 263 esp + 16 CHILDOF 261 OFFSET 16 LOCALVAR var_68 
-            4022ed      8 DATAREF STACK 264 esp + 24 CHILDOF 261 OFFSET 24 LOCALVAR var_60 
-            4022ed      8 DATAREF STACK 265 esp + 32 CHILDOF 261 OFFSET 32 LOCALVAR var_58 
-            4022ed      8 DATAREF STACK 266 esp + 40 CHILDOF 261 OFFSET 40 LOCALVAR var_50 
-            4022ed      8 DATAREF STACK 267 esp + 48 CHILDOF 261 OFFSET 48 LOCALVAR var_48 
-            4022ed      8 DATAREF STACK 268 esp + 56 CHILDOF 261 OFFSET 56 LOCALVAR var_40 
-            4022ed      8 DATAREF STACK 269 esp + 64 CHILDOF 261 OFFSET 64 LOCALVAR var_38 
-            4022ed      8 DATAREF STACK 270 esp + 72 CHILDOF 261 OFFSET 72 LOCALVAR var_30 
-            4022ed      8 DATAREF STACK 271 esp + 80 CHILDOF 261 OFFSET 80 LOCALVAR var_28 
             4022ed      8 MEMORYHOLE STACK esp + 120 ReturnAddress 
-            4022ed     96 DATAREF STACK 261 esp + 0 PARENT LocalFrame LOCALFRAME
+            4022ed     96 DATAREF STACK 215 esp + 0 PARENT LocalFrame LOCALFRAME
             4022f1     -1 INSTR LOCAL NoMetaUpdate cmp     byte ptr [rdi+1C0h], 0 
             4022f1      7 INSTR BELONGTO 4022e0 
             4022f8     -1 INSTR LOCAL MetadataUnused movsd   [rsp+78h+var_58], xmm0 
@@ -2149,16 +2092,9 @@
             402435     -3 INSTR LOCAL NoWarn push    rbx 
             402436      3 INSTR BELONGTO 402430 
             402436      3 INSTR DEADREGS  EFLAGS RAX RDX RBX RDI R12 R13 ZZ mov     rbx, rsi 
-            402439     12 DATAREF STACK 282 esp + 156 CHILDOF 274 OFFSET 156 LOCALVAR var_2C 
-            402439    168 DATAREF STACK 274 esp + 0 PARENT LocalFrame LOCALFRAME
-            402439     16 DATAREF STACK 276 esp + 128 CHILDOF 274 OFFSET 128 LOCALVAR var_48 
-            402439      2 DATAREF STACK 277 esp + 144 CHILDOF 274 OFFSET 144 LOCALVAR var_38 
-            402439      2 DATAREF STACK 278 esp + 146 CHILDOF 274 OFFSET 146 LOCALVAR var_36 
-            402439      2 DATAREF STACK 279 esp + 148 CHILDOF 274 OFFSET 148 LOCALVAR var_34 
-            402439      2 DATAREF STACK 280 esp + 150 CHILDOF 274 OFFSET 150 LOCALVAR var_32 
-            402439     32 DATAREF STACK 275 esp + 0 CHILDOF 274 OFFSET 0 OutArgsRegion OUTARGS
+            402439    168 DATAREF STACK 217 esp + 0 PARENT LocalFrame LOCALFRAME
+            402439     32 DATAREF STACK 218 esp + 0 CHILDOF 217 OFFSET 0 OutArgsRegion OUTARGS
             402439     32 MEMORYHOLE STACK esp + 168 CalleeSavedRegs 
-            402439      4 DATAREF STACK 281 esp + 152 CHILDOF 274 OFFSET 152 LOCALVAR var_30 
             402439      7 INSTR BELONGTO 402430 
             402439      7 INSTR DEADREGS  EFLAGS RAX RDX RDI R12 R13 ZZ sub     rsp, 0A8h 
             402439      8 MEMORYHOLE STACK esp + 200 ReturnAddress 
@@ -2409,10 +2345,8 @@
             4026f4     -3 INSTR LOCAL NoWarn push    rbx 
             4026f5     -1 INSTR LOCAL MetadataUnused mov     rbx, rdi 
             4026f5      3 INSTR BELONGTO 4026f0 
-            4026f8     16 DATAREF STACK 284 esp + 0 CHILDOF 283 OFFSET 0 LOCALVAR var_28 
-            4026f8     16 DATAREF STACK 285 esp + 16 CHILDOF 283 OFFSET 16 LOCALVAR var_18 
             4026f8     -1 INSTR LOCAL SafeFrameAlloc sub     rsp, 20h 
-            4026f8     32 DATAREF STACK 283 esp + 0 PARENT LocalFrame LOCALFRAME
+            4026f8     32 DATAREF STACK 219 esp + 0 PARENT LocalFrame LOCALFRAME
             4026f8      4 INSTR BELONGTO 4026f0 
             4026f8      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 20h 
             4026f8      8 MEMORYHOLE STACK esp + 32 CalleeSavedRegs 
@@ -2501,13 +2435,11 @@
             4027a1     -3 INSTR LOCAL NoWarn push    rbx 
             4027a2      3 INSTR BELONGTO 4027a0 
             4027a2      3 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rbx, rdi 
-            4027a5    128 DATAREF STACK 288 esp + 16 CHILDOF 286 OFFSET 16 LOCALVAR var_E8 
             4027a5     16 MEMORYHOLE STACK esp + 232 CalleeSavedRegs 
-            4027a5    232 DATAREF STACK 286 esp + 0 PARENT LocalFrame LOCALFRAME
-            4027a5      4 DATAREF STACK 287 esp + 0 CHILDOF 286 OFFSET 0 OutArgsRegion OUTARGS
+            4027a5    232 DATAREF STACK 220 esp + 0 PARENT LocalFrame LOCALFRAME
+            4027a5      4 DATAREF STACK 221 esp + 0 CHILDOF 220 OFFSET 0 OutArgsRegion OUTARGS
             4027a5      7 INSTR BELONGTO 4027a0 
             4027a5      7 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 0E8h 
-            4027a5     88 DATAREF STACK 289 esp + 144 CHILDOF 286 OFFSET 144 LOCALVAR var_68 
             4027a5      8 MEMORYHOLE STACK esp + 248 ReturnAddress 
             4027ac      7 INSTR BELONGTO 4027a0 
             4027ac      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, [rdi+98h] 
@@ -2820,7 +2752,7 @@
             4029e8     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             4029e8      4 INSTR BELONGTO 4029e0 
             4029e8      4 INSTR DEADREGS  EFLAGS RAX RCX ZZ sub     rsp, 8 
-            4029e8      8 DATAREF STACK 290 esp + 0 PARENT LocalFrame LOCALFRAME
+            4029e8      8 DATAREF STACK 222 esp + 0 PARENT LocalFrame LOCALFRAME
             4029e8      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             4029ec      6 INSTR BELONGTO 4029e0 
             4029ec      6 INSTR DEADREGS  EFLAGS RAX RCX ZZ mov     eax, [rdi+108h] 
@@ -3217,7 +3149,7 @@
             403030      4 INSTR BELONGTO 403030 
             403030      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
             403030     61 FUNC GLOBAL sub_403030 FUNC_UNSAFE NOFP RET             40306c 
-            403030      8 DATAREF STACK 291 esp + 0 PARENT LocalFrame LOCALFRAME
+            403030      8 DATAREF STACK 223 esp + 0 PARENT LocalFrame LOCALFRAME
             403030      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             403034     -1 INSTR LOCAL NoMetaUpdate cmp     dword ptr [rsi], 21h 
             403034      3 INSTR BELONGTO 403030 
@@ -3283,13 +3215,7 @@
             403097      5 PTRIMMEDESP STACK -48 displ mov     [rsp+var_30], rbx
             40309c      4 INSTR BELONGTO 403070 
             40309c      4 INSTR DEADREGS  EFLAGS RBX R13 R14 R15 ZZ sub     rsp, 38h 
-            40309c     56 DATAREF STACK 292 esp + 0 PARENT LocalFrame LOCALFRAME
-            40309c      8 DATAREF STACK 293 esp + 8 CHILDOF 292 OFFSET 8 LOCALVAR var_30 
-            40309c      8 DATAREF STACK 294 esp + 16 CHILDOF 292 OFFSET 16 LOCALVAR var_28 
-            40309c      8 DATAREF STACK 295 esp + 24 CHILDOF 292 OFFSET 24 LOCALVAR var_20 
-            40309c      8 DATAREF STACK 296 esp + 32 CHILDOF 292 OFFSET 32 LOCALVAR var_18 
-            40309c      8 DATAREF STACK 297 esp + 40 CHILDOF 292 OFFSET 40 LOCALVAR var_10 
-            40309c      8 DATAREF STACK 298 esp + 48 CHILDOF 292 OFFSET 48 LOCALVAR var_8 
+            40309c     56 DATAREF STACK 224 esp + 0 PARENT LocalFrame LOCALFRAME
             40309c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             4030a0     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             4030a0      3 INSTR BELONGTO 403070 
@@ -3366,7 +3292,7 @@
             403115     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             403115      4 INSTR BELONGTO 403110 
             403115      4 INSTR DEADREGS  EFLAGS RAX RBX ZZ sub     rsp, 8 
-            403115      8 DATAREF STACK 299 esp + 0 PARENT LocalFrame LOCALFRAME
+            403115      8 DATAREF STACK 225 esp + 0 PARENT LocalFrame LOCALFRAME
             403115      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             403119      7 INSTR BELONGTO 403110 
             403119      7 INSTR DEADREGS  EFLAGS RAX RBX ZZ mov     rax, cs:qword_603DC8 
@@ -3401,7 +3327,7 @@
             403148     14 FUNC GLOBAL .term_proc FUNC_UNSAFE NOFP RET             403155 
             403148      4 INSTR BELONGTO 403148 
             403148      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI R8 R9 R10 R11 ZZ sub     rsp, 8          ; _fini 
-            403148      8 DATAREF STACK 300 esp + 0 PARENT LocalFrame LOCALFRAME
+            403148      8 DATAREF STACK 226 esp + 0 PARENT LocalFrame LOCALFRAME
             403148      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             40314c     -1 INSTR LOCAL NoMetaUpdate call    sub_401920 
             40314c      5 INSTR BELONGTO 403148 
diff --git a/tests/quick/trimmed-sorted-save-bzip2.psexe.annot b/tests/quick/trimmed-sorted-save-bzip2.psexe.annot
index 810fd4ca8fa7d6abc8c63d914e30d53f03497dda..1eaa48c48abdbbca42c84a5310771967bbf1a68f 100644
--- a/tests/quick/trimmed-sorted-save-bzip2.psexe.annot
+++ b/tests/quick/trimmed-sorted-save-bzip2.psexe.annot
@@ -600,7 +600,6 @@
             4013b4      1 INSTR BELONGTO 4013a0 
             4013b4      1 INSTR DEADREGS  EFLAGS R13 ZZ push    rbx 
             4013b4     -3 INSTR LOCAL NoWarn push    rbx 
-            4013b5     16 DATAREF STACK 271 esp + 8 CHILDOF 270 OFFSET 8 LOCALVAR ptr 
             4013b5     24 DATAREF STACK 270 esp + 0 PARENT LocalFrame LOCALFRAME
             4013b5     32 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
             4013b5      4 INSTR BELONGTO 4013a0 
@@ -1825,9 +1824,9 @@
             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 + 0 CalleeSavedRegs 
             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 
@@ -1849,7 +1848,7 @@
             401e20     23 FUNC GLOBAL sub_401E20 FUNC_SAFE NOFP RET             401e36 
             401e20      4 INSTR BELONGTO 401e20 
             401e20      4 INSTR DEADREGS  EFLAGS RAX ZZ sub     rsp, 8 
-            401e20      8 DATAREF STACK 272 esp + 0 PARENT LocalFrame LOCALFRAME
+            401e20      8 DATAREF STACK 271 esp + 0 PARENT LocalFrame LOCALFRAME
             401e20      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             401e24      7 INSTR BELONGTO 401e20 
             401e24      7 INSTR DEADREGS  EFLAGS RAX ZZ mov     rax, cs:__gmon_start___ptr 
@@ -1879,7 +1878,7 @@
             401e45     16 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
             401e45      4 INSTR BELONGTO 401e40 
             401e45      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 8 
-            401e45      8 DATAREF STACK 273 esp + 0 PARENT LocalFrame LOCALFRAME
+            401e45      8 DATAREF STACK 272 esp + 0 PARENT LocalFrame LOCALFRAME
             401e45      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             401e49     -1 INSTR LOCAL NoMetaUpdate cmp     cs:byte_6071F8, 0 
             401e49      7 INSTR BELONGTO 401e40 
@@ -1948,14 +1947,10 @@
             401ed1      1 INSTR BELONGTO 401eb0 
             401ee0      0 FUNC FRAMERESTORE 0 0 1 1 0 0 2 0 0 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
             401ee0      0 FUNC MMSAFENESS UNSAFE
-            401ee0     16 DATAREF STACK 278 esp + 40 CHILDOF 274 OFFSET 40 LOCALVAR var_10 
-            401ee0      1 DATAREF STACK 276 esp + 31 CHILDOF 274 OFFSET 31 LOCALVAR var_19 
             401ee0    206 FUNC GLOBAL sub_401EE0 FUNC_UNSAFE NOFP RET             401fad 
-            401ee0     31 DATAREF STACK 275 esp + 0 CHILDOF 274 OFFSET 0 LOCALVAR var_38 
             401ee0      4 INSTR BELONGTO 401ee0 
             401ee0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX R8 R9 R10 R11 ZZ sub     rsp, 38h 
-            401ee0     56 DATAREF STACK 274 esp + 0 PARENT LocalFrame LOCALFRAME
-            401ee0      8 DATAREF STACK 277 esp + 32 CHILDOF 274 OFFSET 32 LOCALVAR var_18 
+            401ee0     56 DATAREF STACK 273 esp + 0 PARENT LocalFrame LOCALFRAME
             401ee0      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             401ee4     -2 INSTR LOCAL n R11 ZZ  AlwaysNUM xor     r11d, r11d 
             401ee4      3 INSTR BELONGTO 401ee0 
@@ -2096,12 +2091,9 @@
             401fba      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbp, rsi 
             401fbd     -1 INSTR LOCAL MetadataUnused mov     [rsp+var_8], r12 
             401fbd      5 INSTR BELONGTO 401fb0 
-            401fc2     24 DATAREF STACK 279 esp + 0 PARENT LocalFrame LOCALFRAME
+            401fc2     24 DATAREF STACK 274 esp + 0 PARENT LocalFrame LOCALFRAME
             401fc2      4 INSTR BELONGTO 401fb0 
             401fc2      4 INSTR DEADREGS  EFLAGS RBX R12 ZZ sub     rsp, 18h 
-            401fc2      8 DATAREF STACK 280 esp + 0 CHILDOF 279 OFFSET 0 LOCALVAR var_18 
-            401fc2      8 DATAREF STACK 281 esp + 8 CHILDOF 279 OFFSET 8 LOCALVAR var_10 
-            401fc2      8 DATAREF STACK 282 esp + 16 CHILDOF 279 OFFSET 16 LOCALVAR var_8 
             401fc2      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             401fc6      3 INSTR BELONGTO 401fb0 
             401fc6      3 INSTR DEADREGS  EFLAGS RBX R12 ZZ mov     rbx, rdi 
@@ -2246,7 +2238,7 @@
             402090      4 INSTR BELONGTO 402090 
             402090      4 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ sub     rsp, 8 
             402090     61 FUNC GLOBAL sub_402090 FUNC_UNSAFE NOFP NORET             4020cc 
-            402090      8 DATAREF STACK 283 esp + 0 PARENT LocalFrame LOCALFRAME
+            402090      8 DATAREF STACK 275 esp + 0 PARENT LocalFrame LOCALFRAME
             402090      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402094      7 INSTR BELONGTO 402090 
             402094      7 INSTR DEADREGS  EFLAGS RCX RDX RSI RDI ZZ mov     rcx, cs:stderr  ; s 
@@ -2281,9 +2273,8 @@
             4020d1      2 INSTR BELONGTO 4020d0 
             4020d1      2 INSTR DEADREGS  EFLAGS RBX ZZ mov     ebx, edi 
             4020d1     -2 INSTR LOCAL n EBX ZZ  NumericDEFs mov     ebx, edi 
-            4020d3    144 DATAREF STACK 286 esp + 16 CHILDOF 284 OFFSET 16 LOCALVAR stat_buf 
-            4020d3    160 DATAREF STACK 284 esp + 0 PARENT LocalFrame LOCALFRAME
-            4020d3      4 DATAREF STACK 285 esp + 0 CHILDOF 284 OFFSET 0 OutArgsRegion OUTARGS
+            4020d3    160 DATAREF STACK 276 esp + 0 PARENT LocalFrame LOCALFRAME
+            4020d3      4 DATAREF STACK 277 esp + 0 CHILDOF 276 OFFSET 0 OutArgsRegion OUTARGS
             4020d3      7 INSTR BELONGTO 4020d0 
             4020d3      7 INSTR DEADREGS  EFLAGS RDI ZZ sub     rsp, 0A0h 
             4020d3      8 MEMORYHOLE STACK esp + 160 CalleeSavedRegs 
@@ -2489,7 +2480,7 @@
             402280     45 FUNC GLOBAL sub_402280 FUNC_UNSAFE NOFP NORET             4022ac 
             402280      4 INSTR BELONGTO 402280 
             402280      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ sub     rsp, 8 
-            402280      8 DATAREF STACK 287 esp + 0 PARENT LocalFrame LOCALFRAME
+            402280      8 DATAREF STACK 278 esp + 0 PARENT LocalFrame LOCALFRAME
             402280      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402284      7 INSTR BELONGTO 402280 
             402284      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rdi, cs:stderr 
@@ -2517,7 +2508,7 @@
             4022b0     40 FUNC GLOBAL sub_4022B0 FUNC_UNSAFE NOFP RET             4022d7 
             4022b0      4 INSTR BELONGTO 4022b0 
             4022b0      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 8 
-            4022b0      8 DATAREF STACK 288 esp + 0 PARENT LocalFrame LOCALFRAME
+            4022b0      8 DATAREF STACK 279 esp + 0 PARENT LocalFrame LOCALFRAME
             4022b0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4022b4     -1 INSTR LOCAL NoMetaUpdate call    _BZ2_bzlibVersion 
             4022b4      5 INSTR BELONGTO 4022b0 
@@ -2622,7 +2613,7 @@
             402380      4 INSTR BELONGTO 402380 
             402380      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ sub     rsp, 8 
             402380     50 FUNC GLOBAL sub_402380 FUNC_UNSAFE NOFP NORET             4023b1 
-            402380      8 DATAREF STACK 289 esp + 0 PARENT LocalFrame LOCALFRAME
+            402380      8 DATAREF STACK 280 esp + 0 PARENT LocalFrame LOCALFRAME
             402380      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402384      7 INSTR BELONGTO 402380 
             402384      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rdi, cs:stderr 
@@ -2653,7 +2644,7 @@
             4023c0      4 INSTR BELONGTO 4023c0 
             4023c0      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 ZZ sub     rsp, 8 
             4023c0     53 FUNC GLOBAL sub_4023C0 FUNC_UNSAFE NOFP NORET             4023f4 
-            4023c0      8 DATAREF STACK 290 esp + 0 PARENT LocalFrame LOCALFRAME
+            4023c0      8 DATAREF STACK 281 esp + 0 PARENT LocalFrame LOCALFRAME
             4023c0      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             4023c4      3 INSTR BELONGTO 4023c0 
             4023c4      3 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI R8 ZZ mov     r8, rdi 
@@ -2686,7 +2677,7 @@
             402400    109 FUNC GLOBAL handler FUNC_UNSAFE NOFP NORET             40246c 
             402400      4 INSTR BELONGTO 402400 
             402400      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ sub     rsp, 8 
-            402400      8 DATAREF STACK 291 esp + 0 PARENT LocalFrame LOCALFRAME
+            402400      8 DATAREF STACK 282 esp + 0 PARENT LocalFrame LOCALFRAME
             402400      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402404     -1 INSTR LOCAL NoMetaUpdate cmp     cs:dword_608350, 1 
             402404      7 INSTR BELONGTO 402400 
@@ -2749,7 +2740,7 @@
             402470      4 INSTR BELONGTO 402470 
             402470      4 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ sub     rsp, 8 
             402470     62 FUNC GLOBAL sub_402470 FUNC_UNSAFE NOFP NORET             4024ad 
-            402470      8 DATAREF STACK 292 esp + 0 PARENT LocalFrame LOCALFRAME
+            402470      8 DATAREF STACK 283 esp + 0 PARENT LocalFrame LOCALFRAME
             402470      8 MEMORYHOLE STACK esp + 8 ReturnAddress 
             402474      7 INSTR BELONGTO 402470 
             402474      7 INSTR DEADREGS  EFLAGS RAX RCX RDX RSI RDI ZZ mov     rcx, cs:s 
@@ -2835,42 +2826,11 @@
             4024ec      1 INSTR BELONGTO 4024e0 
             4024ec      1 INSTR DEADREGS  EFLAGS RAX R12 R13 R15 ZZ push    rbx 
             4024ec     -3 INSTR LOCAL NoWarn push    rbx 
-            4024ed     16 DATAREF STACK 296 esp + 32 CHILDOF 293 OFFSET 32 LOCALVAR var_1478 
-            4024ed     16 DATAREF STACK 298 esp + 72 CHILDOF 293 OFFSET 72 LOCALVAR stream 
-            4024ed     16 DATAREF STACK 325 esp + 5208 CHILDOF 293 OFFSET 5208 LOCALVAR var_40 
-            4024ed      1 DATAREF STACK 308 esp + 5184 CHILDOF 293 OFFSET 5184 LOCALVAR var_58 
-            4024ed      1 DATAREF STACK 309 esp + 5185 CHILDOF 293 OFFSET 5185 LOCALVAR var_57 
-            4024ed      1 DATAREF STACK 310 esp + 5186 CHILDOF 293 OFFSET 5186 LOCALVAR var_56 
-            4024ed      1 DATAREF STACK 311 esp + 5187 CHILDOF 293 OFFSET 5187 LOCALVAR var_55 
-            4024ed      1 DATAREF STACK 312 esp + 5188 CHILDOF 293 OFFSET 5188 LOCALVAR var_54 
-            4024ed      1 DATAREF STACK 313 esp + 5189 CHILDOF 293 OFFSET 5189 LOCALVAR var_53 
-            4024ed      1 DATAREF STACK 314 esp + 5190 CHILDOF 293 OFFSET 5190 LOCALVAR var_52 
-            4024ed      1 DATAREF STACK 315 esp + 5191 CHILDOF 293 OFFSET 5191 LOCALVAR var_51 
-            4024ed      1 DATAREF STACK 317 esp + 5200 CHILDOF 293 OFFSET 5200 LOCALVAR var_48 
-            4024ed      1 DATAREF STACK 318 esp + 5201 CHILDOF 293 OFFSET 5201 LOCALVAR var_47 
-            4024ed      1 DATAREF STACK 319 esp + 5202 CHILDOF 293 OFFSET 5202 LOCALVAR var_46 
-            4024ed      1 DATAREF STACK 320 esp + 5203 CHILDOF 293 OFFSET 5203 LOCALVAR var_45 
-            4024ed      1 DATAREF STACK 321 esp + 5204 CHILDOF 293 OFFSET 5204 LOCALVAR var_44 
-            4024ed      1 DATAREF STACK 322 esp + 5205 CHILDOF 293 OFFSET 5205 LOCALVAR var_43 
-            4024ed      1 DATAREF STACK 323 esp + 5206 CHILDOF 293 OFFSET 5206 LOCALVAR var_42 
-            4024ed      1 DATAREF STACK 324 esp + 5207 CHILDOF 293 OFFSET 5207 LOCALVAR var_41 
-            4024ed     24 DATAREF STACK 297 esp + 48 CHILDOF 293 OFFSET 48 LOCALVAR var_1468 
-            4024ed     32 DATAREF STACK 306 esp + 5120 CHILDOF 293 OFFSET 5120 LOCALVAR var_98 
-            4024ed     32 DATAREF STACK 307 esp + 5152 CHILDOF 293 OFFSET 5152 LOCALVAR var_78 
             4024ed     48 MEMORYHOLE STACK esp + 5224 CalleeSavedRegs 
-            4024ed      4 DATAREF STACK 299 esp + 88 CHILDOF 293 OFFSET 88 LOCALVAR var_1440 
-            4024ed      4 DATAREF STACK 300 esp + 92 CHILDOF 293 OFFSET 92 LOCALVAR var_143C 
-            4024ed      4 DATAREF STACK 301 esp + 96 CHILDOF 293 OFFSET 96 LOCALVAR var_1438 
-            4024ed      4 DATAREF STACK 302 esp + 100 CHILDOF 293 OFFSET 100 LOCALVAR var_1434 
-            4024ed      4 DATAREF STACK 303 esp + 104 CHILDOF 293 OFFSET 104 LOCALVAR var_1430 
-            4024ed      4 DATAREF STACK 304 esp + 108 CHILDOF 293 OFFSET 108 LOCALVAR var_142C 
-            4024ed   5008 DATAREF STACK 305 esp + 112 CHILDOF 293 OFFSET 112 LOCALVAR ptr 
-            4024ed   5224 DATAREF STACK 293 esp + 0 PARENT LocalFrame LOCALFRAME
+            4024ed   5224 DATAREF STACK 284 esp + 0 PARENT LocalFrame LOCALFRAME
             4024ed      7 INSTR BELONGTO 4024e0 
             4024ed      7 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 R15 ZZ sub     rsp, 1468h 
-            4024ed      8 DATAREF STACK 294 esp + 0 CHILDOF 293 OFFSET 0 OutArgsRegion OUTARGS
-            4024ed      8 DATAREF STACK 295 esp + 24 CHILDOF 293 OFFSET 24 LOCALVAR var_1480 
-            4024ed      8 DATAREF STACK 316 esp + 5192 CHILDOF 293 OFFSET 5192 LOCALVAR var_50 
+            4024ed      8 DATAREF STACK 285 esp + 0 CHILDOF 284 OFFSET 0 OutArgsRegion OUTARGS
             4024ed      8 MEMORYHOLE STACK esp + 5272 ReturnAddress 
             4024f4     -2 INSTR LOCAL n RAX ZZ  NumericDEFs mov     rax, fs:28h 
             4024f4      9 INSTR BELONGTO 4024e0 
@@ -3466,17 +3426,10 @@
             402983     -3 INSTR LOCAL NoWarn push    rbx 
             402984      3 INSTR BELONGTO 402980 
             402984      3 INSTR DEADREGS  EFLAGS RAX RBX R12 ZZ mov     rbx, rdi 
-            402987  10048 DATAREF STACK 326 esp + 0 PARENT LocalFrame LOCALFRAME
-            402987     12 DATAREF STACK 327 esp + 8 CHILDOF 326 OFFSET 8 LOCALVAR var_2750 
+            402987  10048 DATAREF STACK 286 esp + 0 PARENT LocalFrame LOCALFRAME
             402987     24 MEMORYHOLE STACK esp + 10048 CalleeSavedRegs 
-            402987      4 DATAREF STACK 328 esp + 20 CHILDOF 326 OFFSET 20 LOCALVAR var_2744 
-            402987      4 DATAREF STACK 329 esp + 24 CHILDOF 326 OFFSET 24 LOCALVAR var_2740 
-            402987      4 DATAREF STACK 330 esp + 28 CHILDOF 326 OFFSET 28 LOCALVAR var_273C 
-            402987   5000 DATAREF STACK 332 esp + 5040 CHILDOF 326 OFFSET 5040 LOCALVAR var_13A8 
-            402987   5008 DATAREF STACK 331 esp + 32 CHILDOF 326 OFFSET 32 LOCALVAR var_2738 
             402987      7 INSTR BELONGTO 402980 
             402987      7 INSTR DEADREGS  EFLAGS RAX R12 ZZ sub     rsp, 2740h 
-            402987      8 DATAREF STACK 333 esp + 10040 CHILDOF 326 OFFSET 10040 LOCALVAR var_20 
             402987      8 MEMORYHOLE STACK esp + 10072 ReturnAddress 
             40298e      9 INSTR BELONGTO 402980 
             40298e      9 INSTR DEADREGS  EFLAGS RAX R12 ZZ mov     rax, fs:28h 
@@ -3887,15 +3840,8 @@
             402c6b     -3 INSTR LOCAL NoWarn push    rbx 
             402c6c      3 INSTR BELONGTO 402c60 
             402c6c      3 INSTR DEADREGS  EFLAGS RAX RBX R12 R13 ZZ mov     rbx, rsi 
-            402c6f  10056 DATAREF STACK 334 esp + 0 PARENT LocalFrame LOCALFRAME
-            402c6f     12 DATAREF STACK 335 esp + 8 CHILDOF 334 OFFSET 8 LOCALVAR var_2760 
-            402c6f     16 DATAREF STACK 341 esp + 10040 CHILDOF 334 OFFSET 10040 LOCALVAR var_30 
+            402c6f  10056 DATAREF STACK 287 esp + 0 PARENT LocalFrame LOCALFRAME
             402c6f     32 MEMORYHOLE STACK esp + 10056 CalleeSavedRegs 
-            402c6f      4 DATAREF STACK 336 esp + 20 CHILDOF 334 OFFSET 20 LOCALVAR var_2754 
-            402c6f      4 DATAREF STACK 337 esp + 24 CHILDOF 334 OFFSET 24 LOCALVAR var_2750 
-            402c6f      4 DATAREF STACK 338 esp + 28 CHILDOF 334 OFFSET 28 LOCALVAR var_274C 
-            402c6f   5000 DATAREF STACK 340 esp + 5040 CHILDOF 334 OFFSET 5040 LOCALVAR var_13B8 
-            402c6f   5008 DATAREF STACK 339 esp + 32 CHILDOF 334 OFFSET 32 LOCALVAR ptr 
             402c6f      7 INSTR BELONGTO 402c60 
             402c6f      7 INSTR DEADREGS  EFLAGS RAX R12 R13 ZZ sub     rsp, 2748h 
             402c6f      8 MEMORYHOLE STACK esp + 10088 ReturnAddress 
@@ -4472,11 +4418,9 @@
             403085      5 INSTR BELONGTO 403080 
             403085      5 INSTR DEADREGS  EFLAGS RBX ZZ mov     [rsp+var_8], rbp 
             403085      5 PTRIMMEDESP STACK -8 displ mov     [rsp+var_8], rbp
-            40308a     24 DATAREF STACK 342 esp + 0 PARENT LocalFrame LOCALFRAME
+            40308a     24 DATAREF STACK 288 esp + 0 PARENT LocalFrame LOCALFRAME
             40308a      4 INSTR BELONGTO 403080 
             40308a      4 INSTR DEADREGS  EFLAGS RBX ZZ sub     rsp, 18h 
-            40308a      8 DATAREF STACK 343 esp + 8 CHILDOF 342 OFFSET 8 LOCALVAR var_10 
-            40308a      8 DATAREF STACK 344 esp + 16 CHILDOF 342 OFFSET 16 LOCALVAR var_8 
             40308a      8 MEMORYHOLE STACK esp + 24 ReturnAddress 
             40308e      3 INSTR BELONGTO 403080 
             40308e      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbp, rdi 
@@ -4558,9 +4502,8 @@
             403114     -3 INSTR LOCAL NoWarn push    rbx 
             403115      3 INSTR BELONGTO 403110 
             403115      3 INSTR DEADREGS  EFLAGS RBX ZZ mov     rbx, rdi 
-            403118     16 DATAREF STACK 346 esp + 8 CHILDOF 345 OFFSET 8 LOCALVAR s 
             403118     16 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
-            403118     24 DATAREF STACK 345 esp + 0 PARENT LocalFrame LOCALFRAME
+            403118     24 DATAREF STACK 289 esp + 0 PARENT LocalFrame LOCALFRAME
             403118      4 INSTR BELONGTO 403110 
             403118      4 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 18h 
             403118      8 MEMORYHOLE STACK esp + 40 ReturnAddress 
@@ -4819,11 +4762,9 @@
             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 347 esp + 0 PARENT LocalFrame LOCALFRAME
+            4032ac     24 DATAREF STACK 290 esp + 0 PARENT LocalFrame LOCALFRAME
             4032ac      4 INSTR BELONGTO 4032a0 
             4032ac      4 INSTR DEADREGS  EFLAGS RDX RBX RSI RDI ZZ sub     rsp, 18h 
-            4032ac      8 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 
@@ -4879,8 +4820,7 @@
             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 351 esp + 24 CHILDOF 350 OFFSET 24 LOCALVAR var_80 
-            403310    152 DATAREF STACK 350 esp + 0 PARENT LocalFrame LOCALFRAME
+            403310    152 DATAREF STACK 291 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 
@@ -4925,7 +4865,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 352 esp + 0 PARENT LocalFrame LOCALFRAME
+            403350      8 DATAREF STACK 292 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 
@@ -4951,8 +4891,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 354 esp + 0 CHILDOF 353 OFFSET 0 OutArgsRegion OUTARGS
-            403380     24 DATAREF STACK 353 esp + 0 PARENT LocalFrame LOCALFRAME
+            403380     16 DATAREF STACK 294 esp + 0 CHILDOF 293 OFFSET 0 OutArgsRegion OUTARGS
+            403380     24 DATAREF STACK 293 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 
@@ -5112,13 +5052,11 @@
             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 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 355 esp + 0 PARENT LocalFrame LOCALFRAME
+            403487    304 DATAREF STACK 295 esp + 0 PARENT LocalFrame LOCALFRAME
             403487      7 INSTR BELONGTO 403480 
             403487      7 INSTR DEADREGS  EFLAGS R12 ZZ sub     rsp, 130h 
-            403487      8 DATAREF STACK 356 esp + 0 CHILDOF 355 OFFSET 0 OutArgsRegion OUTARGS
+            403487      8 DATAREF STACK 296 esp + 0 CHILDOF 295 OFFSET 0 OutArgsRegion OUTARGS
             403487      8 MEMORYHOLE STACK esp + 328 ReturnAddress 
             40348e     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             40348e      3 INSTR BELONGTO 403480 
@@ -5962,8 +5900,7 @@
             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 360 esp + 24 CHILDOF 359 OFFSET 24 LOCALVAR var_80 
-            403c04    144 DATAREF STACK 359 esp + 0 PARENT LocalFrame LOCALFRAME
+            403c04    144 DATAREF STACK 297 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 
@@ -6298,13 +6235,11 @@
             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 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 361 esp + 0 PARENT LocalFrame LOCALFRAME
+            403ef5    312 DATAREF STACK 298 esp + 0 PARENT LocalFrame LOCALFRAME
             403ef5      7 INSTR BELONGTO 403ef0 
             403ef5      7 INSTR DEADREGS  EFLAGS ZZ sub     rsp, 138h 
-            403ef5      8 DATAREF STACK 362 esp + 0 CHILDOF 361 OFFSET 0 OutArgsRegion OUTARGS
+            403ef5      8 DATAREF STACK 299 esp + 0 CHILDOF 298 OFFSET 0 OutArgsRegion OUTARGS
             403ef5      8 MEMORYHOLE STACK esp + 328 ReturnAddress 
             403efc     -1 INSTR LOCAL NoMetaUpdate test    rdi, rdi 
             403efc      3 INSTR BELONGTO 403ef0 
@@ -7048,13 +6983,7 @@
             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 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     56 DATAREF STACK 300 esp + 0 PARENT LocalFrame LOCALFRAME
             40456c      8 MEMORYHOLE STACK esp + 56 ReturnAddress 
             404570     -1 INSTR LOCAL MetadataUnused sub     rbp, r12 
             404570      3 INSTR BELONGTO 404540 
@@ -7131,7 +7060,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 372 esp + 0 PARENT LocalFrame LOCALFRAME
+            4045e5      8 DATAREF STACK 301 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 
@@ -7166,7 +7095,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 373 esp + 0 PARENT LocalFrame LOCALFRAME
+            404618      8 DATAREF STACK 302 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 fd01fce6093da57221a21692e3117654ed16c63e..2cc1697461bc28482e21193d23cd11f109e2a6e9 100644
--- a/tests/quick/trimmed-sorted-save-malloc.psexe.annot
+++ b/tests/quick/trimmed-sorted-save-malloc.psexe.annot
@@ -179,10 +179,13 @@
            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     12 DATAREF STACK 45 esp + 0 PARENT LocalFrame LOCALFRAME
+           8048547      4 DATAREF STACK 46 esp + 0 CHILDOF 45 OFFSET 0 OutArgsRegion OUTARGS
            8048547      4 MEMORYHOLE STACK esp + 32 ReturnAddress 
            8048547      5 INSTR BELONGTO 8048530 
            8048547      5 INSTR DEADREGS  EFLAGS ESI ZZ push    offset main     ; main 
+           8048547      8 MEMORYHOLE STACK esp + 20 CalleeSavedRegs 
+           8048547      8 MEMORYHOLE STACK esp + 4 CalleeSavedRegs 
            804854c     -1 INSTR LOCAL NoMetaUpdate call    ___libc_start_main 
            804854c      5 INSTR BELONGTO 8048530 
            804854c      5 INSTR DEADREGS  EFLAGS ESI ZZ call    ___libc_start_main 
@@ -201,7 +204,7 @@
            8048563     -3 INSTR LOCAL NoWarn push    ebx 
            8048564      3 INSTR BELONGTO 8048560 
            8048564      3 INSTR DEADREGS  EFLAGS EBX ZZ sub     esp, 4 
-           8048564      4 DATAREF STACK 45 esp + 0 PARENT LocalFrame LOCALFRAME
+           8048564      4 DATAREF STACK 47 esp + 0 PARENT LocalFrame LOCALFRAME
            8048564      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
            8048564      8 MEMORYHOLE STACK esp + 4 CalleeSavedRegs 
            8048567     -1 INSTR LOCAL NoMetaUpdate cmp     ds:completed_6159, 0 
@@ -255,10 +258,10 @@
            80485c0     -3 INSTR LOCAL NoWarn push    ebp 
            80485c1      2 INSTR BELONGTO 80485c0 
            80485c1      2 INSTR DEADREGS  EFLAGS EAX ZZ mov     ebp, esp 
-           80485c3     24 DATAREF STACK 46 esp + 0 PARENT LocalFrame LOCALFRAME
+           80485c3     24 DATAREF STACK 48 esp + 0 PARENT LocalFrame LOCALFRAME
            80485c3      3 INSTR BELONGTO 80485c0 
            80485c3      3 INSTR DEADREGS  EFLAGS EAX ZZ sub     esp, 18h 
-           80485c3      4 DATAREF STACK 47 esp + 0 CHILDOF 46 OFFSET 0 OutArgsRegion OUTARGS
+           80485c3      4 DATAREF STACK 49 esp + 0 CHILDOF 48 OFFSET 0 OutArgsRegion OUTARGS
            80485c3      4 MEMORYHOLE STACK esp + 24 CalleeSavedRegs 
            80485c3      4 MEMORYHOLE STACK esp + 28 ReturnAddress 
            80485c6      5 INSTR BELONGTO 80485c0 
@@ -286,15 +289,11 @@
            80485e2     24 DEALLOC STACK esp - 24 retn
            80485f0      0 FUNC FRAMERESTORE 0 0 4 1 0 0 2 0 0 3 0 0 4 0 8 5 0 0 6 0 0 7 0 0 ZZ
            80485f0      0 FUNC MMSAFENESS SAFE
-           80485f0     16 DATAREF STACK 49 esp + 0 CHILDOF 48 OFFSET 0 OutArgsRegion OUTARGS
+           80485f0     16 DATAREF STACK 51 esp + 0 CHILDOF 50 OFFSET 0 OutArgsRegion OUTARGS
            80485f0    209 FUNC GLOBAL dohanoi FUNC_UNSAFE NOFP RET            80486c0 
            80485f0      3 INSTR BELONGTO 80485f0 
            80485f0      3 INSTR DEADREGS  EFLAGS EAX ZZ sub     esp, 2Ch 
-           80485f0     44 DATAREF STACK 48 esp + 0 PARENT LocalFrame LOCALFRAME
-           80485f0      4 DATAREF STACK 50 esp + 28 CHILDOF 48 OFFSET 28 LOCALVAR var_10 
-           80485f0      4 DATAREF STACK 51 esp + 32 CHILDOF 48 OFFSET 32 LOCALVAR var_C 
-           80485f0      4 DATAREF STACK 52 esp + 36 CHILDOF 48 OFFSET 36 LOCALVAR var_8 
-           80485f0      4 DATAREF STACK 53 esp + 40 CHILDOF 48 OFFSET 40 LOCALVAR var_4 
+           80485f0     44 DATAREF STACK 50 esp + 0 PARENT LocalFrame LOCALFRAME
            80485f0      4 MEMORYHOLE STACK esp + 44 ReturnAddress 
            80485f3      4 INSTR BELONGTO 80485f0 
            80485f3      4 INSTR DEADREGS  EFLAGS EAX ZZ mov     [esp+2Ch+var_10], ebx 
@@ -451,8 +450,8 @@
            80486c6      3 INSTR BELONGTO 80486c1 
            80486c6      3 INSTR DEADREGS  EFLAGS EAX EBX ESI ZZ and     esp, 0FFFFFFF0h 
            80486c9     12 MEMORYHOLE STACK esp + 16 CalleeSavedRegs 
-           80486c9     16 DATAREF STACK 54 esp + 0 PARENT LocalFrame LOCALFRAME
-           80486c9     16 DATAREF STACK 55 esp + 0 CHILDOF 54 OFFSET 0 OutArgsRegion OUTARGS
+           80486c9     16 DATAREF STACK 52 esp + 0 PARENT LocalFrame LOCALFRAME
+           80486c9     16 DATAREF STACK 53 esp + 0 CHILDOF 52 OFFSET 0 OutArgsRegion OUTARGS
            80486c9      3 INSTR BELONGTO 80486c1 
            80486c9      3 INSTR DEADREGS  EFLAGS EAX EBX ESI ZZ sub     esp, 10h 
            80486c9      4 MEMORYHOLE STACK esp + 28 ReturnAddress 
@@ -629,9 +628,9 @@
            80487f4      5 INSTR DEADREGS  EFLAGS ESI EDI ZZ call    __i686_get_pc_thunk_bx 
            80487f9     -1 INSTR LOCAL 1stSrcVia2ndSrcIMMEDNUM add     ebx, 17FBh 
            80487f9      6 INSTR BELONGTO 80487f0 
-           80487ff     12 DATAREF STACK 57 esp + 0 CHILDOF 56 OFFSET 0 OutArgsRegion OUTARGS
+           80487ff     12 DATAREF STACK 55 esp + 0 CHILDOF 54 OFFSET 0 OutArgsRegion OUTARGS
            80487ff     16 MEMORYHOLE STACK esp + 28 CalleeSavedRegs 
-           80487ff     28 DATAREF STACK 56 esp + 0 PARENT LocalFrame LOCALFRAME
+           80487ff     28 DATAREF STACK 54 esp + 0 PARENT LocalFrame LOCALFRAME
            80487ff      3 INSTR BELONGTO 80487f0 
            80487ff      3 INSTR DEADREGS  EFLAGS ESI EDI ZZ sub     esp, 1Ch 
            80487ff      4 MEMORYHOLE STACK esp + 44 ReturnAddress 
@@ -725,7 +724,7 @@
            8048873     -3 INSTR LOCAL NoWarn push    ebx 
            8048874      3 INSTR BELONGTO 8048870 
            8048874      3 INSTR DEADREGS  EFLAGS EAX EBX ZZ sub     esp, 4 
-           8048874      4 DATAREF STACK 58 esp + 0 PARENT LocalFrame LOCALFRAME
+           8048874      4 DATAREF STACK 56 esp + 0 PARENT LocalFrame LOCALFRAME
            8048874      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
            8048874      8 MEMORYHOLE STACK esp + 4 CalleeSavedRegs 
            8048877      5 INSTR BELONGTO 8048870 
@@ -767,7 +766,7 @@
            804889d      3 INSTR DEADREGS  EFLAGS EBX ZZ sub     esp, 8 
            804889d      4 MEMORYHOLE STACK esp + 12 ReturnAddress 
            804889d      4 MEMORYHOLE STACK esp + 8 CalleeSavedRegs 
-           804889d      8 DATAREF STACK 59 esp + 0 PARENT LocalFrame LOCALFRAME
+           804889d      8 DATAREF STACK 57 esp + 0 PARENT LocalFrame LOCALFRAME
            80488a0     -1 INSTR LOCAL NoMetaUpdate call    $+5 
            80488a0      5 INSTR BELONGTO 804889c 
            80488a5      1 INSTR BELONGTO 804889c