diff --git a/core/core-modules.el b/core/core-modules.el
index 904c9ef63..087bd7783 100644
--- a/core/core-modules.el
+++ b/core/core-modules.el
@@ -258,7 +258,7 @@ non-nil, return paths of possible modules, activated or otherwise."
     (setq use-package-keywords
           (use-package-list-insert keyword use-package-keywords :after)))
 
-  (defalias 'use-package-normalize/:defer-incrementally 'use-package-normalize-symlist)
+  (defalias 'use-package-normalize/:defer-incrementally #'use-package-normalize-symlist)
   (defun use-package-handler/:defer-incrementally (name _keyword targets rest state)
     (use-package-concat
      `((doom-load-packages-incrementally
@@ -267,11 +267,11 @@ non-nil, return paths of possible modules, activated or otherwise."
             (append targets (list name)))))
      (use-package-process-keywords name rest state)))
 
-  (defalias 'use-package-normalize/:after-call 'use-package-normalize-symlist)
+  (defalias 'use-package-normalize/:after-call #'use-package-normalize-symlist)
   (defun use-package-handler/:after-call (name _keyword hooks rest state)
     (if (plist-get state :demand)
         (use-package-process-keywords name rest state)
-      (let ((fn (intern (format "doom|transient-hook--load-%s" name))))
+      (let ((fn (make-symbol (format "doom|transient-hook--load-%s" name))))
         (use-package-concat
          `((fset ',fn
                  (lambda (&rest _)
@@ -284,8 +284,8 @@ non-nil, return paths of possible modules, activated or otherwise."
                      (dolist (hook (cdr deferral-list))
                        (advice-remove hook #',fn)
                        (remove-hook hook #',fn))
-                     (setq doom--deferred-packages-alist
-                           (delq deferral-list doom--deferred-packages-alist))))))
+                     (delq! deferral-list doom--deferred-packages-alist)
+                     (unintern ',fn nil)))))
          (let (forms)
            (dolist (hook hooks forms)
              (push (if (string-match-p "-\\(?:functions\\|hook\\)$" (symbol-name hook))
diff --git a/modules/app/irc/README.org b/modules/app/irc/README.org
index 2af6489cb..f2d56d0e7 100644
--- a/modules/app/irc/README.org
+++ b/modules/app/irc/README.org
@@ -4,17 +4,17 @@
 #+STARTUP: inlineimages
 
 * Table of Contents :TOC:
-- [[Description][Description]]
-  - [[Module Flags][Module Flags]]
-  - [[Plugins][Plugins]]
-- [[Dependencies][Dependencies]]
-- [[Prerequisites][Prerequisites]]
-- [[Features][Features]]
-  - [[An IRC Client in Emacs][An IRC Client in Emacs]]
-- [[Configuration][Configuration]]
-  - [[Pass: the unix password manager][Pass: the unix password manager]]
-  - [[Emacs' auth-source API][Emacs' auth-source API]]
-- [[Troubleshooting][Troubleshooting]]
+- [[#description][Description]]
+  - [[#module-flags][Module Flags]]
+  - [[#plugins][Plugins]]
+- [[#dependencies][Dependencies]]
+- [[#prerequisites][Prerequisites]]
+- [[#features][Features]]
+  - [[#an-irc-client-in-emacs][An IRC Client in Emacs]]
+- [[#configuration][Configuration]]
+  - [[#pass-the-unix-password-manager][Pass: the unix password manager]]
+  - [[#emacs-auth-source-api][Emacs' auth-source API]]
+- [[#troubleshooting][Troubleshooting]]
 
 * Description
 This module turns adds an IRC client to Emacs with OS notifications.
diff --git a/modules/tools/eval/autoload/eval.el b/modules/tools/eval/autoload/eval.el
index 877a2c206..f4c9e8f33 100644
--- a/modules/tools/eval/autoload/eval.el
+++ b/modules/tools/eval/autoload/eval.el
@@ -45,5 +45,4 @@
                     (current-buffer))
            (error (message "Invalid expression")
                   (insert (current-kill 0)))))
-        (t (quickrun-replace-region beg end))))
-
+        ((quickrun-replace-region beg end))))
diff --git a/modules/tools/lsp/autoload.el b/modules/tools/lsp/autoload.el
index 5dd061dba..f2d778975 100644
--- a/modules/tools/lsp/autoload.el
+++ b/modules/tools/lsp/autoload.el
@@ -1,4 +1,4 @@
 ;;; feature/lsp/autoload.el -*- lexical-binding: t; -*-
 
-;;;###autodef 
+;;;###autodef
 (defalias 'lsp! #'lsp)
diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el
index 70e4906b8..d66868411 100644
--- a/modules/tools/magit/config.el
+++ b/modules/tools/magit/config.el
@@ -12,7 +12,7 @@ It is passed a user and repository name.")
   :commands magit-file-delete
   :defer-incrementally (dash f s with-editor git-commit package eieio lv transient)
   :init
-  (setq magit-auto-revert-mode nil)  ; we already use `global-auto-revert-mode'
+  (setq magit-auto-revert-mode nil)  ; we do this ourselves
   ;; Must be set early to prevent ~/.emacs.d/transient from being created
   (setq transient-levels-file  (concat doom-etc-dir "transient/levels")
         transient-values-file  (concat doom-etc-dir "transient/values")
diff --git a/modules/ui/workspaces/autoload/workspaces.el b/modules/ui/workspaces/autoload/workspaces.el
index f92662bf1..65669764a 100644
--- a/modules/ui/workspaces/autoload/workspaces.el
+++ b/modules/ui/workspaces/autoload/workspaces.el
@@ -15,7 +15,7 @@
 
 
 ;;
-;; Library
+;;; Library
 
 (defun +workspace--protected-p (name)
   (equal name persp-nil-name))
@@ -28,8 +28,7 @@
       1))
 
 
-;; --- Predicates -------------------------
-
+;;; Predicates
 ;;;###autoload
 (defalias #'+workspace-p #'perspective-p
   "Return t if OBJ is a perspective hash table.")
@@ -44,8 +43,7 @@
   "Return non-nil if BUFFER is in WORKSPACE (defaults to current workspace).")
 
 
-;; --- Getters ----------------------------
-
+;;; Getters
 ;;;###autoload
 (defalias #'+workspace-current #'get-current-persp
   "Return the currently active workspace.")
@@ -97,8 +95,7 @@ PERSP can be a string (name of a workspace) or a workspace (satisfies
   (cl-remove-if #'persp--buffer-in-persps (buffer-list)))
 
 
-;; --- Actions ----------------------------
-
+;;; Actions
 ;;;###autoload
 (defun +workspace-load (name)
   "Loads a single workspace (named NAME) into the current session. Can only
@@ -186,7 +183,7 @@ throws an error."
 
 
 ;;
-;; Commands
+;;; Commands
 
 ;;;###autoload
 (defalias '+workspace/restore-last-session #'doom/quickload-session)
@@ -384,7 +381,7 @@ the next."
 
 
 ;;
-;; Tabs display in minibuffer
+;;; Tabs display in minibuffer
 
 (defun +workspace--tabline (&optional names)
   (let ((names (or names (+workspace-list-names)))
@@ -430,7 +427,7 @@ the next."
 
 
 ;;
-;; Hooks
+;;; Hooks
 
 ;;;###autoload
 (defun +workspaces|delete-associated-workspace (&optional frame)
@@ -516,7 +513,7 @@ This be hooked to `projectile-after-switch-project-hook'."
 
 
 ;;
-;; Advice
+;;; Advice
 
 ;;;###autoload
 (defun +workspaces*autosave-real-buffers (orig-fn &rest args)
diff --git a/modules/ui/workspaces/config.el b/modules/ui/workspaces/config.el
index 4475e7d2f..e09d6c8b1 100644
--- a/modules/ui/workspaces/config.el
+++ b/modules/ui/workspaces/config.el
@@ -154,7 +154,7 @@ Uses `+workspaces-main' to determine the name of the main workspace."
             ("e" counsel-projectile-switch-project-action-edit-dir-locals "edit project dir-locals")
             ("v" counsel-projectile-switch-project-action-vc "open project in vc-dir / magit / monky")
             ("s" (lambda (project) (let ((projectile-switch-project-action (lambda () (call-interactively #'+ivy/project-search))))
-                                     (counsel-projectile-switch-project-by-name project))) "search project")
+                                (counsel-projectile-switch-project-by-name project))) "search project")
             ("xs" counsel-projectile-switch-project-action-run-shell "invoke shell from project root")
             ("xe" counsel-projectile-switch-project-action-run-eshell "invoke eshell from project root")
             ("xt" counsel-projectile-switch-project-action-run-term "invoke term from project root")