diff --git a/lib/hyperscript/compiler.sx b/lib/hyperscript/compiler.sx
index 16e94b69..d8eadd64 100644
--- a/lib/hyperscript/compiler.sx
+++ b/lib/hyperscript/compiler.sx
@@ -1035,15 +1035,7 @@
                   ((fn-expr (hs-to-sx (nth ast 1)))
                     (args (map hs-to-sx (nth ast 2))))
                   (cons fn-expr args)))
-              ((= head (quote return))
-                (let
-                  ((val (nth ast 1)))
-                  (if
-                    (nil? val)
-                    (list (quote raise) (list (quote list) "hs-return" nil))
-                    (list
-                      (quote raise)
-                      (list (quote list) "hs-return" (hs-to-sx val))))))
+              ((= head (quote return)) (hs-to-sx (nth ast 1)))
               ((= head (quote throw))
                 (list (quote raise) (hs-to-sx (nth ast 1))))
               ((= head (quote settle))
@@ -1114,41 +1106,13 @@
                   (quote hs-init)
                   (list (quote fn) (list) (hs-to-sx (nth ast 1)))))
               ((= head (quote def))
-                (let
-                  ((body (hs-to-sx (nth ast 3)))
-                    (params
-                      (map
-                        (fn
-                          (p)
-                          (if
-                            (and (list? p) (= (first p) (quote ref)))
-                            (make-symbol (nth p 1))
-                            (make-symbol p)))
-                        (nth ast 2))))
+                (list
+                  (quote define)
+                  (make-symbol (nth ast 1))
                   (list
-                    (quote define)
-                    (make-symbol (nth ast 1))
-                    (list
-                      (quote fn)
-                      params
-                      (list
-                        (quote guard)
-                        (list
-                          (quote _e)
-                          (list
-                            (quote true)
-                            (list
-                              (quote if)
-                              (list
-                                (quote and)
-                                (list (quote list?) (quote _e))
-                                (list
-                                  (quote =)
-                                  (list (quote first) (quote _e))
-                                  "hs-return"))
-                              (list (quote nth) (quote _e) 1)
-                              (list (quote raise) (quote _e)))))
-                        body)))))
+                    (quote fn)
+                    (map make-symbol (nth ast 2))
+                    (hs-to-sx (nth ast 3)))))
               ((= head (quote behavior)) (emit-behavior ast))
               ((= head (quote sx-eval))
                 (let
diff --git a/shared/static/wasm/sx/hs-compiler.sx b/shared/static/wasm/sx/hs-compiler.sx
index 16e94b69..d8eadd64 100644
--- a/shared/static/wasm/sx/hs-compiler.sx
+++ b/shared/static/wasm/sx/hs-compiler.sx
@@ -1035,15 +1035,7 @@
                   ((fn-expr (hs-to-sx (nth ast 1)))
                     (args (map hs-to-sx (nth ast 2))))
                   (cons fn-expr args)))
-              ((= head (quote return))
-                (let
-                  ((val (nth ast 1)))
-                  (if
-                    (nil? val)
-                    (list (quote raise) (list (quote list) "hs-return" nil))
-                    (list
-                      (quote raise)
-                      (list (quote list) "hs-return" (hs-to-sx val))))))
+              ((= head (quote return)) (hs-to-sx (nth ast 1)))
               ((= head (quote throw))
                 (list (quote raise) (hs-to-sx (nth ast 1))))
               ((= head (quote settle))
@@ -1114,41 +1106,13 @@
                   (quote hs-init)
                   (list (quote fn) (list) (hs-to-sx (nth ast 1)))))
               ((= head (quote def))
-                (let
-                  ((body (hs-to-sx (nth ast 3)))
-                    (params
-                      (map
-                        (fn
-                          (p)
-                          (if
-                            (and (list? p) (= (first p) (quote ref)))
-                            (make-symbol (nth p 1))
-                            (make-symbol p)))
-                        (nth ast 2))))
+                (list
+                  (quote define)
+                  (make-symbol (nth ast 1))
                   (list
-                    (quote define)
-                    (make-symbol (nth ast 1))
-                    (list
-                      (quote fn)
-                      params
-                      (list
-                        (quote guard)
-                        (list
-                          (quote _e)
-                          (list
-                            (quote true)
-                            (list
-                              (quote if)
-                              (list
-                                (quote and)
-                                (list (quote list?) (quote _e))
-                                (list
-                                  (quote =)
-                                  (list (quote first) (quote _e))
-                                  "hs-return"))
-                              (list (quote nth) (quote _e) 1)
-                              (list (quote raise) (quote _e)))))
-                        body)))))
+                    (quote fn)
+                    (map make-symbol (nth ast 2))
+                    (hs-to-sx (nth ast 3)))))
               ((= head (quote behavior)) (emit-behavior ast))
               ((= head (quote sx-eval))
                 (let