diff --git a/include/asm/rpn.h b/include/asm/rpn.h
index c971bf98..d5a2eb8f 100644
--- a/include/asm/rpn.h
+++ b/include/asm/rpn.h
@@ -27,9 +27,6 @@ struct Expression {
 	uint32_t nRPNPatchSize; // Size the expression will take in the obj file
 };
 
-/* FIXME: Should be defined in `parser.h`, but impossible with POSIX Yacc */
-extern int32_t nPCOffset;
-
 /*
  * Determines if an expression is known at assembly time
  */
diff --git a/src/asm/lexer.c b/src/asm/lexer.c
index c29fc26b..221d2d02 100644
--- a/src/asm/lexer.c
+++ b/src/asm/lexer.c
@@ -1919,7 +1919,7 @@ static int yylex_RAW(void)
 				i--;
 			/* Empty macro args break their expansion, so prevent that */
 			if (i == 0) {
-				// If at EOF, don't shift a non-existent chat
+				// If at EOF, don't shift a non-existent char.
 				// However, don't return EOF, as this might cause a bug...
 				// If a macro is invoked on the last line of a file, with no blank
 				// line afterwards, returning EOF here will cause Bison to stop
diff --git a/src/asm/parser.y b/src/asm/parser.y
index c0e2b141..708c8ef6 100644
--- a/src/asm/parser.y
+++ b/src/asm/parser.y
@@ -590,7 +590,6 @@ enum {
 asmfile		: lines last_line
 ;
 
-/* Note: The lexer adds T_NEWLINE at the end of the input */
 lines		: %empty
 		| lines line
 ;
@@ -1556,7 +1555,7 @@ cpu_command	: z80_adc
 		| z80_rra
 		| z80_rrc
 		| z80_rrca
-		| /*{ nPCOffset = 0; }*/ z80_rst
+		| z80_rst
 		| z80_sbc
 		| z80_scf
 		| z80_set