diff --git a/src/asm/main.cpp b/src/asm/main.cpp
index e70e5704..78952ec3 100644
--- a/src/asm/main.cpp
+++ b/src/asm/main.cpp
@@ -214,7 +214,7 @@ int main(int argc, char *argv[])
 		case 'H':
 			if (warnOnHaltNop)
 				warning(WARNING_OBSOLETE,
-					"Automatic `nop` after `halt` is deprecated\n");
+					"Automatic `nop` after `halt` (the `-H` flag) is deprecated\n");
 			else
 				errx("`-H` and `-h` don't make sense together");
 			haltNop = true;
@@ -241,7 +241,7 @@ int main(int argc, char *argv[])
 		case 'l':
 			if (warnOnLdOpt)
 				warning(WARNING_OBSOLETE,
-					"Automatic `ld` to `ldh` optimization is deprecated\n");
+					"Automatic `ld` to `ldh` optimization (the `-l` flag) is deprecated\n");
 			else
 				errx("`-L` and `-l` don't make sense together");
 			optimizeLoads = true;
diff --git a/src/asm/opt.cpp b/src/asm/opt.cpp
index 116235ab..d77d9beb 100644
--- a/src/asm/opt.cpp
+++ b/src/asm/opt.cpp
@@ -260,10 +260,12 @@ void opt_Push(void)
 
 	entry->fillByte = fillByte; // Pulled from section.hpp
 
-	entry->haltNop = haltNop; // Pulled from main.hpp
+	// Both of these are pulled from main.hpp
+	entry->haltNop = haltNop;
 	entry->warnOnHaltNop = warnOnHaltNop;
 
-	entry->optimizeLoads = optimizeLoads; // Pulled from main.hpp
+	// Both of these are pulled from main.hpp
+	entry->optimizeLoads = optimizeLoads;
 	entry->warnOnLdOpt = warnOnLdOpt;
 
 	// Both of these pulled from warning.hpp
diff --git a/src/asm/parser.y b/src/asm/parser.y
index 8b63035e..97e6e549 100644
--- a/src/asm/parser.y
+++ b/src/asm/parser.y
@@ -1933,7 +1933,7 @@ z80_halt	: T_Z80_HALT {
 				if (warnOnHaltNop) {
 					warnOnHaltNop = false;
 					warning(WARNING_OBSOLETE,
-						"Automatic `nop` after `halt` is deprecated\n");
+						"Automatic `nop` after `halt` (option 'H') is deprecated\n");
 				}
 				sect_AbsByte(0x00);
 			}
@@ -2047,7 +2047,7 @@ z80_ld_mem	: T_Z80_LD op_mem_ind T_COMMA T_MODE_SP {
 				if (warnOnLdOpt) {
 					warnOnLdOpt = false;
 					warning(WARNING_OBSOLETE,
-						"Automatic `ld` to `ldh` optimization is deprecated\n");
+						"Automatic `ld` to `ldh` optimization (option 'l') is deprecated\n");
 				}
 				sect_AbsByte(0xE0);
 				sect_AbsByte($2.val & 0xFF);
@@ -2100,7 +2100,7 @@ z80_ld_a	: T_Z80_LD reg_r T_COMMA c_ind {
 					if (warnOnLdOpt) {
 						warnOnLdOpt = false;
 						warning(WARNING_OBSOLETE,
-							"Automatic `ld` to `ldh` optimization is deprecated\n");
+							"Automatic `ld` to `ldh` optimization (option 'l') is deprecated\n");
 					}
 					sect_AbsByte(0xF0);
 					sect_AbsByte($4.val & 0xFF);