diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp
index 29aa5e836..8a10849c7 100644
--- a/Source/drlg_l1.cpp
+++ b/Source/drlg_l1.cpp
@@ -1095,7 +1095,7 @@ static void DRLG_L1Pass3()
 		xx = 16;
 		for (i = 0; i < DMAXX; i++) {
 			lv = dungeon[i][j] - 1;
-			/// ASSERT: assert(lv >= 0);
+			assert(lv >= 0);
 			MegaTiles = (WORD *)&pMegaTiles[lv * 8];
 			v1 = SDL_SwapLE16(*(MegaTiles + 0)) + 1;
 			v2 = SDL_SwapLE16(*(MegaTiles + 1)) + 1;
diff --git a/Source/missiles.cpp b/Source/missiles.cpp
index c4f574ac1..dc4c46fd2 100644
--- a/Source/missiles.cpp
+++ b/Source/missiles.cpp
@@ -4085,10 +4085,10 @@ void MI_LightningArrow(Sint32 i)
 
 	mx = missile[i]._mix;
 	my = missile[i]._miy;
-	/// ASSERT: assert((DWORD)mx < MAXDUNX);
-	/// ASSERT: assert((DWORD)my < MAXDUNY);
+	assert((DWORD)mx < MAXDUNX);
+	assert((DWORD)my < MAXDUNY);
 	pn = dPiece[mx][my];
-	/// ASSERT: assert((DWORD)pn <= MAXTILES);
+	assert((DWORD)pn <= MAXTILES);
 
 	if (missile[i]._misource == -1) {
 		if ((mx != missile[i]._misx || my != missile[i]._misy) && nMissileTable[pn]) {
diff --git a/Source/msg.cpp b/Source/msg.cpp
index fafa77157..c209df9e2 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -404,7 +404,7 @@ static DWORD On_DLEVEL(int pnum, TCmd *pCmd)
 		}
 	}
 
-	/// ASSERT: assert(p->wOffset == sgdwRecvOffset);
+	assert(p->wOffset == sgdwRecvOffset);
 	memcpy(&sgRecvBuf[p->wOffset], &p[1], p->wBytes);
 	sgdwRecvOffset += p->wBytes;
 	return p->wBytes + sizeof(*p);
@@ -448,8 +448,8 @@ void delta_sync_monster(const TSyncMonster *pSync, BYTE bLevel)
 	if (!gbIsMultiplayer)
 		return;
 
-	/// ASSERT: assert(pSync != NULL);
-	/// ASSERT: assert(bLevel < NUMLEVELS);
+	assert(pSync != NULL);
+	assert(bLevel < NUMLEVELS);
 	sgbDeltaChanged = true;
 
 	DMonsterStr *pD = &sgLevels[bLevel].monster[pSync->_mndx];
@@ -704,11 +704,12 @@ void DeltaLoadLevel()
 					monster[i]._moldy = sgLevels[currlevel].monster[i]._my; // CODEFIX: useless assignment
 					M_ClearSquares(i);
 					if (monster[i]._mAi != AI_DIABLO) {
-						if (monster[i]._uniqtype == 0)
-							/// ASSERT: assert(monster[i].MType != NULL);
+						if (monster[i]._uniqtype == 0) {
+							assert(monster[i].MType != NULL);
 							AddDead(monster[i]._mx, monster[i]._my, monster[i].MType->mdeadval, (direction)monster[i]._mdir);
-						else
+						} else {
 							AddDead(monster[i]._mx, monster[i]._my, monster[i]._udeadval, (direction)monster[i]._mdir);
+						}
 					}
 					monster[i]._mDelFlag = true;
 					M_UpdateLeader(i);
diff --git a/Source/multi.cpp b/Source/multi.cpp
index 82a81c7c5..593783614 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -357,9 +357,9 @@ static void multi_begin_timeout()
 		}
 	}
 
-	/// ASSERT: assert(bGroupPlayers);
-	/// ASSERT: assert(nLowestActive != -1);
-	/// ASSERT: assert(nLowestPlayer != -1);
+	assert(bGroupPlayers);
+	assert(nLowestActive != -1);
+	assert(nLowestPlayer != -1);
 
 	if (bGroupPlayers < bGroupCount) {
 		gbGameDestroyed = true;
@@ -466,7 +466,7 @@ void multi_process_network_packets()
 		plr[dwID]._pownerx = pkt->px;
 		plr[dwID]._pownery = pkt->py;
 		if (dwID != myplr) {
-			// ASSERT: gbBufferMsgs != BUFFER_PROCESS (2)
+			assert(gbBufferMsgs != 2);
 			plr[dwID]._pHitPoints = pkt->php;
 			plr[dwID]._pMaxHP = pkt->pmhp;
 			cond = gbBufferMsgs == 1;
@@ -517,9 +517,9 @@ void multi_send_zero_packet(int pnum, _cmd_id bCmd, BYTE *pbSrc, DWORD dwLen)
 	TPkt pkt;
 	TCmdPlrInfoHdr *p;
 
-	/// ASSERT: assert(pnum != myplr);
-	/// ASSERT: assert(pbSrc);
-	/// ASSERT: assert(dwLen <= 0x0ffff);
+	assert(pnum != myplr);
+	assert(pbSrc);
+	assert(dwLen <= 0x0ffff);
 
 	dwOffset = 0;
 
@@ -541,7 +541,7 @@ void multi_send_zero_packet(int pnum, _cmd_id bCmd, BYTE *pbSrc, DWORD dwLen)
 		if (dwLen < dwBody) {
 			dwBody = dwLen;
 		}
-		/// ASSERT: assert(dwBody <= 0x0ffff);
+		assert(dwBody <= 0x0ffff);
 		p->wBytes = dwBody;
 		memcpy(&pkt.body[sizeof(*p)], pbSrc, p->wBytes);
 		dwMsg = sizeof(pkt.hdr);
@@ -861,7 +861,7 @@ void recv_plrinfo(int pnum, TCmdPlrInfoHdr *p, bool recv)
 	if (myplr == pnum) {
 		return;
 	}
-	/// ASSERT: assert((DWORD)pnum < MAX_PLRS);
+	assert((DWORD)pnum < MAX_PLRS);
 
 	if (sgwPackPlrOffsetTbl[pnum] != p->wOffset) {
 		sgwPackPlrOffsetTbl[pnum] = 0;
diff --git a/Source/player.cpp b/Source/player.cpp
index 776867be2..6fe4e0fb9 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -388,7 +388,7 @@ static DWORD GetPlrGFXSize(plr_class c, const char *szCel)
 			sprintf(Type, "%c%c%c", CharChar[c], *a, *w);
 			sprintf(pszName, "PlrGFX\\%s\\%s\\%s%s.CL2", ClassPathTbl[c], Type, Type, szCel);
 			if (SFileOpenFile(pszName, &hsFile)) {
-				/// ASSERT: assert(hsFile);
+				assert(hsFile);
 				dwSize = SFileGetFileSize(hsFile, NULL);
 				SFileCloseFile(hsFile);
 				if (dwMaxSize <= dwSize) {
diff --git a/Source/sync.cpp b/Source/sync.cpp
index 1b3288930..e27dc9690 100644
--- a/Source/sync.cpp
+++ b/Source/sync.cpp
@@ -261,7 +261,7 @@ Uint32 sync_update(int pnum, const Uint8 *pbBuf)
 		app_fatal("bad sync command");
 	}
 
-	/// ASSERT: assert(gbBufferMsgs != BUFFER_PROCESS);
+	assert(gbBufferMsgs != 2);
 
 	if (gbBufferMsgs == 1) {
 		return pHdr->wLen + sizeof(*pHdr);