 
   (with-eval-after-load 'cider-macroexpansion
     (evil-define-key 'normal cider-macroexpansion-mode-map
-      (kbd "r") #'cider-macroexpand-again
-      (kbd "q") #'cider-popup-buffer-quit-function
-      (kbd "K") #'cider-doc
-      (kbd "J") #'cider-javadoc
-      (kbd ".") #'cider-find-var
-      (kbd "m") #'cider-macroexpand-1-inplace
-      (kbd "a") #'cider-macroexpand-all-inplace
-      (kbd "u") #'cider-macroexpand-undo
+      ;; quit
+      "q" #'cider-popup-buffer-quit-function
+
+      "r" #'cider-macroexpand-again
+      "K" #'cider-doc ; Evil has `evil-lookup'.
+      "J" #'cider-javadoc
+      "." #'cider-find-var
+      "m" #'cider-macroexpand-1-inplace
+      "a" #'cider-macroexpand-all-inplace
+      "u" #'cider-macroexpand-undo
       [remap undo] #'cider-macroexpand-undo))
 
   (with-eval-after-load 'cider-client

      (kbd "C-c C-t") 'cider-test-commands-map
      (kbd "M-p") #'cider-test-previous-result
      (kbd "M-n") #'cider-test-next-result
      "gd" #'cider-test-jump
      (kbd "<backtab>") #'cider-test-previous-result
      (kbd "TAB") #'cider-test-next-result
      (kbd "RET") #'cider-test-jump
      (kbd "t") #'cider-test-jump
      (kbd "d") #'cider-test-ediff
      (kbd "e") #'cider-test-stacktrace
      "f" #'cider-test-rerun-failed-tests
      "n" #'cider-test-run-ns-tests
      "L" #'cider-test-run-loaded-tests

      "d" #'cider-connections-make-default
      "g" #'cider-connection-browser
      "x" #'cider-connections-close-connection
      (kbd "<return>") #'cider-connections-goto-connection
      "?" #'describe-mode
      "H" #'describe-mode)))

