Index: src/ControlStruct/LabelFixer.h
===================================================================
--- src/ControlStruct/LabelFixer.h	(revision 8688ce11a6b7047ca103783a09a35cbcf0be3233)
+++ src/ControlStruct/LabelFixer.h	(revision f849c8e4b3f075cb38f1eaa97a5b29a42af70554)
@@ -26,5 +26,5 @@
 namespace ControlStruct {
 	/// normalizes label definitions and generates multi-level exit labels
-	class LabelFixer : public Visitor {
+	class LabelFixer final : public Visitor {
 		typedef Visitor Parent;
 	  public:
@@ -33,24 +33,26 @@
 		std::map < Label, Statement * > *resolveJumps() throw ( SemanticError );
 
+		using Visitor::visit;
+
 		// Declarations
-		virtual void visit( FunctionDecl *functionDecl );
+		virtual void visit( FunctionDecl *functionDecl ) override;
 
 		// Statements
 		void visit( Statement *stmt );
 
-		virtual void visit( CompoundStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-		virtual void visit( NullStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-		virtual void visit( ExprStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-		virtual void visit( IfStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-		virtual void visit( WhileStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-		virtual void visit( ForStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-		virtual void visit( SwitchStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-		virtual void visit( CaseStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-		virtual void visit( ReturnStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-		virtual void visit( TryStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-		virtual void visit( CatchStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-		virtual void visit( DeclStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-		virtual void visit( BranchStmt *branchStmt );
-		virtual void visit( UntypedExpr *untyped );
+		virtual void visit( CompoundStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+		virtual void visit( NullStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+		virtual void visit( ExprStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+		virtual void visit( IfStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+		virtual void visit( WhileStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+		virtual void visit( ForStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+		virtual void visit( SwitchStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+		virtual void visit( CaseStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+		virtual void visit( ReturnStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+		virtual void visit( TryStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+		virtual void visit( CatchStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+		virtual void visit( DeclStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
+		virtual void visit( BranchStmt *branchStmt ) override;
+		virtual void visit( UntypedExpr *untyped ) override;
 
 		Label setLabelsDef( std::list< Label > &, Statement *definition );
Index: src/ControlStruct/LabelTypeChecker.cc
===================================================================
--- src/ControlStruct/LabelTypeChecker.cc	(revision 8688ce11a6b7047ca103783a09a35cbcf0be3233)
+++ src/ControlStruct/LabelTypeChecker.cc	(revision f849c8e4b3f075cb38f1eaa97a5b29a42af70554)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelTypeChecker.cc -- 
+// LabelTypeChecker.cc --
 //
 // Author           : Rodolfo G. Esteves
@@ -28,5 +28,5 @@
 		assert( untypedExpr != 0 );
 		NameExpr *fname;
-		if ( ((fname = dynamic_cast<NameExpr *>(untypedExpr->get_function())) != 0) 
+		if ( ((fname = dynamic_cast<NameExpr *>(untypedExpr->get_function())) != 0)
 			 && fname->get_name() == std::string("&&") )
 			std::cerr << "Taking the label of an address." << std::endl;
@@ -58,7 +58,7 @@
 
 		NameExpr *name;
-		if ( ((name = dynamic_cast<NameExpr *>(target)) == 0) )
+		if ( (name = dynamic_cast<NameExpr *>(target)) == 0 )
 			return; // Not a name expression
-	
+
 		std::list< DeclarationWithType * > interps;
 		index.lookupId(name->get_name(), interps);