.

original commit: f22cb9df23dcb72d5aaf543b7056fa8604ee1f43

collects/framework/framework.ss

@@ -8,7 +8,10 @@
 
 (require-relative-library "test.ss")
 
-(invoke-open-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^]
@@ -37,3 +40,4 @@
   (keys : framework:keys^)
   (test : framework:test^)
   mred-interfaces^)
+

collects/framework/test.ss

@@ -1,7 +1,12 @@
 (require-relative-library "tests.ss")
 (require-relative-library "mred-interfaces.ss")
 
-(invoke-open-unit/sig
+(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@)]
@@ -11,3 +16,4 @@
     (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^)
 
 #|