diff --git a/src/taoensso/telemere.cljc b/src/taoensso/telemere.cljc
index 4ad1061..23678a2 100644
--- a/src/taoensso/telemere.cljc
+++ b/src/taoensso/telemere.cljc
@@ -42,8 +42,7 @@
 ;;;; Shared signal API
 
 (sigs/def-api
-  {:purpose  "signal"
-   :sf-arity 4
+  {:sf-arity 4
    :ct-sig-filter   impl/ct-sig-filter
    :*rt-sig-filter* impl/*rt-sig-filter*
    :*sig-handlers*  impl/*sig-handlers*})
diff --git a/src/taoensso/telemere/consoles.cljc b/src/taoensso/telemere/consoles.cljc
index bfb6f2e..bc15539 100644
--- a/src/taoensso/telemere/consoles.cljc
+++ b/src/taoensso/telemere/consoles.cljc
@@ -35,7 +35,7 @@
       (let [error-signal? utils/error-signal?]
 
         (fn a-handler:console
-          ([]) ; Shut down (noop)
+          ([      ]) ; Stop => noop
           ([signal]
            (let [^java.io.Writer stream
                  (case stream
@@ -70,7 +70,7 @@
         (let [js-console-logger utils/js-console-logger]
 
           (fn a-handler:console
-            ([]) ; Shut down (noop)
+            ([      ]) ; Stop => noop
             ([signal]
              (when-let [output (output-fn signal)]
                (let [logger (js-console-logger (get signal :level))]
@@ -115,7 +115,7 @@
                  :raw-error?      true})]
 
           (fn a-handler:console-raw
-            ([]) ; Shut down (noop)
+            ([      ]) ; Stop => noop
             ([signal]
              (let [{:keys [level error]} signal
                    logger (js-console-logger level)]
diff --git a/src/taoensso/telemere/files.clj b/src/taoensso/telemere/files.clj
index 77eb51e..b0d26f8 100644
--- a/src/taoensso/telemere/files.clj
+++ b/src/taoensso/telemere/files.clj
@@ -362,7 +362,7 @@
          lock (Object.)]
 
      (fn a-handler:file
-       ([] (locking lock (fw))) ; Close writer
+       ([      ] (locking lock (fw))) ; Stop => close writer
        ([signal]
         (when-let [output (output-fn signal)]
           (let [new-interval?   (when interval      (new-interval!?))
diff --git a/src/taoensso/telemere/open_telemetry.clj b/src/taoensso/telemere/open_telemetry.clj
index f59c004..b62f688 100644
--- a/src/taoensso/telemere/open_telemetry.clj
+++ b/src/taoensso/telemere/open_telemetry.clj
@@ -162,7 +162,7 @@
           (merge-prefix-map "ctx"  (get signal :ctx))
           (merge-prefix-map "data" (get signal :data))
           (merge-prefix-map "kvs"  (get signal :kvs))
-          (enc/fast-merge attr-kvs) ; Unprefixed, undocumented
+          (enc/merge attr-kvs) ; Unprefixed, undocumented
           )]
 
     attrs-map))
@@ -217,7 +217,7 @@
 
    (let []
      (fn a-handler:open-telemetry-logger
-       ([]) ; Shut down (noop)
+       ([      ]) ; Stop => noop
        ([signal]
         (let [{:keys [ns inst level msg_]} signal
               logger    (.get logger-provider (or ns "default"))
diff --git a/src/taoensso/telemere/postal.clj b/src/taoensso/telemere/postal.clj
index 9292cb4..6a855a8 100644
--- a/src/taoensso/telemere/postal.clj
+++ b/src/taoensso/telemere/postal.clj
@@ -107,7 +107,7 @@
 
    (let [handler-fn
          (fn a-handler:postal
-           ([]) ; Shut down (noop)
+           ([      ]) ; Stop => noop
            ([signal]
             (enc/when-let [subject (subject-fn signal)
                            body    (body-fn    signal)]
@@ -130,4 +130,5 @@
                 (when-not success?
                   (throw (ex-info "Failed to send email" result ex)))))))]
 
-     (with-meta handler-fn default-dispatch-opts))))
+     (with-meta handler-fn
+       {:dispatch-opts default-dispatch-opts}))))
diff --git a/src/taoensso/telemere/slack.clj b/src/taoensso/telemere/slack.clj
index a727b20..53e2b2f 100644
--- a/src/taoensso/telemere/slack.clj
+++ b/src/taoensso/telemere/slack.clj
@@ -74,7 +74,7 @@
 
          handler-fn
          (fn a-handler:slack
-           ([]) ; Shut down (noop)
+           ([      ]) ; Stop => noop
            ([signal]
             (when-let [output (output-fn signal)]
               (slack.chat/post-message conn-opts channel-id
diff --git a/src/taoensso/telemere/sockets.clj b/src/taoensso/telemere/sockets.clj
index 3b47593..23e11dc 100644
--- a/src/taoensso/telemere/sockets.clj
+++ b/src/taoensso/telemere/sockets.clj
@@ -43,7 +43,7 @@
 
    (let [sw (utils/tcp-socket-writer socket-opts)]
      (fn a-handler:tcp-socket
-       ([] (sw)) ; Shut down
+       ([      ] (sw)) ; Stop => close socket
        ([signal]
         (when-let [output (output-fn signal)]
           (sw output)))))))
@@ -95,7 +95,7 @@
      (.connect socket (InetSocketAddress. (str host) (int port)))
 
      (fn a-handler:udp-socket
-       ([] (.close socket)) ; Shut down
+       ([      ] (locking lock (.close socket))) ; Stop => close socket
        ([signal]
         (when-let [output (output-fn signal)]
           (let [ba     (enc/str->utf8-ba (str output))