1 files changed, 23 insertions, 23 deletions
diff --git a/stdlib/source/library/lux/meta/compiler.lux b/stdlib/source/library/lux/meta/compiler.lux
index 0bac9c1be..4721d1374 100644
--- a/stdlib/source/library/lux/meta/compiler.lux
+++ b/stdlib/source/library/lux/meta/compiler.lux
@@ -1,24 +1,21 @@
 (.require
  [library
-  [lux (.except Module Code #module)
+  [lux (.except Code #module)
    [control
-    ["<>" parser (.only)]
-    ["[0]" try (.only Try)]
+    [try (.only Try)]
     ["[0]" exception (.only Exception)]]
    [data
-    ["[0]" text]
-    ["[0]" binary (.only Binary)
+    [binary
      [\\format (.only Format)]
-     ["<[1]>" \\parser (.only Parser)]]]
+     [\\parser (.only Parser)]]]
    [world
-    ["[0]" file (.only Path)]]]]
+    ["[0]" file]]]]
  [/
   [meta
-   ["[0]" archive (.only Output Archive)
+   ["[0]" archive (.only Archive)
     [key (.only Key)]
     [module
-     [descriptor (.only Descriptor Module)]
-     [document (.only Document)]]]]])
+     ["[0]" descriptor]]]]])
 
 (type .public Code
   Text)
@@ -28,20 +25,21 @@
 
 (type .public Input
   (Record
-   [#module Module
-    #file Path
+   [#module descriptor.Module
+    #file file.Path
     #hash Nat
     #code Code]))
 
-(type .public (Compilation s d)
+(type .public (Compilation state document)
   (Record
-   [#dependencies (List Module)
-    #process (-> s Archive
-                 (Try [s (Either (Compilation s d)
-                                 (archive.Entry d))]))]))
+   [#dependencies (List descriptor.Module)
+    #process (-> state Archive
+                 (Try [state (Either (Compilation state document)
+                                     (archive.Entry document))]))]))
 
-(type .public (Compiler s d)
-  (-> Input (Compilation s d)))
+(type .public (Compiler state document)
+  (-> Input
+      (Compilation state document)))
 
 (type .public Custom
   (Ex (_ state document)
@@ -49,12 +47,14 @@
      (Key document)
      (Format document)
      (Parser document)
-     (-> Input (Try (Compilation state document)))]))
+     (-> Input
+         (Try (Compilation state document)))]))
 
-(type .public (Instancer s d)
-  (-> (Key d) (List Parameter) (Compiler s d)))
+(type .public (Instancer state document)
+  (-> (Key document) (List Parameter)
+      (Compiler state document)))
 
 (exception.def .public (cannot_compile module)
-  (Exception Module)
+  (Exception descriptor.Module)
   (exception.report
    (list ["Module" module])))