diff --git a/lua/u/range.lua b/lua/u/range.lua
index 60af282..8873cde 100644
--- a/lua/u/range.lua
+++ b/lua/u/range.lua
@@ -2,9 +2,10 @@ local Pos = require 'u.pos'
 
 -- Certain functions in the Range class yank text. In order to prevent unwanted
 -- highlighting, we intercept and discard some calls to the `on_yank` callback.
-local orig_on_yank = (vim.hl or vim.highlight).on_yank
+local orig_on_yank = vim.hl.on_yank
 local on_yank_enabled = true
-((vim.hl or vim.highlight) --[[@as any]]).on_yank = function(opts)
+--- @diagnostic disable-next-line: duplicate-set-field
+function vim.hl.on_yank(opts)
   if not on_yank_enabled then return end
   return orig_on_yank(opts)
 end
@@ -574,8 +575,8 @@ function Range:highlight(group, opts)
 
   local ns = vim.api.nvim_create_namespace ''
 
-  local winview = vim.fn.winsaveview();
-  (vim.hl or vim.highlight).range(
+  local winview = vim.fn.winsaveview()
+  vim.hl.range(
     self.start.bufnr,
     ns,
     group,