Index: src/ControlStruct/Mutate.cc
===================================================================
--- src/ControlStruct/Mutate.cc	(revision e39aa0f16322a921d6a17d13906cfd8c8ffca0d9)
+++ src/ControlStruct/Mutate.cc	(revision 982d63f614adf976a02207144f8aae600364c069)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Mutate.cc -- 
+// Mutate.cc --
 //
 // Author           : Rodolfo G. Esteves
@@ -39,10 +39,10 @@
 		ForExprMutator formut;
 
+		// transform choose statements into switch statements
+		ChooseMutator chmut;
+
 		// normalizes label definitions and generates multi-level
 		// exit labels
 		LabelFixer lfix;
-
-		// transform choose statements into switch statements
-		ChooseMutator chmut;
 
 		// expand case ranges and turn fallthru into a null statement
@@ -53,6 +53,6 @@
 
 		mutateAll( translationUnit, formut );
+		mutateAll( translationUnit, chmut );
 		acceptAll( translationUnit, lfix );
-		mutateAll( translationUnit, chmut );
 		mutateAll( translationUnit, ranges );
 		//mutateAll( translationUnit, exc );