diff --git a/.gitignore b/.gitignore
index d733b1c25..3e7eda3d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ modules/private
 .cask/
 cask/
 elpa/
+test/.local*
 
 # emacs tempfiles that shouldn't be there
 .mc-lists.el
diff --git a/core/core.el b/core/core.el
index 964aa479a..226ce8e6d 100644
--- a/core/core.el
+++ b/core/core.el
@@ -196,7 +196,8 @@ users).")
 (when IS-WINDOWS
   (setq abbreviated-home-dir "\\`'"))
 
-;; Don't litter `doom-emacs-dir'
+;; Don't litter `doom-emacs-dir'. We don't use `no-littering' because it's a
+;; mote too opinionated for our needs.
 (setq abbrev-file-name             (concat doom-local-dir "abbrev.el")
       async-byte-compile-log-file  (concat doom-etc-dir "async-bytecomp.log")
       bookmark-default-file        (concat doom-etc-dir "bookmarks")
diff --git a/core/packages.el b/core/packages.el
index 13da63a94..5f4bbeaba 100644
--- a/core/packages.el
+++ b/core/packages.el
@@ -21,7 +21,7 @@
 (package! pcre2el)
 (package! smartparens)
 (package! so-long
-  :built-in 'prefer
+  :built-in 'prefer ; included in Emacs 27+
   ;; REVIEW so-long is slated to be published to ELPA eventually, but until then
   ;; I've created my own mirror for it because git.savannah.gnu.org runs on a
   ;; potato.
diff --git a/modules/lang/web/+css.el b/modules/lang/web/+css.el
index 7f8162814..f182a6ef8 100644
--- a/modules/lang/web/+css.el
+++ b/modules/lang/web/+css.el
@@ -36,7 +36,6 @@
 
   (use-package! counsel-css
     :when (featurep! :completion ivy)
-    :commands counsel-css
     :hook (css-mode . counsel-css-imenu-setup)
     :init
     (map! :map (css-mode-map scss-mode-map less-css-mode-map)
diff --git a/modules/ui/workspaces/autoload/workspaces.el b/modules/ui/workspaces/autoload/workspaces.el
index a367f2664..547998dd8 100644
--- a/modules/ui/workspaces/autoload/workspaces.el
+++ b/modules/ui/workspaces/autoload/workspaces.el
@@ -174,11 +174,12 @@ throws an error."
         (+workspace-new name)
       (error "%s is not an available workspace" name)))
   (let ((old-name (+workspace-current-name)))
-    (setq +workspace--last
-          (or (and (not (string= old-name persp-nil-name))
-                   old-name)
-              +workspaces-main))
-    (persp-frame-switch name)
+    (unless (equal old-name name)
+      (setq +workspace--last
+            (or (and (not (string= old-name persp-nil-name))
+                     old-name)
+                +workspaces-main))
+      (persp-frame-switch name))
     (equal (+workspace-current-name) name)))