diff --git a/Language/Eiffel/Util.hs b/Language/Eiffel/Util.hs
--- a/Language/Eiffel/Util.hs
+++ b/Language/Eiffel/Util.hs
@@ -499,9 +499,6 @@
 -- | Rename everything in a class.
 renameAll :: [RenameClause] -> AbsClas body exp -> AbsClas body exp
 renameAll renames cls = renamed
-  -- | Map.size (featureMap cls) == Map.size (featureMap renamed) = renamed
-  -- | otherwise = error $ "renameAll: changed number of entries: " ++ 
-  --               show (Map.keys $ featureMap cls, Map.keys $ featureMap renamed, renames, className cls)
   where
     renamed = foldr renameClass cls renames
     
diff --git a/dist/build/Language/Eiffel/Parser/Lex.hs b/dist/build/Language/Eiffel/Parser/Lex.hs
--- a/dist/build/Language/Eiffel/Parser/Lex.hs
+++ b/dist/build/Language/Eiffel/Parser/Lex.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP,MagicHash #-}
+{-# LANGUAGE CPP,MagicHash,BangPatterns #-}
 {-# LINE 1 "Language/Eiffel/Parser/Lex.x" #-}
 
 {-# LANGUAGE OverloadedStrings #-}
@@ -80,6 +80,7 @@
 #endif
 {-# LINE 1 "templates/wrappers.hs" #-}
 {-# LINE 1 "templates/wrappers.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
 {-# LINE 1 "templates/wrappers.hs" #-}
 -- -----------------------------------------------------------------------------
@@ -102,7 +103,7 @@
 -- -----------------------------------------------------------------------------
 -- The input type
 
-{-# LINE 72 "templates/wrappers.hs" #-}
+{-# LINE 71 "templates/wrappers.hs" #-}
 
 
 type AlexInput = (AlexPosn,     -- current position,
@@ -121,9 +122,9 @@
                                     in p' `seq` cs' `seq` Just (b, (p', c, cs'))
 
 
-{-# LINE 103 "templates/wrappers.hs" #-}
+{-# LINE 102 "templates/wrappers.hs" #-}
 
-{-# LINE 118 "templates/wrappers.hs" #-}
+{-# LINE 117 "templates/wrappers.hs" #-}
 
 -- -----------------------------------------------------------------------------
 -- Token positions
@@ -151,7 +152,7 @@
 -- -----------------------------------------------------------------------------
 -- Default monad
 
-{-# LINE 231 "templates/wrappers.hs" #-}
+{-# LINE 230 "templates/wrappers.hs" #-}
 
 
 -- -----------------------------------------------------------------------------
@@ -246,15 +247,15 @@
 -- -----------------------------------------------------------------------------
 -- Basic wrapper
 
-{-# LINE 346 "templates/wrappers.hs" #-}
+{-# LINE 345 "templates/wrappers.hs" #-}
 
 
 -- -----------------------------------------------------------------------------
 -- Basic wrapper, ByteString version
 
-{-# LINE 364 "templates/wrappers.hs" #-}
+{-# LINE 363 "templates/wrappers.hs" #-}
 
-{-# LINE 377 "templates/wrappers.hs" #-}
+{-# LINE 376 "templates/wrappers.hs" #-}
 
 
 -- -----------------------------------------------------------------------------
@@ -262,13 +263,13 @@
 
 -- Adds text positions to the basic model.
 
-{-# LINE 394 "templates/wrappers.hs" #-}
+{-# LINE 393 "templates/wrappers.hs" #-}
 
 
 -- -----------------------------------------------------------------------------
 -- Posn wrapper, ByteString version
 
-{-# LINE 409 "templates/wrappers.hs" #-}
+{-# LINE 408 "templates/wrappers.hs" #-}
 
 
 -- -----------------------------------------------------------------------------
@@ -734,6 +735,7 @@
 alex_action_21 =  withPos (tokConst LexError) 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
@@ -761,10 +763,10 @@
 #ifdef WORDS_BIGENDIAN
   narrow16Int# i
   where
-        i    = word2Int# ((high `uncheckedShiftL#` 8#) `or#` low)
-        high = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))
-        low  = int2Word# (ord# (indexCharOffAddr# arr off'))
-        off' = off *# 2#
+        !i    = word2Int# ((high `uncheckedShiftL#` 8#) `or#` low)
+        !high = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))
+        !low  = int2Word# (ord# (indexCharOffAddr# arr off'))
+        !off' = off *# 2#
 #else
   indexInt16OffAddr# arr off
 #endif
@@ -861,12 +863,12 @@
 
 
 	let
-		(base) = alexIndexInt32OffAddr alex_base s
-		((I# (ord_c))) = fromIntegral c
-		(offset) = (base +# ord_c)
-		(check)  = alexIndexInt16OffAddr alex_check offset
+		(!(base)) = alexIndexInt32OffAddr alex_base s
+		(!((I# (ord_c)))) = fromIntegral c
+		(!(offset)) = (base +# ord_c)
+		(!(check))  = alexIndexInt16OffAddr alex_check offset
 		
-		(new_s) = if (offset >=# 0#) && (check ==# ord_c)
+		(!(new_s)) = if (offset >=# 0#) && (check ==# ord_c)
 			  then alexIndexInt16OffAddr alex_table offset
 			  else alexIndexInt16OffAddr alex_deflt s
 	in
diff --git a/language-eiffel.cabal b/language-eiffel.cabal
--- a/language-eiffel.cabal
+++ b/language-eiffel.cabal
@@ -7,7 +7,7 @@
 -- The package version. See the Haskell package versioning policy
 -- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for
 -- standards guiding when and how versions should be incremented.
-Version:             0.1.1
+Version:             0.1.2
 
 -- A short (one-line) description of the package.
 Synopsis:           Parser and pretty printer for the Eiffel language.