Merge ModuleOptions and Options.

src/GF/Compile/Optimize.hs

@@ -58,7 +58,7 @@ optimizeModule opts mse@(ms,eenv) mo@(_,mi) = case mi of
       return (mo2,eenv)
   _ -> evalModule oopts mse mo
  where
-   oopts = opts `addOptions` toOptions (flagsModule mo)
+   oopts = opts `addOptions` flagsModule mo
    optim = flag optOptimizations oopts
 
 evalModule :: Options -> ([(Ident,SourceModInfo)],EEnv) -> (Ident,SourceModInfo) -> 

src/GF/Compile/ReadFiles.hs

@@ -210,4 +210,4 @@ getOptionsFromFile file = do
   s <- ioeIO $ readFileIfStrict file
   let ls = filter (BS.isPrefixOf (BS.pack "--#")) $ BS.lines s
       fs = map (BS.unpack . BS.unwords . BS.words . BS.drop 3) ls
-  ioeErr $ liftM toOptions $ parseModuleOptions fs
+  ioeErr $ parseModuleOptions fs