diff --git a/core/core-lib.el b/core/core-lib.el
index 8c44627a4..fe15d66e0 100644
--- a/core/core-lib.el
+++ b/core/core-lib.el
@@ -407,8 +407,8 @@ COMMAND. This macro is meant to be used as a target for keybinds (e.g. with
   `(lambda (arg &rest _) (interactive "P")
      (let ((current-prefix-arg (or ,prefix-arg arg)))
        (,(if args
-             'funcall-interactively
-           'call-interactively)
+             #'funcall-interactively
+           #'call-interactively)
         ,command ,@args))))
 
 (defmacro cmds! (&rest branches)
diff --git a/core/core.el b/core/core.el
index 15df30f35..aa033e723 100644
--- a/core/core.el
+++ b/core/core.el
@@ -305,7 +305,7 @@ users).")
 
 
 ;;
-;;; Don't litter `doom-emacs-dir'
+;;; Don't litter `doom-emacs-dir'/$HOME
 
 ;; I change `user-emacs-directory' because many packages (even built-in ones)
 ;; abuse it to build paths for storage/cache files (instead of correctly using
@@ -329,6 +329,12 @@ users).")
 ;; config (e.g. ~/.doom.d/).
 (setq custom-file (expand-file-name "custom.el" doom-private-dir))
 
+;; By default, Emacs stores `authinfo' in $HOME and in plain-text. Let's not do
+;; that, mkay? This file stores usernames, passwords, and other treasures for
+;; the aspiring malicious third party. You'll need a GPG setup though.
+(setq auth-sources (list (concat doom-etc-dir "authinfo.gpg")
+                         "~/.authinfo.gpg"))
+
 (define-advice en/disable-command (:around (fn &rest args) write-to-data-dir)
   "Write saved safe-local-variables to `custom-file' instead.
 
@@ -470,15 +476,9 @@ Otherwise, `en/disable-command' (in novice.el.gz) is hardcoded to write them to
 (setq debug-on-error init-file-debug
       jka-compr-verbose init-file-debug)
 
-;; Emacs stores `authinfo' in $HOME and in plain-text. Let's not do that, mkay?
-;; This file stores usernames, passwords, and other treasures for the aspiring
-;; malicious third party. However, for this to work you need a GPG setup.
-(setq auth-sources (list (concat doom-etc-dir "authinfo.gpg")
-                         "~/.authinfo.gpg"))
-
-;; Get rid of "For information about GNU Emacs..." message at startup, unless
-;; we're in a daemon session where it'll say "Starting Emacs daemon." instead,
-;; which isn't so bad.
+;; Get rid of "For information about GNU Emacs..." message at startup. It's
+;; redundant with our dashboard. However, in daemon sessions it says "Starting
+;; Emacs daemon." instead, which is fine.
 (unless (daemonp)
   (advice-add #'display-startup-echo-area-message :override #'ignore))