Index: src/ControlStruct/LabelFixer.cc
===================================================================
--- src/ControlStruct/LabelFixer.cc	(revision 07de76bb7a0e1179ac6fb9bae0cb96e709315c84)
+++ src/ControlStruct/LabelFixer.cc	(revision a21dec46515be7f1baa5f03d23f83fe06d3a2425)
@@ -75,11 +75,9 @@
 
 
-	// sets the definition of the labelTable entry to be the provided statement for every label in the list
-	// parameter. Happens for every kind of statement
+	// Sets the definition of the labelTable entry to be the provided statement for every label in
+	// the list parameter. Happens for every kind of statement.
 	Label LabelFixer::setLabelsDef( std::list< Label > & llabel, Statement * definition ) {
 		assert( definition != 0 );
 		assert( llabel.size() > 0 );
-
-		Entry * e = new Entry( definition );
 
 		for ( std::list< Label >::iterator i = llabel.begin(); i != llabel.end(); i++ ) {
@@ -87,18 +85,22 @@
 			l.set_statement( definition ); // attach statement to the label to be used later
 			if ( labelTable.find( l ) == labelTable.end() ) {
-				// all labels on this statement need to use the same entry, so this should only be created once
+				// All labels on this statement need to use the same entry,
+				// so this should only be created once.
 				// undefined and unused until now, add an entry
-				labelTable[ l ] =  e;
+				labelTable[ l ] = new Entry( definition );
 			} else if ( labelTable[ l ]->defined() ) {
 				// defined twice, error
-				SemanticError( l.get_statement()->location, "Duplicate definition of label: " + l.get_name() );
-			}	else {
+				SemanticError( l.get_statement()->location,
+					"Duplicate definition of label: " + l.get_name() );
+			} else {
 				// used previously, but undefined until now -> link with this entry
+				// Question: Is changing objects important?
 				delete labelTable[ l ];
-				labelTable[ l ] = e;
+				labelTable[ l ] = new Entry( definition );
 			} // if
 		} // for
 
-		// produce one of the labels attached to this statement to be temporarily used as the canonical label
+		// Produce one of the labels attached to this statement to be temporarily used as the
+		// canonical label.
 		return labelTable[ llabel.front() ]->get_label();
 	}