2 files changed, 18 insertions, 13 deletions
diff --git a/stdlib/source/lux/tool/compiler/phase/extension/analysis.lux b/stdlib/source/lux/tool/compiler/phase/extension/analysis.lux
index 15e525d5d..446e769f1 100644
--- a/stdlib/source/lux/tool/compiler/phase/extension/analysis.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension/analysis.lux
@@ -1,17 +1,22 @@
-(.module:
-  [lux #*
-   [data
-    [collection
-     ["." dictionary]]]]
-  [////
-   [default
-    [evaluation (#+ Eval)]]
-   [analysis (#+ Bundle)]]
-  [/
-   ["." common]
-   ["." host]])
+(.`` (.module:
+       [lux #*
+        [data
+         [collection
+          ["." dictionary]]]
+        [tool
+         [compiler
+          ["@" host]]]]
+       [////
+        [default
+         [evaluation (#+ Eval)]]
+        [analysis (#+ Bundle)]]
+       [/
+        ["." common]
+        ["." (~~ (.for {"{old}" jvm
+                        "JVM" jvm}))]]))
 
 (def: #export (bundle eval)
   (-> Eval Bundle)
-  (dictionary.merge host.bundle
+  (dictionary.merge (`` (for {(~~ (static @.old)) jvm.bundle
+                              (~~ (static @.jvm)) jvm.bundle}))
                     (common.bundle eval)))
diff --git a/stdlib/source/lux/tool/compiler/phase/extension/analysis/host.old.lux b/stdlib/source/lux/tool/compiler/phase/extension/analysis/jvm.lux
index 998590d1c..998590d1c 100644
--- a/stdlib/source/lux/tool/compiler/phase/extension/analysis/host.old.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension/analysis/jvm.lux