diff --git a/Source/cursor.cpp b/Source/cursor.cpp
index 124ba1a76..62649c80f 100644
--- a/Source/cursor.cpp
+++ b/Source/cursor.cpp
@@ -75,12 +75,7 @@ void InitCursor()
 
 void FreeCursor()
 {
-	void *p;
-
-	p = pCursCels;
-	pCursCels = NULL;
-	mem_free_dbg(p);
-
+	MemFreeDbg(pCursCels);
 	ClearCursor();
 }
 
diff --git a/Source/debug.cpp b/Source/debug.cpp
index 1673d9e93..9139765bb 100644
--- a/Source/debug.cpp
+++ b/Source/debug.cpp
@@ -13,9 +13,7 @@ void LoadDebugGFX()
 
 void FreeDebugGFX()
 {
-	void *temp = pSquareCel;
-	pSquareCel = NULL;
-	mem_free_dbg(temp);
+	MemFreeDbg(pSquareCel);
 }
 
 void CheckDungeonClear()
diff --git a/Source/doom.cpp b/Source/doom.cpp
index eff49b2ed..f20768b65 100644
--- a/Source/doom.cpp
+++ b/Source/doom.cpp
@@ -42,9 +42,7 @@ void doom_alloc_cel()
 
 void doom_cleanup()
 {
-	void *ptr = pDoomCel;
-	pDoomCel = NULL;
-	mem_free_dbg(ptr);
+	MemFreeDbg(pDoomCel);
 }
 
 void doom_load_graphics()
diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp
index e893bdce9..3a085c727 100644
--- a/Source/drlg_l1.cpp
+++ b/Source/drlg_l1.cpp
@@ -425,11 +425,7 @@ void DRLG_LoadL1SP()
 
 void DRLG_FreeL1SP()
 {
-	void *ptr;
-
-	ptr = pSetPiece;
-	pSetPiece = NULL;
-	mem_free_dbg(ptr);
+	MemFreeDbg(pSetPiece);
 }
 
 void DRLG_L5(int entry)
diff --git a/Source/drlg_l2.cpp b/Source/drlg_l2.cpp
index 11290beb9..6ba5edf2b 100644
--- a/Source/drlg_l2.cpp
+++ b/Source/drlg_l2.cpp
@@ -650,11 +650,7 @@ void DRLG_LoadL2SP()
 
 void DRLG_FreeL2SP()
 {
-	char *ptr;
-
-	ptr = pSetPiece_2;
-	pSetPiece_2 = NULL;
-	mem_free_dbg(ptr);
+	MemFreeDbg(pSetPiece_2);
 }
 
 void DRLG_L2(int entry)
@@ -1517,21 +1513,18 @@ void AddHall(int nX1, int nY1, int nX2, int nY2, int nHd)
 
 void GetHall(int *nX1, int *nY1, int *nX2, int *nY2, int *nHd)
 {
-	HALLNODE *p1;
-	HALLNODE *p2;
+	HALLNODE *p;
 
-	p1 = pHallList->pNext;
+	p = pHallList->pNext;
 	*nX1 = pHallList->nHallx1;
 	*nY1 = pHallList->nHally1;
 	*nX2 = pHallList->nHallx2;
 	*nY2 = pHallList->nHally2;
 	*nHd = pHallList->nHalldir;
 
-	p2 = pHallList;
-	pHallList = NULL;
-	mem_free_dbg(p2);
+	MemFreeDbg(pHallList);
 
-	pHallList = p1;
+	pHallList = p;
 }
 
 void ConnectHall(int nX1, int nY1, int nX2, int nY2, int nHd)
diff --git a/Source/drlg_l4.cpp b/Source/drlg_l4.cpp
index 46d201800..6a69341e3 100644
--- a/Source/drlg_l4.cpp
+++ b/Source/drlg_l4.cpp
@@ -304,11 +304,7 @@ void DRLG_LoadL4SP()
 
 void DRLG_FreeL4SP()
 {
-	char *ptr;
-
-	ptr = pSetPiece_2;
-	pSetPiece_2 = NULL;
-	mem_free_dbg(ptr);
+	MemFreeDbg(pSetPiece_2);
 }
 
 void DRLG_L4SetSPRoom(int rx1, int ry1)
diff --git a/Source/dthread.cpp b/Source/dthread.cpp
index 1aabb4f66..ed4304495 100644
--- a/Source/dthread.cpp
+++ b/Source/dthread.cpp
@@ -127,7 +127,7 @@ unsigned int __stdcall dthread_handler(void *unused)
 void dthread_cleanup()
 {
 	char *error_buf;
-	TMegaPkt *tmp1, *tmp2;
+	TMegaPkt *tmp;
 
 	if (sghWorkToDoEvent == NULL) {
 		return;
@@ -147,10 +147,8 @@ void dthread_cleanup()
 	sghWorkToDoEvent = NULL;
 
 	while (sgpInfoHead) {
-		tmp1 = sgpInfoHead->pNext;
-		tmp2 = sgpInfoHead;
-		sgpInfoHead = NULL;
-		mem_free_dbg(tmp2);
-		sgpInfoHead = tmp1;
+		tmp = sgpInfoHead->pNext;
+		MemFreeDbg(sgpInfoHead);
+		sgpInfoHead = tmp;
 	}
 }
diff --git a/Source/gmenu.cpp b/Source/gmenu.cpp
index bd0e538c7..7698406fc 100644
--- a/Source/gmenu.cpp
+++ b/Source/gmenu.cpp
@@ -70,23 +70,11 @@ void gmenu_print_text(int x, int y, char *pszStr)
 
 void FreeGMenu()
 {
-	void *ptr;
-
-	ptr = sgpLogo;
-	sgpLogo = NULL;
-	mem_free_dbg(ptr);
-	ptr = BigTGold_cel;
-	BigTGold_cel = NULL;
-	mem_free_dbg(ptr);
-	ptr = PentSpin_cel;
-	PentSpin_cel = NULL;
-	mem_free_dbg(ptr);
-	ptr = option_cel;
-	option_cel = NULL;
-	mem_free_dbg(ptr);
-	ptr = optbar_cel;
-	optbar_cel = NULL;
-	mem_free_dbg(ptr);
+	MemFreeDbg(sgpLogo);
+	MemFreeDbg(BigTGold_cel);
+	MemFreeDbg(PentSpin_cel);
+	MemFreeDbg(option_cel);
+	MemFreeDbg(optbar_cel);
 }
 
 void gmenu_init_menu()
diff --git a/Source/interfac.cpp b/Source/interfac.cpp
index 4fd3e57fd..f56c16594 100644
--- a/Source/interfac.cpp
+++ b/Source/interfac.cpp
@@ -243,11 +243,7 @@ void ShowProgress(unsigned int uMsg)
 
 void FreeInterface()
 {
-	void *ptr;
-
-	ptr = sgpBackCel;
-	sgpBackCel = NULL;
-	mem_free_dbg(ptr);
+	MemFreeDbg(sgpBackCel);
 }
 
 void InitCutscene(unsigned int uMsg)
diff --git a/Source/inv.cpp b/Source/inv.cpp
index 1afa53578..0bed8ed3b 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -90,10 +90,7 @@ int AP2x2Tbl[10] = { 8, 28, 6, 26, 4, 24, 2, 22, 0, 20 }; // weak
 
 void FreeInvGFX()
 {
-	void *invCels = pInvCels;
-
-	pInvCels = NULL;
-	mem_free_dbg(invCels);
+	MemFreeDbg(pInvCels);
 }
 
 void InitInv()
diff --git a/Source/items.cpp b/Source/items.cpp
index 721237364..ab14c9229 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -3124,13 +3124,10 @@ void ProcessItems()
 
 void FreeItemGFX()
 {
-	int i;    // esi
-	void *v1; // ecx
+	int i;
 
 	for (i = 0; i < 35; i++) {
-		v1 = (void *)itemanims[i];
-		itemanims[i] = 0;
-		mem_free_dbg(v1);
+		MemFreeDbg(itemanims[i]);
 	}
 }
 
diff --git a/Source/lighting.cpp b/Source/lighting.cpp
index 2c0233e9d..0406e0439 100644
--- a/Source/lighting.cpp
+++ b/Source/lighting.cpp
@@ -751,11 +751,7 @@ void DoVision(int nXPos, int nYPos, int nRadius, BOOL doautomap, BOOL visible)
 
 void FreeLightTable()
 {
-	BYTE *ptr;
-
-	ptr = pLightTbl;
-	pLightTbl = NULL;
-	mem_free_dbg(ptr);
+	MemFreeDbg(pLightTbl);
 }
 
 void InitLightTable()
diff --git a/Source/minitext.cpp b/Source/minitext.cpp
index f5c1b75a5..3be0ffe2b 100644
--- a/Source/minitext.cpp
+++ b/Source/minitext.cpp
@@ -39,24 +39,15 @@ int qscroll_spd_tbl[9] = { 2, 4, 6, 8, 0, -1, -2, -3, -4 };
 
 void FreeQuestText()
 {
-	void *ptr;
-
-	ptr = pMedTextCels;
-	pMedTextCels = NULL;
-	mem_free_dbg(ptr);
-	ptr = pTextBoxCels;
-	pTextBoxCels = NULL;
-	mem_free_dbg(ptr);
+	MemFreeDbg(pMedTextCels);
+	MemFreeDbg(pTextBoxCels);
 }
 
 void InitQuestText()
 {
-	unsigned char *v0; // eax
-
 	pMedTextCels = LoadFileInMem("Data\\MedTextS.CEL", 0);
-	v0 = LoadFileInMem("Data\\TextBox.CEL", 0);
+	pTextBoxCels = LoadFileInMem("Data\\TextBox.CEL", 0);
 	qtextflag = FALSE;
-	pTextBoxCels = v0;
 }
 // 646D00: using guessed type char qtextflag;
 
diff --git a/Source/monster.cpp b/Source/monster.cpp
index c0ec0467a..d050c6eb8 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -5861,15 +5861,12 @@ void FreeMonsters()
 {
 	int mtype;
 	int i, j;
-	void *ptr;
 
 	for (i = 0; i < nummtypes; i++) {
 		mtype = Monsters[i].mtype;
 		for (j = 0; j < 6; j++) {
 			if (animletter[j] != 's' || monsterdata[mtype].has_special) {
-				ptr = Monsters[i].Anims[j].CMem;
-				Monsters[i].Anims[j].CMem = NULL;
-				mem_free_dbg(ptr);
+				MemFreeDbg(Monsters[i].Anims[j].CMem);
 			}
 		}
 	}
diff --git a/Source/mpqapi.cpp b/Source/mpqapi.cpp
index d566d79ec..05e686ba0 100644
--- a/Source/mpqapi.cpp
+++ b/Source/mpqapi.cpp
@@ -575,16 +575,9 @@ BOOLEAN mpqapi_parse_archive_header(_FILEHEADER *pHdr, int *pdwNextFileStart) //
 
 void mpqapi_close_archive(const char *pszArchive, BOOL bFree, int dwChar) // CloseMPQ
 {
-	_BLOCKENTRY *blockEntry;
-	_HASHENTRY *hashEntry;
-
 	if (bFree) {
-		blockEntry = sgpBlockTbl;
-		sgpBlockTbl = NULL;
-		mem_free_dbg(blockEntry);
-		hashEntry = sgpHashTbl;
-		sgpHashTbl = NULL;
-		mem_free_dbg(hashEntry);
+		MemFreeDbg(sgpBlockTbl);
+		MemFreeDbg(sgpHashTbl);
 	}
 	if (sghArchive != INVALID_HANDLE_VALUE) {
 		CloseHandle(sghArchive);
diff --git a/Source/msg.cpp b/Source/msg.cpp
index 4c09184d5..3bdd8a09f 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -106,13 +106,9 @@ BOOL msg_wait_resync()
 
 void msg_free_packets()
 {
-	TMegaPkt *tmp;
-
 	while (sgpMegaPkt) {
 		sgpCurrPkt = sgpMegaPkt->pNext;
-		tmp = sgpMegaPkt;
-		sgpMegaPkt = NULL;
-		mem_free_dbg(tmp);
+		MemFreeDbg(sgpMegaPkt);
 		sgpMegaPkt = sgpCurrPkt;
 	}
 }
diff --git a/Source/objects.cpp b/Source/objects.cpp
index 1bd665ba5..20c5aed5a 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -394,12 +394,9 @@ void InitObjectGFX()
 void FreeObjectGFX()
 {
 	int i;
-	void *ptr;
 
 	for (i = 0; i < numobjfiles; i++) {
-		ptr = pObjCels[i];
-		pObjCels[i] = NULL;
-		mem_free_dbg(ptr);
+		MemFreeDbg(pObjCels[i]);
 	}
 	numobjfiles = 0;
 }
@@ -4666,21 +4663,19 @@ void SyncQSTLever(int i)
 
 void SyncPedistal(int i)
 {
-	int v1;            // esi
-	unsigned char *v2; // esi
+	BYTE *setp;
 
-	v1 = i;
 	if (object[i]._oVar6 == 1)
 		ObjChangeMapResync(setpc_x, setpc_y + 3, setpc_x + 2, setpc_y + 7);
-	if (object[v1]._oVar6 == 2) {
+	if (object[i]._oVar6 == 2) {
 		ObjChangeMapResync(setpc_x, setpc_y + 3, setpc_x + 2, setpc_y + 7);
 		ObjChangeMapResync(setpc_x + 6, setpc_y + 3, setpc_x + setpc_w, setpc_y + 7);
 	}
-	if (object[v1]._oVar6 == 3) {
-		ObjChangeMapResync(object[v1]._oVar1, object[v1]._oVar2, object[v1]._oVar3, object[v1]._oVar4);
-		v2 = LoadFileInMem("Levels\\L2Data\\Blood2.DUN", 0);
-		LoadMapObjs(v2, 2 * setpc_x, 2 * setpc_y);
-		mem_free_dbg(v2);
+	if (object[i]._oVar6 == 3) {
+		ObjChangeMapResync(object[i]._oVar1, object[i]._oVar2, object[i]._oVar3, object[i]._oVar4);
+		setp = LoadFileInMem("Levels\\L2Data\\Blood2.DUN", 0);
+		LoadMapObjs(setp, 2 * setpc_x, 2 * setpc_y);
+		mem_free_dbg(setp);
 	}
 }
 // 5CF334: using guessed type int setpc_w;
diff --git a/Source/player.cpp b/Source/player.cpp
index 1c2146da4..76eeb199c 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -345,39 +345,19 @@ DWORD GetPlrGFXSize(char *szCel)
 
 void FreePlayerGFX(int pnum)
 {
-	void *ptr;
-
 	if ((DWORD)pnum >= MAX_PLRS) {
 		app_fatal("FreePlayerGFX: illegal player %d", pnum);
 	}
 
-	ptr = plr[pnum]._pNData;
-	plr[pnum]._pNData = NULL;
-	mem_free_dbg(ptr);
-	ptr = plr[pnum]._pWData;
-	plr[pnum]._pWData = NULL;
-	mem_free_dbg(ptr);
-	ptr = plr[pnum]._pAData;
-	plr[pnum]._pAData = NULL;
-	mem_free_dbg(ptr);
-	ptr = plr[pnum]._pHData;
-	plr[pnum]._pHData = NULL;
-	mem_free_dbg(ptr);
-	ptr = plr[pnum]._pLData;
-	plr[pnum]._pLData = NULL;
-	mem_free_dbg(ptr);
-	ptr = plr[pnum]._pFData;
-	plr[pnum]._pFData = NULL;
-	mem_free_dbg(ptr);
-	ptr = plr[pnum]._pTData;
-	plr[pnum]._pTData = NULL;
-	mem_free_dbg(ptr);
-	ptr = plr[pnum]._pDData;
-	plr[pnum]._pDData = NULL;
-	mem_free_dbg(ptr);
-	ptr = plr[pnum]._pBData;
-	plr[pnum]._pBData = NULL;
-	mem_free_dbg(ptr);
+	MemFreeDbg(plr[pnum]._pNData);
+	MemFreeDbg(plr[pnum]._pWData);
+	MemFreeDbg(plr[pnum]._pAData);
+	MemFreeDbg(plr[pnum]._pHData);
+	MemFreeDbg(plr[pnum]._pLData);
+	MemFreeDbg(plr[pnum]._pFData);
+	MemFreeDbg(plr[pnum]._pTData);
+	MemFreeDbg(plr[pnum]._pDData);
+	MemFreeDbg(plr[pnum]._pBData);
 	plr[pnum]._pGFXLoad = 0;
 }
 
diff --git a/Source/stores.cpp b/Source/stores.cpp
index 76457df68..672b10bed 100644
--- a/Source/stores.cpp
+++ b/Source/stores.cpp
@@ -130,17 +130,9 @@ void SetupTownStores()
 
 void FreeStoreMem()
 {
-	void *p;
-
-	p = pSTextBoxCels;
-	pSTextBoxCels = NULL;
-	mem_free_dbg(p);
-	p = pCelBuff;
-	pCelBuff = NULL;
-	mem_free_dbg(p);
-	p = pSTextSlidCels;
-	pSTextSlidCels = NULL;
-	mem_free_dbg(p);
+	MemFreeDbg(pSTextBoxCels);
+	MemFreeDbg(pCelBuff);
+	MemFreeDbg(pSTextSlidCels);
 }
 
 void DrawSTextBack()
diff --git a/Source/tmsg.cpp b/Source/tmsg.cpp
index d5b20a79f..9bdc34fd2 100644
--- a/Source/tmsg.cpp
+++ b/Source/tmsg.cpp
@@ -38,11 +38,11 @@ void tmsg_add(BYTE *pbMsg, BYTE bLen)
 
 void *tmsg_cleanup()
 {
+	TMsg *next;
+
 	while (sgpTimedMsgHead) {
-		TMsg *next = sgpTimedMsgHead->hdr.pNext;
-		TMsg *head = sgpTimedMsgHead;
-		sgpTimedMsgHead = NULL;
-		mem_free_dbg(head);
+		next = sgpTimedMsgHead->hdr.pNext;
+		MemFreeDbg(sgpTimedMsgHead);
 		sgpTimedMsgHead = next;
 	}
 	return sgpTimedMsgHead;
diff --git a/Source/towners.cpp b/Source/towners.cpp
index 3ced7f25f..ef2f6f5fc 100644
--- a/Source/towners.cpp
+++ b/Source/towners.cpp
@@ -391,22 +391,17 @@ void InitTowners()
 
 void FreeTownerGFX()
 {
-	void *tmp;
 	int i;
 
 	for (i = 0; i < 16; i++) {
 		if (towner[i]._tNData == pCowCels) {
 			towner[i]._tNData = NULL;
 		} else if (towner[i]._tNData) {
-			tmp = towner[i]._tNData;
-			towner[i]._tNData = NULL;
-			mem_free_dbg(tmp);
+			MemFreeDbg(towner[i]._tNData);
 		}
 	}
 
-	tmp = pCowCels;
-	pCowCels = NULL;
-	mem_free_dbg(tmp);
+	MemFreeDbg(pCowCels);
 }
 
 void TownCtrlMsg(int i)
diff --git a/Source/wave.cpp b/Source/wave.cpp
index ebb75cea4..36858871f 100644
--- a/Source/wave.cpp
+++ b/Source/wave.cpp
@@ -102,9 +102,7 @@ void *AllocateMemFile(HANDLE hsFile, MEMFILE *pMemFile, DWORD dwPos)
 
 void FreeMemFile(MEMFILE *pMemFile)
 {
-	void *mem = pMemFile->buf;
-	pMemFile->buf = NULL;
-	mem_free_dbg(mem);
+	MemFreeDbg(pMemFile->buf);
 }
 
 BOOL ReadWaveFile(MEMFILE *pMemFile, WAVEFORMATEX *pwfx, CKINFO *chunk)