4 files changed, 4 insertions, 32 deletions
diff --git a/autoload/zig/config.vim b/autoload/zig/config.vim
index a35e73e8..ed373f56 100644
--- a/autoload/zig/config.vim
+++ b/autoload/zig/config.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/zig/config.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 function! zig#config#ListTypeCommands() abort
   return get(g:, 'zig_list_type_commands', {})
@@ -46,5 +41,3 @@ endfunction
 function! zig#config#Debug() abort
   return get(g:, 'zig_debug', [])
 endfunction
-
-endif
diff --git a/autoload/zig/fmt.vim b/autoload/zig/fmt.vim
index c148ca2b..bdc21290 100644
--- a/autoload/zig/fmt.vim
+++ b/autoload/zig/fmt.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/zig/fmt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " Adapted from fatih/vim-go: autoload/go/fmt.vim
 "
@@ -173,5 +168,3 @@ function! zig#fmt#ToggleFmtAutoSave() abort
 endfunction
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/autoload/zig/list.vim b/autoload/zig/list.vim
index 382a9882..d09dd76e 100644
--- a/autoload/zig/list.vim
+++ b/autoload/zig/list.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/zig/list.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " Adapted from fatih/vim-go: autoload/go/list.vim
 "
@@ -165,5 +160,3 @@ function! zig#list#Type(for) abort
 endfunction
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/autoload/zig/util.vim b/autoload/zig/util.vim
index 0c803802..baa2d32c 100644
--- a/autoload/zig/util.vim
+++ b/autoload/zig/util.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/zig/util.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " Adapted from vim-go: autoload/go/util.vim
 "
@@ -397,5 +392,3 @@ function! zig#util#HasDebug(flag)
 endfunction
 
 " vim: sw=2 ts=2 et
-
-endif