.

original commit: f22cb9df23dcb72d5aaf543b7056fa8604ee1f43

collects/framework/framework.ss

@@ -8,8 +8,11 @@
 
 (require-relative-library "test.ss")
 
-(invoke-open-unit/sig
- (compound-unit/sig
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig frameworkc^
+  (compound-unit/sig
    (import [core:string : mzlib:string^]
 	   [core:function : mzlib:function^]
 	   [core:pretty-print : mzlib:pretty-print^]
@@ -28,12 +31,13 @@
 			   framework:keys
 			   framework:test)])
    (export (open f)))
- #f
- mzlib:string^
- mzlib:function^
- mzlib:pretty-print^
- mzlib:file^
- mzlib:thread^
- (keys : framework:keys^)
- (test : framework:test^)
- mred-interfaces^)
+  #f
+  mzlib:string^
+  mzlib:function^
+  mzlib:pretty-print^
+  mzlib:file^
+  mzlib:thread^
+  (keys : framework:keys^)
+  (test : framework:test^)
+  mred-interfaces^)
+

collects/framework/test.ss

@@ -1,13 +1,19 @@
 (require-relative-library "tests.ss")
 (require-relative-library "mred-interfaces.ss")
 
-(invoke-open-unit/sig
- (compound-unit/sig
-  (import)
-  (link [mred : mred-interfaces^ (mred-interfaces@)]
-	[keys : framework:keys^ ((require-relative-library "keys.ss"))]
-	[test : framework:test^ ((require-relative-library "testr.ss") mred keys)])
-  (export
-   (unit test)
-   (unit keys)
-   (open mred))))
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig ((open mred-interfaces^)
+				(open framework:keys^)
+				(open framework:test^))
+  (compound-unit/sig
+   (import)
+   (link [mred : mred-interfaces^ (mred-interfaces@)]
+	 [keys : framework:keys^ ((require-relative-library "keys.ss"))]
+	 [test : framework:test^ ((require-relative-library "testr.ss") mred keys)])
+   (export
+    (unit test)
+    (unit keys)
+    (open mred))))
+

collects/hierlist/hierlist.ss

@@ -1,6 +1,12 @@
 (require-library "hierlists.ss" "hierlist")
 
-(invoke-open-unit/sig (require-library "hierlistr.ss" "hierlist") #f mred^)
+(begin-elaboration-time
+  (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig hierlist^
+  (require-library "hierlistr.ss" "hierlist")
+  #f
+  mred^)
 
 #|