Reorganize things in preparation for formatting

app/MimaAsm/Main.hs

@@ -33,7 +33,7 @@ main = doRun_ $ do
   settings <- lift $ execParser opts
 
   lift $ putStrLn $ "Loading assembly file at " ++ infile settings
-  (state, _) <- parseFile parseState (infile settings)
+  (state, _) <- loadFile readState (infile settings)
   lift $ putStrLn "Parsing successful"
 
   lift $ putStrLn $ "Writing result to " ++ outfile settings

app/MimaRun/Main.hs

@@ -94,7 +94,7 @@ runMima settings s f =
       pure s'
 
 loadFlagFile :: FilePath -> Run (Flags (MimaAddress -> Bool))
-loadFlagFile filename = flagChecks <$> parseFile parseFlagFile filename
+loadFlagFile filename = (interpretFlagSpec . getFlagSpec) <$> loadFile readFlagFile filename
 
 loadFlags :: Settings -> Run (Flags (MimaAddress -> Bool))
 loadFlags settings = do