Moved "lux/macro" to "lux/meta/macro".

67 files changed, 211 insertions, 176 deletions

diff --git a/stdlib/source/library/lux/tool/compiler/default/init.lux b/stdlib/source/library/lux/tool/compiler/default/init.lux
index f966f9b63..7d015fd6b 100644
--- a/stdlib/source/library/lux/tool/compiler/default/init.lux
+++ b/stdlib/source/library/lux/tool/compiler/default/init.lux
@@ -2,7 +2,6 @@
  [library
   [lux (.except)
    ["@" target (.only Target)]
-   ["[0]" meta]
    [abstract
     ["[0]" monad (.only do)]]
    [control
@@ -18,7 +17,7 @@
      ["[0]" dictionary]
      ["[0]" set]
      ["[0]" sequence (.use "[1]#[0]" functor)]]]
-   [meta
+   ["[0]" meta (.only)
     ["[0]" configuration (.only Configuration)]
     ["[0]" version]]
    [world
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux
index 13d0ba6ed..2442874a0 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux
@@ -17,8 +17,6 @@
      ["%" \\format (.only Format)]]
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix)]]]
-   [macro
-    [syntax (.only syntax)]]
    [math
     [number
      ["n" nat]
@@ -29,7 +27,9 @@
     ["[0]" location]
     ["[0]" configuration (.only Configuration)]
     ["[0]" code
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    [macro
+     [syntax (.only syntax)]]]]]
  ["[0]" /
   ["[1][0]" simple (.only Simple)]
   ["[1][0]" complex (.only Tuple Variant Complex)]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux
index 04023ab5c..aefb5abc7 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux
@@ -16,15 +16,16 @@
      ["[0]" list (.use "[1]#[0]" functor mix)]
      ["[0]" dictionary (.only Dictionary)]
      ["[0]" set (.only Set) (.use "[1]#[0]" equivalence)]]]
-   [macro
-    ["^" pattern]
-    ["[0]" template]]
    [math
     [number
      ["n" nat (.use "[1]#[0]" interval)]
      ["i" int]
      ["r" rev]
-     ["f" frac]]]]]
+     ["f" frac]]]
+   [meta
+    [macro
+     ["^" pattern]
+     ["[0]" template]]]]]
  ["[0]" //
   ["[1][0]" simple]
   ["[1][0]" complex]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux
index bbffab2a0..d25fb1f8a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux
@@ -14,13 +14,13 @@
      ["%" \\format (.only format)]]
     [collection
      ["[0]" list (.use "[1]#[0]" functor monoid)]]]
-   [macro
-    ["^" pattern]
-    ["[0]" template]]
    [math
     [number
      ["n" nat]]]
    [meta
+    [macro
+     ["^" pattern]
+     ["[0]" template]]
     ["[0]" type (.only)
      ["[0]" check]]]]]
  ["/" // (.only Analysis Operation Phase)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/macro.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/macro.lux
index 73ce2ea01..2e2982214 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/macro.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/macro.lux
@@ -1,6 +1,7 @@
 (.require
  [library
   [lux (.except)
+   ["[0]" meta]
    [abstract
     [monad (.only do)]]
    [control
@@ -8,8 +9,7 @@
     ["[0]" exception (.only exception)]]
    [data
     ["[0]" text
-     ["%" \\format (.only format)]]]
-   ["[0]" meta]]]
+     ["%" \\format (.only format)]]]]]
  [/////
   ["[0]" phase]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/module.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/module.lux
index d9ab4f4a1..33e818a9e 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/module.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/module.lux
@@ -1,6 +1,7 @@
 (.require
  [library
   [lux (.except Label with)
+   ["[0]" meta]
    [abstract
     ["[0]" monad (.only do)]]
    [control
@@ -12,8 +13,7 @@
      ["%" \\format (.only format)]]
     [collection
      ["[0]" list (.use "[1]#[0]" mix functor)
-      ["[0]" property]]]]
-   ["[0]" meta]]]
+      ["[0]" property]]]]]]
  ["/" // (.only Operation)
   ["//[1]" //
    [phase
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/simple.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/simple.lux
index b87c107ff..4b092ad00 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/simple.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/simple.lux
@@ -7,14 +7,15 @@
     ["[0]" bit (.use "[1]#[0]" equivalence)]
     ["[0]" text (.use "[1]#[0]" equivalence)
      ["%" \\format (.only Format)]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["n" nat]
      ["i" int]
      ["r" rev]
-     ["f" frac]]]]])
+     ["f" frac]]]
+   [meta
+    [macro
+     ["^" pattern]]]]])
 
 (type .public Simple
   (Variant
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux
index 6cfad0d9f..b534b616a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux
@@ -1,7 +1,6 @@
 (.require
  [library
   [lux (.except)
-   ["[0]" meta]
    [abstract
     ["[0]" monad (.only do)]]
    [control
@@ -12,12 +11,12 @@
      ["%" \\format (.only format)]]
     [collection
      ["[0]" list]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["n" nat]]]
-   [meta
+   ["[0]" meta (.only)
+    [macro
+     ["^" pattern]]
     [type
      ["[0]" check (.only Check)]]]]]
  ["/" // (.only Operation)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux b/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux
index bd46c3d8c..c217a6d6c 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux
@@ -16,14 +16,14 @@
      ["[0]" sequence (.only Sequence)]
      ["[0]" list (.use "[1]#[0]" functor mix)]
      ["[0]" set (.only Set)]]]
-   [macro
-    ["^" pattern]
-    ["[0]" template]]
    [math
     [number
      ["n" nat]]]
    [meta
-    ["[0]" symbol]]]]
+    ["[0]" symbol]
+    [macro
+     ["^" pattern]
+     ["[0]" template]]]]]
  [//
   [synthesis (.only Synthesis)]
   [phase
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux
index 5882c78f4..594626581 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux
@@ -10,14 +10,14 @@
      ["%" \\format (.only format)]]
     [collection
      ["[0]" list]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["n" nat]]]
    ["[0]" meta (.only)
+    ["[0]" location]
     ["[0]" code]
-    ["[0]" location]]]]
+    [macro
+     ["^" pattern]]]]]
  ["[0]" /
   ["[1][0]" simple]
   ["[1][0]" complex]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux
index 7301f6b8e..65d951e0a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux
@@ -16,10 +16,10 @@
    [math
     [number
      ["n" nat]]]
-   [macro
-    ["^" pattern]]
    ["[0]" meta (.only)
     ["[0]" code]
+    [macro
+     ["^" pattern]]
     ["[0]" type (.only)
      ["[0]" check (.only Check)]]]]]
  ["[0]" /
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux
index 2e43232b3..61daacb2f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux
@@ -1,7 +1,6 @@
 (.require
  [library
   [lux (.except)
-   ["[0]" meta]
    [abstract
     [monad (.only do)]]
    [control
@@ -9,8 +8,9 @@
    [data
     ["[0]" text (.use "[1]#[0]" equivalence)
      ["%" \\format (.only format)]]]
-   [macro
-    ["^" pattern]]]]
+   ["[0]" meta (.only)
+    [macro
+     ["^" pattern]]]]]
  ["[0]" //
   ["/[1]" //
    ["[1][0]" extension]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux
index c8ffe0bb7..36a7deaa1 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux
@@ -16,8 +16,9 @@
     [collection
      ["[0]" list]
      ["[0]" dictionary (.only Dictionary)]]]
-   [macro
-    ["^" pattern]]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  [/////
   ["//" phase]
   [meta
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
index 54592b36b..39dc0ac97 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
@@ -24,9 +24,6 @@
      ["[0]" array]
      ["[0]" dictionary (.only Dictionary)]
      ["[0]" sequence]]]
-   [macro
-    ["^" pattern]
-    ["[0]" template]]
    [math
     [number
      ["n" nat]
@@ -34,6 +31,9 @@
    ["[0]" meta (.only)
     ["[0]" code
      ["<[1]>" \\parser (.only Parser)]]
+    [macro
+     ["^" pattern]
+     ["[0]" template]]
     ["[0]" type (.only)
      ["[0]" check (.only Check) (.use "[1]#[0]" monad)]]]
    [target
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
index a9932f619..367240a34 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
@@ -14,14 +14,14 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]
      ["[0]" dictionary (.only Dictionary)]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["n" nat]]]
    [meta
     ["[0]" code
      ["<[1]>" \\parser (.only Parser)]]
+    [macro
+     ["^" pattern]]
     [type
      ["[0]" check]]]
    ["[0]" meta]]]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/jvm.lux
index 9f74950cb..8cb1f6b1c 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/jvm.lux
@@ -21,16 +21,16 @@
      ["[0]" dictionary]
      ["[0]" sequence]
      ["[0]" set (.only Set)]]]
-   [macro
-    ["^" pattern]
-    ["[0]" template]]
    [math
     [number
      ["n" nat]
      ["[0]" i32]]]
    [meta
     ["[0]" code
-     ["<[1]>" \\parser (.only Parser)]]]
+     ["<[1]>" \\parser (.only Parser)]]
+    [macro
+     ["^" pattern]
+     ["[0]" template]]]
    [target
     [jvm
      ["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/lux.lux
index 8b50853ac..8c5f5dbc8 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/lux.lux
@@ -20,14 +20,14 @@
      ["[0]" array]
      ["[0]" list (.use "[1]#[0]" functor mix)]
      ["[0]" set (.only Set)]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["n" nat]]]
    ["[0]" meta (.only)
     ["[0]" code
-     ["<[1]>" \\parser (.only Parser)]]]
+     ["<[1]>" \\parser (.only Parser)]]
+    [macro
+     ["^" pattern]]]
    ["[0]" type (.only sharing) (.use "[1]#[0]" equivalence)
     ["[0]" check]]]]
  ["[0]" /// (.only Extender)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
index 150ff7dee..3205b9933 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
@@ -11,11 +11,12 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]
      ["[0]" dictionary]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["f" frac]]]
+   [meta
+    [macro
+     ["^" pattern]]]
    ["@" target (.only)
     ["_" js (.only Literal Expression Statement)]]]]
  ["[0]" ////
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
index 13662d1c3..b72b69b2c 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
@@ -19,13 +19,14 @@
      ["[0]" dictionary (.only Dictionary)]
      ["[0]" set (.only Set)]
      ["[0]" sequence]]]
-   [macro
-    ["^" pattern]
-    ["[0]" template]]
    [math
     [number
      ["n" nat]
      ["[0]" i32]]]
+   [meta
+    [macro
+     ["^" pattern]
+     ["[0]" template]]]
    [target
     [jvm
      ["[0]" version]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux
index 560f6c1ae..abaf8d32f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux
@@ -14,11 +14,12 @@
     [collection
      ["[0]" dictionary]
      ["[0]" list (.use "[1]#[0]" functor mix)]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["f" frac]]]
+   [meta
+    [macro
+     ["^" pattern]]]
    ["@" target (.only)
     ["_" lua (.only Expression Statement)]]]]
  ["[0]" ////
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux
index f36712cd4..37ac2d627 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux
@@ -14,11 +14,12 @@
     [collection
      ["[0]" dictionary]
      ["[0]" list (.use "[1]#[0]" functor mix)]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["f" frac]]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     ["_" python (.only Expression Statement)]]]]
  ["[0]" ////
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux
index a9681db10..95b08bf3c 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux
@@ -14,11 +14,12 @@
     [collection
      ["[0]" dictionary]
      ["[0]" list (.use "[1]#[0]" functor mix)]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["f" frac]]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     ["_" ruby (.only Expression Statement)]]]]
  ["[0]" ////
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux
index 9087341e0..8af11bb77 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux
@@ -3,8 +3,9 @@
   [lux (.except)
    [abstract
     [monad (.only do)]]
-   [macro
-    ["^" pattern]]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  ["[0]" /
   [runtime (.only Phase)]
   ["[1][0]" primitive]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux
index a839ca4ba..6059eddc2 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux
@@ -9,11 +9,12 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix monoid)]
      ["[0]" set]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["n" nat]]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     ["_" common_lisp (.only Expression Var/1)]]]]
  ["[0]" //
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
index 434d214e0..a945e79be 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
@@ -14,14 +14,14 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor monoid)]
      ["[0]" sequence]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     [number (.only hex)
      ["[0]" i64]]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]
    ["@" target
     ["_" common_lisp (.only Expression Computation Literal)]]]]
  ["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux
index 0ccc9cbd3..9ab55a0a6 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux
@@ -6,11 +6,11 @@
    [data
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]]]
-   ["[0]" macro (.only with_symbols)
-    [syntax (.only syntax)]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only with_symbols)
+     [syntax (.only syntax)]]]]]
  ["[0]" ///
   ["[1][0]" extension]
   [//
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux
index 4c6b002c2..907159f8a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux
@@ -5,8 +5,9 @@
     [monad (.only do)]]
    [control
     ["[0]" exception (.only exception)]]
-   [macro
-    ["^" pattern]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     ["_" js]]]]
  ["[0]" /
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux
index ce5b1a3f8..24e27bd78 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux
@@ -9,11 +9,12 @@
     ["[0]" text]
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix)]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["n" nat]]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     ["_" js (.only Expression Computation Var Statement)]]]]
  ["[0]" //
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
index 75762cc34..da52044a7 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
@@ -15,14 +15,14 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]
      ["[0]" sequence]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     [number (.only hex)
      ["[0]" i64]]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]
    [target
     ["_" js (.only Expression Var Computation Statement)]]]]
  ["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm.lux
index e5994dc9f..8b5ee06f9 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm.lux
@@ -3,8 +3,9 @@
   [lux (.except)
    [abstract
     [monad (.only do)]]
-   [macro
-    ["^" pattern]]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  ["[0]" /
   [runtime (.only Phase)]
   ["[1][0]" primitive]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux
index ad49fa9e5..bc03aae26 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux
@@ -10,12 +10,13 @@
      ["[0]" list (.use "[1]#[0]" mix)]]
     ["[0]" text (.use "[1]#[0]" equivalence)
      ["%" \\format (.only format)]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["n" nat]
      ["[0]" i32]]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     [jvm
      ["_" bytecode (.only Label Bytecode) (.use "[1]#[0]" monad)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux
index ad9b0e720..100d864ab 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux
@@ -6,11 +6,12 @@
     [monad (.only do)]]
    [control
     ["[0]" try]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["i" int]]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     [jvm
      ["_" bytecode (.only Bytecode)]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux
index e3929c22c..6971e4cfa 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux
@@ -5,8 +5,9 @@
     [monad (.only do)]]
    [control
     ["[0]" exception (.only exception)]]
-   [macro
-    ["^" pattern]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     ["_" lua]]]]
  ["[0]" /
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux
index 5d87b83d7..ea8ca09f0 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux
@@ -9,8 +9,9 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix)]
      ["[0]" set]]]
-   [macro
-    ["^" pattern]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     ["_" lua (.only Expression Var Statement)]]]]
  ["[0]" //
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
index 0d3d0f783..7d2fff7cd 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
@@ -15,14 +15,14 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]
      ["[0]" sequence]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     [number (.only hex)
      ["[0]" i64]]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]
    ["@" target (.only)
     ["_" lua (.only Expression Location Var Computation Literal Label Statement)]]]]
  ["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux
index 030565284..e96ac884a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux
@@ -5,8 +5,9 @@
     [monad (.only do)]]
    [control
     ["[0]" exception (.only exception)]]
-   [macro
-    ["^" pattern]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     ["_" php]]]]
  ["[0]" /
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux
index 2b015ee7f..39ae8fcd4 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux
@@ -10,11 +10,12 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix)]
      ["[0]" set]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["i" int]]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     ["_" php (.only Expression Var Statement)]]]]
  ["[0]" //
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
index 2e525be79..755efeded 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
@@ -15,14 +15,14 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]
      ["[0]" sequence]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     [number (.only hex)
      ["[0]" i64]]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]
    ["@" target (.only)
     ["_" php (.only Expression Label Constant Var Computation Literal Statement)]]]]
  ["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux
index f88b023c8..a5435e72d 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux
@@ -5,8 +5,9 @@
     [monad (.only do)]]
    [control
     ["[0]" exception (.only exception)]]
-   [macro
-    ["^" pattern]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     ["_" python]]]]
  ["[0]" /
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux
index b79dc468b..5062e41ae 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux
@@ -9,12 +9,13 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix)]
      ["[0]" set]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["n" nat]
      ["i" int]]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     ["_" python (.only Expression SVar Statement)]]]]
  ["[0]" //
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
index 19c967248..b90fd1962 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
@@ -15,8 +15,6 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]
      ["[0]" sequence]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     [number (.only hex)
      ["f" frac]
@@ -24,7 +22,9 @@
    ["[0]" meta (.only)
     ["[0]" version]
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]
    ["@" target (.only)
     ["_" python (.only Expression SVar Computation Literal Statement)]]]]
  ["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux
index cb2ccd087..135f3e4df 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux
@@ -3,8 +3,9 @@
   [lux (.except)
    [abstract
     [monad (.only do)]]
-   [macro
-    ["^" pattern]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     ["_" r]]]]
  ["[0]" /
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux
index ac0a29c7e..51cb787a3 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux
@@ -10,12 +10,13 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix)]
      ["[0]" set]]]
-   [macro
-    ["^" pattern]
-    ["[0]" template]]
    [math
     [number
      ["i" int]]]
+   [meta
+    [macro
+     ["^" pattern]
+     ["[0]" template]]]
    [target
     ["_" r (.only Expression SVar)]]]]
  ["[0]" //
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
index 49dfb21af..47cc25566 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
@@ -15,8 +15,6 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]
      ["[0]" sequence]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     [number (.only hex)
      ["n" nat]
@@ -24,7 +22,9 @@
      ["[0]" i64]]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]
    ["@" target (.only)
     ["_" r (.only SVar Expression)]]]]
  ["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux
index f46905815..989d07127 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux
@@ -5,8 +5,9 @@
     [monad (.only do)]]
    [control
     ["[0]" exception (.only exception)]]
-   [macro
-    ["^" pattern]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     ["_" ruby]]]]
  ["[0]" /
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux
index 8e22cf563..68c958870 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux
@@ -9,12 +9,13 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix)]
      ["[0]" set]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["n" nat]
      ["i" int]]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     ["_" ruby (.only Expression LVar Statement)]]]]
  ["[0]" //
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
index 6684e6a59..32eb33c53 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
@@ -15,15 +15,15 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix)]
      ["[0]" sequence]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     [number (.only hex)
      ["[0]" i64]
      ["[0]" int (.use "[1]#[0]" interval)]]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]
    ["@" target (.only)
     ["_" ruby (.only Expression LVar Computation Literal Statement)]]]]
  ["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux
index 35c505b59..24b418ffa 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux
@@ -3,8 +3,9 @@
   [lux (.except)
    [abstract
     [monad (.only do)]]
-   [macro
-    ["^" pattern]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [target
     ["_" scheme]]]]
  ["[0]" /
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux
index 5f07b07e7..b9546d729 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux
@@ -10,12 +10,13 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix)]
      ["[0]" set]]]
-   [macro
-    ["^" pattern]
-    ["[0]" template]]
    [math
     [number
      ["i" int]]]
+   [meta
+    [macro
+     ["^" pattern]
+     ["[0]" template]]]
    [target
     ["_" scheme (.only Expression Computation Var)]]]]
  ["[0]" //
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux
index cbf99339c..80d6b5111 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux
@@ -11,11 +11,11 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]
      ["dict" dictionary (.only Dictionary)]]]
-   ["[0]" macro (.only with_symbols)
-    [syntax (.only syntax)]]
    [meta
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only with_symbols)
+     [syntax (.only syntax)]]]
    [target
     ["_" scheme (.only Expression Computation)]]]]
  ["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
index 1bf3f72eb..a54248283 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
@@ -15,14 +15,14 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]
      ["[0]" sequence]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     [number (.only hex)
      ["[0]" i64]]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]
    ["@" target (.only)
     ["_" scheme (.only Expression Computation Var)]]]]
  ["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux
index 69c424b5b..3aa00a192 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux
@@ -10,8 +10,9 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]
      ["[0]" dictionary (.only Dictionary)]]]
-   [macro
-    ["^" pattern]]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  ["[0]" /
   ["[1][0]" function]
   ["[1][0]" case]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux
index 507e0b5fa..b2e0d357d 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux
@@ -13,13 +13,14 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix monoid)]
      ["[0]" set (.only Set)]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["n" nat]
      ["[0]" i64]
-     ["[0]" frac]]]]]
+     ["[0]" frac]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  ["[0]" ///
   [//
    ["[1][0]" analysis (.only Match Analysis)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux
index e58b8f6fd..f1bf10c2c 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux
@@ -13,11 +13,12 @@
      ["%" \\format (.only format)]]
     [collection
      ["[0]" list (.use "[1]#[0]" functor monoid)]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  ["[0]" //
   ["[1][0]" loop (.only Transform)]
   ["//[1]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux
index 42d9ed6ae..eb5738a11 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux
@@ -8,11 +8,12 @@
    [data
     [collection
      ["[0]" list]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  [////
   ["[0]" analysis (.only Environment)
    ["[1]/[0]" complex]]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
index 7f2be3cf5..80fce0c79 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
@@ -15,11 +15,12 @@
      ["[0]" dictionary (.only Dictionary)]
      ["[0]" list (.use "[1]#[0]" functor mix)]
      ["[0]" set]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  [////
   ["[0]" analysis (.only)
    ["[1]/[0]" complex]]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux
index cba888c44..e5304ee2e 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux
@@ -41,13 +41,13 @@
     [collection
      ["[0]" list]
      ["[0]" dictionary (.only Dictionary)]]]
-   [macro
-    [syntax (.only syntax)]
-    ["[0]" template]]
    [meta
     ["[0]" symbol]
     ["[0]" code
-     ["<[1]>" \\parser]]]
+     ["<[1]>" \\parser]]
+    [macro
+     [syntax (.only syntax)]
+     ["[0]" template]]]
    [math
     [number
      ["n" nat]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux
index 03fd9d860..735da0f51 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux
@@ -16,14 +16,15 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]
      ["[0]" dictionary (.only Dictionary)]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["[0]" i64]
      ["n" nat]
      ["i" int]
-     ["f" frac]]]]]
+     ["f" frac]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  ["[0]" /
   ["[1][0]" simple (.only Simple)]
   ["[1][0]" access (.only Access)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/simple.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/simple.lux
index 32a921934..738ea9b76 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/simple.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/simple.lux
@@ -10,14 +10,15 @@
     ["[0]" bit (.use "[1]#[0]" equivalence)]
     ["[0]" text (.use "[1]#[0]" equivalence)
      ["%" \\format]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["[0]" i64 (.use "[1]#[0]" equivalence)]
      ["n" nat]
      ["i" int]
-     ["f" frac]]]]])
+     ["f" frac]]]
+   [meta
+    [macro
+     ["^" pattern]]]]])
 
 (type .public Simple
   (Variant
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/artifact/category.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/artifact/category.lux
index 665894617..706ea16ae 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive/artifact/category.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/artifact/category.lux
@@ -8,11 +8,12 @@
    [data
     ["[0]" product]
     ["[0]" text (.use "[1]#[0]" equivalence)]]
-   [macro
-    ["^" pattern]]
    [math
     [number
-     ["[0]" nat]]]]]
+     ["[0]" nat]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  [/////
   [arity (.only Arity)]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/module/descriptor.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/module/descriptor.lux
index b3e186b92..057f72e6e 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive/module/descriptor.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/module/descriptor.lux
@@ -13,11 +13,12 @@
      ["<[1]>" \\parser (.only Parser)]]
     [collection
      ["[0]" set (.only Set)]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["[0]" nat]]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [world
     [file (.only Path)]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux
index b7c1e2e35..fa6493f90 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux
@@ -20,9 +20,9 @@
      ["[0]" list]
      ["[0]" sequence (.only Sequence) (.use "[1]#[0]" functor mix)]
      ["[0]" dictionary (.only Dictionary)]]]
-   [macro
-    ["^" pattern]]
    [meta
+    [macro
+     ["^" pattern]]
     [type
      [primitive (.except)]]]]]
  ["[0]" //
diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux
index 11fa0a54f..d3e19193c 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux
@@ -12,13 +12,13 @@
      ["[0]" set (.only Set)]
      ["[0]" dictionary (.only Dictionary)]
      ["[0]" sequence]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["[0]" nat]]]
    [meta
-    ["[0]" symbol]]
+    ["[0]" symbol]
+    [macro
+     ["^" pattern]]]
    [tool
     [compiler
      ["[0]" phase]
diff --git a/stdlib/source/library/lux/tool/compiler/meta/cli.lux b/stdlib/source/library/lux/tool/compiler/meta/cli.lux
index caeb07961..2f2aa0f92 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/cli.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/cli.lux
@@ -14,13 +14,13 @@
      ["<[1]>" \\parser]]
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]]]
-   [macro
-    ["^" pattern]]
    [math
     [number (.only hex)]]
    [meta
     ["[0]" symbol]
-    ["[0]" configuration (.only Configuration)]]
+    ["[0]" configuration (.only Configuration)]
+    [macro
+     ["^" pattern]]]
    ["[0]" program
     ["<[1]>" \\parser (.only Parser)]]
    [tool
diff --git a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
index 3a89e09eb..032eaaf66 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
@@ -20,11 +20,11 @@
      ["[0]" list (.use "[1]#[0]" mix)]
      ["[0]" dictionary (.only Dictionary)]
      ["[0]" sequence (.only Sequence)]]]
-   [macro
-    ["^" pattern]]
    [meta
     ["[0]" configuration (.only Configuration)]
-    ["[0]" version]]
+    ["[0]" version]
+    [macro
+     ["^" pattern]]]
    [world
     ["[0]" file]]]]
  ["[0]" // (.only)
diff --git a/stdlib/source/library/lux/tool/compiler/reference.lux b/stdlib/source/library/lux/tool/compiler/reference.lux
index c4a64ae2e..340cf1a0d 100644
--- a/stdlib/source/library/lux/tool/compiler/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/reference.lux
@@ -9,13 +9,13 @@
    [data
     [text
      ["%" \\format (.only Format)]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["n" nat]]]
    [meta
-    ["[0]" symbol]]]]
+    ["[0]" symbol]
+    [macro
+     ["^" pattern]]]]]
  ["[0]" /
   ["[1][0]" variable (.only Variable)]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/reference/variable.lux b/stdlib/source/library/lux/tool/compiler/reference/variable.lux
index 30f7b449d..852a1e058 100644
--- a/stdlib/source/library/lux/tool/compiler/reference/variable.lux
+++ b/stdlib/source/library/lux/tool/compiler/reference/variable.lux
@@ -9,12 +9,13 @@
    [data
     [text
      ["%" \\format (.only Format)]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["n" nat]
-     ["i" int]]]]])
+     ["i" int]]]
+   [meta
+    [macro
+     ["^" pattern]]]]])
 
 (type .public Register
   Nat)