diff --git a/lib/hyperscript/compiler.sx b/lib/hyperscript/compiler.sx
index 6a47db8e..d0ac73a9 100644
--- a/lib/hyperscript/compiler.sx
+++ b/lib/hyperscript/compiler.sx
@@ -999,7 +999,31 @@
                     (hs-to-sx (nth ast 1))
                     (hs-to-sx (nth ast 2)))))
               ((= head (quote do))
-                (cons (quote do) (map hs-to-sx (rest ast))))
+                (let
+                  ((compiled (map hs-to-sx (rest ast))))
+                  (if
+                    (and
+                      (> (len compiled) 1)
+                      (some
+                        (fn
+                          (c)
+                          (and
+                            (list? c)
+                            (or
+                              (= (first c) (quote hs-fetch))
+                              (= (first c) (quote hs-wait))
+                              (= (first c) (quote perform)))))
+                        compiled))
+                    (reduce
+                      (fn
+                        (body cmd)
+                        (list
+                          (quote let)
+                          (list (list (quote it) cmd))
+                          body))
+                      (nth compiled (- (len compiled) 1))
+                      (reverse (rest (reverse compiled))))
+                    (cons (quote do) compiled))))
               ((= head (quote wait)) (list (quote hs-wait) (nth ast 1)))
               ((= head (quote wait-for)) (emit-wait-for ast))
               ((= head (quote log))
diff --git a/lib/hyperscript/parser.sx b/lib/hyperscript/parser.sx
index 45c695b3..3e07187c 100644
--- a/lib/hyperscript/parser.sx
+++ b/lib/hyperscript/parser.sx
@@ -1859,7 +1859,8 @@
                   (let
                     ((acc2 (append acc (list cmd))))
                     (cond
-                      ((match-kw "then") (cl-collect acc2))
+                      ((match-kw "then")
+                        (cl-collect (append acc2 (list (quote __then__)))))
                       ((and (not (at-end?)) (= (tp-type) "keyword") (cmd-kw? (tp-val)))
                         (cl-collect acc2))
                       (true acc2)))))))
@@ -1868,7 +1869,10 @@
             (cond
               ((= (len cmds) 0) nil)
               ((= (len cmds) 1) (first cmds))
-              (true (cons (quote do) cmds))))))
+              (true
+                (cons
+                  (quote do)
+                  (filter (fn (c) (not (= c (quote __then__)))) cmds)))))))
       (define
         parse-on-feat
         (fn