1 files changed, 9 insertions, 9 deletions
diff --git a/stdlib/source/lux/macro/syntax/common/reader.lux b/stdlib/source/lux/macro/syntax/common/reader.lux
index bbbe3f6d7..93e2ffa09 100644
--- a/stdlib/source/lux/macro/syntax/common/reader.lux
+++ b/stdlib/source/lux/macro/syntax/common/reader.lux
@@ -2,9 +2,9 @@
   [lux #*
    [control
     monad
-    ["p" parser ("parser/." Monad<Parser>)]]
+    ["p" parser ("parser/." monad)]]
    [data
-    [name ("name/." Equivalence<Name>)]
+    [name ("name/." equivalence)]
     ["." product]
     ["." maybe]
     [collection
@@ -40,7 +40,7 @@
 ## Definitions
 (def: check^
   (Syntax [(Maybe Code) Code])
-  (p.either (s.form (do p.Monad<Parser>
+  (p.either (s.form (do p.monad
                       [_ (s.this (' "lux check"))
                        type s.any
                        value s.any]
@@ -55,7 +55,7 @@
 (def: (_definition-anns^ _)
   (-> Any (Syntax //.Annotations))
   (p.or (s.this (' #.Nil))
-        (s.form (do p.Monad<Parser>
+        (s.form (do p.monad
                   [_ (s.this (' #.Cons))
                    [head tail] (p.and (s.tuple (p.and _definition-anns-tag^ s.any))
                                       (_definition-anns^ []))]
@@ -64,10 +64,10 @@
 
 (def: (flat-list^ _)
   (-> Any (Syntax (List Code)))
-  (p.either (do p.Monad<Parser>
+  (p.either (do p.monad
               [_ (s.this (' #.Nil))]
               (wrap (list)))
-            (s.form (do p.Monad<Parser>
+            (s.form (do p.monad
                       [_ (s.this (' #.Cons))
                        [head tail] (s.tuple (p.and s.any s.any))
                        tail (s.local (list tail) (flat-list^ []))]
@@ -79,7 +79,7 @@
      (<| s.tuple
          (p.after s.any)
          s.form
-         (do p.Monad<Parser>
+         (do p.monad
            [_ (s.this (' <tag>))]
            <then>)))]
 
@@ -105,7 +105,7 @@
 (def: #export (definition compiler)
   {#.doc "A reader that first macro-expands and then analyses the input Code, to ensure it's a definition."}
   (-> Lux (Syntax //.Definition))
-  (do p.Monad<Parser>
+  (do p.monad
     [definition-raw s.any
      me-definition-raw (|> definition-raw
                            ////.expand-all
@@ -129,7 +129,7 @@
 (def: #export (typed-definition compiler)
   {#.doc "A reader for definitions that ensures the input syntax is typed."}
   (-> Lux (Syntax //.Definition))
-  (do p.Monad<Parser>
+  (do p.monad
     [_definition (definition compiler)
      _ (case (get@ #//.definition-type _definition)
          (#.Some _)