diff --git a/cabal-plugin/src/Distribution/Simple/UUAGC/AbsSyn.hs b/cabal-plugin/src/Distribution/Simple/UUAGC/AbsSyn.hs
--- a/cabal-plugin/src/Distribution/Simple/UUAGC/AbsSyn.hs
+++ b/cabal-plugin/src/Distribution/Simple/UUAGC/AbsSyn.hs
@@ -58,12 +58,19 @@
                  | USepSemMods
                  | UGenFileDeps
                  | UGenVisage
+                 | UGenAspectAG
                  | UGenAttrList
                  | UForceIrrefutable FilePath
+                 | UUniqueDispenser  String
                  | ULCKeyWords
                  | UOptimize
                  | UDoubleColons
                  | UHaskellSyntax
+                 | UStatistics FilePath
+                 | UCheckParseRhs
+                 | UCheckParseTys
+                 | UCheckParseBlocks
+                 | UCheckParseHaskell
                    deriving (Eq, Read, Show)
 
 type UUAGCOptions = [UUAGCOption]
@@ -128,13 +135,20 @@
 fromUUAGCOtoArgs USepSemMods            = toLOp osepsemmods
 fromUUAGCOtoArgs UGenFileDeps           = toLOp ogenfiledeps
 fromUUAGCOtoArgs UGenVisage             = toLOp ogenvisage
+fromUUAGCOtoArgs UGenAspectAG           = toLOp ogenaspectag
 fromUUAGCOtoArgs UGenAttrList           = toLOp ogenattrlist
 fromUUAGCOtoArgs (UForceIrrefutable fp) = toLEOpA oforceirrefutable fp
+fromUUAGCOtoArgs (UUniqueDispenser  nm) = toLEOpA ouniquedispenser  nm
 fromUUAGCOtoArgs UOptimize              = toLOp ooptimize
 fromUUAGCOtoArgs UModuleDefault         = toLOp omodule
 fromUUAGCOtoArgs UHaskellSyntax         = toLOp ohaskellsyntax
 fromUUAGCOtoArgs UDoubleColons          = toLOp odoublecolons
 fromUUAGCOtoArgs ULCKeyWords            = toLOp olckeywords
+fromUUAGCOtoArgs (UStatistics fp)       = toLEOpA ostatistics fp
+fromUUAGCOtoArgs UCheckParseRhs         = toLOp ocheckparserhs
+fromUUAGCOtoArgs UCheckParseTys         = toLOp ocheckparsetys
+fromUUAGCOtoArgs UCheckParseBlocks      = toLOp ocheckparseblocks
+fromUUAGCOtoArgs UCheckParseHaskell     = toLOp ocheckparsehaskell
 
 fromUUAGCOstoArgs :: UUAGCOptions -> [String]
 fromUUAGCOstoArgs = map fromUUAGCOtoArgs
@@ -144,4 +158,3 @@
     where f e (AGFileOption s' classes opt)
               | s == (normalise s')  = opt
               | otherwise            = e
-
diff --git a/cabal-plugin/src/Distribution/Simple/UUAGC/Options.hs b/cabal-plugin/src/Distribution/Simple/UUAGC/Options.hs
--- a/cabal-plugin/src/Distribution/Simple/UUAGC/Options.hs
+++ b/cabal-plugin/src/Distribution/Simple/UUAGC/Options.hs
@@ -1,52 +1,59 @@
 module Distribution.Simple.UUAGC.Options where
 
-odata           = "data"
-ostrictdata     = "strictdata"
-ostrictwrap     = "strictwrap"
-ocatas          = "catas"
-osemfuns        = "semfuns"
-osignatures     = "signatures"
-onewtypes       = "newtypes"
-opretty         = "pretty"
-owrappers       = "wrappers"
-orename         = "rename"
-omodcopy        = "modcopy"
-onest           = "nest"
-osyntaxmacro    = "syntaxmacro"
-overbose        = "verbose"
-ohelp           = "help"
-oself           = "self"
-ocycle          = "cycle"
-oversion        = "version"
-ovisit          = "visit"
-oseq            = "seq"
-ounbox          = "unbox"
-obangpats       = "bangpats" 
-ocase           = "case"
-ostrictcase     = "strictcase"
-ostrictercase   = "strictercase"
-olocalcps       = "localcps"
-osplitsems      = "splitsems"
-owerrors        = "Werrors"
-owignore        = "Wignore"
-odumpgrammar    = "dumpgrammar"
-odumpcgrammar   = "dumpcgrammar"
-ogentraces      = "gentraces"
-ogenusetraces   = "genusetraces"
-ogencostcentres = "gencostcentres"
-ogenlinepragmas = "genlinepragmas"
-osepsemmods     = "sepsemmods"
-ogenfiledeps    = "genfiledeps"
-ogenvisage      = "genvisage"
-ogenattrlist    = "genattrlist"
-olckeywords     = "lckeywords"
-ooptimize       = "optimize"
-odoublecolons   = "doublecolons"
-ohaskellsyntax  = "haskellsyntax"
-oall            = "all"
-omodule         = "module"
-ooutput         = "output"
-osearch         = "path"
-oprefix         = "prefix"
-owmax           = "Wmax"
-oforceirrefutable = "forceirrefutable"
+odata              = "data"
+ostrictdata        = "strictdata"
+ostrictwrap        = "strictwrap"
+ocatas             = "catas"
+osemfuns           = "semfuns"
+osignatures        = "signatures"
+onewtypes          = "newtypes"
+opretty            = "pretty"
+owrappers          = "wrappers"
+orename            = "rename"
+omodcopy           = "modcopy"
+onest              = "nest"
+osyntaxmacro       = "syntaxmacro"
+overbose           = "verbose"
+ohelp              = "help"
+oself              = "self"
+ocycle             = "cycle"
+oversion           = "version"
+ovisit             = "visit"
+oseq               = "seq"
+ounbox             = "unbox"
+obangpats          = "bangpats" 
+ocase              = "case"
+ostrictcase        = "strictcase"
+ostrictercase      = "strictercase"
+olocalcps          = "localcps"
+osplitsems         = "splitsems"
+owerrors           = "Werrors"
+owignore           = "Wignore"
+owmax              = "Wmax"
+odumpgrammar       = "dumpgrammar"
+odumpcgrammar      = "dumpcgrammar"
+ogentraces         = "gentraces"
+ogenusetraces      = "genusetraces"
+ogencostcentres    = "gencostcentres"
+ogenlinepragmas    = "genlinepragmas"
+osepsemmods        = "sepsemmods"
+ogenfiledeps       = "genfiledeps"
+ogenvisage         = "genvisage"
+ogenaspectag       = "genAspectAG"
+ogenattrlist       = "genattrlist"
+oforceirrefutable  = "forceirrefutable"
+ouniquedispenser   = "uniquedispenser"
+olckeywords        = "lckeywords"
+ooptimize          = "optimize"
+odoublecolons      = "doublecolons"
+ohaskellsyntax     = "haskellsyntax"
+oall               = "all"
+omodule            = "module"
+ooutput            = "output"
+osearch            = "path"
+oprefix            = "prefix"
+ostatistics        = "statistics"
+ocheckparserhs     = "checkParseRhs"
+ocheckparsetys     = "checkParseTys"
+ocheckparseblocks  = "checkParseBlocks"
+ocheckparsehaskell = "checkParseHaskell"
diff --git a/cabal-plugin/src/Distribution/Simple/UUAGC/Parser.hs b/cabal-plugin/src/Distribution/Simple/UUAGC/Parser.hs
--- a/cabal-plugin/src/Distribution/Simple/UUAGC/Parser.hs
+++ b/cabal-plugin/src/Distribution/Simple/UUAGC/Parser.hs
@@ -30,8 +30,9 @@
          ,ocase, ostrictcase, ostrictercase, olocalcps, osplitsems
          ,owerrors, owignore, odumpgrammar, odumpcgrammar, ogentraces
          ,ogenusetraces, ogencostcentres, ogenlinepragmas, osepsemmods
-         ,ogenfiledeps, ogenvisage, ogenattrlist, olckeywords
-         ,odoublecolons, oself ]
+         ,ogenfiledeps, ogenvisage, ogenaspectag, ogenattrlist, olckeywords
+         ,odoublecolons, oself
+         ,ocheckparserhs,ocheckparsetys,ocheckparseblocks,ocheckparsehaskell]
 
 uabsFlags = [UData, UStrictData, UStrictWData, UCatas, USemFuns, USignatures
             ,UNewTypes, UPretty
@@ -40,8 +41,9 @@
             ,UCase, UStrictCase, UStricterCase, ULocalCPS, USplitSems
             ,UWErrors, UWIgnore, UDumpGrammar, UDumpCGrammar, UGenTraces
             ,UGenUseTraces, UGenCostCentres, UGenLinePragmas, USepSemMods
-            ,UGenFileDeps, UGenVisage, UGenAttrList, ULCKeyWords
-            ,UDoubleColons, USelf ]
+            ,UGenFileDeps, UGenVisage, UGenAspectAG, UGenAttrList, ULCKeyWords
+            ,UDoubleColons, USelf
+            ,UCheckParseRhs, UCheckParseTys, UCheckParseBlocks, UCheckParseHaskell]
 
 gFlags = [(oall, [odata, ocatas, osemfuns, osignatures, opretty, orename])
          ,(ooptimize, [ovisit,ocase])
@@ -51,7 +53,7 @@
 gabsFlags = [UAll, UOptimize, UHaskellSyntax]
 
 
-aFlags = [omodule, ooutput, osearch, oprefix, owmax, oforceirrefutable]
+aFlags = [omodule, ooutput, osearch, oprefix, owmax, oforceirrefutable, ouniquedispenser, ostatistics]
 
 ugFlags = uFlags ++ (map (fst) gFlags)
 
@@ -92,7 +94,13 @@
 pForceIrrefutable :: Parser Token UUAGCOption
 pForceIrrefutable = UForceIrrefutable <$> (pKey oforceirrefutable *> pString)
 
-pAllFlags = pugFlags ++ [pModule,pOutput,pSearch,pPrefix,pWmax,pForceIrrefutable]
+pUniqueDispenser :: Parser Token UUAGCOption
+pUniqueDispenser = UUniqueDispenser <$> (pKey ouniquedispenser *> pString)
+
+pStatistics :: Parser Token UUAGCOption
+pStatistics = UStatistics <$> (pKey ostatistics *> pString)
+
+pAllFlags = pugFlags ++ [pModule,pOutput,pSearch,pPrefix,pWmax,pForceIrrefutable,pUniqueDispenser,pStatistics]
 
 pAnyFlag = pAny id pAllFlags
 
diff --git a/cabal-plugin/src/Distribution/Simple/UUAGC/UUAGC.hs b/cabal-plugin/src/Distribution/Simple/UUAGC/UUAGC.hs
--- a/cabal-plugin/src/Distribution/Simple/UUAGC/UUAGC.hs
+++ b/cabal-plugin/src/Distribution/Simple/UUAGC/UUAGC.hs
@@ -10,7 +10,7 @@
 import Distribution.Simple.LocalBuildInfo
 import Distribution.Simple.Utils
 import Distribution.Simple.Setup
-import Distribution.PackageDescription
+import Distribution.PackageDescription hiding (Flag)
 import Distribution.Simple.UUAGC.AbsSyn( AGFileOption(..)
                                          , AGFileOptions
                                          , AGOptionsClass(..)
@@ -23,6 +23,7 @@
                                          , fileClasses
                                          )
 import Distribution.Simple.UUAGC.Parser
+import Distribution.Verbosity
 import System.Process( CreateProcess(..), createProcess, CmdSpec(..)
                      , StdStream(..), runProcess, waitForProcess
                      , proc)
@@ -220,7 +221,10 @@
   options <- getAGFileOptions (bis >>= customFieldsBI)
   fileOptions <- forM options (\ opt ->
       let (notFound, opts) = getOptionsFromClass classes $ opt
-      in forM_ notFound (hPutStrLn stderr) >> return (normalise . filename $ opt, opts))
+      in do case buildVerbosity bf of
+              Flag v | v >= verbose -> putStrLn ("options for " ++ filename opt ++ ": " ++ show opts)
+              _ -> return () 
+            forM_ notFound (hPutStrLn stderr) >> return (normalise . filename $ opt, opts))
   writeFileOptions fileOptions
   let agflSP = map (id &&& dropFileName) $ nub $ getAGFileList options
   mapM_ (updateAGFile pd lbi) agflSP
diff --git a/src-derived/AG2AspectAG.hs b/src-derived/AG2AspectAG.hs
--- a/src-derived/AG2AspectAG.hs
+++ b/src-derived/AG2AspectAG.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (AG2AspectAG.ag)
+-- UUAGC 0.9.37.1 (AG2AspectAG.ag)
 module AG2AspectAG where
 {-# LINE 7 "AG2AspectAG.ag" #-}
 
diff --git a/src-derived/AbstractSyntax.hs b/src-derived/AbstractSyntax.hs
--- a/src-derived/AbstractSyntax.hs
+++ b/src-derived/AbstractSyntax.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (AbstractSyntax.ag)
+-- UUAGC 0.9.37.1 (AbstractSyntax.ag)
 module AbstractSyntax where
 {-# LINE 2 "AbstractSyntax.ag" #-}
 
diff --git a/src-derived/AbstractSyntaxDump.hs b/src-derived/AbstractSyntaxDump.hs
--- a/src-derived/AbstractSyntaxDump.hs
+++ b/src-derived/AbstractSyntaxDump.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (AbstractSyntaxDump.ag)
+-- UUAGC 0.9.37.1 (AbstractSyntaxDump.ag)
 module AbstractSyntaxDump where
 {-# LINE 6 "AbstractSyntaxDump.ag" #-}
 
diff --git a/src-derived/Code.hs b/src-derived/Code.hs
--- a/src-derived/Code.hs
+++ b/src-derived/Code.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (Code.ag)
+-- UUAGC 0.9.37.1 (Code.ag)
 module Code where
 {-# LINE 2 "Code.ag" #-}
 
diff --git a/src-derived/CodeSyntax.hs b/src-derived/CodeSyntax.hs
--- a/src-derived/CodeSyntax.hs
+++ b/src-derived/CodeSyntax.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (CodeSyntax.ag)
+-- UUAGC 0.9.37.1 (CodeSyntax.ag)
 module CodeSyntax where
 {-# LINE 2 "CodeSyntax.ag" #-}
 
diff --git a/src-derived/CodeSyntaxDump.hs b/src-derived/CodeSyntaxDump.hs
--- a/src-derived/CodeSyntaxDump.hs
+++ b/src-derived/CodeSyntaxDump.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (CodeSyntaxDump.ag)
+-- UUAGC 0.9.37.1 (CodeSyntaxDump.ag)
 module CodeSyntaxDump where
 {-# LINE 5 "CodeSyntaxDump.ag" #-}
 
diff --git a/src-derived/ConcreteSyntax.hs b/src-derived/ConcreteSyntax.hs
--- a/src-derived/ConcreteSyntax.hs
+++ b/src-derived/ConcreteSyntax.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (ConcreteSyntax.ag)
+-- UUAGC 0.9.37.1 (ConcreteSyntax.ag)
 module ConcreteSyntax where
 {-# LINE 2 "ConcreteSyntax.ag" #-}
 
diff --git a/src-derived/DeclBlocks.hs b/src-derived/DeclBlocks.hs
--- a/src-derived/DeclBlocks.hs
+++ b/src-derived/DeclBlocks.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (DeclBlocks.ag)
+-- UUAGC 0.9.37.1 (DeclBlocks.ag)
 module DeclBlocks where
 {-# LINE 2 "DeclBlocks.ag" #-}
 
diff --git a/src-derived/DefaultRules.hs b/src-derived/DefaultRules.hs
--- a/src-derived/DefaultRules.hs
+++ b/src-derived/DefaultRules.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -XBangPatterns #-}
 
--- UUAGC 0.9.36.2 (DefaultRules.ag)
+-- UUAGC 0.9.37.1 (DefaultRules.ag)
 module DefaultRules where
 {-# LINE 10 "DefaultRules.ag" #-}
 
diff --git a/src-derived/Desugar.hs b/src-derived/Desugar.hs
--- a/src-derived/Desugar.hs
+++ b/src-derived/Desugar.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -XBangPatterns #-}
 
--- UUAGC 0.9.36.2 (Desugar.ag)
+-- UUAGC 0.9.37.1 (Desugar.ag)
 module Desugar where
 {-# LINE 13 "Desugar.ag" #-}
 
diff --git a/src-derived/ErrorMessages.hs b/src-derived/ErrorMessages.hs
--- a/src-derived/ErrorMessages.hs
+++ b/src-derived/ErrorMessages.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (ErrorMessages.ag)
+-- UUAGC 0.9.37.1 (ErrorMessages.ag)
 module ErrorMessages where
 {-# LINE 2 "ErrorMessages.ag" #-}
 
diff --git a/src-derived/Expression.hs b/src-derived/Expression.hs
--- a/src-derived/Expression.hs
+++ b/src-derived/Expression.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (Expression.ag)
+-- UUAGC 0.9.37.1 (Expression.ag)
 module Expression where
 {-# LINE 2 "Expression.ag" #-}
 
diff --git a/src-derived/GenerateCode.hs b/src-derived/GenerateCode.hs
--- a/src-derived/GenerateCode.hs
+++ b/src-derived/GenerateCode.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (GenerateCode.ag)
+-- UUAGC 0.9.37.1 (GenerateCode.ag)
 module GenerateCode where
 {-# LINE 9 "GenerateCode.ag" #-}
 
diff --git a/src-derived/HsToken.hs b/src-derived/HsToken.hs
--- a/src-derived/HsToken.hs
+++ b/src-derived/HsToken.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (HsToken.ag)
+-- UUAGC 0.9.37.1 (HsToken.ag)
 module HsToken where
 {-# LINE 2 "HsToken.ag" #-}
 
diff --git a/src-derived/Interfaces.hs b/src-derived/Interfaces.hs
--- a/src-derived/Interfaces.hs
+++ b/src-derived/Interfaces.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (Interfaces.ag)
+-- UUAGC 0.9.37.1 (Interfaces.ag)
 module Interfaces where
 {-# LINE 2 "Interfaces.ag" #-}
 
diff --git a/src-derived/InterfacesRules.hs b/src-derived/InterfacesRules.hs
--- a/src-derived/InterfacesRules.hs
+++ b/src-derived/InterfacesRules.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -XBangPatterns #-}
 
--- UUAGC 0.9.36.2 (InterfacesRules.lag)
+-- UUAGC 0.9.37.1 (InterfacesRules.lag)
 module InterfacesRules where
 {-# LINE 10 "InterfacesRules.lag" #-}
 
diff --git a/src-derived/Order.hs b/src-derived/Order.hs
--- a/src-derived/Order.hs
+++ b/src-derived/Order.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (Order.ag)
+-- UUAGC 0.9.37.1 (Order.ag)
 module Order where
 {-# LINE 9 "Order.ag" #-}
 
diff --git a/src-derived/Patterns.hs b/src-derived/Patterns.hs
--- a/src-derived/Patterns.hs
+++ b/src-derived/Patterns.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (Patterns.ag)
+-- UUAGC 0.9.37.1 (Patterns.ag)
 module Patterns where
 {-# LINE 2 "Patterns.ag" #-}
 
diff --git a/src-derived/PrintCode.hs b/src-derived/PrintCode.hs
--- a/src-derived/PrintCode.hs
+++ b/src-derived/PrintCode.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -XBangPatterns #-}
 
--- UUAGC 0.9.36.2 (PrintCode.ag)
+-- UUAGC 0.9.37.1 (PrintCode.ag)
 module PrintCode where
 {-# LINE 10 "PrintCode.ag" #-}
 
diff --git a/src-derived/PrintErrorMessages.hs b/src-derived/PrintErrorMessages.hs
--- a/src-derived/PrintErrorMessages.hs
+++ b/src-derived/PrintErrorMessages.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (PrintErrorMessages.ag)
+-- UUAGC 0.9.37.1 (PrintErrorMessages.ag)
 module PrintErrorMessages where
 {-# LINE 4 "PrintErrorMessages.ag" #-}
 
diff --git a/src-derived/PrintOcamlCode.hs b/src-derived/PrintOcamlCode.hs
--- a/src-derived/PrintOcamlCode.hs
+++ b/src-derived/PrintOcamlCode.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -XBangPatterns #-}
 
--- UUAGC 0.9.36.2 (PrintOcamlCode.ag)
+-- UUAGC 0.9.37.1 (PrintOcamlCode.ag)
 module PrintOcamlCode where
 {-# LINE 10 "PrintOcamlCode.ag" #-}
 
diff --git a/src-derived/PrintVisitCode.hs b/src-derived/PrintVisitCode.hs
--- a/src-derived/PrintVisitCode.hs
+++ b/src-derived/PrintVisitCode.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (PrintVisitCode.ag)
+-- UUAGC 0.9.37.1 (PrintVisitCode.ag)
 module PrintVisitCode where
 {-# LINE 10 "PrintVisitCode.ag" #-}
 
diff --git a/src-derived/SemHsTokens.hs b/src-derived/SemHsTokens.hs
--- a/src-derived/SemHsTokens.hs
+++ b/src-derived/SemHsTokens.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (SemHsTokens.ag)
+-- UUAGC 0.9.37.1 (SemHsTokens.ag)
 module SemHsTokens where
 {-# LINE 4 "SemHsTokens.ag" #-}
 
diff --git a/src-derived/TfmToVisage.hs b/src-derived/TfmToVisage.hs
--- a/src-derived/TfmToVisage.hs
+++ b/src-derived/TfmToVisage.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (TfmToVisage.ag)
+-- UUAGC 0.9.37.1 (TfmToVisage.ag)
 module TfmToVisage where
 {-# LINE 8 "TfmToVisage.ag" #-}
 
diff --git a/src-derived/Transform.hs b/src-derived/Transform.hs
--- a/src-derived/Transform.hs
+++ b/src-derived/Transform.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (Transform.ag)
+-- UUAGC 0.9.37.1 (Transform.ag)
 module Transform where
 {-# LINE 8 "Transform.ag" #-}
 
diff --git a/src-derived/Visage.hs b/src-derived/Visage.hs
--- a/src-derived/Visage.hs
+++ b/src-derived/Visage.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (Visage.ag)
+-- UUAGC 0.9.37.1 (Visage.ag)
 module Visage where
 {-# LINE 6 "Visage.ag" #-}
 
diff --git a/src-derived/VisagePatterns.hs b/src-derived/VisagePatterns.hs
--- a/src-derived/VisagePatterns.hs
+++ b/src-derived/VisagePatterns.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (VisagePatterns.ag)
+-- UUAGC 0.9.37.1 (VisagePatterns.ag)
 module VisagePatterns where
 {-# LINE 2 "VisagePatterns.ag" #-}
 
diff --git a/src-derived/VisageSyntax.hs b/src-derived/VisageSyntax.hs
--- a/src-derived/VisageSyntax.hs
+++ b/src-derived/VisageSyntax.hs
@@ -1,6 +1,6 @@
 
 
--- UUAGC 0.9.36.2 (VisageSyntax.ag)
+-- UUAGC 0.9.37.1 (VisageSyntax.ag)
 module VisageSyntax where
 {-# LINE 2 "VisageSyntax.ag" #-}
 
diff --git a/src/RhsCheck.hs b/src/RhsCheck.hs
--- a/src/RhsCheck.hs
+++ b/src/RhsCheck.hs
@@ -6,18 +6,16 @@
 import Expression
 import HsToken
 import UU.Scanner.Position
-import Debug.Trace
 
 checkRhs,checkBlock,checkTy :: Expression -> Errors
-checkRhs = check parseExpWithMode
+checkRhs   = check parseExpWithMode
 checkBlock = check parseModuleWithMode
-checkTy = check parseTypeWithMode
+checkTy    = check parseTypeWithMode
 
 check :: (ParseMode -> String -> ParseResult a) -> Expression -> Errors
 check p (Expression pos tks) = case res of
    ParseOk _           -> []
-   ParseFailed loc msg -> trace (">>\n" ++ str ++ "\n" ++ msg ++ "<<") $
-                          let pos' = Pos (srcLine loc + line pos - 1) (srcColumn loc) (srcFilename loc)
+   ParseFailed loc msg -> let pos' = Pos (srcLine loc + line pos - 1) (srcColumn loc) (srcFilename loc)
                           in [HsParseError pos' msg]
  where
   pos0 = Pos (line pos) 1 (file pos)
diff --git a/src/Version.hs b/src/Version.hs
--- a/src/Version.hs
+++ b/src/Version.hs
@@ -1,4 +1,4 @@
 module Version where
 
 banner :: String
-banner = "Attribute Grammar compiler / HUT project. Version 0.9.37.0"
+banner = "Attribute Grammar compiler / HUT project. Version 0.9.37.1"
diff --git a/uuagc.cabal b/uuagc.cabal
--- a/uuagc.cabal
+++ b/uuagc.cabal
@@ -1,7 +1,7 @@
 cabal-version: >=1.2
 build-type: Simple
 name: uuagc
-version: 0.9.37.0
+version: 0.9.37.1
 license: GPL
 license-file: LICENSE
 maintainer: Arie Middelkoop <ariem@cs.uu.nl>
diff --git a/uuagc.cabal-for-ghc-6.6 b/uuagc.cabal-for-ghc-6.6
--- a/uuagc.cabal-for-ghc-6.6
+++ b/uuagc.cabal-for-ghc-6.6
@@ -1,5 +1,5 @@
 name: uuagc
-version: 0.9.37.0
+version: 0.9.37.1
 license: GPL
 license-file: LICENSE
 maintainer: Arie Middelkoop <ariem@cs.uu.nl>
