Prefer GADT's over typ families for some SyntaxTree elements.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/Language/Fiddle/Compiler/Qualification.hs b/src/Language/Fiddle/Compiler/Qualification.hs
index 7eea141..a39e5dc 100644
--- a/src/Language/Fiddle/Compiler/Qualification.hs
+++ b/src/Language/Fiddle/Compiler/Qualification.hs
@@ -117,8 +117,8 @@ instance AdvanceStage S PackageBody where
     PackageBody <$> advanceFiddleDecls localState decls <*> pure a
 
 instance AdvanceStage S FiddleUnit where
-  advanceStage localState (FiddleUnit () decls a) =
-    FiddleUnit () <$> advanceFiddleDecls localState decls <*> pure a
+  advanceStage localState (FiddleUnit v decls a) =
+    FiddleUnit v <$> advanceFiddleDecls localState decls <*> pure a
 
 modifyEphemeralScope ::
   ( Scope String (Metadata, ExportedDecl) -> Scope String (Metadata, ExportedDecl)
@@ -200,7 +200,7 @@ advanceFiddleDecls localState decls = fmap (reverse . fst) $ do
                     return (declsRet, modifyCurrentScopePath (addUsingPath (nameToList name)) localState')
                   OptionDecl key value ann -> doReturn $ OptionDecl key value ann
                   ImportDecl st@(ImportStatement {importInterface = interface}) a ->
-                    let localState'' = modifyEphemeralScope (<> rootScope interface) localState'
+                    let localState'' = modifyEphemeralScope (<> rootScope (unwrap interface)) localState'
                      in doReturnWith localState''
                           =<< ImportDecl
                             <$> advanceStage localState'' st