Index: src/GenPoly/Box.cc
===================================================================
--- src/GenPoly/Box.cc	(revision d7dc82447d825854b37e78a7aa777b1a58e7e1b2)
+++ src/GenPoly/Box.cc	(revision 436c0deab931c3644feb0da7d5a23034b5e7cfd3)
@@ -62,6 +62,4 @@
 namespace GenPoly {
 	namespace {
-		const std::list<Label> noLabels;
-
 		FunctionType *makeAdapterType( FunctionType *adaptee, const TyVarMap &tyVars );
 
Index: src/GenPoly/CopyParams.cc
===================================================================
--- src/GenPoly/CopyParams.cc	(revision d7dc82447d825854b37e78a7aa777b1a58e7e1b2)
+++ src/GenPoly/CopyParams.cc	(revision 436c0deab931c3644feb0da7d5a23034b5e7cfd3)
@@ -45,6 +45,4 @@
 
 	CopyParams::CopyParams() : namer( "_cp" ) {}
-
-	static const std::list< Label > noLabels;
 
 	void CopyParams::visit( FunctionDecl *funcDecl ) {
Index: src/GenPoly/DeclMutator.cc
===================================================================
--- src/GenPoly/DeclMutator.cc	(revision d7dc82447d825854b37e78a7aa777b1a58e7e1b2)
+++ src/GenPoly/DeclMutator.cc	(revision 436c0deab931c3644feb0da7d5a23034b5e7cfd3)
@@ -20,12 +20,8 @@
 
 namespace GenPoly {
-	namespace {
-		const std::list<Label> noLabels;
-	}
-
 	DeclMutator::DeclMutator() : Mutator(), declsToAdd(1), declsToAddAfter(1) {}
 
 	DeclMutator::~DeclMutator() {}
-	
+
 	void DeclMutator::mutateDeclarationList( std::list< Declaration* > &decls ) {
 		for ( std::list< Declaration* >::iterator decl = decls.begin(); ; ++decl ) {
@@ -34,5 +30,5 @@
 
 			if ( decl == decls.end() ) break;
-			
+
 			// run mutator on declaration
 			*decl = maybeMutate( *decl, *this );
@@ -55,5 +51,5 @@
 		newBack->splice( newBack->end(), *back );
 		declsToAdd.pop_back();
-		
+
 		back = declsToAddAfter.rbegin();
 		newBack = back + 1;
@@ -66,7 +62,7 @@
 		CompoundStmt *compoundStmt = dynamic_cast< CompoundStmt* >(stmt);
 		if ( compoundStmt ) return mutate( compoundStmt );
-		
+
 		doBeginScope();
-		
+
 		// run mutator on statement
 		stmt = maybeMutate( stmt, *this );
@@ -102,5 +98,5 @@
 		doBeginScope();
 
-		
+
 		for ( std::list< Statement* >::iterator stmt = stmts.begin(); ; ++stmt ) {
 			// add any new declarations after the previous statement
@@ -112,5 +108,5 @@
 
 			if ( stmt == stmts.end() ) break;
-			
+
 			// run mutator on statement
 			*stmt = maybeMutate( *stmt, *this );
@@ -123,5 +119,5 @@
 			declsToAdd.back().clear();
 		}
-		
+
 		doEndScope();
 	}
@@ -139,5 +135,5 @@
 		return compoundStmt;
 	}
-	
+
 	Statement* DeclMutator::mutate(IfStmt *ifStmt) {
 		ifStmt->set_condition( maybeMutate( ifStmt->get_condition(), *this ) );
@@ -146,5 +142,5 @@
 		return ifStmt;
 	}
-	
+
 	Statement* DeclMutator::mutate(WhileStmt *whileStmt) {
 		whileStmt->set_condition( maybeMutate( whileStmt->get_condition(), *this ) );
@@ -152,5 +148,5 @@
 		return whileStmt;
 	}
-	
+
 	Statement* DeclMutator::mutate(ForStmt *forStmt) {
 		mutateAll( forStmt->get_initialization(), *this );
@@ -160,5 +156,5 @@
 		return forStmt;
 	}
-	
+
 	Statement* DeclMutator::mutate(SwitchStmt *switchStmt) {
 		switchStmt->set_condition( maybeMutate( switchStmt->get_condition(), *this ) );
@@ -166,5 +162,5 @@
 		return switchStmt;
 	}
-	
+
 	Statement* DeclMutator::mutate(CaseStmt *caseStmt) {
 		caseStmt->set_condition( maybeMutate( caseStmt->get_condition(), *this ) );
@@ -172,5 +168,5 @@
 		return caseStmt;
 	}
-	
+
 	Statement* DeclMutator::mutate(TryStmt *tryStmt) {
 		tryStmt->set_block( maybeMutate( tryStmt->get_block(), *this ) );
@@ -179,5 +175,5 @@
 		return tryStmt;
 	}
-	
+
 	Statement* DeclMutator::mutate(CatchStmt *catchStmt) {
 		catchStmt->set_decl( maybeMutate( catchStmt->get_decl(), *this ) );
Index: src/GenPoly/Lvalue.cc
===================================================================
--- src/GenPoly/Lvalue.cc	(revision d7dc82447d825854b37e78a7aa777b1a58e7e1b2)
+++ src/GenPoly/Lvalue.cc	(revision 436c0deab931c3644feb0da7d5a23034b5e7cfd3)
@@ -35,6 +35,4 @@
 namespace GenPoly {
 	namespace {
-		const std::list<Label> noLabels;
-
 		/// Replace uses of lvalue returns with appropriate pointers
 		class Pass1 : public Mutator {