Simplify with-let even more

src/reagent/ratom.clj

@@ -23,6 +23,12 @@
                                    (= 'finally (first fin)))
                             [(butlast body) `(fn [] ~@(rest fin))]
                             [body nil]))
+        add-destroy (when destroy
+                      `(let [destroy# ~destroy]
+                         (if (reagent.ratom/reactive?)
+                           (when (< (alength ~v) 2)
+                             (aset ~v 1 destroy#))
+                           (destroy#))))
         asserting (if *assert* true false)]
     `(let [~v (reagent.ratom/with-let-value ~k)]
        (when ~asserting
@@ -35,10 +41,6 @@
          (aset ~v 0 (let ~bindings
                       (fn []
                         (let [res# (do ~@forms)]
-                          (when-some [destroy# ~destroy]
+                          ~add-destroy
-                            (if (reagent.ratom/reactive?)
-                              (when (< (alength ~v) 2)
-                                (aset ~v 1 destroy#))
-                              (destroy#)))
                           res#)))))
        ((aget ~v 0)))))

src/reagent/ratom.cljs

@@ -140,7 +140,7 @@
                                      (dissoc cached-reactions key))
                                (when (some? obj)
                                  (set! (.-reaction obj) nil))
-                               (when-not (nil? destroy)
+                               (when (some? destroy)
                                  (destroy x))
                                nil))
             v (-deref r)]