diff --git a/lens/base/identity.rkt b/lens/base/identity.rkt
deleted file mode 100644
index 801997a..0000000
--- a/lens/base/identity.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/base
-
-(require racket/function
-         racket/contract/base
-         "base.rkt"
-         unstable/lens/isomorphism/base
-         )
-
-(module+ test
-  (require rackunit
-           "view-set.rkt"))
-
-(provide
- (contract-out [identity-lens lens?]))
-
-(define identity-lens
-  (isomorphism-lens identity identity))
-
-
-(module+ test
-  (check-equal? (lens-view identity-lens 'foo) 'foo)
-  (check-equal? (lens-set identity-lens 'foo 'bar) 'bar))
diff --git a/lens/base/main.rkt b/lens/base/main.rkt
index fcec7c2..c24eaf7 100644
--- a/lens/base/main.rkt
+++ b/lens/base/main.rkt
@@ -1,13 +1,12 @@
-#lang racket/base
+#lang sweet-exp racket/base
 
-(require "base.rkt"
-         "view-set.rkt"
-         "transform.rkt"
-         "identity.rkt")
-
-(provide
- (all-from-out
+require
   "base.rkt"
   "view-set.rkt"
   "transform.rkt"
-  "identity.rkt"))
+
+provide
+  all-from-out
+    "base.rkt"
+    "view-set.rkt"
+    "transform.rkt"
diff --git a/lens/compound/compose.rkt b/lens/compound/compose.rkt
index bb331ba..b218c02 100644
--- a/lens/compound/compose.rkt
+++ b/lens/compound/compose.rkt
@@ -1,18 +1,20 @@
-#lang racket/base
+#lang sweet-exp racket/base
 
-(require racket/contract
-         racket/list
-         racket/match
-         fancy-app
-         "../base/main.rkt"
-         unstable/lens/isomorphism/base
-         )
+require racket/contract
+        racket/list
+        racket/match
+        fancy-app
+        "../base/main.rkt"
+        "../util/rest-contract.rkt"
+        "identity.rkt"
+        unstable/lens/isomorphism/base
 
-(module+ test
-  (require rackunit))
+module+ test
+  require rackunit
 
-(provide
- (contract-out [lens-compose (->* () () #:rest (listof lens?) lens?)]))
+provide
+  contract-out
+    lens-compose (rest-> lens? lens?)
 
 
 (define (lens-compose2 sub-lens super-lens)
diff --git a/lens/compound/identity.rkt b/lens/compound/identity.rkt
new file mode 100644
index 0000000..937f844
--- /dev/null
+++ b/lens/compound/identity.rkt
@@ -0,0 +1,22 @@
+#lang sweet-exp racket/base
+
+require racket/function
+        racket/contract/base
+        "../base/main.rkt"
+        unstable/lens/isomorphism/base
+
+module+ test
+  require rackunit
+          "../base/main.rkt"
+
+provide
+  contract-out
+    identity-lens lens?
+
+
+(define identity-lens
+  (isomorphism-lens identity identity))
+
+(module+ test
+  (check-equal? (lens-view identity-lens 'foo) 'foo)
+  (check-equal? (lens-set identity-lens 'foo 'bar) 'bar))
diff --git a/lens/compound/main.rkt b/lens/compound/main.rkt
index b82bc06..5b115b3 100644
--- a/lens/compound/main.rkt
+++ b/lens/compound/main.rkt
@@ -1,16 +1,19 @@
-#lang racket/base
+#lang sweet-exp racket/base
 
-(require "compose.rkt"
-         "join-hash.rkt"
-         "join-list.rkt"
-         "join-string.rkt"
-         "join-vector.rkt"
-         "thrush.rkt")
+require
+  "compose.rkt"
+  "identity.rkt"
+  "join-hash.rkt"
+  "join-list.rkt"
+  "join-string.rkt"
+  "join-vector.rkt"
+  "thrush.rkt"
 
-(provide (all-from-out
-          "compose.rkt"
-          "join-hash.rkt"
-          "join-list.rkt"
-          "join-string.rkt"
-          "join-vector.rkt"
-          "thrush.rkt"))
+provide
+  all-from-out
+    "compose.rkt"
+    "join-hash.rkt"
+    "join-list.rkt"
+    "join-string.rkt"
+    "join-vector.rkt"
+    "thrush.rkt"
diff --git a/lens/main.rkt b/lens/main.rkt
index c3e22cf..c70847d 100644
--- a/lens/main.rkt
+++ b/lens/main.rkt
@@ -1,6 +1,6 @@
-#lang racket/base
+#lang sweet-exp racket/base
 
-(require
+require
   "base/main.rkt"
   "compound/main.rkt"
   "dict.rkt"
@@ -9,22 +9,22 @@
   "stream.rkt"
   "string.rkt"
   "struct/main.rkt"
-  "vector/main.rkt")
+  "vector/main.rkt"
 
-(provide
- (except-out
-  (all-from-out
-   "base/main.rkt"
-   "compound/main.rkt"
-   "dict.rkt"
-   "hash/main.rkt"
-   "list/main.rkt"
-   "stream.rkt"
-   "string.rkt"
-   "struct/main.rkt"
-   "vector/main.rkt")
-  gen:lens
-  focus-lens
-  drop-lens
-  take-lens
-  use-applicable-lenses!))
+provide
+  except-out
+    all-from-out
+      "base/main.rkt"
+      "compound/main.rkt"
+      "dict.rkt"
+      "hash/main.rkt"
+      "list/main.rkt"
+      "stream.rkt"
+      "string.rkt"
+      "struct/main.rkt"
+      "vector/main.rkt"
+    gen:lens
+    focus-lens
+    drop-lens
+    take-lens
+    use-applicable-lenses!