diff --git a/users/crumb/programs/emacs/modules/doom-popup/doom-popup-hacks.el b/users/crumb/programs/emacs/modules/doom-popup/doom-popup-hacks.el
index 9a1727d..75773d4 100644
--- a/users/crumb/programs/emacs/modules/doom-popup/doom-popup-hacks.el
+++ b/users/crumb/programs/emacs/modules/doom-popup/doom-popup-hacks.el
@@ -261,70 +261,98 @@ the command buffer."
 
 
 (with-eval-after-load 'org
-  (defadvice! doom-popup--suppress-delete-other-windows-a (fn &rest args)
+  (defun doom-popup--suppress-delete-other-windows-a (fn &rest args)
     "Org has a scorched-earth window management policy I'm not fond of. i.e. it
 kills all other windows just so it can monopolize the frame. No thanks. We can
 do better."
-    :around #'org-add-log-note
-    :around #'org-capture-place-template
-    :around #'org-export--dispatch-ui
-    :around #'org-agenda-get-restriction-and-command
-    :around #'org-goto-location
-    :around #'org-fast-tag-selection
-    :around #'org-fast-todo-selection
     (if doom-popup-mode
-        (letf! ((#'delete-other-windows #'ignore)
-                (#'delete-window        #'ignore))
-          (apply fn args))
+        (cl-letf (((symbol-function #'delete-other-windows) #'ignore))
+          (cl-letf
+              (((symbol-function #'delete-window) #'ignore))
+            (apply fn args)))
       (apply fn args)))
 
-  (defadvice! doom-popup--org-fix-goto-a (fn &rest args)
+  (dolist (target (list #'org-add-log-note
+                        #'org-capture-place-template
+                        #'org-export--dispatch-ui
+                        #'org-agenda-get-restriction-and-command
+                        #'org-goto-location
+                        #'org-fast-tag-selection
+                        #'org-fast-todo-selection))
+    (advice-add target
+                :around #'doom-popup--suppress-delete-other-windows-a))
+
+  (defun doom-popup--org-fix-goto-a (fn &rest args)
     "`org-goto' uses `with-output-to-temp-buffer' to display its help buffer,
 for some reason, which is very unconventional, and so requires these gymnastics
 to tame (i.e. to get the popup manager to handle it)."
-    :around #'org-goto-location
     (if doom-popup-mode
-        (letf! (defun internal-temp-output-buffer-show (buffer)
-                 (let ((temp-buffer-show-function
-                        (lambda (&rest args)
-                          (apply #'doom-popup-display-buffer-stacked-side-window-fn
+        (cl-letf ((internal-temp-output-buffer-show
+                   (symbol-function #'internal-temp-output-buffer-show)))
+          (ignore internal-temp-output-buffer-show)
+          (cl-letf (((symbol-function #'internal-temp-output-buffer-show)
+                     (lambda (buffer)
+                       (let ((temp-buffer-show-function
+                              (lambda (&rest args)
+                                (apply
+                                 #'doom-popup-display-buffer-stacked-side-window-fn
                                  nil args))))
-                   (with-current-buffer buffer
-                     (doom-popup-buffer-mode +1))
-                   (funcall internal-temp-output-buffer-show buffer)))
-          (apply fn args))
+                         (with-current-buffer buffer
+                           (doom-popup-buffer-mode 1))
+                         (funcall internal-temp-output-buffer-show buffer)))))
+            (apply fn args)))
       (apply fn args)))
+  (advice-add #'org-goto-location
+              :around #'doom-popup--org-fix-goto-a)
 
-  (defadvice! doom-popup--org-fix-popup-window-shrinking-a (fn &rest args)
+  (defun doom-popup--org-fix-popup-window-shrinking-a (fn &rest args)
     "Hides the mode-line in *Org tags* buffer so you can actually see its
 content and displays it in a side window without deleting all other windows.
 Ugh, such an ugly hack."
-    :around #'org-fast-tag-selection
-    :around #'org-fast-todo-selection
     (if doom-popup-mode
-        (letf! ((defun read-char-exclusive (&rest args)
-                  (message nil)
-                  (apply read-char-exclusive args))
-                (defun split-window-vertically (&optional _size)
-                  (funcall split-window-vertically (- 0 window-min-height 1)))
-                (defun org-fit-window-to-buffer (&optional window max-height min-height shrink-only)
-                  (when-let (buf (window-buffer window))
-                    (with-current-buffer buf
-                      (doom-popup-buffer-mode)))
-                  (when (> (window-buffer-height window)
-                           (window-height window))
-                    (fit-window-to-buffer window (window-buffer-height window)))))
-          (apply fn args))
+        (cl-letf ((read-char-exclusive
+                   (symbol-function #'read-char-exclusive)))
+          (ignore read-char-exclusive)
+          (cl-letf (((symbol-function #'read-char-exclusive)
+                     (lambda (&rest args) (message nil)
+                       (apply read-char-exclusive args))))
+            (cl-letf ((split-window-vertically
+                       (symbol-function #'split-window-vertically)))
+              (ignore split-window-vertically)
+              (cl-letf (((symbol-function #'split-window-vertically)
+                         (lambda (&optional _size)
+                           (funcall split-window-vertically
+                                    (- 0 window-min-height 1)))))
+                (cl-letf ((org-fit-window-to-buffer
+                           (symbol-function #'org-fit-window-to-buffer)))
+                  (ignore org-fit-window-to-buffer)
+                  (cl-letf (((symbol-function #'org-fit-window-to-buffer)
+                             (lambda (&optional window max-height
+                                           min-height shrink-only)
+                               (when-let* ((buf (window-buffer window)))
+                                 (with-current-buffer buf
+                                   (doom-popup-buffer-mode)))
+                               (when (> (window-buffer-height window)
+                                        (window-height window))
+                                 (fit-window-to-buffer
+                                  window
+                                  (window-buffer-height window))))))
+                    (apply fn args)))))))
       (apply fn args)))
+  (dolist (target (list #'org-fast-tag-selection
+                        #'org-fast-todo-selection))
+    (advice-add target
+                :around #'doom-popup--org-fix-popup-window-shrinking-a))
 
-  (defadvice! doom-popup--org-edit-src-exit-a (fn &rest args)
+  (defun doom-popup--org-edit-src-exit-a (fn &rest args)
     "If you switch workspaces or the src window is recreated..."
-    :around #'org-edit-src-exit
     (let* ((window (selected-window))
            (popup-p (doom-popup-window-p window)))
       (prog1 (apply fn args)
         (when (and popup-p (window-live-p window))
-          (delete-window window))))))
+          (delete-window window)))))
+  (advice-add #'org-edit-src-exit
+              :around #'doom-popup--org-edit-src-exit-a))
 
 ;;;###package org-journal
 (with-eval-after-load 'org-journal