De-taggification | part 2

3 files changed, 19 insertions, 19 deletions

diff --git a/stdlib/source/poly/lux/abstract/equivalence.lux b/stdlib/source/poly/lux/abstract/equivalence.lux
index fddbc16ff..6273ef67f 100644
--- a/stdlib/source/poly/lux/abstract/equivalence.lux
+++ b/stdlib/source/poly/lux/abstract/equivalence.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ Monad do)]]
+     [monad {"+" [Monad do]}]]
     [control
      ["." maybe]
      ["<>" parser
@@ -11,17 +11,17 @@
      ["." product]
      ["." bit]
      ["." text ("#\." monoid)
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." monad)]
       ["." row]
       ["." array]
       ["." queue]
       ["." set]
-      ["." dictionary (#+ Dictionary)]
+      ["." dictionary {"+" [Dictionary]}]
       ["." tree]]]
     [macro
-     [syntax (#+ syntax:)]
+     [syntax {"+" [syntax:]}]
      ["." code]]
     [math
      [number
@@ -36,7 +36,7 @@
      ["." day]
      ["." month]]
     ["." type
-     ["." poly (#+ poly:)]
+     ["." poly {"+" [poly:]}]
      ["." unit]]]]
   [\\library
    ["." /]])
diff --git a/stdlib/source/poly/lux/abstract/functor.lux b/stdlib/source/poly/lux/abstract/functor.lux
index 44a3bdaef..b6f841560 100644
--- a/stdlib/source/poly/lux/abstract/functor.lux
+++ b/stdlib/source/poly/lux/abstract/functor.lux
@@ -1,26 +1,26 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ Monad do)]]
+     [monad {"+" [Monad do]}]]
     [control
      ["p" parser
       ["<.>" type]
-      ["s" code (#+ Parser)]]]
+      ["s" code {"+" [Parser]}]]]
     [data
      ["." product]
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." monad monoid)]]]
     [macro
-     [syntax (#+ syntax:)]
+     [syntax {"+" [syntax:]}]
      ["." code]]
     [math
      [number
       ["n" nat]]]
     ["." type
-     ["." poly (#+ poly:)]]]]
+     ["." poly {"+" [poly:]}]]]]
   [\\library
    ["." /]])
 
diff --git a/stdlib/source/poly/lux/data/format/json.lux b/stdlib/source/poly/lux/data/format/json.lux
index 512ca920c..2412f65e4 100644
--- a/stdlib/source/poly/lux/data/format/json.lux
+++ b/stdlib/source/poly/lux/data/format/json.lux
@@ -1,10 +1,10 @@
 (.module:
   {#.doc "Codecs for values in the JSON format."}
   [library
-   [lux #*
+   [lux "*"
     ["." debug]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      ["." codec]]
     [control
      ["." try]
@@ -14,13 +14,13 @@
       ["<.>" code]]]
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." monad)]
-      ["." row (#+ row)]
+      ["." row {"+" [row]}]
       ["." dictionary]]]
     [macro
-     [syntax (#+ syntax:)]
+     [syntax {"+" [syntax:]}]
      ["." code]]
     [math
      [number
@@ -36,9 +36,9 @@
      ["." month]]
     ["." type
      ["." unit]
-     ["." poly (#+ poly:)]]]]
+     ["." poly {"+" [poly:]}]]]]
   [\\library
-   ["." / (#+ JSON)]])
+   ["." / {"+" [JSON]}]])
 
 (def: tag
   (-> Nat Frac)