Index: src/CodeGen/CodeGenerator.cc
===================================================================
--- src/CodeGen/CodeGenerator.cc	(revision 8bafacc74962838e850f1305c85abbf4ed4f878b)
+++ src/CodeGen/CodeGenerator.cc	(revision 0dd18fdcc6be610d50195b02a8db7f16db0095ed)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 18 14:20:00 2017
-// Update Count     : 487
+// Last Modified On : Fri Aug 18 15:34:00 2017
+// Update Count     : 488
 //
 #include "CodeGenerator.h"
@@ -77,26 +77,4 @@
 		} // for
 		return output;
-	}
-
-	CodeGenerator::LineMarker::LineMarker(
-			CodeLocation const & loc, bool toPrint) :
-		loc(loc), toPrint(toPrint)
-	{}
-
-	CodeGenerator::LineMarker CodeGenerator::lineDirective(
-			BaseSyntaxNode const * node) {
-		return LineMarker(node->location, lineMarks);
-	}
-
-	std::ostream & operator<<(std::ostream & out,
-			CodeGenerator::LineMarker const & marker) {
-		if (marker.toPrint && marker.loc.isSet()) {
-			return out << "\n# " << marker.loc.linenumber << " \""
-				<< marker.loc.filename << "\"\n";
-		} else if (marker.toPrint) {
-			return out << "\n/* Missing CodeLocation */\n";
-		} else {
-        	return out;
-		}
 	}
 
Index: src/CodeGen/CodeGenerator.h
===================================================================
--- src/CodeGen/CodeGenerator.h	(revision 8bafacc74962838e850f1305c85abbf4ed4f878b)
+++ src/CodeGen/CodeGenerator.h	(revision 0dd18fdcc6be610d50195b02a8db7f16db0095ed)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 18 13:52:00 2017
-// Update Count     : 55
+// Last Modified On : Fri Aug 18 15:40:00 2017
+// Update Count     : 56
 //
 
@@ -108,17 +108,10 @@
 		};
 
-		struct LineMarker {
-			CodeLocation const & loc;
-			bool toPrint;
-
-			LineMarker(CodeLocation const & loc, bool toPrint);
-		};
-
-		LineMarker lineDirective(BaseSyntaxNode const * node);
-
 		void asmName( DeclarationWithType *decl );
 
 		void extension( Expression *expr );
 		void extension( Declaration *decl );
+
+		void updateLocation( BaseSyntaxNode const * to );
 	  private:
 		Indenter indent;
@@ -132,5 +125,4 @@
 		CodeLocation currentLocation;
 		void updateLocation( CodeLocation const & to );
-		void updateLocation( BaseSyntaxNode const * to );
 		void nextLine();
 
@@ -160,7 +152,4 @@
 	/// returns C-compatible name of declaration
 	std::string genName( DeclarationWithType * decl );
-
-	std::ostream & operator<<(std::ostream &,
-		CodeGenerator::LineMarker const &);
 } // namespace CodeGen
 
Index: src/CodeGen/Generate.cc
===================================================================
--- src/CodeGen/Generate.cc	(revision 8bafacc74962838e850f1305c85abbf4ed4f878b)
+++ src/CodeGen/Generate.cc	(revision 0dd18fdcc6be610d50195b02a8db7f16db0095ed)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May 19 13:05:00 2017
-// Update Count     : 6
+// Last Modified On : Fri Aug 18 15:39:00 2017
+// Update Count     : 7
 //
 #include "Generate.h"
@@ -33,5 +33,5 @@
 		for ( auto & dcl : translationUnit ) {
 			if ( LinkageSpec::isGeneratable( dcl->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( dcl->get_linkage() ) ) ) {
-				os << cgv.lineDirective(dcl);
+				cgv.updateLocation( dcl );
 				dcl->accept(cgv);
 				if ( doSemicolon( dcl ) ) {