diff --git a/.gitignore b/.gitignore
index 2b6b5281a..52a4782b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -325,3 +325,4 @@ build.sh
 *.raddbg
 
 misc/featuregen/featuregen
+codegen/build/gen_src.map
diff --git a/codegen/gen_src.cpp b/codegen/gen_src.cpp
index 2896a86b9..306070191 100644
--- a/codegen/gen_src.cpp
+++ b/codegen/gen_src.cpp
@@ -460,6 +460,7 @@ int gen_main()
 					}));
 					body.append(swapped_table);
 					body.append(fmt_newline);
+
 					// Right after is where the struct definitions were defined, we'll insert them here
 					body.append(def_pragma(txt("region TYPE_KINDS")));
 					body.append(fmt_newline);
diff --git a/codegen/gencpp/gen.cpp b/codegen/gencpp/gen.cpp
index ed8d554a9..fd61f690d 100644
--- a/codegen/gencpp/gen.cpp
+++ b/codegen/gencpp/gen.cpp
@@ -1522,12 +1522,6 @@ void CodeBody::to_string( String& result )
 	while ( left-- )
 	{
 		result.append_fmt( "%S", curr.to_string() );
-
-		if (left > 1) switch (ast->Type)
-		{
-			case ECode::Enum_Body:
-				result.append("\n");
-		}
 		++curr;
 	}
 }
@@ -10706,8 +10700,13 @@ namespace parser
 							// <Name> = <Expression> <Macro>,
 						}
 
-						entry.Length = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)entry.Text;
+						// Consume inline comments
+						if ( currtok.Type == TokType::Comment && prevtok.Line == currtok.Line )
+						{
+							eat( TokType::Comment );
+						}
 
+						entry.Length = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)entry.Text;
 						member       = untyped_str( entry );
 						break;
 				}