5 files changed, 44 insertions, 44 deletions
diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux
index 840b06e2d..6e2ea94c0 100644
--- a/stdlib/source/program/compositor.lux
+++ b/stdlib/source/program/compositor.lux
@@ -1,24 +1,24 @@
 (.module:
   [library
-   [lux {"-" [Module]}
-    [type {"+" [:sharing]}]
+   [lux {"-" Module}
+    [type {"+" :sharing}]
     ["@" target]
     ["[0]" debug]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" io {"+" [IO io]}]
-     ["[0]" try {"+" [Try]}]
+     ["[0]" io {"+" IO io}]
+     ["[0]" try {"+" Try}]
      [concurrency
-      ["[0]" async {"+" [Async]} ("[1]#[0]" monad)]]]
+      ["[0]" async {"+" Async} ("[1]#[0]" monad)]]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
-      ["[0]" dictionary {"+" [Dictionary]}]
-      ["[0]" row {"+" [Row]}]]]
+      ["[0]" dictionary {"+" Dictionary}]
+      ["[0]" row {"+" Row}]]]
     [time
      ["[0]" instant]]
     ["[0]" world "_"
@@ -30,21 +30,21 @@
      [compiler
       ["[0]" phase]
       [default
-       ["[0]" platform {"+" [Platform]}]]
+       ["[0]" platform {"+" Platform}]]
       [language
        ["$" lux
-        ["[1]/[0]" program {"+" [Program]}]
+        ["[1]/[0]" program {"+" Program}]
         ["[0]" syntax]
         ["[0]" analysis
-         [macro {"+" [Expander]}]]
-        ["[0]" generation {"+" [Buffer Context]}]
+         [macro {"+" Expander}]]
+        ["[0]" generation {"+" Buffer Context}]
         ["[0]" directive]
         [phase
-         [extension {"+" [Extender]}]]]]
+         [extension {"+" Extender}]]]]
       [meta
-       [packager {"+" [Packager]}]
-       [archive {"+" [Archive]}
-        [descriptor {"+" [Module]}]]
+       [packager {"+" Packager}]
+       [archive {"+" Archive}
+        [descriptor {"+" Module}]]
        [cache
         ["[0]" dependency]]
        [io
@@ -52,8 +52,8 @@
      ... ["[0]" interpreter]
      ]]]
   ["[0]" / "_"
-   ["[1][0]" cli {"+" [Service]}]
-   ["[1][0]" static {"+" [Static]}]
+   ["[1][0]" cli {"+" Service}]
+   ["[1][0]" static {"+" Static}]
    ["[1][0]" export]
    ["[1][0]" import]])
 
diff --git a/stdlib/source/program/compositor/cli.lux b/stdlib/source/program/compositor/cli.lux
index e678f2c6e..207d76560 100644
--- a/stdlib/source/program/compositor/cli.lux
+++ b/stdlib/source/program/compositor/cli.lux
@@ -1,17 +1,17 @@
 (.module:
   [library
-   [lux {"-" [Module Source]}
+   [lux {"-" Module Source}
     [control
-     [pipe {"+" [case>]}]
+     [pipe {"+" case>}]
      ["<>" parser
-      ["[0]" cli {"+" [Parser]}]]]
+      ["[0]" cli {"+" Parser}]]]
     [tool
      [compiler
       [meta
        [archive
-        [descriptor {"+" [Module]}]]]]]
+        [descriptor {"+" Module}]]]]]
     [world
-     [file {"+" [Path]}]]]])
+     [file {"+" Path}]]]])
 
 (type: .public Source
   Path)
diff --git a/stdlib/source/program/compositor/export.lux b/stdlib/source/program/compositor/export.lux
index 117c52251..64cb95955 100644
--- a/stdlib/source/program/compositor/export.lux
+++ b/stdlib/source/program/compositor/export.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux {"-" [Source]}
+   [lux {"-" Source}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]
+     ["[0]" try {"+" Try}]
      [concurrency
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" async {"+" Async}]]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" dictionary]
       ["[0]" row]]
@@ -22,11 +22,11 @@
      [compiler
       [meta
        ["[0]" io "_"
-        ["[1]" context {"+" [Extension]}]]]]]
+        ["[1]" context {"+" Extension}]]]]]
     [world
      ["[0]" file]]]]
   [//
-   [cli {"+" [Source Export]}]])
+   [cli {"+" Source Export}]])
 
 (def: file
   "library.tar")
diff --git a/stdlib/source/program/compositor/import.lux b/stdlib/source/program/compositor/import.lux
index 0e41d66a9..04eb93e6e 100644
--- a/stdlib/source/program/compositor/import.lux
+++ b/stdlib/source/program/compositor/import.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux {"-" [Module]}
+   [lux {"-" Module}
     [abstract
-     ["[0]" monad {"+" [Monad do]}]]
+     ["[0]" monad {"+" Monad do}]]
     [control
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]
      [concurrency
-      ["[0]" async {"+" [Async]} ("[1]#[0]" monad)]]
+      ["[0]" async {"+" Async} ("[1]#[0]" monad)]]
      ["<>" parser
       ["<[0]>" binary]]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
-      ["[0]" dictionary {"+" [Dictionary]}]
+      ["[0]" dictionary {"+" Dictionary}]
       ["[0]" row]]
      [format
       ["[0]" tar]]]
@@ -23,11 +23,11 @@
      [compiler
       [meta
        [archive
-        [descriptor {"+" [Module]}]]]]]
+        [descriptor {"+" Module}]]]]]
     [world
      ["[0]" file]]]]
   [//
-   [cli {"+" [Library]}]])
+   [cli {"+" Library}]])
 
 (def: Action
   (type (All (_ a) (Async (Try a)))))
diff --git a/stdlib/source/program/compositor/static.lux b/stdlib/source/program/compositor/static.lux
index 44d5d8a18..b509d5108 100644
--- a/stdlib/source/program/compositor/static.lux
+++ b/stdlib/source/program/compositor/static.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    [target {"+" [Target]}]
+    [target {"+" Target}]
     [world
-     [file {"+" [Path]}]]]])
+     [file {"+" Path}]]]])
 
 (type: .public Static
   (Record