                          (when-let [entry (get-entry kc k v)]
                            (when (or include-deleted (not (:deleted entry)))
                              (aput scan-work res-ch
-                                   (merge m {:more true :status :ok
-                                             res-key key :entry entry})))))
-                       (aput-close scan-work res-ch (merge m {:status :ok}))))
+                                   (assoc m :more true :status :ok
+                                          res-key key :entry entry)))))
+                       (aput-close scan-work res-ch (assoc m :status :ok))))
                 nil)]
        (kvs-do actx state-ch res-ch
                (fn [state] ((kvs-checker m cb) (or kvs-snapshot state)))))))

                                         (-> kvs
                                             (assoc :clean (:dirty kvs))
                                             (assoc :dirty (make-kc))))
                               (merge m {:status :ok
                                         :status-info [:synced (:kv-ident m)]})]))))})

(defn make-kvs-mgr [actx & {:keys [cmd-ch state-ch op-handlers]}]
  (let [cmd-ch (or cmd-ch (achan actx))

                         (let [entry (kc-entry-by-key kc key)]
                           (if (and entry (or include-deleted (not (:deleted entry))))
                             (aput multi-get res-ch
                                   (assoc res-m :more true :status :ok
                                          :key key :entry entry))
                             (aput multi-get res-ch
                                   (assoc res-m :more true :status :not-found
                                          :key key)))))
                       (aput-close multi-get res-ch (assoc res-m :status :ok))))
                nil)]
       (kvs-do actx state-ch res-ch
               (fn [state] ((kvs-checker m cb) (or kvs-snapshot state))))))
