diff --git a/src/workgroups-buf.el b/src/workgroups-buf.el
index c47e5668ab4d285409f895b664931e7cb7b34260..c961488e0d533181d30faf0d3bf712506123c731 100644
--- a/src/workgroups-buf.el
+++ b/src/workgroups-buf.el
@@ -187,7 +187,7 @@ This is only here for completeness."
 
 (defun wg-find-buffer-in-buf-list (buffer-or-name buf-list)
   "Find BUFFER-OR-NAME in BUF-LIST."
-  (wg-aif (wg-buffer-uid buffer-or-name)
+  (aif (wg-buffer-uid buffer-or-name)
       (wg-find-bufobj-by-uid it buf-list)
     (wg-find-bufobj buffer-or-name buf-list)))
 
@@ -241,7 +241,7 @@ If there isn't already a buf corresponding to BUFFER in
 in either case."
   (with-current-buffer buffer
     (setq wg-buffer-uid
-          (wg-aif (wg-find-buffer-in-buf-list buffer (wg-buf-list))
+          (aif (wg-find-buffer-in-buf-list buffer (wg-buf-list))
               (wg-buf-uid it)
             (let ((buf (wg-buffer-to-buf buffer)))
               (push buf (wg-buf-list))
@@ -350,7 +350,7 @@ Read with PROMT DEFAULT REQUIRE-MATCH."
     (wg-with-buffer-list-filters 'read-buffer
       (funcall (wg-read-buffer-function)
                (wg-buffer-list-filter-prompt
-                (wg-aif (string-match ": *$" prompt)
+                (aif (string-match ": *$" prompt)
                     (substring prompt 0 it) prompt))
                default require-match))))