.

original commit: f22cb9df23dcb72d5aaf543b7056fa8604ee1f43

collects/net/cgi.ss

@@ -1,5 +1,8 @@
-(require-library "macro.ss")
 
 (require-library "cgiu.ss" "net")
 
-(invoke-open-unit/sig mzlib:cgi@ #f)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:cgi^
+  mzlib:cgi@)

collects/net/dns.ss

@@ -1,5 +1,7 @@
 
-
 (require-relative-library "dnss.ss")
 
-(invoke-open-unit/sig (require-relative-library "dnsr.ss"))
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig (require-relative-library "dnsr.ss"))

collects/net/imap.ss

@@ -1,4 +1,8 @@
 
 (require-relative-library "imaps.ss")
 
-(invoke-open-unit/sig (require-relative-library "imapr.ss"))
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:imap^
+  (require-relative-library "imapr.ss"))

collects/net/nntp.ss

@@ -1,3 +1,8 @@
 (require-library "nntpu.ss" "net")
 
-(invoke-open-unit/sig mzlib:nntp@ nntp)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:nntp^
+  mzlib:nntp@
+  nntp)

collects/net/pop3.ss

@@ -1,6 +1,10 @@
 (require-library "pop3u.ss" "net")
 
-(invoke-open-unit/sig mzlib:pop3@ pop3)
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:pop3^
+  mzlib:pop3@ pop3)
 
 #|
 

collects/net/smtp.ss

@@ -1,4 +1,8 @@
 
 (require-relative-library "smtps.ss")
 
-(invoke-open-unit/sig (require-relative-library "smtpr.ss"))
+(begin-elaboration-time
+ (require-library "invoke.ss"))
+
+(define-values/invoke-unit/sig mzlib:smtp^
+  (require-relative-library "smtpr.ss"))