diff --git a/core/core-lib.el b/core/core-lib.el
index b64c546a6..2ebccd5d4 100644
--- a/core/core-lib.el
+++ b/core/core-lib.el
@@ -6,7 +6,7 @@
   (require 'map))
 
 (eval-and-compile
-  (when (version< emacs-version "26")
+  (unless EMACS26+
     (with-no-warnings
       (defalias 'if-let* #'if-let)
       (defalias 'when-let* #'when-let))))
diff --git a/core/core.el b/core/core.el
index 7a6e0acb8..858fd78e5 100644
--- a/core/core.el
+++ b/core/core.el
@@ -56,6 +56,9 @@ Use this for files that change often, like cache files.")
 (defvar doom-packages-dir (concat doom-local-dir "packages/")
   "Where package.el and quelpa plugins (and their caches) are stored.")
 
+(defconst EMACS26+ (not (version< emacs-version "26")))
+(defconst EMACS27+ (not (version< emacs-version "27")))
+
 
 ;;;
 ;; UTF-8 as the default coding system
diff --git a/modules/feature/popup/autoload.el b/modules/feature/popup/autoload.el
index 342e4c75f..e1bfa7500 100644
--- a/modules/feature/popup/autoload.el
+++ b/modules/feature/popup/autoload.el
@@ -1,6 +1,6 @@
 ;;; feature/popup/autoload.el -*- lexical-binding: t; -*-
 
-(defvar +popup--populate-wparams (version< emacs-version "26.1"))
+(defvar +popup--populate-wparams (not EMACS26+))
 
 (defun +popup--remember (windows)
   "Remember WINDOWS (a list of windows) for later restoration."
@@ -423,7 +423,7 @@ prevent the popup(s) from messing up the UI (or vice versa)."
 ;; Popup actions
 ;;
 
-(when (version< emacs-version "26")
+(unless EMACS26+
   (defvar window-sides-reversed nil)
 
   (defun window--sides-reverse-on-frame-p (frame)
diff --git a/modules/feature/version-control/config.el b/modules/feature/version-control/config.el
index 7970ebba1..4a2a9791d 100644
--- a/modules/feature/version-control/config.el
+++ b/modules/feature/version-control/config.el
@@ -20,7 +20,7 @@
 (def-package! smerge-mode
   :hook (find-file . +vcs|enable-smerge-mode-maybe)
   :config
-  (when (version< emacs-version "26")
+  (unless EMACS26+
     (with-no-warnings
       (defalias #'smerge-keep-upper #'smerge-keep-mine)
       (defalias #'smerge-keep-lower #'smerge-keep-other)