diff --git a/main/src/taoensso/telemere.cljc b/main/src/taoensso/telemere.cljc
index b1472b8..9442059 100644
--- a/main/src/taoensso/telemere.cljc
+++ b/main/src/taoensso/telemere.cljc
@@ -58,7 +58,7 @@
   enc/newline
   enc/comp-middleware
   sigs/default-handler-dispatch-opts
-  truss/keep-callsite
+  #?(:clj truss/keep-callsite)
 
   ;; Impl
   impl/msg-splice
@@ -236,7 +236,7 @@
 
 #?(:clj
    (defmacro signal!
-     "opts => allowed? / unconditional run result (value or throw)."
+     "opts => allowed? / run result (value or throw)."
      {:doc      (impl/signal-docstring :signal!)
       :arglists (impl/signal-arglists  :signal!)}
      [& args]
@@ -295,7 +295,7 @@
 #?(:clj
    (let [base-opts {:kind :trace, :level :info, :msg `impl/default-trace-msg}]
      (defmacro trace!
-       "?id + run => unconditional run result (value or throw)."
+       "?id + run => run result (value or throw)."
        {:doc      (impl/signal-docstring :trace!)
         :arglists (impl/signal-arglists  :trace!)}
        ([opts-or-run]    `(impl/signal!        ~(merge-or-assoc-opts base-opts &form :run opts-or-run)))
@@ -306,7 +306,7 @@
 #?(:clj
    (let [base-opts {:kind :spy, :level :info, :msg `impl/default-trace-msg}]
      (defmacro spy!
-       "?level + run => unconditional run result (value or throw)."
+       "?level + run => run result (value or throw)."
        {:doc      (impl/signal-docstring :spy!)
         :arglists (impl/signal-arglists  :spy!)}
        ([opts-or-run]       `(impl/signal!        ~(merge-or-assoc-opts base-opts &form :run   opts-or-run)))
@@ -317,7 +317,7 @@
 #?(:clj
    (let [base-opts {:kind :error, :level :error}]
      (defmacro error!
-       "?id + error => unconditional given error."
+       "?id + error => given error."
        {:doc      (impl/signal-docstring :error!)
         :arglists (impl/signal-arglists  :error!)}
        ([opts-or-id error] `(error! ~(assoc (merge-or-assoc-opts base-opts &form :id opts-or-id) :error error)))
@@ -334,7 +334,7 @@
 #?(:clj
    (let [base-opts {:kind :error, :level :error}]
      (defmacro catch->error!
-       "?id + run => unconditional run value or ?catch-val."
+       "?id + run => run value or ?catch-val."
        {:doc      (impl/signal-docstring :catch->error!)
         :arglists (impl/signal-arglists  :catch->error!)}
        ([opts-or-id run] `(catch->error! ~(assoc (merge-or-assoc-opts base-opts &form :id opts-or-id) :run run)))
diff --git a/main/src/taoensso/telemere/impl.cljc b/main/src/taoensso/telemere/impl.cljc
index 0c1b87f..2ef3d6a 100644
--- a/main/src/taoensso/telemere/impl.cljc
+++ b/main/src/taoensso/telemere/impl.cljc
@@ -397,7 +397,7 @@
             sample-rate kind ns id level when rate-limit rate-limit-by,
             #_ctx #_ctx+ #_parent #_root #_trace?, #_do #_let #_data #_msg #_error #_run #_& #_kvs]}])
 
-       :signal! ; opts => allowed? / unconditional run result (value or throw)
+       :signal! ; opts => allowed? / run result (value or throw)
        '(   [& opts-kvs]
          [{:as opts-map :keys
            [#_elide? #_allow? #_callsite-id, ; Undocumented
@@ -405,7 +405,7 @@
             sample-rate kind ns id level when rate-limit rate-limit-by,
             ctx ctx+ parent root trace?, do let data msg error run & kvs]}])
 
-       :log! ; ?level + msg => allowed?
+       :log! ; ?level + msg => nil / allowed?
        '([opts-or-msg]
          [level   msg]
          [{:as opts-map :keys
@@ -415,7 +415,7 @@
             ctx ctx+ parent root trace?, do let data msg error #_run & kvs]}
           msg])
 
-       :event! ; id + ?level => allowed?
+       :event! ; id + ?level => nil / allowed?
        '([opts-or-id]
          [id   level]
          [id
@@ -425,7 +425,7 @@
             sample-rate kind ns id level when rate-limit rate-limit-by,
             ctx ctx+ parent root trace?, do let data msg error #_run & kvs]}])
 
-       :trace! ; ?id + run => unconditional run result (value or throw)
+       :trace! ; ?id + run => run result (value or throw)
        '([opts-or-run]
          [id      run]
          [{:as opts-map :keys
@@ -435,7 +435,7 @@
             ctx ctx+ parent root trace?, do let data msg error run & kvs]}
           run])
 
-       :spy! ; ?level + run => unconditional run result (value or throw)
+       :spy! ; ?level + run => run result (value or throw)
        '([opts-or-run]
          [level   run]
          [{:as opts-map :keys
@@ -445,7 +445,7 @@
             ctx ctx+ parent root trace?, do let data msg error run & kvs]}
           run])
 
-       :error! ; ?id + error => unconditional given error
+       :error! ; ?id + error => given error
        '([opts-or-error]
          [id      error]
          [{:as opts-map :keys
@@ -455,7 +455,7 @@
             ctx ctx+ parent root trace?, do let data msg error #_run & kvs]}
           error])
 
-       :catch->error! ; ?id + run => unconditional run value or ?catch-val
+       :catch->error! ; ?id + run => run value or ?catch-val
        '([opts-or-run]
          [id      run]
          [{:as opts-map :keys