5 files changed, 7 insertions, 8 deletions
diff --git a/stdlib/source/lux/world/net/http/cookie.lux b/stdlib/source/lux/world/net/http/cookie.lux
index d2899d106..73f73ffff 100644
--- a/stdlib/source/lux/world/net/http/cookie.lux
+++ b/stdlib/source/lux/world/net/http/cookie.lux
@@ -7,7 +7,7 @@
    [data
     ["." error (#+ Error)]
     [text
-     format]
+     ["%" format (#+ format)]]
     [format
      ["." context (#+ Context)]]
     [collection
@@ -32,8 +32,8 @@
   (-> Duration Directive)
   (let [seconds (duration.query duration.second duration)]
     (..directive (format "Max-Age=" (if (i/< +0 seconds)
-                                      (%i seconds)
-                                      (%n (.nat seconds)))))))
+                                      (%.int seconds)
+                                      (%.nat (.nat seconds)))))))
 
 (template [<name> <prefix>]
   [(def: #export (<name> value)
diff --git a/stdlib/source/lux/world/net/http/header.lux b/stdlib/source/lux/world/net/http/header.lux
index 3a96b37fa..4cd1daa67 100644
--- a/stdlib/source/lux/world/net/http/header.lux
+++ b/stdlib/source/lux/world/net/http/header.lux
@@ -4,7 +4,7 @@
     [pipe (#+ case>)]]
    [data
     [text
-     format]
+     ["%" format (#+ format)]]
     [collection
      ["." dictionary (#+ Dictionary)]]]]
   [// (#+ Header)
@@ -23,7 +23,7 @@
 
 (def: #export content-length
   (-> Nat Header)
-  (|>> %n (..add "Content-Length")))
+  (|>> %.nat (..add "Content-Length")))
 
 (def: #export content-type
   (-> MIME Header)
diff --git a/stdlib/source/lux/world/net/http/mime.lux b/stdlib/source/lux/world/net/http/mime.lux
index 035ff0364..f3f795a13 100644
--- a/stdlib/source/lux/world/net/http/mime.lux
+++ b/stdlib/source/lux/world/net/http/mime.lux
@@ -2,7 +2,7 @@
   [lux #*
    [data
     ["." text
-     format
+     ["%" format (#+ format)]
      ["." encoding (#+ Encoding)]]]
    [type
     abstract]])
diff --git a/stdlib/source/lux/world/net/http/query.lux b/stdlib/source/lux/world/net/http/query.lux
index 516c67ff8..a0854d1e9 100644
--- a/stdlib/source/lux/world/net/http/query.lux
+++ b/stdlib/source/lux/world/net/http/query.lux
@@ -10,7 +10,7 @@
     [number
      ["." nat]]
     ["." text
-     format]
+     ["%" format (#+ format)]]
     [format
      ["." context (#+ Context)]]
     [collection
diff --git a/stdlib/source/lux/world/net/http/response.lux b/stdlib/source/lux/world/net/http/response.lux
index f1b0b1978..b262f3226 100644
--- a/stdlib/source/lux/world/net/http/response.lux
+++ b/stdlib/source/lux/world/net/http/response.lux
@@ -6,7 +6,6 @@
      ["." frp ("#@." monad)]]]
    [data
     ["." text
-     format
      ["." encoding]]
     [format
      ["." html]