diff --git a/modules/editor/init.zsh b/modules/editor/init.zsh
index 432ce11..a1d3d86 100644
--- a/modules/editor/init.zsh
+++ b/modules/editor/init.zsh
@@ -231,6 +231,5 @@ else
   print "omz: invalid keymap: $keymap" >&2
 fi
 
-unset keymap
-unset key
+unset key{map,}
 
diff --git a/modules/history-substring-search/init.zsh b/modules/history-substring-search/init.zsh
index 370cac3..4140c46 100644
--- a/modules/history-substring-search/init.zsh
+++ b/modules/history-substring-search/init.zsh
@@ -13,8 +13,7 @@ if zstyle -t ':omz:module:history-substring-search' case-sensitive; then
 fi
 
 if ! zstyle -t ':omz:module:history-substring-search' color; then
-  unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
-  unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
+  unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_{FOUND,NOT_FOUND}
 fi
 
 bindkey -M emacs "$keyinfo[Control]P" history-substring-search-up
diff --git a/modules/spectrum/init.zsh b/modules/spectrum/init.zsh
index e9a5774..66cd218 100644
--- a/modules/spectrum/init.zsh
+++ b/modules/spectrum/init.zsh
@@ -61,5 +61,5 @@ for color in {0..255}; do
   FG[$color]="\e[38;5;${color}m"
   BG[$color]="\e[48;5;${color}m"
 done
-unset colors color index
+unset color{s,} index
 
diff --git a/modules/ssh-agent/init.zsh b/modules/ssh-agent/init.zsh
index abc29c8..375b83b 100644
--- a/modules/ssh-agent/init.zsh
+++ b/modules/ssh-agent/init.zsh
@@ -63,6 +63,5 @@ fi
 
 # Tidy up after ourselves.
 unfunction _ssh-agent-start
-unset _ssh_agent_forwarding
-unset _ssh_agent_env
+unset _ssh_agent_{env,forwarding}