diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changes
 =======
 
+Version 0.3.2.1
+---------------
+
+Use `pretty-show-1.6.1` in the test suite
+
 Version 0.3.2
 -------------
 
diff --git a/haskell-names.cabal b/haskell-names.cabal
--- a/haskell-names.cabal
+++ b/haskell-names.cabal
@@ -1,5 +1,5 @@
 Name:                   haskell-names
-Version:                0.3.2
+Version:                0.3.2.1
 License:                BSD3
 Author:                 Roman Cheplyaka, Lennart Augustsson
 Maintainer:             Roman Cheplyaka <roma@ro-che.info>
@@ -305,7 +305,9 @@
     , tasty-golden
     , filemanip
     , utf8-string
-    , pretty-show == 1.5.*
+      -- we have to fix the pretty-show version, because the change in the
+      -- output format may affect the tests success
+    , pretty-show == 1.6.1
     , Cabal
     , haskell-names
     , tagged
diff --git a/tests/exports/ExportList.hs.golden b/tests/exports/ExportList.hs.golden
--- a/tests/exports/ExportList.hs.golden
+++ b/tests/exports/ExportList.hs.golden
@@ -1,14 +1,12 @@
-Symbols (
-  fromList [] ) (
-  fromList
-    [ SymData
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportList"
-                                          , gName = "A"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    ] )
+Symbols
+  (fromList [])
+  (fromList
+     [ SymData
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "ExportList" , gName = "A" }
+               }
+         , st_fixity = Nothing
+         }
+     ])
diff --git a/tests/exports/ExportList2.hs.golden b/tests/exports/ExportList2.hs.golden
--- a/tests/exports/ExportList2.hs.golden
+++ b/tests/exports/ExportList2.hs.golden
@@ -1,46 +1,35 @@
-Symbols (
-  fromList
-    [ SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportList2"
-                                          , gName = "c"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    , SymSelector
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportList2"
-                                          , gName = "b"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportList2"
-                                          , gName = "A"
-                                          }
-                          }
-        , sv_constructors = [ OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "ExportList2"
-                                                , gName = "A"
-                                                }
-                                }
-                            , OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "ExportList2"
-                                                , gName = "B"
-                                                }
-                                }
-                            ]
-        }
-    ] ) (
-  fromList [] )
+Symbols
+  (fromList
+     [ SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "ExportList2" , gName = "c" }
+               }
+         , sv_fixity = Nothing
+         }
+     , SymSelector
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "ExportList2" , gName = "b" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "ExportList2" , gName = "A" }
+               }
+         , sv_constructors =
+             [ OrigName
+                 { origPackage = Nothing
+                 , origGName = GName { gModule = "ExportList2" , gName = "A" }
+                 }
+             , OrigName
+                 { origPackage = Nothing
+                 , origGName = GName { gModule = "ExportList2" , gName = "B" }
+                 }
+             ]
+         }
+     ])
+  (fromList [])
diff --git a/tests/exports/ExportListMembers.hs.golden b/tests/exports/ExportListMembers.hs.golden
--- a/tests/exports/ExportListMembers.hs.golden
+++ b/tests/exports/ExportListMembers.hs.golden
@@ -1,128 +1,109 @@
-Symbols (
-  fromList
-    [ SymMethod
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListMembers"
-                                          , gName = "x"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_className = OrigName
-                           { origPackage = Nothing
-                           , origGName = GName
-                                           { gModule = "ExportListMembers"
-                                           , gName = "Bar"
-                                           }
-                           }
-        }
-    , SymSelector
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListMembers"
-                                          , gName = "c"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListMembers"
-                                          , gName = "Foo"
-                                          }
-                          }
-        , sv_constructors = [ OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "ExportListMembers"
-                                                , gName = "Foo2"
-                                                }
-                                }
-                            ]
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListMembers"
-                                          , gName = "Foo1"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListMembers"
-                                          , gName = "Foo"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListMembers"
-                                          , gName = "Foo3"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListMembers"
-                                          , gName = "Foo"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListMembers"
-                                          , gName = "N"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListMembers"
-                                          , gName = "N"
-                                          }
-                          }
-        }
-    ] ) (
-  fromList
-    [ SymData
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListMembers"
-                                          , gName = "Foo"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymNewType
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListMembers"
-                                          , gName = "N"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymClass
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListMembers"
-                                          , gName = "Bar"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    ] )
+Symbols
+  (fromList
+     [ SymMethod
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "ExportListMembers" , gName = "x" }
+               }
+         , sv_fixity = Nothing
+         , sv_className =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListMembers" , gName = "Bar" }
+               }
+         }
+     , SymSelector
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "ExportListMembers" , gName = "c" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListMembers" , gName = "Foo" }
+               }
+         , sv_constructors =
+             [ OrigName
+                 { origPackage = Nothing
+                 , origGName =
+                     GName { gModule = "ExportListMembers" , gName = "Foo2" }
+                 }
+             ]
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListMembers" , gName = "Foo1" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListMembers" , gName = "Foo" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListMembers" , gName = "Foo3" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListMembers" , gName = "Foo" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "ExportListMembers" , gName = "N" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "ExportListMembers" , gName = "N" }
+               }
+         }
+     ])
+  (fromList
+     [ SymData
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListMembers" , gName = "Foo" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymNewType
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "ExportListMembers" , gName = "N" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymClass
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListMembers" , gName = "Bar" }
+               }
+         , st_fixity = Nothing
+         }
+     ])
diff --git a/tests/exports/ExportListWildcards.hs.golden b/tests/exports/ExportListWildcards.hs.golden
--- a/tests/exports/ExportListWildcards.hs.golden
+++ b/tests/exports/ExportListWildcards.hs.golden
@@ -1,170 +1,151 @@
-Symbols (
-  fromList
-    [ SymMethod
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "x"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_className = OrigName
-                           { origPackage = Nothing
-                           , origGName = GName
-                                           { gModule = "ExportListWildcards"
-                                           , gName = "Bar"
-                                           }
-                           }
-        }
-    , SymSelector
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "c"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "Foo"
-                                          }
-                          }
-        , sv_constructors = [ OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "ExportListWildcards"
-                                                , gName = "Foo3"
-                                                }
-                                }
-                            ]
-        }
-    , SymSelector
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "unN"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "N"
-                                          }
-                          }
-        , sv_constructors = [ OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "ExportListWildcards"
-                                                , gName = "N"
-                                                }
-                                }
-                            ]
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "Foo1"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "Foo"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "Foo2"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "Foo"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "Foo3"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "Foo"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "N"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "N"
-                                          }
-                          }
-        }
-    ] ) (
-  fromList
-    [ SymData
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "Foo"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymNewType
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "N"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymClass
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "ExportListWildcards"
-                                          , gName = "Bar"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    ] )
+Symbols
+  (fromList
+     [ SymMethod
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "x" }
+               }
+         , sv_fixity = Nothing
+         , sv_className =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "Bar" }
+               }
+         }
+     , SymSelector
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "c" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "Foo" }
+               }
+         , sv_constructors =
+             [ OrigName
+                 { origPackage = Nothing
+                 , origGName =
+                     GName { gModule = "ExportListWildcards" , gName = "Foo3" }
+                 }
+             ]
+         }
+     , SymSelector
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "unN" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "N" }
+               }
+         , sv_constructors =
+             [ OrigName
+                 { origPackage = Nothing
+                 , origGName =
+                     GName { gModule = "ExportListWildcards" , gName = "N" }
+                 }
+             ]
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "Foo1" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "Foo" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "Foo2" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "Foo" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "Foo3" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "Foo" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "N" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "N" }
+               }
+         }
+     ])
+  (fromList
+     [ SymData
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "Foo" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymNewType
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "N" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymClass
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "ExportListWildcards" , gName = "Bar" }
+               }
+         , st_fixity = Nothing
+         }
+     ])
diff --git a/tests/exports/ImplicitExportList.hs.golden b/tests/exports/ImplicitExportList.hs.golden
--- a/tests/exports/ImplicitExportList.hs.golden
+++ b/tests/exports/ImplicitExportList.hs.golden
@@ -1,14 +1,12 @@
-Symbols (
-  fromList
-    [ SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Main"
-                                          , gName = "main"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    ] ) (
-  fromList [] )
+Symbols
+  (fromList
+     [ SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Main" , gName = "main" }
+               }
+         , sv_fixity = Nothing
+         }
+     ])
+  (fromList [])
diff --git a/tests/exports/ModuleReExport.hs.golden b/tests/exports/ModuleReExport.hs.golden
--- a/tests/exports/ModuleReExport.hs.golden
+++ b/tests/exports/ModuleReExport.hs.golden
@@ -1,269 +1,223 @@
-Symbols (
-  fromList
-    [ SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "function"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    , SymMethod
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "method1"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_className = OrigName
-                           { origPackage = Nothing
-                           , origGName = GName
-                                           { gModule = "Prelude"
-                                           , gName = "Class"
-                                           }
-                           }
-        }
-    , SymMethod
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "method2"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_className = OrigName
-                           { origPackage = Nothing
-                           , origGName = GName
-                                           { gModule = "Prelude"
-                                           , gName = "Class"
-                                           }
-                           }
-        }
-    , SymSelector
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "selector1"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataTypeWithSelectors"
-                                          }
-                          }
-        , sv_constructors = [ OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-                            ]
-        }
-    , SymSelector
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "selector2"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataTypeWithSelectors"
-                                          }
-                          }
-        , sv_constructors = [ OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-                            ]
-        }
-    , SymSelector
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "unNewtype"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "NewtypeWithSelectors"
-                                          }
-                          }
-        , sv_constructors = [ OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-                            ]
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Constructor1"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataType"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Constructor2"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataType"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataTypeWithSelectors"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataTypeWithSelectors"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Newtype"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Newtype"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "NewtypeWithSelectors"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "NewtypeWithSelectors"
-                                          }
-                          }
-        }
-    ] ) (
-  fromList
-    [ SymType
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "TypeSynonym"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymData
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataType"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymData
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataTypeWithSelectors"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymNewType
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Newtype"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymNewType
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "NewtypeWithSelectors"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymClass
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Class"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    ] )
+Symbols
+  (fromList
+     [ SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "function" }
+               }
+         , sv_fixity = Nothing
+         }
+     , SymMethod
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "method1" }
+               }
+         , sv_fixity = Nothing
+         , sv_className =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Class" }
+               }
+         }
+     , SymMethod
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "method2" }
+               }
+         , sv_fixity = Nothing
+         , sv_className =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Class" }
+               }
+         }
+     , SymSelector
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "selector1" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+               }
+         , sv_constructors =
+             [ OrigName
+                 { origPackage = Nothing
+                 , origGName =
+                     GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                 }
+             ]
+         }
+     , SymSelector
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "selector2" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+               }
+         , sv_constructors =
+             [ OrigName
+                 { origPackage = Nothing
+                 , origGName =
+                     GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                 }
+             ]
+         }
+     , SymSelector
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "unNewtype" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+               }
+         , sv_constructors =
+             [ OrigName
+                 { origPackage = Nothing
+                 , origGName =
+                     GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                 }
+             ]
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "Constructor1" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "Constructor2" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+               }
+         }
+     ])
+  (fromList
+     [ SymType
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "TypeSynonym" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymData
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymData
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymNewType
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymNewType
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymClass
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Class" }
+               }
+         , st_fixity = Nothing
+         }
+     ])
diff --git a/tests/exports/Prelude.hs.golden b/tests/exports/Prelude.hs.golden
--- a/tests/exports/Prelude.hs.golden
+++ b/tests/exports/Prelude.hs.golden
@@ -1,269 +1,223 @@
-Symbols (
-  fromList
-    [ SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "function"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    , SymMethod
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "method1"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_className = OrigName
-                           { origPackage = Nothing
-                           , origGName = GName
-                                           { gModule = "Prelude"
-                                           , gName = "Class"
-                                           }
-                           }
-        }
-    , SymMethod
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "method2"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_className = OrigName
-                           { origPackage = Nothing
-                           , origGName = GName
-                                           { gModule = "Prelude"
-                                           , gName = "Class"
-                                           }
-                           }
-        }
-    , SymSelector
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "selector1"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataTypeWithSelectors"
-                                          }
-                          }
-        , sv_constructors = [ OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-                            ]
-        }
-    , SymSelector
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "selector2"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataTypeWithSelectors"
-                                          }
-                          }
-        , sv_constructors = [ OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-                            ]
-        }
-    , SymSelector
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "unNewtype"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "NewtypeWithSelectors"
-                                          }
-                          }
-        , sv_constructors = [ OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-                            ]
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Constructor1"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataType"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Constructor2"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataType"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataTypeWithSelectors"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataTypeWithSelectors"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Newtype"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Newtype"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "NewtypeWithSelectors"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "NewtypeWithSelectors"
-                                          }
-                          }
-        }
-    ] ) (
-  fromList
-    [ SymType
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "TypeSynonym"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymData
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataType"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymData
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataTypeWithSelectors"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymNewType
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Newtype"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymNewType
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "NewtypeWithSelectors"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymClass
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Class"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    ] )
+Symbols
+  (fromList
+     [ SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "function" }
+               }
+         , sv_fixity = Nothing
+         }
+     , SymMethod
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "method1" }
+               }
+         , sv_fixity = Nothing
+         , sv_className =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Class" }
+               }
+         }
+     , SymMethod
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "method2" }
+               }
+         , sv_fixity = Nothing
+         , sv_className =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Class" }
+               }
+         }
+     , SymSelector
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "selector1" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+               }
+         , sv_constructors =
+             [ OrigName
+                 { origPackage = Nothing
+                 , origGName =
+                     GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                 }
+             ]
+         }
+     , SymSelector
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "selector2" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+               }
+         , sv_constructors =
+             [ OrigName
+                 { origPackage = Nothing
+                 , origGName =
+                     GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                 }
+             ]
+         }
+     , SymSelector
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "unNewtype" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+               }
+         , sv_constructors =
+             [ OrigName
+                 { origPackage = Nothing
+                 , origGName =
+                     GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                 }
+             ]
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "Constructor1" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "Constructor2" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+               }
+         }
+     ])
+  (fromList
+     [ SymType
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "TypeSynonym" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymData
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymData
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymNewType
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymNewType
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymClass
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Class" }
+               }
+         , st_fixity = Nothing
+         }
+     ])
diff --git a/tests/exports/Rec1.hs.golden b/tests/exports/Rec1.hs.golden
--- a/tests/exports/Rec1.hs.golden
+++ b/tests/exports/Rec1.hs.golden
@@ -1,44 +1,36 @@
-Symbols (
-  fromList
-    [ SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Rec1"
-                                          , gName = "rec1_1"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    , SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Rec1"
-                                          , gName = "rec1_2"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    , SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Rec2"
-                                          , gName = "rec2"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    , SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Rec3"
-                                          , gName = "rec3"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    ] ) (
-  fromList [] )
+Symbols
+  (fromList
+     [ SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Rec1" , gName = "rec1_1" }
+               }
+         , sv_fixity = Nothing
+         }
+     , SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Rec1" , gName = "rec1_2" }
+               }
+         , sv_fixity = Nothing
+         }
+     , SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Rec2" , gName = "rec2" }
+               }
+         , sv_fixity = Nothing
+         }
+     , SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Rec3" , gName = "rec3" }
+               }
+         , sv_fixity = Nothing
+         }
+     ])
+  (fromList [])
diff --git a/tests/exports/Rec2.hs.golden b/tests/exports/Rec2.hs.golden
--- a/tests/exports/Rec2.hs.golden
+++ b/tests/exports/Rec2.hs.golden
@@ -1,34 +1,28 @@
-Symbols (
-  fromList
-    [ SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Rec1"
-                                          , gName = "rec1_1"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    , SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Rec2"
-                                          , gName = "rec2"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    , SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Rec3"
-                                          , gName = "rec3"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    ] ) (
-  fromList [] )
+Symbols
+  (fromList
+     [ SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Rec1" , gName = "rec1_1" }
+               }
+         , sv_fixity = Nothing
+         }
+     , SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Rec2" , gName = "rec2" }
+               }
+         , sv_fixity = Nothing
+         }
+     , SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Rec3" , gName = "rec3" }
+               }
+         , sv_fixity = Nothing
+         }
+     ])
+  (fromList [])
diff --git a/tests/exports/Rec3.hs.golden b/tests/exports/Rec3.hs.golden
--- a/tests/exports/Rec3.hs.golden
+++ b/tests/exports/Rec3.hs.golden
@@ -1,34 +1,28 @@
-Symbols (
-  fromList
-    [ SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Rec1"
-                                          , gName = "rec1_1"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    , SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Rec1"
-                                          , gName = "rec1_2"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    , SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Rec3"
-                                          , gName = "rec3"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    ] ) (
-  fromList [] )
+Symbols
+  (fromList
+     [ SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Rec1" , gName = "rec1_1" }
+               }
+         , sv_fixity = Nothing
+         }
+     , SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Rec1" , gName = "rec1_2" }
+               }
+         , sv_fixity = Nothing
+         }
+     , SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Rec3" , gName = "rec3" }
+               }
+         , sv_fixity = Nothing
+         }
+     ])
+  (fromList [])
diff --git a/tests/exports/SelfReExport.hs.golden b/tests/exports/SelfReExport.hs.golden
--- a/tests/exports/SelfReExport.hs.golden
+++ b/tests/exports/SelfReExport.hs.golden
@@ -1,289 +1,239 @@
-Symbols (
-  fromList
-    [ SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "function"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    , SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "SelfReExport"
-                                          , gName = "local"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    , SymMethod
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "method1"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_className = OrigName
-                           { origPackage = Nothing
-                           , origGName = GName
-                                           { gModule = "Prelude"
-                                           , gName = "Class"
-                                           }
-                           }
-        }
-    , SymMethod
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "method2"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_className = OrigName
-                           { origPackage = Nothing
-                           , origGName = GName
-                                           { gModule = "Prelude"
-                                           , gName = "Class"
-                                           }
-                           }
-        }
-    , SymSelector
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "selector1"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataTypeWithSelectors"
-                                          }
-                          }
-        , sv_constructors = [ OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-                            ]
-        }
-    , SymSelector
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "selector2"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataTypeWithSelectors"
-                                          }
-                          }
-        , sv_constructors = [ OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-                            ]
-        }
-    , SymSelector
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "unNewtype"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "NewtypeWithSelectors"
-                                          }
-                          }
-        , sv_constructors = [ OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-                            ]
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Constructor1"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataType"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Constructor2"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataType"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataTypeWithSelectors"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataTypeWithSelectors"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Newtype"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Newtype"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "NewtypeWithSelectors"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "NewtypeWithSelectors"
-                                          }
-                          }
-        }
-    ] ) (
-  fromList
-    [ SymType
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "TypeSynonym"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymData
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataType"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymData
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "DataTypeWithSelectors"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymData
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "SelfReExport"
-                                          , gName = "Local"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymNewType
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Newtype"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymNewType
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "NewtypeWithSelectors"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymClass
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "Prelude"
-                                          , gName = "Class"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    ] )
+Symbols
+  (fromList
+     [ SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "function" }
+               }
+         , sv_fixity = Nothing
+         }
+     , SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "SelfReExport" , gName = "local" }
+               }
+         , sv_fixity = Nothing
+         }
+     , SymMethod
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "method1" }
+               }
+         , sv_fixity = Nothing
+         , sv_className =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Class" }
+               }
+         }
+     , SymMethod
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "method2" }
+               }
+         , sv_fixity = Nothing
+         , sv_className =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Class" }
+               }
+         }
+     , SymSelector
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "selector1" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+               }
+         , sv_constructors =
+             [ OrigName
+                 { origPackage = Nothing
+                 , origGName =
+                     GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                 }
+             ]
+         }
+     , SymSelector
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "selector2" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+               }
+         , sv_constructors =
+             [ OrigName
+                 { origPackage = Nothing
+                 , origGName =
+                     GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                 }
+             ]
+         }
+     , SymSelector
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "unNewtype" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+               }
+         , sv_constructors =
+             [ OrigName
+                 { origPackage = Nothing
+                 , origGName =
+                     GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                 }
+             ]
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "Constructor1" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "Constructor2" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+               }
+         }
+     ])
+  (fromList
+     [ SymType
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "TypeSynonym" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymData
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymData
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymData
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "SelfReExport" , gName = "Local" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymNewType
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymNewType
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName =
+                   GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymClass
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "Prelude" , gName = "Class" }
+               }
+         , st_fixity = Nothing
+         }
+     ])
diff --git a/tests/exports/SimpleData.hs.golden b/tests/exports/SimpleData.hs.golden
--- a/tests/exports/SimpleData.hs.golden
+++ b/tests/exports/SimpleData.hs.golden
@@ -1,32 +1,26 @@
-Symbols (
-  fromList
-    [ SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "SimpleData"
-                                          , gName = "A"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "SimpleData"
-                                          , gName = "A"
-                                          }
-                          }
-        }
-    ] ) (
-  fromList
-    [ SymData
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "SimpleData"
-                                          , gName = "A"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    ] )
+Symbols
+  (fromList
+     [ SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "SimpleData" , gName = "A" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "SimpleData" , gName = "A" }
+               }
+         }
+     ])
+  (fromList
+     [ SymData
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "SimpleData" , gName = "A" }
+               }
+         , st_fixity = Nothing
+         }
+     ])
diff --git a/tests/exports/SimpleTypes.hs.golden b/tests/exports/SimpleTypes.hs.golden
--- a/tests/exports/SimpleTypes.hs.golden
+++ b/tests/exports/SimpleTypes.hs.golden
@@ -1,94 +1,74 @@
-Symbols (
-  fromList
-    [ SymSelector
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "SimpleTypes"
-                                          , gName = "c"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "SimpleTypes"
-                                          , gName = "A"
-                                          }
-                          }
-        , sv_constructors = [ OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "SimpleTypes"
-                                                , gName = "B"
-                                                }
-                                }
-                            ]
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "SimpleTypes"
-                                          , gName = "B"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "SimpleTypes"
-                                          , gName = "A"
-                                          }
-                          }
-        }
-    , SymConstructor
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "SimpleTypes"
-                                          , gName = "H"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        , sv_typeName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "SimpleTypes"
-                                          , gName = "G"
-                                          }
-                          }
-        }
-    ] ) (
-  fromList
-    [ SymType
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "SimpleTypes"
-                                          , gName = "L"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymData
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "SimpleTypes"
-                                          , gName = "A"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    , SymNewType
-        { st_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "SimpleTypes"
-                                          , gName = "G"
-                                          }
-                          }
-        , st_fixity = Nothing
-        }
-    ] )
+Symbols
+  (fromList
+     [ SymSelector
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "SimpleTypes" , gName = "c" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "SimpleTypes" , gName = "A" }
+               }
+         , sv_constructors =
+             [ OrigName
+                 { origPackage = Nothing
+                 , origGName = GName { gModule = "SimpleTypes" , gName = "B" }
+                 }
+             ]
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "SimpleTypes" , gName = "B" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "SimpleTypes" , gName = "A" }
+               }
+         }
+     , SymConstructor
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "SimpleTypes" , gName = "H" }
+               }
+         , sv_fixity = Nothing
+         , sv_typeName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "SimpleTypes" , gName = "G" }
+               }
+         }
+     ])
+  (fromList
+     [ SymType
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "SimpleTypes" , gName = "L" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymData
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "SimpleTypes" , gName = "A" }
+               }
+         , st_fixity = Nothing
+         }
+     , SymNewType
+         { st_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "SimpleTypes" , gName = "G" }
+               }
+         , st_fixity = Nothing
+         }
+     ])
diff --git a/tests/exports/SimpleValue.hs.golden b/tests/exports/SimpleValue.hs.golden
--- a/tests/exports/SimpleValue.hs.golden
+++ b/tests/exports/SimpleValue.hs.golden
@@ -1,14 +1,12 @@
-Symbols (
-  fromList
-    [ SymValue
-        { sv_origName = OrigName
-                          { origPackage = Nothing
-                          , origGName = GName
-                                          { gModule = "SimpleValue"
-                                          , gName = "a"
-                                          }
-                          }
-        , sv_fixity = Nothing
-        }
-    ] ) (
-  fromList [] )
+Symbols
+  (fromList
+     [ SymValue
+         { sv_origName =
+             OrigName
+               { origPackage = Nothing
+               , origGName = GName { gModule = "SimpleValue" , gName = "a" }
+               }
+         , sv_fixity = Nothing
+         }
+     ])
+  (fromList [])
diff --git a/tests/imports/ExplicitPrelude.hs.golden b/tests/imports/ExplicitPrelude.hs.golden
--- a/tests/imports/ExplicitPrelude.hs.golden
+++ b/tests/imports/ExplicitPrelude.hs.golden
@@ -1,3 +1,1 @@
-Table (
-  fromList [] ) (
-  fromList [] )
+Table (fromList []) (fromList [])
diff --git a/tests/imports/ExplicitPreludeQualified.hs.golden b/tests/imports/ExplicitPreludeQualified.hs.golden
--- a/tests/imports/ExplicitPreludeQualified.hs.golden
+++ b/tests/imports/ExplicitPreludeQualified.hs.golden
@@ -1,388 +1,291 @@
-Table (
-  fromList
-    [ ( GName
-          { gModule = "Prelude"
-          , gName = "Constructor1"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Constructor2"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "DataTypeWithSelectors"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Newtype"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Newtype"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Newtype"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "NewtypeWithSelectors"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "function"
-          }
-      , fromList
-          [ SymValue
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "function"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "method1"
-          }
-      , fromList
-          [ SymMethod
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "method1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_className = OrigName
-                                 { origPackage = Nothing
-                                 , origGName = GName
-                                                 { gModule = "Prelude"
-                                                 , gName = "Class"
-                                                 }
-                                 }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "method2"
-          }
-      , fromList
-          [ SymMethod
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "method2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_className = OrigName
-                                 { origPackage = Nothing
-                                 , origGName = GName
-                                                 { gModule = "Prelude"
-                                                 , gName = "Class"
-                                                 }
-                                 }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "selector1"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "selector1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "DataTypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "selector2"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "selector2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "DataTypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "unNewtype"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "unNewtype"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "NewtypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    ] ) (
-  fromList
-    [ ( GName
-          { gModule = "Prelude"
-          , gName = "Class"
-          }
-      , fromList
-          [ SymClass
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Class"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "DataType"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "DataTypeWithSelectors"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Newtype"
-          }
-      , fromList
-          [ SymNewType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Newtype"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "NewtypeWithSelectors"
-          }
-      , fromList
-          [ SymNewType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "TypeSynonym"
-          }
-      , fromList
-          [ SymType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "TypeSynonym"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    ] )
+Table
+  (fromList
+     [ ( GName { gModule = "Prelude" , gName = "Constructor1" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Constructor2" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Newtype" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "function" }
+       , fromList
+           [ SymValue
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "function" }
+                     }
+               , sv_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "method1" }
+       , fromList
+           [ SymMethod
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "method1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_className =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "method2" }
+       , fromList
+           [ SymMethod
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "method2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_className =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "selector1" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "selector1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "selector2" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "selector2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "unNewtype" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "unNewtype" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     ])
+  (fromList
+     [ ( GName { gModule = "Prelude" , gName = "Class" }
+       , fromList
+           [ SymClass
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "DataType" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Newtype" }
+       , fromList
+           [ SymNewType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+       , fromList
+           [ SymNewType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "TypeSynonym" }
+       , fromList
+           [ SymType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "TypeSynonym" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     ])
diff --git a/tests/imports/Hiding.hs.golden b/tests/imports/Hiding.hs.golden
--- a/tests/imports/Hiding.hs.golden
+++ b/tests/imports/Hiding.hs.golden
@@ -1,349 +1,261 @@
-Table (
-  fromList
-    [ ( GName
-          { gModule = ""
-          , gName = "Constructor2"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "DataTypeWithSelectors"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "function"
-          }
-      , fromList
-          [ SymValue
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "function"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "method2"
-          }
-      , fromList
-          [ SymMethod
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "method2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_className = OrigName
-                                 { origPackage = Nothing
-                                 , origGName = GName
-                                                 { gModule = "Prelude"
-                                                 , gName = "Class"
-                                                 }
-                                 }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "selector1"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "selector1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "DataTypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Constructor2"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "DataTypeWithSelectors"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "function"
-          }
-      , fromList
-          [ SymValue
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "function"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "method2"
-          }
-      , fromList
-          [ SymMethod
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "method2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_className = OrigName
-                                 { origPackage = Nothing
-                                 , origGName = GName
-                                                 { gModule = "Prelude"
-                                                 , gName = "Class"
-                                                 }
-                                 }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "selector1"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "selector1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "DataTypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    ] ) (
-  fromList
-    [ ( GName
-          { gModule = ""
-          , gName = "DataType"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "DataTypeWithSelectors"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "TypeSynonym"
-          }
-      , fromList
-          [ SymType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "TypeSynonym"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "DataType"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "DataTypeWithSelectors"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "TypeSynonym"
-          }
-      , fromList
-          [ SymType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "TypeSynonym"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    ] )
+Table
+  (fromList
+     [ ( GName { gModule = "" , gName = "Constructor2" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "DataTypeWithSelectors" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "function" }
+       , fromList
+           [ SymValue
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "function" }
+                     }
+               , sv_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "method2" }
+       , fromList
+           [ SymMethod
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "method2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_className =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "selector1" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "selector1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Constructor2" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "function" }
+       , fromList
+           [ SymValue
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "function" }
+                     }
+               , sv_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "method2" }
+       , fromList
+           [ SymMethod
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "method2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_className =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "selector1" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "selector1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     ])
+  (fromList
+     [ ( GName { gModule = "" , gName = "DataType" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "DataTypeWithSelectors" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "TypeSynonym" }
+       , fromList
+           [ SymType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "TypeSynonym" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "DataType" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "TypeSynonym" }
+       , fromList
+           [ SymType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "TypeSynonym" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     ])
diff --git a/tests/imports/ImplicitPrelude.hs.golden b/tests/imports/ImplicitPrelude.hs.golden
--- a/tests/imports/ImplicitPrelude.hs.golden
+++ b/tests/imports/ImplicitPrelude.hs.golden
@@ -1,771 +1,577 @@
-Table (
-  fromList
-    [ ( GName
-          { gModule = ""
-          , gName = "Constructor1"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "Constructor2"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "DataTypeWithSelectors"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "Newtype"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Newtype"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Newtype"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "NewtypeWithSelectors"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "function"
-          }
-      , fromList
-          [ SymValue
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "function"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "method1"
-          }
-      , fromList
-          [ SymMethod
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "method1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_className = OrigName
-                                 { origPackage = Nothing
-                                 , origGName = GName
-                                                 { gModule = "Prelude"
-                                                 , gName = "Class"
-                                                 }
-                                 }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "method2"
-          }
-      , fromList
-          [ SymMethod
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "method2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_className = OrigName
-                                 { origPackage = Nothing
-                                 , origGName = GName
-                                                 { gModule = "Prelude"
-                                                 , gName = "Class"
-                                                 }
-                                 }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "selector1"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "selector1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "DataTypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "selector2"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "selector2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "DataTypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "unNewtype"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "unNewtype"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "NewtypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Constructor1"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Constructor2"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "DataTypeWithSelectors"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Newtype"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Newtype"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Newtype"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "NewtypeWithSelectors"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "function"
-          }
-      , fromList
-          [ SymValue
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "function"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "method1"
-          }
-      , fromList
-          [ SymMethod
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "method1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_className = OrigName
-                                 { origPackage = Nothing
-                                 , origGName = GName
-                                                 { gModule = "Prelude"
-                                                 , gName = "Class"
-                                                 }
-                                 }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "method2"
-          }
-      , fromList
-          [ SymMethod
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "method2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_className = OrigName
-                                 { origPackage = Nothing
-                                 , origGName = GName
-                                                 { gModule = "Prelude"
-                                                 , gName = "Class"
-                                                 }
-                                 }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "selector1"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "selector1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "DataTypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "selector2"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "selector2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "DataTypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "unNewtype"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "unNewtype"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "NewtypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    ] ) (
-  fromList
-    [ ( GName
-          { gModule = ""
-          , gName = "Class"
-          }
-      , fromList
-          [ SymClass
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Class"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "DataType"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "DataTypeWithSelectors"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "Newtype"
-          }
-      , fromList
-          [ SymNewType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Newtype"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "NewtypeWithSelectors"
-          }
-      , fromList
-          [ SymNewType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "TypeSynonym"
-          }
-      , fromList
-          [ SymType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "TypeSynonym"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Class"
-          }
-      , fromList
-          [ SymClass
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Class"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "DataType"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "DataTypeWithSelectors"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Newtype"
-          }
-      , fromList
-          [ SymNewType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Newtype"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "NewtypeWithSelectors"
-          }
-      , fromList
-          [ SymNewType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "TypeSynonym"
-          }
-      , fromList
-          [ SymType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "TypeSynonym"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    ] )
+Table
+  (fromList
+     [ ( GName { gModule = "" , gName = "Constructor1" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "Constructor2" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "DataTypeWithSelectors" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "Newtype" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "NewtypeWithSelectors" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "function" }
+       , fromList
+           [ SymValue
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "function" }
+                     }
+               , sv_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "method1" }
+       , fromList
+           [ SymMethod
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "method1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_className =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "method2" }
+       , fromList
+           [ SymMethod
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "method2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_className =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "selector1" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "selector1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "selector2" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "selector2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "unNewtype" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "unNewtype" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Constructor1" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Constructor2" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Newtype" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "function" }
+       , fromList
+           [ SymValue
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "function" }
+                     }
+               , sv_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "method1" }
+       , fromList
+           [ SymMethod
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "method1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_className =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "method2" }
+       , fromList
+           [ SymMethod
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "method2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_className =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "selector1" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "selector1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "selector2" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "selector2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "unNewtype" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "unNewtype" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     ])
+  (fromList
+     [ ( GName { gModule = "" , gName = "Class" }
+       , fromList
+           [ SymClass
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "DataType" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "DataTypeWithSelectors" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "Newtype" }
+       , fromList
+           [ SymNewType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "NewtypeWithSelectors" }
+       , fromList
+           [ SymNewType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "TypeSynonym" }
+       , fromList
+           [ SymType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "TypeSynonym" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Class" }
+       , fromList
+           [ SymClass
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "DataType" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Newtype" }
+       , fromList
+           [ SymNewType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+       , fromList
+           [ SymNewType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "TypeSynonym" }
+       , fromList
+           [ SymType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "TypeSynonym" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     ])
diff --git a/tests/imports/ImportList.hs.golden b/tests/imports/ImportList.hs.golden
--- a/tests/imports/ImportList.hs.golden
+++ b/tests/imports/ImportList.hs.golden
@@ -1,169 +1,125 @@
-Table (
-  fromList
-    [ ( GName
-          { gModule = ""
-          , gName = "Constructor1"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "Constructor2"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "function"
-          }
-      , fromList
-          [ SymValue
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "function"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Constructor1"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Constructor2"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "function"
-          }
-      , fromList
-          [ SymValue
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "function"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              }
-          ]
-      )
-    ] ) (
-  fromList
-    [ ( GName
-          { gModule = ""
-          , gName = "DataType"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "DataType"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    ] )
+Table
+  (fromList
+     [ ( GName { gModule = "" , gName = "Constructor1" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "Constructor2" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "function" }
+       , fromList
+           [ SymValue
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "function" }
+                     }
+               , sv_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Constructor1" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Constructor2" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "function" }
+       , fromList
+           [ SymValue
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "function" }
+                     }
+               , sv_fixity = Nothing
+               }
+           ]
+       )
+     ])
+  (fromList
+     [ ( GName { gModule = "" , gName = "DataType" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "DataType" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     ])
diff --git a/tests/imports/NoImplicitPrelude.hs.golden b/tests/imports/NoImplicitPrelude.hs.golden
--- a/tests/imports/NoImplicitPrelude.hs.golden
+++ b/tests/imports/NoImplicitPrelude.hs.golden
@@ -1,3 +1,1 @@
-Table (
-  fromList [] ) (
-  fromList [] )
+Table (fromList []) (fromList [])
diff --git a/tests/imports/SimpleImport.hs.golden b/tests/imports/SimpleImport.hs.golden
--- a/tests/imports/SimpleImport.hs.golden
+++ b/tests/imports/SimpleImport.hs.golden
@@ -1,771 +1,577 @@
-Table (
-  fromList
-    [ ( GName
-          { gModule = ""
-          , gName = "Constructor1"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "Constructor2"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "DataTypeWithSelectors"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "Newtype"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Newtype"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Newtype"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "NewtypeWithSelectors"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "function"
-          }
-      , fromList
-          [ SymValue
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "function"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "method1"
-          }
-      , fromList
-          [ SymMethod
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "method1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_className = OrigName
-                                 { origPackage = Nothing
-                                 , origGName = GName
-                                                 { gModule = "Prelude"
-                                                 , gName = "Class"
-                                                 }
-                                 }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "method2"
-          }
-      , fromList
-          [ SymMethod
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "method2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_className = OrigName
-                                 { origPackage = Nothing
-                                 , origGName = GName
-                                                 { gModule = "Prelude"
-                                                 , gName = "Class"
-                                                 }
-                                 }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "selector1"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "selector1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "DataTypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "selector2"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "selector2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "DataTypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "unNewtype"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "unNewtype"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "NewtypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Constructor1"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Constructor2"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Constructor2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "DataTypeWithSelectors"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Newtype"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Newtype"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Newtype"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "NewtypeWithSelectors"
-          }
-      , fromList
-          [ SymConstructor
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "function"
-          }
-      , fromList
-          [ SymValue
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "function"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "method1"
-          }
-      , fromList
-          [ SymMethod
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "method1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_className = OrigName
-                                 { origPackage = Nothing
-                                 , origGName = GName
-                                                 { gModule = "Prelude"
-                                                 , gName = "Class"
-                                                 }
-                                 }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "method2"
-          }
-      , fromList
-          [ SymMethod
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "method2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_className = OrigName
-                                 { origPackage = Nothing
-                                 , origGName = GName
-                                                 { gModule = "Prelude"
-                                                 , gName = "Class"
-                                                 }
-                                 }
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "selector1"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "selector1"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "DataTypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "selector2"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "selector2"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "DataTypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "unNewtype"
-          }
-      , fromList
-          [ SymSelector
-              { sv_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "unNewtype"
-                                                }
-                                }
-              , sv_fixity = Nothing
-              , sv_typeName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              , sv_constructors = [ OrigName
-                                      { origPackage = Nothing
-                                      , origGName = GName
-                                                      { gModule = "Prelude"
-                                                      , gName = "NewtypeWithSelectors"
-                                                      }
-                                      }
-                                  ]
-              }
-          ]
-      )
-    ] ) (
-  fromList
-    [ ( GName
-          { gModule = ""
-          , gName = "Class"
-          }
-      , fromList
-          [ SymClass
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Class"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "DataType"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "DataTypeWithSelectors"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "Newtype"
-          }
-      , fromList
-          [ SymNewType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Newtype"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "NewtypeWithSelectors"
-          }
-      , fromList
-          [ SymNewType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = ""
-          , gName = "TypeSynonym"
-          }
-      , fromList
-          [ SymType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "TypeSynonym"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Class"
-          }
-      , fromList
-          [ SymClass
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Class"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "DataType"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataType"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "DataTypeWithSelectors"
-          }
-      , fromList
-          [ SymData
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "DataTypeWithSelectors"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "Newtype"
-          }
-      , fromList
-          [ SymNewType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "Newtype"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "NewtypeWithSelectors"
-          }
-      , fromList
-          [ SymNewType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "NewtypeWithSelectors"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    , ( GName
-          { gModule = "Prelude"
-          , gName = "TypeSynonym"
-          }
-      , fromList
-          [ SymType
-              { st_origName = OrigName
-                                { origPackage = Nothing
-                                , origGName = GName
-                                                { gModule = "Prelude"
-                                                , gName = "TypeSynonym"
-                                                }
-                                }
-              , st_fixity = Nothing
-              }
-          ]
-      )
-    ] )
+Table
+  (fromList
+     [ ( GName { gModule = "" , gName = "Constructor1" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "Constructor2" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "DataTypeWithSelectors" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "Newtype" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "NewtypeWithSelectors" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "function" }
+       , fromList
+           [ SymValue
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "function" }
+                     }
+               , sv_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "method1" }
+       , fromList
+           [ SymMethod
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "method1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_className =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "method2" }
+       , fromList
+           [ SymMethod
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "method2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_className =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "selector1" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "selector1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "selector2" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "selector2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "unNewtype" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "unNewtype" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Constructor1" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Constructor2" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "Constructor2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Newtype" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+       , fromList
+           [ SymConstructor
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "function" }
+       , fromList
+           [ SymValue
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "function" }
+                     }
+               , sv_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "method1" }
+       , fromList
+           [ SymMethod
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "method1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_className =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "method2" }
+       , fromList
+           [ SymMethod
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "method2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_className =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "selector1" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "selector1" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "selector2" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "selector2" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "unNewtype" }
+       , fromList
+           [ SymSelector
+               { sv_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "unNewtype" }
+                     }
+               , sv_fixity = Nothing
+               , sv_typeName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               , sv_constructors =
+                   [ OrigName
+                       { origPackage = Nothing
+                       , origGName =
+                           GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                       }
+                   ]
+               }
+           ]
+       )
+     ])
+  (fromList
+     [ ( GName { gModule = "" , gName = "Class" }
+       , fromList
+           [ SymClass
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "DataType" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "DataTypeWithSelectors" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "Newtype" }
+       , fromList
+           [ SymNewType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "NewtypeWithSelectors" }
+       , fromList
+           [ SymNewType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "" , gName = "TypeSynonym" }
+       , fromList
+           [ SymType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "TypeSynonym" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Class" }
+       , fromList
+           [ SymClass
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Class" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "DataType" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "DataType" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+       , fromList
+           [ SymData
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "DataTypeWithSelectors" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "Newtype" }
+       , fromList
+           [ SymNewType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "Newtype" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+       , fromList
+           [ SymNewType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName =
+                         GName { gModule = "Prelude" , gName = "NewtypeWithSelectors" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     , ( GName { gModule = "Prelude" , gName = "TypeSynonym" }
+       , fromList
+           [ SymType
+               { st_origName =
+                   OrigName
+                     { origPackage = Nothing
+                     , origGName = GName { gModule = "Prelude" , gName = "TypeSynonym" }
+                     }
+               , st_fixity = Nothing
+               }
+           ]
+       )
+     ])
