                   [(StringsCompleter. #^java.util.Collection (conj (mapv name (cmd-aliases k)) (name k)))
                    (proxy [Completer] []
                      (complete [buffer cursor #^java.util.List candidates]
-                       (if (not (nil? fn-args))
+                       (when (not (nil? fn-args))
                          (.add candidates (str "Arguments: " fn-args)))
-                       (if (not (nil? completion-hint))
+                       (when (not (nil? completion-hint))
                          (.add candidates (str completion-hint)))
-                       (if (not (and (not (nil? fn-args)) (not (nil? completion-hint))))
+                       (when (not (and (not (nil? fn-args)) (not (nil? completion-hint))))
                          (.add candidates ""))
                        0))])))
             v)))

                   (symbol? f) (utils/map-quote-vec (utils/get-defn-arglists (eval `(var ~f))))
                   (and (list? f)
                        (= 'fn (first f))) (:args (utils/get-fn-arglists f))
                   :default nil)]
        (if (and
              (not (nil? args))
              (nil? (get-in m [:cmds k :fn-args])))

                             history-file (jio/file history-file-name)]
                         (FileHistory. history-file))
                       nil)
        _ (when (not (nil? file-history))
            (.setHistory in-rdr file-history))
        arg-hint-completers (create-arg-hint-completers cmds)
        _ (doseq [compl arg-hint-completers]
