Respect symlinks for resolving vim-polyglot as fallback, closes #605

182 files changed, 184 insertions, 1456 deletions

diff --git a/indent/Jenkinsfile.vim b/indent/Jenkinsfile.vim
index 438d6991..74390b23 100644
--- a/indent/Jenkinsfile.vim
+++ b/indent/Jenkinsfile.vim
@@ -1,12 +1,5 @@
-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, 'indent/Jenkinsfile.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jenkins', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jenkins') == -1
 
 runtime indent/groovy.vim
-
-endif
diff --git a/indent/aap.vim b/indent/aap.vim
index 799112c8..fde2ebc4 100644
--- a/indent/aap.vim
+++ b/indent/aap.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, 'indent/aap.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('aap', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aap') == -1
 
 " Vim indent file
 " Language:	Aap recipe
@@ -19,5 +14,3 @@ endif
 
 " Works mostly like Python.
 runtime! indent/python.vim
-
-endif
diff --git a/indent/ada.vim b/indent/ada.vim
index 3240a795..6c924fbc 100644
--- a/indent/ada.vim
+++ b/indent/ada.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, 'indent/ada.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ada', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ada') == -1
 
 "------------------------------------------------------------------------------
 "  Description: Vim Ada indent file
@@ -315,5 +310,3 @@ finish " 1}}}
 "------------------------------------------------------------------------------
 " vim: textwidth=78 wrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
 " vim: foldmethod=marker
-
-endif
diff --git a/indent/ansible.vim b/indent/ansible.vim
index 6686d9ab..f6a9cbef 100644
--- a/indent/ansible.vim
+++ b/indent/ansible.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, 'indent/ansible.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ansible', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 
 let s:save_cpo = &cpo
 set cpo&vim
@@ -66,5 +61,3 @@ function GetAnsibleIndent(lnum)
 endfunction
 
 let &cpo = s:save_cpo
-
-endif
diff --git a/indent/ant.vim b/indent/ant.vim
index d0af9c74..e6a46688 100644
--- a/indent/ant.vim
+++ b/indent/ant.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, 'indent/ant.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ant', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ant') == -1
 
 " Vim indent file
 " Language:    ANT files
@@ -19,5 +14,3 @@ endif
 
 " Use XML formatting rules
 runtime! indent/xml.vim
-
-endif
diff --git a/indent/applescript.vim b/indent/applescript.vim
index 0e31d286..88fc6835 100644
--- a/indent/applescript.vim
+++ b/indent/applescript.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, 'indent/applescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('applescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'applescript') == -1
 
 "Plugin Name: applescript indent file.
 "Author: mityu
@@ -84,5 +79,3 @@ let &cpo=s:cpo_save
 unlet s:cpo_save
 
 " vim: foldmethod=marker
-
-endif
diff --git a/indent/arduino.vim b/indent/arduino.vim
index 90c72c7c..ede5e1e6 100644
--- a/indent/arduino.vim
+++ b/indent/arduino.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, 'indent/arduino.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('arduino', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arduino') == -1
 
 " Vim indent file
 " Language:	Arduino
@@ -22,5 +17,3 @@ let b:did_indent = 1
 setlocal cindent
 
 let b:undo_indent = "setl cin<"
-
-endif
diff --git a/indent/autohotkey.vim b/indent/autohotkey.vim
index 354ceeb9..99d8b6d5 100644
--- a/indent/autohotkey.vim
+++ b/indent/autohotkey.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, 'indent/autohotkey.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('autohotkey', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'autohotkey') == -1
 
 " Vim indent file
 " Language:   AutoHotkey
@@ -226,5 +221,3 @@ function! GetAutoHotkeyIndent()
 endfunction
 
 let b:did_indent = 1
-
-endif
diff --git a/indent/automake.vim b/indent/automake.vim
index 4bded6f7..4fd489fa 100644
--- a/indent/automake.vim
+++ b/indent/automake.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, 'indent/automake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('automake', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'automake') == -1
 
 " Vim indent file
 " Language:    	    automake
@@ -18,5 +13,3 @@ endif
 
 " same as makefile indenting for now.
 runtime! indent/make.vim
-
-endif
diff --git a/indent/awk.vim b/indent/awk.vim
index 5e802ecd..ba18e12e 100644
--- a/indent/awk.vim
+++ b/indent/awk.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, 'indent/awk.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('awk', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'awk') == -1
 
 "  vim: set sw=3 sts=3:
 
@@ -239,5 +234,3 @@ function! s:Safe_indent( base, wordlen, this_line )
    endif
    return indent + a:wordlen
 endfunction
-
-endif
diff --git a/indent/bib.vim b/indent/bib.vim
index 619859fc..37622c70 100644
--- a/indent/bib.vim
+++ b/indent/bib.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, 'indent/bib.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bib', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bib') == -1
 
 " Vim indent file
 " Language:      BibTeX
@@ -22,5 +17,3 @@ let b:did_indent = 1
 setlocal cindent
 
 let b:undo_indent = "setl cin<"
-
-endif
diff --git a/indent/blade.vim b/indent/blade.vim
index efdecf32..a16266c1 100644
--- a/indent/blade.vim
+++ b/indent/blade.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, 'indent/blade.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('blade', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
 
 " Vim indent file
 " Language:     Blade (Laravel)
@@ -102,5 +97,3 @@ function! GetBladeIndent()
 
     return indent
 endfunction
-
-endif
diff --git a/indent/bst.vim b/indent/bst.vim
index adc852ae..29ae2961 100644
--- a/indent/bst.vim
+++ b/indent/bst.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, 'indent/bst.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bst') == -1
 
 " Vim indent file
 " Language:	bst
@@ -82,5 +77,3 @@ function! GetBstIndent(lnum) abort
     let ind = ind - shiftwidth() * s:count(fakeline,'}')
     return ind
 endfunction
-
-endif
diff --git a/indent/bzl.vim b/indent/bzl.vim
index e41ba9c9..2ee9d707 100644
--- a/indent/bzl.vim
+++ b/indent/bzl.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, 'indent/bzl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bzl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzl') == -1
 
 " Vim indent file
 " Language:	Bazel (http://bazel.io)
@@ -101,5 +96,3 @@ endfunction
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/indent/cabal.vim b/indent/cabal.vim
index 1698e16d..e65eee71 100644
--- a/indent/cabal.vim
+++ b/indent/cabal.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, 'indent/cabal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 
 " indentation for cabal
 "
@@ -38,5 +33,3 @@ function! GetCabalIndent()
     return match(l:prevline, '\S')
   endif
 endfunction
-
-endif
diff --git a/indent/caddyfile.vim b/indent/caddyfile.vim
index 11980473..1db00f22 100644
--- a/indent/caddyfile.vim
+++ b/indent/caddyfile.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, 'indent/caddyfile.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('caddyfile', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
 
 if exists('b:did_indent')
 	finish
@@ -48,5 +43,3 @@ function! GetCaddyfileIndent(lnum)
 
 	return ind
 endfunction
-
-endif
diff --git a/indent/cdl.vim b/indent/cdl.vim
index 3f69f349..e52b8082 100644
--- a/indent/cdl.vim
+++ b/indent/cdl.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, 'indent/cdl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cdl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdl') == -1
 
 " Description:	Comshare Dimension Definition Language (CDL)
 " Author:	Raul Segura Acevedo <raulseguraaceved@netscape.net>
@@ -136,5 +131,3 @@ fun! CdlGetIndent(lnum)
 
   return ind
 endfun
-
-endif
diff --git a/indent/ch.vim b/indent/ch.vim
index 0b606769..bcee5c3c 100644
--- a/indent/ch.vim
+++ b/indent/ch.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, 'indent/ch.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ch', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ch') == -1
 
 " Vim indent file
 " Language:	Ch
@@ -25,5 +20,3 @@ let b:did_indent = 1
 
 " Ch indenting is built-in, thus this is very simple
 setlocal cindent
-
-endif
diff --git a/indent/chaiscript.vim b/indent/chaiscript.vim
index 967f4ce0..ba2908f9 100644
--- a/indent/chaiscript.vim
+++ b/indent/chaiscript.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, 'indent/chaiscript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('chaiscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chaiscript') == -1
 
 " Vim indent file
 " Language:     ChaiScript
@@ -57,5 +52,3 @@ function! GetChaiScriptIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/clojure.vim b/indent/clojure.vim
index c2dd0cdc..72bff69f 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.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, 'indent/clojure.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('clojure', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
 
 " Vim indent file
 " Language:     Clojure
@@ -410,5 +405,3 @@ let &cpo = s:save_cpo
 unlet! s:save_cpo
 
 " vim:sts=8:sw=8:ts=8:noet
-
-endif
diff --git a/indent/cmake.vim b/indent/cmake.vim
index 30af204e..49e8fd96 100644
--- a/indent/cmake.vim
+++ b/indent/cmake.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, 'indent/cmake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cmake', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmake') == -1
 
 " Vim indent file
 " Language:     CMake (ft=cmake)
@@ -96,5 +91,3 @@ endfun
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/indent/cobol.vim b/indent/cobol.vim
index e09bc85b..c962a0d0 100644
--- a/indent/cobol.vim
+++ b/indent/cobol.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, 'indent/cobol.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cobol', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cobol') == -1
 
 " Vim indent file
 " Language:	cobol
@@ -230,5 +225,3 @@ function! GetCobolIndent(lnum) abort
     endif
     return ind < bshft ? bshft : ind
 endfunction
-
-endif
diff --git a/indent/coffee.vim b/indent/coffee.vim
index dca66e4e..6fc21afc 100644
--- a/indent/coffee.vim
+++ b/indent/coffee.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, 'indent/coffee.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -435,5 +430,3 @@ function! GetCoffeeIndent(curlnum)
   " No special rules applied, so use the default policy.
   exec 'return' s:GetDefaultPolicy(a:curlnum)
 endfunction
-
-endif
diff --git a/indent/config.vim b/indent/config.vim
index 4a500a02..096f5b40 100644
--- a/indent/config.vim
+++ b/indent/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, 'indent/config.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('config', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'config') == -1
 
 " Vim indent file
 " Language:             Autoconf configure.{ac,in} file
@@ -89,5 +84,3 @@ function GetConfigIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/crystal.vim b/indent/crystal.vim
index c405f358..9b3a8d53 100644
--- a/indent/crystal.vim
+++ b/indent/crystal.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, 'indent/crystal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " Initialization {{{1
 " ==============
@@ -117,5 +112,3 @@ endfunction
 " }}}1
 
 " vim:sw=2 sts=2 ts=8 fdm=marker et:
-
-endif
diff --git a/indent/cs.vim b/indent/cs.vim
index dad26529..60e2a61d 100644
--- a/indent/cs.vim
+++ b/indent/cs.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, 'indent/cs.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cs', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cs') == -1
 
 " Vim indent file
 " Language:            C#
@@ -80,5 +75,3 @@ let &cpoptions = s:save_cpo
 unlet s:save_cpo
 
 " vim:et:sw=2:sts=2
-
-endif
diff --git a/indent/css.vim b/indent/css.vim
index 33131747..a831c77b 100644
--- a/indent/css.vim
+++ b/indent/css.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, 'indent/css.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('css', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'css') == -1
 
 " Vim indent file
 " Language:	    CSS
@@ -91,5 +86,3 @@ endfunction
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/indent/cucumber.vim b/indent/cucumber.vim
index 52fad848..72826cca 100644
--- a/indent/cucumber.vim
+++ b/indent/cucumber.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, 'indent/cucumber.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cucumber', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 
 " Vim indent file
 " Language:	Cucumber
@@ -82,5 +77,3 @@ function! GetCucumberIndent()
 endfunction
 
 " vim:set sts=2 sw=2:
-
-endif
diff --git a/indent/cuda.vim b/indent/cuda.vim
index c878c472..10c26fd6 100644
--- a/indent/cuda.vim
+++ b/indent/cuda.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, 'indent/cuda.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cuda', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cuda') == -1
 
 " Vim indent file
 " Language:	CUDA
@@ -22,5 +17,3 @@ let b:did_indent = 1
 setlocal cindent
 
 let b:undo_indent = "setl cin<"
-
-endif
diff --git a/indent/cython.vim b/indent/cython.vim
index c8b0e997..5f13b77e 100644
--- a/indent/cython.vim
+++ b/indent/cython.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, 'indent/cython.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('python-indent', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-indent') == -1
 
 " PEP8 compatible Python indent file
 " Language:         Python
@@ -461,5 +456,3 @@ function! GetPythonPEPIndent(lnum)
 
     return s:indent_like_previous_line(a:lnum)
 endfunction
-
-endif
diff --git a/indent/d.vim b/indent/d.vim
index 7a0a195d..c121801b 100644
--- a/indent/d.vim
+++ b/indent/d.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, 'indent/d.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dlang', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 
 " Vim indent file for the D programming language (version 1.076 and 2.063).
 "
@@ -84,5 +79,3 @@ function GetDIndent()
 
   return cind
 endfunction
-
-endif
diff --git a/indent/dart.vim b/indent/dart.vim
index aa9d99f9..45bedcf8 100644
--- a/indent/dart.vim
+++ b/indent/dart.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, 'indent/dart.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dart', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
 
 if exists('b:did_indent')
   finish
@@ -42,5 +37,3 @@ function! DartIndent()
 
   return indentTo
 endfunction
-
-endif
diff --git a/indent/dictconf.vim b/indent/dictconf.vim
index 478d2b4c..c721105c 100644
--- a/indent/dictconf.vim
+++ b/indent/dictconf.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, 'indent/dictconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dictconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictconf') == -1
 
 " Vim indent file
 " Language:             dict(1) configuration file
@@ -20,5 +15,3 @@ let b:did_indent = 1
 setlocal indentkeys=0{,0},!^F,o,O cinwords= autoindent smartindent
 setlocal nosmartindent
 inoremap <buffer> # X#
-
-endif
diff --git a/indent/dictdconf.vim b/indent/dictdconf.vim
index fc948939..68460d33 100644
--- a/indent/dictdconf.vim
+++ b/indent/dictdconf.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, 'indent/dictdconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dictdconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictdconf') == -1
 
 " Vim indent file
 " Language:             dictd(8) configuration file
@@ -20,5 +15,3 @@ let b:did_indent = 1
 setlocal indentkeys=0{,0},!^F,o,O cinwords= autoindent smartindent
 setlocal nosmartindent
 inoremap <buffer> # X#
-
-endif
diff --git a/indent/dosbatch.vim b/indent/dosbatch.vim
index 60949dda..0f7dec48 100644
--- a/indent/dosbatch.vim
+++ b/indent/dosbatch.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, 'indent/dosbatch.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dosbatch', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosbatch') == -1
 
 " Vim indent file
 " Language:	MSDOS batch file (with NT command extensions)
@@ -66,5 +61,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8 sw=2 sts=2
-
-endif
diff --git a/indent/dtd.vim b/indent/dtd.vim
index 7dfe14db..0653c474 100644
--- a/indent/dtd.vim
+++ b/indent/dtd.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, 'indent/dtd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dtd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dtd') == -1
 
 " Vim indent file
 " Language:    	    DTD (Document Type Definition for XML)
@@ -332,5 +327,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/dune.vim b/indent/dune.vim
index 563ed198..f2c06615 100644
--- a/indent/dune.vim
+++ b/indent/dune.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, 'indent/dune.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim indent file
 " Language: dune
@@ -17,5 +12,3 @@ let b:did_indent = 1
 
 " dune format-dune-file uses 1 space to indent
 set softtabstop=1 shiftwidth=1 expandtab
-
-endif
diff --git a/indent/dylan.vim b/indent/dylan.vim
index f5a9c835..da2e5bc0 100644
--- a/indent/dylan.vim
+++ b/indent/dylan.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, 'indent/dylan.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dylan', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dylan') == -1
 
 " Vim indent file
 " Language:	Dylan
@@ -97,5 +92,3 @@ function DylanGetIndent()
 endfunction
 
 " vim:sw=2 tw=130
-
-endif
diff --git a/indent/ecrystal.vim b/indent/ecrystal.vim
index 2bca7b1b..483f9d0c 100644
--- a/indent/ecrystal.vim
+++ b/indent/ecrystal.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, 'indent/ecrystal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " Setup {{{1
 " =====
@@ -483,5 +478,3 @@ endfunction
 " }}}
 
 " vim:fdm=marker
-
-endif
diff --git a/indent/eelixir.vim b/indent/eelixir.vim
index f45af493..56081e23 100644
--- a/indent/eelixir.vim
+++ b/indent/eelixir.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, 'indent/eelixir.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists("b:did_indent")
   finish
@@ -79,5 +74,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/elixir.vim b/indent/elixir.vim
index a2854f17..4d135c2e 100644
--- a/indent/elixir.vim
+++ b/indent/elixir.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, 'indent/elixir.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists("b:did_indent")
   finish
@@ -22,5 +17,3 @@ setlocal indentkeys+=*<Return>,=->,=\|>,=<>,0},0],0)
 function! elixir#indent(lnum)
   return elixir#indent#indent(a:lnum)
 endfunction
-
-endif
diff --git a/indent/elm.vim b/indent/elm.vim
index 731f8f87..4a8a540a 100644
--- a/indent/elm.vim
+++ b/indent/elm.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, 'indent/elm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
 
 " indentation for Elm (https://elm-lang.org/)
 
@@ -119,5 +114,3 @@ function! GetElmIndent()
 
 	return l:ind
 endfunc
-
-endif
diff --git a/indent/ember-script.vim b/indent/ember-script.vim
index de519c34..0e9bdc93 100644
--- a/indent/ember-script.vim
+++ b/indent/ember-script.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, 'indent/ember-script.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('emberscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
 
 " Language:    ember-script
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>>
@@ -21,5 +16,3 @@ endif
 runtime! indent/coffee.vim
 unlet! b:did_indent
 let b:did_indent = 1
-
-endif
diff --git a/indent/emblem.vim b/indent/emblem.vim
index 7653e6fb..86937ed9 100644
--- a/indent/emblem.vim
+++ b/indent/emblem.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, 'indent/emblem.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('emblem', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
 
 " Language:    emblem
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>
@@ -13,5 +8,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
 " Version:     2.0.1
 " Last Change: 2016 Jul 6
 " License:     ISC
-
-endif
diff --git a/indent/erlang.vim b/indent/erlang.vim
index b66ccd59..2a35b1af 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.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, 'indent/erlang.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('erlang', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
 
 " Vim indent file
 " Language:     Erlang (http://www.erlang.org)
@@ -1490,5 +1485,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 et fdm=marker
-
-endif
diff --git a/indent/eruby.vim b/indent/eruby.vim
index 7ba4bf52..98e5b8a0 100644
--- a/indent/eruby.vim
+++ b/indent/eruby.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, 'indent/eruby.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim indent file
 " Language:		eRuby
@@ -117,5 +112,3 @@ let &cpo = s:cpo_sav
 unlet! s:cpo_sav
 
 " vim:set sw=2 sts=2 ts=8 noet:
-
-endif
diff --git a/indent/eterm.vim b/indent/eterm.vim
index e0b391ef..d0a68a7c 100644
--- a/indent/eterm.vim
+++ b/indent/eterm.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, 'indent/eterm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('eterm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'eterm') == -1
 
 " Vim indent file
 " Language:             Eterm configuration file
@@ -43,5 +38,3 @@ function GetEtermIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/falcon.vim b/indent/falcon.vim
index bdd716a2..a92a517b 100644
--- a/indent/falcon.vim
+++ b/indent/falcon.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, 'indent/falcon.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('falcon', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'falcon') == -1
 
 " Vim indent file
 " Language: Falcon
@@ -458,5 +453,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: set sw=4 sts=4 et tw=80 :
-
-endif
diff --git a/indent/fennel.vim b/indent/fennel.vim
index cddb5827..90ccd467 100644
--- a/indent/fennel.vim
+++ b/indent/fennel.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, 'indent/fennel.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fennel', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fennel') == -1
 
 " Vim filetype plugin file
 " Language: FENNEL
@@ -333,5 +328,3 @@ endif
 
 let &cpo = s:save_cpo
 unlet! s:save_cpo
-
-endif
diff --git a/indent/fish.vim b/indent/fish.vim
index f62375fb..5b314c7f 100644
--- a/indent/fish.vim
+++ b/indent/fish.vim
@@ -1,13 +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, 'indent/fish.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fish', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 
 setlocal indentexpr=fish#Indent()
 setlocal indentkeys+==end,=else,=case
-
-endif
diff --git a/indent/fortran.vim b/indent/fortran.vim
index cb00f26d..7aac6b5b 100644
--- a/indent/fortran.vim
+++ b/indent/fortran.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, 'indent/fortran.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fortran', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fortran') == -1
 
 " Vim indent file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
@@ -226,5 +221,3 @@ let &cpoptions=s:cposet
 unlet s:cposet
 
 " vim:sw=2 tw=130
-
-endif
diff --git a/indent/framescript.vim b/indent/framescript.vim
index de80fd70..6371d8cb 100644
--- a/indent/framescript.vim
+++ b/indent/framescript.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, 'indent/framescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('framescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'framescript') == -1
 
 " Vim indent file
 " Language:             FrameScript
@@ -48,5 +43,3 @@ function GetFrameScriptIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/fsharp.vim b/indent/fsharp.vim
index cb4af8cc..0ab8dfff 100644
--- a/indent/fsharp.vim
+++ b/indent/fsharp.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, 'indent/fsharp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fsharp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
 
 " Vim indent file
 " Language:     FSharp
@@ -256,5 +251,3 @@ function! GetFsharpIndent()
 endfunction
 
 " vim: sw=4 et sts=4
-
-endif
diff --git a/indent/gdscript3.vim b/indent/gdscript3.vim
index 7fb7c84f..93f4c26e 100644
--- a/indent/gdscript3.vim
+++ b/indent/gdscript3.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, 'indent/gdscript3.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gdscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdscript') == -1
 
 " Vim indent file
 " Language:		Python
@@ -207,5 +202,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:sw=2
-
-endif
diff --git a/indent/gitconfig.vim b/indent/gitconfig.vim
index 8155b3c7..5cdd4ce4 100644
--- a/indent/gitconfig.vim
+++ b/indent/gitconfig.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, 'indent/gitconfig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim indent file
 " Language:	git config file
@@ -45,5 +40,3 @@ function! GetGitconfigIndent()
     return -1
   endif
 endfunction
-
-endif
diff --git a/indent/gitolite.vim b/indent/gitolite.vim
index d0f3e820..c6517e79 100644
--- a/indent/gitolite.vim
+++ b/indent/gitolite.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, 'indent/gitolite.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gitolite', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitolite') == -1
 
 " Vim indent file
 " Language:	gitolite configuration
@@ -56,5 +51,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/glsl.vim b/indent/glsl.vim
index 442db43d..db9b0ddb 100644
--- a/indent/glsl.vim
+++ b/indent/glsl.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, 'indent/glsl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('glsl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
 
 " Language: OpenGL Shading Language
 " Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
@@ -18,5 +13,3 @@ setlocal autoindent cindent
 setlocal formatoptions+=roq
 
 " vim:set sts=2 sw=2 :
-
-endif
diff --git a/indent/go.vim b/indent/go.vim
index a70243ad..f3ee7ef7 100644
--- a/indent/go.vim
+++ b/indent/go.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, 'indent/go.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 " Copyright 2011 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
@@ -93,5 +88,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/indent/gohtmltmpl.vim b/indent/gohtmltmpl.vim
index ca2ad060..f714d9df 100644
--- a/indent/gohtmltmpl.vim
+++ b/indent/gohtmltmpl.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, 'indent/gohtmltmpl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 if exists("b:did_indent")
   finish
@@ -61,5 +56,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/indent/graphql.vim b/indent/graphql.vim
index 713381cb..a02b2885 100644
--- a/indent/graphql.vim
+++ b/indent/graphql.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, 'indent/graphql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 
 " Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
 "
@@ -114,5 +109,3 @@ endfunction
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/haml.vim b/indent/haml.vim
index 8597f60d..9f5be96c 100644
--- a/indent/haml.vim
+++ b/indent/haml.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, 'indent/haml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('haml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 
 " Vim indent file
 " Language:	Haml
@@ -81,5 +76,3 @@ function! GetHamlIndent()
 endfunction
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/hamster.vim b/indent/hamster.vim
index 2edb2e73..43411745 100644
--- a/indent/hamster.vim
+++ b/indent/hamster.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, 'indent/hamster.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hamster', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hamster') == -1
 
 " Vim indent file
 " Language:    Hamster Script 
@@ -62,5 +57,3 @@ function HamGetFreeIndent()
 endfunction
 
 " vim:sw=2 tw=80
-
-endif
diff --git a/indent/handlebars.vim b/indent/handlebars.vim
index a2a9e4e3..f58aa660 100644
--- a/indent/handlebars.vim
+++ b/indent/handlebars.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, 'indent/handlebars.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('handlebars', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
 " Mustache & Handlebars syntax
 " Language:	Mustache, Handlebars
@@ -132,5 +127,3 @@ function! GetHandlebarsIndent(...)
 
   return ind
 endfunction
-
-endif
diff --git a/indent/haskell.vim b/indent/haskell.vim
index 7f4d4a96..19f4e076 100644
--- a/indent/haskell.vim
+++ b/indent/haskell.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, 'indent/haskell.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 
 " indentation for haskell
 "
@@ -516,5 +511,3 @@ function! GetHaskellIndent()
 
   return -1
 endfunction
-
-endif
diff --git a/indent/hcl.vim b/indent/hcl.vim
index e193b83b..a0cd2b07 100644
--- a/indent/hcl.vim
+++ b/indent/hcl.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, 'indent/hcl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hcl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hcl') == -1
 
 if exists('b:did_indent')
   finish
@@ -18,5 +13,3 @@ setlocal cindent
 
 " don't de-indent comments (cindent treats them like preprocessor directives)
 setlocal cinkeys-=0#
-
-endif
diff --git a/indent/hog.vim b/indent/hog.vim
index 3280d67d..a7607314 100644
--- a/indent/hog.vim
+++ b/indent/hog.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, 'indent/hog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hog') == -1
 
 " Vim indent file
 " Language:     hog (Snort.conf)
@@ -84,5 +79,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/html.vim b/indent/html.vim
index c8922278..b6ade453 100644
--- a/indent/html.vim
+++ b/indent/html.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, 'indent/html.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('html', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html') == -1
 
 " Vim indent script for HTML
 " Maintainer:	Bram Moolenaar
@@ -1087,5 +1082,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: fdm=marker ts=8 sw=2 tw=78
-
-endif
diff --git a/indent/htmldjango.vim b/indent/htmldjango.vim
index 5e3b7fd1..27ba1b06 100644
--- a/indent/htmldjango.vim
+++ b/indent/htmldjango.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, 'indent/htmldjango.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('htmldjango', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
 
 " Vim indent file
 " Language:	Django HTML template
@@ -19,5 +14,3 @@ endif
 
 " Use HTML formatting rules.
 runtime! indent/html.vim
-
-endif
diff --git a/indent/idris.vim b/indent/idris.vim
index f3884f12..ffa22afd 100644
--- a/indent/idris.vim
+++ b/indent/idris.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, 'indent/idris.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 
 " indentation for idris (idris-lang.org)
 "
@@ -151,5 +146,3 @@ function! GetIdrisIndent()
 
   return match(prevline, '\S')
 endfunction
-
-endif
diff --git a/indent/idris2.vim b/indent/idris2.vim
index f2ea6e31..81b816f8 100644
--- a/indent/idris2.vim
+++ b/indent/idris2.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, 'indent/idris2.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
 
 " indentation for idris (idris-lang.org)
 "
@@ -151,5 +146,3 @@ function! GetIdrisIndent()
 
   return match(prevline, '\S')
 endfunction
-
-endif
diff --git a/indent/j.vim b/indent/j.vim
index dbea206c..1c51552a 100644
--- a/indent/j.vim
+++ b/indent/j.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, 'indent/j.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('j', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'j') == -1
 
 " Vim indent file
 " Language:	J
@@ -57,5 +52,3 @@ function GetJIndent() abort
   endif
   return l:indent
 endfunction
-
-endif
diff --git a/indent/java.vim b/indent/java.vim
index 06a20d7a..c6190122 100644
--- a/indent/java.vim
+++ b/indent/java.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, 'indent/java.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('java', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'java') == -1
 
 " Vim indent file
 " Language:	Java
@@ -157,5 +152,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vi: sw=2 et
-
-endif
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 65acc8df..40a6bb5d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.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, 'indent/javascript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 
 " Vim indent file
 " Language: Javascript
@@ -484,5 +479,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/json.vim b/indent/json.vim
index 71b269e7..a2e0b6d6 100644
--- a/indent/json.vim
+++ b/indent/json.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, 'indent/json.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('json', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
 
 " Vim indent file
 " Language:		JSON
@@ -184,5 +179,3 @@ unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 noet:
 
-
-endif
diff --git a/indent/jsp.vim b/indent/jsp.vim
index 0cbfc2ee..4ff51051 100644
--- a/indent/jsp.vim
+++ b/indent/jsp.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, 'indent/jsp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jsp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsp') == -1
 
 " Vim filetype indent file
 " Language:    JSP files
@@ -24,5 +19,3 @@ endif
 runtime! indent/html.vim
 
 
-
-endif
diff --git a/indent/jst.vim b/indent/jst.vim
index 4920d6d7..507e8b56 100644
--- a/indent/jst.vim
+++ b/indent/jst.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, 'indent/jst.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jst') == -1
 
 if exists("b:did_indent")
   finish
@@ -82,5 +77,3 @@ endfunction
 
 " vim:set sw=2 sts=2 ts=8 noet:
 
-
-endif
diff --git a/indent/julia.vim b/indent/julia.vim
index 2db6faba..3ea209a1 100644
--- a/indent/julia.vim
+++ b/indent/julia.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, 'indent/julia.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " Vim indent file
 " Language:	Julia
@@ -493,5 +488,3 @@ function GetJuliaIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/kotlin.vim b/indent/kotlin.vim
index fdb8891c..996b2fd7 100644
--- a/indent/kotlin.vim
+++ b/indent/kotlin.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, 'indent/kotlin.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('kotlin', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
 
 " Vim indent file
 " Language: Kotlin
@@ -63,5 +58,3 @@ function! GetKotlinIndent()
 
     return prev_indent
 endfunction
-
-endif
diff --git a/indent/ld.vim b/indent/ld.vim
index 9d671e54..550b7032 100644
--- a/indent/ld.vim
+++ b/indent/ld.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, 'indent/ld.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ld', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ld') == -1
 
 " Vim indent file
 " Language:             ld(1) script
@@ -91,5 +86,3 @@ function GetLDIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/ledger.vim b/indent/ledger.vim
index a79be9c1..11037610 100644
--- a/indent/ledger.vim
+++ b/indent/ledger.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, 'indent/ledger.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ledger', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ledger') == -1
 
 " Vim filetype indent file
 " filetype: ledger
@@ -55,5 +50,3 @@ function GetLedgerIndent(...)
     return 0
   endif
 endf
-
-endif
diff --git a/indent/less.vim b/indent/less.vim
index 45276bea..6ce917af 100644
--- a/indent/less.vim
+++ b/indent/less.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, 'indent/less.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('less', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 
 " Vim indent file
 " Language:	less
@@ -20,5 +15,3 @@ endif
 runtime! indent/css.vim
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/lifelines.vim b/indent/lifelines.vim
index 3da037d1..70f21aa2 100644
--- a/indent/lifelines.vim
+++ b/indent/lifelines.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, 'indent/lifelines.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lifelines', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lifelines') == -1
 
 " Vim indent file
 " Language:	LifeLines
@@ -31,5 +26,3 @@ setlocal cinoptions+=*500
 
 let b:undo_indent = "setl cin< cino< cinw<"
 " vim: ts=8 sw=4
-
-endif
diff --git a/indent/lilypond.vim b/indent/lilypond.vim
index 792ffbbf..cdb418da 100644
--- a/indent/lilypond.vim
+++ b/indent/lilypond.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, 'indent/lilypond.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lilypond', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 
 " LilyPond indent file
 " Language:     LilyPond
@@ -67,5 +62,3 @@ endfunction
 "
 "
 "
-
-endif
diff --git a/indent/liquid.vim b/indent/liquid.vim
index 5c0ba020..f3fb43a9 100644
--- a/indent/liquid.vim
+++ b/indent/liquid.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, 'indent/liquid.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('liquid', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
 
 " Vim indent file
 " Language:     Liquid
@@ -70,5 +65,3 @@ function! GetLiquidIndent(...)
   let ind -= sw * s:count(cline,'{%\s*end\w*$')
   return ind
 endfunction
-
-endif
diff --git a/indent/lisp.vim b/indent/lisp.vim
index d920cf9e..88a08b72 100644
--- a/indent/lisp.vim
+++ b/indent/lisp.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, 'indent/lisp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lisp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lisp') == -1
 
 " Vim indent file
 " Language:	Lisp
@@ -22,5 +17,3 @@ let b:did_indent = 1
 setlocal ai nosi
 
 let b:undo_indent = "setl ai< si<"
-
-endif
diff --git a/indent/litcoffee.vim b/indent/litcoffee.vim
index c7d3d29b..0515201f 100644
--- a/indent/litcoffee.vim
+++ b/indent/litcoffee.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, 'indent/litcoffee.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 if exists('b:did_indent')
   finish
@@ -29,5 +24,3 @@ function GetLitCoffeeIndent()
   endif
 endfunc
 
-
-endif
diff --git a/indent/llvm.vim b/indent/llvm.vim
index d57b3a12..53c6f999 100644
--- a/indent/llvm.vim
+++ b/indent/llvm.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, 'indent/llvm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 
 " Vim indent file
 " Language:   llvm
@@ -79,5 +74,3 @@ function! GetLLVMIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/logtalk.vim b/indent/logtalk.vim
index 843dcc23..863afeda 100644
--- a/indent/logtalk.vim
+++ b/indent/logtalk.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, 'indent/logtalk.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('logtalk', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logtalk') == -1
 
 "  Maintainer:	Paulo Moura <pmoura@logtalk.org>
 "  Revised on:	2018.08.04
@@ -71,5 +66,3 @@ function! GetLogtalkIndent()
 	endif
 	return ind
 endfunction
-
-endif
diff --git a/indent/ls.vim b/indent/ls.vim
index 41ebcac5..591ccf76 100644
--- a/indent/ls.vim
+++ b/indent/ls.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, 'indent/ls.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('livescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 
 " Language:    LiveScript
 " Maintainer:  George Zahariev
@@ -271,5 +266,3 @@ function! GetLiveScriptIndent(curlinenum)
 
   return indent
 endfunction
-
-endif
diff --git a/indent/lua.vim b/indent/lua.vim
index f4bc40f0..537a390c 100644
--- a/indent/lua.vim
+++ b/indent/lua.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, 'indent/lua.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lua', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lua') == -1
 
 " Vim indent file
 " Language: Lua
@@ -135,5 +130,3 @@ function GetLuaIndent()
   return indent(prev_line) + (shiftwidth() * i)
 
 endfunction
-
-endif
diff --git a/indent/mail.vim b/indent/mail.vim
index 462bd947..5899c2a4 100644
--- a/indent/mail.vim
+++ b/indent/mail.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, 'indent/mail.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mail', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mail') == -1
 
 " Vim indent file
 " Language:	Mail
@@ -20,5 +15,3 @@ let b:did_indent = 1
 " What works best is auto-indenting, disable other indenting.
 " For formatting see the ftplugin.
 setlocal autoindent nosmartindent nocindent indentexpr=
-
-endif
diff --git a/indent/make.vim b/indent/make.vim
index f7aabdc5..0fe68ecb 100644
--- a/indent/make.vim
+++ b/indent/make.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, 'indent/make.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('make', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'make') == -1
 
 " Vim indent file
 " Language:             Makefile
@@ -123,5 +118,3 @@ function GetMakeIndent()
     endif
   endif
 endfunction
-
-endif
diff --git a/indent/mako.vim b/indent/mako.vim
index 27a09b05..34d7dbf6 100644
--- a/indent/mako.vim
+++ b/indent/mako.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, 'indent/mako.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mako', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
 
 " Vim indent file
 " Language: Mako
@@ -435,5 +430,3 @@ fun! <SID>HtmlIndentSum(lnum, style)
 endfun
 
 " vim: set ts=4 sw=4:
-
-endif
diff --git a/indent/markdown.vim b/indent/markdown.vim
index 0e0ff248..10c576d7 100644
--- a/indent/markdown.vim
+++ b/indent/markdown.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, 'indent/markdown.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('markdown', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
 
 if exists("b:did_indent") | finish | endif
 let b:did_indent = 1
@@ -82,5 +77,3 @@ function GetMarkdownIndent()
         return ind
     endif
 endfunction
-
-endif
diff --git a/indent/meson.vim b/indent/meson.vim
index 6e055c7f..d2bd1663 100644
--- a/indent/meson.vim
+++ b/indent/meson.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, 'indent/meson.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('meson', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'meson') == -1
 
 " Vim indent file
 " Language:		Meson
@@ -187,5 +182,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:sw=2
-
-endif
diff --git a/indent/mf.vim b/indent/mf.vim
index a0158dd1..24c13c7b 100644
--- a/indent/mf.vim
+++ b/indent/mf.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, 'indent/mf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mf') == -1
 
 " METAFONT indent file
 " Language:    METAFONT
@@ -13,5 +8,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mf') == -1
 " Last Change: 2016 Oct 1
 
 runtime! indent/mp.vim
-
-endif
diff --git a/indent/moon.vim b/indent/moon.vim
index d5c55ec4..a71db55c 100644
--- a/indent/moon.vim
+++ b/indent/moon.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, 'indent/moon.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('moonscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
 
 " Language:    MoonScript
 " Maintainer:  leafo <leafot@gmail.com>
@@ -330,5 +325,3 @@ function! GetMoonIndent(curlinenum)
 
   return indent
 endfunction
-
-endif
diff --git a/indent/mp.vim b/indent/mp.vim
index 45f15f64..6dca244a 100644
--- a/indent/mp.vim
+++ b/indent/mp.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, 'indent/mp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mp') == -1
 
 " MetaPost indent file
 " Language:           MetaPost
@@ -367,5 +362,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:sw=2:fdm=marker
-
-endif
diff --git a/indent/mustache.vim b/indent/mustache.vim
index f546461c..a7a0d3c3 100644
--- a/indent/mustache.vim
+++ b/indent/mustache.vim
@@ -1,12 +1,5 @@
-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, 'indent/mustache.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('handlebars', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
 runtime! indent/handlebars.vim
-
-endif
diff --git a/indent/nginx.vim b/indent/nginx.vim
index c797da45..cd0af59f 100644
--- a/indent/nginx.vim
+++ b/indent/nginx.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, 'indent/nginx.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nginx', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
 
 if exists("b:did_indent")
     finish
@@ -18,5 +13,3 @@ setlocal indentexpr=
 setlocal cindent
 " Just make sure that the comments are not reset as defs would be.
 setlocal cinkeys-=0#
-
-endif
diff --git a/indent/nim.vim b/indent/nim.vim
index 9a3e62f3..25747ec5 100644
--- a/indent/nim.vim
+++ b/indent/nim.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, 'indent/nim.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nim', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -149,5 +144,3 @@ endfunction
 
 " vim:sw=2
 
-
-endif
diff --git a/indent/nix.vim b/indent/nix.vim
index 15465a0e..24b19cdc 100644
--- a/indent/nix.vim
+++ b/indent/nix.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, 'indent/nix.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nix', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 
 " Vim indent file
 " Language:    Nix
@@ -110,5 +105,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/nsis.vim b/indent/nsis.vim
index 61b29b4a..ed4bd161 100644
--- a/indent/nsis.vim
+++ b/indent/nsis.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, 'indent/nsis.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nsis', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nsis') == -1
 
 " Vim indent file
 " Language:		NSIS script
@@ -98,5 +93,3 @@ function! GetNsisIndent(lnum)
 endfunction
 
 " vim: ts=8 sw=2 sts=2
-
-endif
diff --git a/indent/ocaml.vim b/indent/ocaml.vim
index d7a89a61..3a0e70cf 100644
--- a/indent/ocaml.vim
+++ b/indent/ocaml.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, 'indent/ocaml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim indent file
 " Language:     OCaml
@@ -281,5 +276,3 @@ function! GetOCamlIndent()
 endfunction
 
 " vim:sw=2
-
-endif
diff --git a/indent/occam.vim b/indent/occam.vim
index d6fefc76..fea8e44d 100644
--- a/indent/occam.vim
+++ b/indent/occam.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, 'indent/occam.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('occam', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'occam') == -1
 
 " Vim indent file
 " Language:	occam
@@ -194,5 +189,3 @@ endfunction
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/indent/octave.vim b/indent/octave.vim
index f15e6745..fbbf0314 100644
--- a/indent/octave.vim
+++ b/indent/octave.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, 'indent/octave.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('octave', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'octave') == -1
 
 " Vim indent file
 " Language:            Octave
@@ -80,5 +75,3 @@ endfunction
 
 setlocal indentexpr=GetOctaveIndent()
 setlocal autoindent
-
-endif
diff --git a/indent/odin.vim b/indent/odin.vim
index 5c94c67d..50f247bd 100644
--- a/indent/odin.vim
+++ b/indent/odin.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, 'indent/odin.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('odin', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'odin') == -1
 
 if exists("b:did_indent")
   finish
@@ -44,5 +39,3 @@ function! GetOdinIndent(lnum)
 
   return ind
 endfunction
-
-endif
diff --git a/indent/omake.vim b/indent/omake.vim
index 87ace177..3f1e550d 100644
--- a/indent/omake.vim
+++ b/indent/omake.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, 'indent/omake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim indent file
 " Language:         OMakefile
@@ -121,5 +116,3 @@ function GetMakeIndent()
     endif
   endif
 endfunction
-
-endif
diff --git a/indent/opencl.vim b/indent/opencl.vim
index 6914df5f..75d7059c 100644
--- a/indent/opencl.vim
+++ b/indent/opencl.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, 'indent/opencl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('opencl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -17,5 +12,3 @@ if version > 600
 endif
 
 let b:did_indent = 1
-
-endif
diff --git a/indent/pascal.vim b/indent/pascal.vim
index f07cb0e4..a58cb87b 100644
--- a/indent/pascal.vim
+++ b/indent/pascal.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, 'indent/pascal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pascal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pascal') == -1
 
 " Vim indent file
 " Language:    Pascal
@@ -235,5 +230,3 @@ function! GetPascalIndent( line_num )
 	return indnt
 endfunction
 
-
-endif
diff --git a/indent/perl.vim b/indent/perl.vim
index 4c671bc3..c0871db6 100644
--- a/indent/perl.vim
+++ b/indent/perl.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, 'indent/perl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim indent file
 " Language:      Perl 5
@@ -187,5 +182,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:ts=8:sts=4:sw=4:expandtab:ft=vim
-
-endif
diff --git a/indent/pgsql.vim b/indent/pgsql.vim
index ac967355..4a3e9144 100644
--- a/indent/pgsql.vim
+++ b/indent/pgsql.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, 'indent/pgsql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pgsql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pgsql') == -1
 
 " Vim indent file
 " Language:    SQL
@@ -396,5 +391,3 @@ endfunction
 let &cpo= s:keepcpo
 unlet s:keepcpo
 " vim: ts=4 fdm=marker sw=4
-
-endif
diff --git a/indent/plantuml.vim b/indent/plantuml.vim
index c0f3065b..1620a7c6 100644
--- a/indent/plantuml.vim
+++ b/indent/plantuml.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, 'indent/plantuml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('plantuml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
 
 scriptencoding utf-8
 " Vim indent file
@@ -92,5 +87,3 @@ function! s:getIncIndent() abort
         \ '^\s*skinparam\>.*{\s*$\|' .
         \ s:typeKeywordIncPattern()
 endfunction
-
-endif
diff --git a/indent/pony.vim b/indent/pony.vim
index 51f668de..7d1dc3d2 100644
--- a/indent/pony.vim
+++ b/indent/pony.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, 'indent/pony.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pony', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
 
 " Vim indent file
 " Language:     Pony
@@ -44,5 +39,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 let b:did_indent = 1
-
-endif
diff --git a/indent/postscr.vim b/indent/postscr.vim
index 89797648..ba7ce419 100644
--- a/indent/postscr.vim
+++ b/indent/postscr.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, 'indent/postscr.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('postscr', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'postscr') == -1
 
 " PostScript indent file
 " Language:    PostScript
@@ -75,5 +70,3 @@ function! PostscrIndentGet(lnum)
 endfunction
 
 " vim:sw=2
-
-endif
diff --git a/indent/pov.vim b/indent/pov.vim
index 1964b7b8..13e0f96f 100644
--- a/indent/pov.vim
+++ b/indent/pov.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, 'indent/pov.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pov', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pov') == -1
 
 " Vim indent file
 " Language: PoV-Ray Scene Description Language
@@ -91,5 +86,3 @@ function GetPoVRayIndent()
 
   return final < 0 ? 0 : final
 endfunction
-
-endif
diff --git a/indent/prolog.vim b/indent/prolog.vim
index cb97bf86..420edee7 100644
--- a/indent/prolog.vim
+++ b/indent/prolog.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, 'indent/prolog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('prolog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'prolog') == -1
 
 "  vim: set sw=4 sts=4:
 "  Maintainer	: Gergely Kontra <kgergely@mcl.hu>
@@ -74,5 +69,3 @@ function! GetPrologIndent()
     endif
     return ind
 endfunction
-
-endif
diff --git a/indent/proto.vim b/indent/proto.vim
index 8bf58362..8fa33fd6 100644
--- a/indent/proto.vim
+++ b/indent/proto.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, 'indent/proto.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('protobuf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protobuf') == -1
 
 " Vim indent file
 " Language:	Protobuf
@@ -24,5 +19,3 @@ setlocal expandtab
 setlocal shiftwidth=2
 
 let b:undo_indent = "setl cin<"
-
-endif
diff --git a/indent/ps1.vim b/indent/ps1.vim
index 92222de8..ac6b83fe 100644
--- a/indent/ps1.vim
+++ b/indent/ps1.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, 'indent/ps1.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('powershell', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 
 " Vim indent file
 " Language:           Windows PowerShell
@@ -27,5 +22,3 @@ inoremap <buffer> # X#
 
 let b:undo_indent = "setl si<"
 
-
-endif
diff --git a/indent/pug.vim b/indent/pug.vim
index d0aadb62..20703d8c 100644
--- a/indent/pug.vim
+++ b/indent/pug.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, 'indent/pug.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pug', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
 
 " Vim indent file
 " Language: Pug
@@ -77,5 +72,3 @@ function! GetPugIndent()
 endfunction
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/puppet.vim b/indent/puppet.vim
index 321bf9f8..1f0a8e3c 100644
--- a/indent/puppet.vim
+++ b/indent/puppet.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, 'indent/puppet.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 " Vim indent file
 " Language: Puppet
@@ -146,5 +141,3 @@ function! GetPuppetIndent(...)
 
     return ind
 endfunction
-
-endif
diff --git a/indent/purescript.vim b/indent/purescript.vim
index fc6e2a26..b040855a 100644
--- a/indent/purescript.vim
+++ b/indent/purescript.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, 'indent/purescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('purescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
 
 " indentation for purescript
 "
@@ -283,5 +278,3 @@ function! GetPurescriptIndent()
 
   return match(prevline, '\S')
 endfunction
-
-endif
diff --git a/indent/pyrex.vim b/indent/pyrex.vim
index 061b71a8..9ffe4c12 100644
--- a/indent/pyrex.vim
+++ b/indent/pyrex.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, 'indent/pyrex.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pyrex', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pyrex') == -1
 
 " Vim indent file
 " Language:	Pyrex
@@ -20,5 +15,3 @@ endif
 
 " Use Python formatting rules
 runtime! indent/python.vim
-
-endif
diff --git a/indent/python.vim b/indent/python.vim
index 8e2ea0d7..5f13b77e 100644
--- a/indent/python.vim
+++ b/indent/python.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, 'indent/python.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('python-indent', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-indent') == -1
 
 " PEP8 compatible Python indent file
 " Language:         Python
@@ -461,5 +456,3 @@ function! GetPythonPEPIndent(lnum)
 
     return s:indent_like_previous_line(a:lnum)
 endfunction
-
-endif
diff --git a/indent/qml.vim b/indent/qml.vim
index 944e72f2..480e9d8f 100644
--- a/indent/qml.vim
+++ b/indent/qml.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, 'indent/qml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('qml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
 
 " Vim indent file
 " Language:     QML
@@ -66,5 +61,3 @@ function! GetJsIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/racket.vim b/indent/racket.vim
index 626dde52..ceeec45c 100644
--- a/indent/racket.vim
+++ b/indent/racket.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, 'indent/racket.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('racket', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
 
 " Language:     Racket
 " Maintainer:   Will Langstroth <will@langstroth.com>
@@ -19,5 +14,3 @@ let b:did_indent = 1
 setlocal ai nosi
 
 let b:undo_indent = "setl ai< si<"
-
-endif
diff --git a/indent/raku.vim b/indent/raku.vim
index 052693cf..1c759b70 100644
--- a/indent/raku.vim
+++ b/indent/raku.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, 'indent/raku.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('raku', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raku') == -1
 
 " Vim indent file
 " Language:      Raku
@@ -134,5 +129,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:ts=8:sts=4:sw=4:expandtab:ft=vim
-
-endif
diff --git a/indent/razor.vim b/indent/razor.vim
index e35688e4..2708d10e 100644
--- a/indent/razor.vim
+++ b/indent/razor.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, 'indent/razor.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('razor', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'razor') == -1
 
 " Vim indent file
 " Language:	    Razor
@@ -17,5 +12,3 @@ if exists("b:did_indent")
 endif
 runtime! indent/html.vim
 runtime! indent/javscript.vim
-
-endif
diff --git a/indent/readline.vim b/indent/readline.vim
index 53ef6f21..3c79245b 100644
--- a/indent/readline.vim
+++ b/indent/readline.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, 'indent/readline.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('readline', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'readline') == -1
 
 " Vim indent file
 " Language:             readline configuration file
@@ -43,5 +38,3 @@ function GetReadlineIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/reason.vim b/indent/reason.vim
index 490cdeaf..4a5160bd 100644
--- a/indent/reason.vim
+++ b/indent/reason.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, 'indent/reason.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('reason', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reason') == -1
 
 " Vim indent file
 " Language:         Reason (adapted from Rust)
@@ -224,5 +219,3 @@ function GetReasonIndent(lnum)
 	" Fall back on cindent, which does it mostly right
 	return cindent(a:lnum)
 endfunction
-
-endif
diff --git a/indent/rmd.vim b/indent/rmd.vim
index d95e442a..a5c44090 100644
--- a/indent/rmd.vim
+++ b/indent/rmd.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, 'indent/rmd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rmd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rmd') == -1
 
 " Vim indent file
 " Language:	Rmd
@@ -73,5 +68,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2
-
-endif
diff --git a/indent/rnoweb.vim b/indent/rnoweb.vim
index 4473d32d..350e6d9b 100644
--- a/indent/rnoweb.vim
+++ b/indent/rnoweb.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, 'indent/rnoweb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rnoweb', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnoweb') == -1
 
 " Vim indent file
 " Language:	Rnoweb
@@ -54,5 +49,3 @@ function GetRnowebIndent()
 endfunction
 
 " vim: sw=2
-
-endif
diff --git a/indent/rpl.vim b/indent/rpl.vim
index f5df9afb..3e11fabe 100644
--- a/indent/rpl.vim
+++ b/indent/rpl.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, 'indent/rpl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rpl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
 
 " Vim indent file
 " Language:	RPL/2
@@ -70,5 +65,3 @@ function RplGetFreeIndent()
 endfunction
 
 " vim:sw=2 tw=130
-
-endif
diff --git a/indent/rrst.vim b/indent/rrst.vim
index 5b3187b6..3d31f1eb 100644
--- a/indent/rrst.vim
+++ b/indent/rrst.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, 'indent/rrst.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rrst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rrst') == -1
 
 " Vim indent file
 " Language:	Rrst
@@ -54,5 +49,3 @@ function GetRrstIndent()
 endfunction
 
 " vim: sw=2
-
-endif
diff --git a/indent/rst.vim b/indent/rst.vim
index 2585df03..8fbb3d17 100644
--- a/indent/rst.vim
+++ b/indent/rst.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, 'indent/rst.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
 
 " Vim indent file
 " Vim reST indent file
@@ -82,5 +77,3 @@ function GetRSTIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/ruby.vim b/indent/ruby.vim
index 56a348a7..2fe4a374 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.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, 'indent/ruby.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim indent file
 " Language:		Ruby
@@ -971,5 +966,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif
diff --git a/indent/rust.vim b/indent/rust.vim
index 7f0fff27..395e7409 100644
--- a/indent/rust.vim
+++ b/indent/rust.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, 'indent/rust.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Vim indent file
 " Language:         Rust
@@ -291,5 +286,3 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/indent/sas.vim b/indent/sas.vim
index 671e213c..eb2afdf1 100644
--- a/indent/sas.vim
+++ b/indent/sas.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, 'indent/sas.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sas', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sas') == -1
 
 " Vim indent file
 " Language:     SAS
@@ -145,5 +140,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/sass.vim b/indent/sass.vim
index b3002bef..4f4971a0 100644
--- a/indent/sass.vim
+++ b/indent/sass.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, 'indent/sass.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sass', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sass') == -1
 
 " Vim indent file
 " Language:	Sass
@@ -45,5 +40,3 @@ function! GetSassIndent()
 endfunction
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/scala.vim b/indent/scala.vim
index 62d67720..adddc554 100644
--- a/indent/scala.vim
+++ b/indent/scala.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, 'indent/scala.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 " Vim indent file
 " Language         : Scala (http://scala-lang.org/)
@@ -613,5 +608,3 @@ endfunction
 
 " vim:set sw=2 sts=2 ts=8 et:
 " vim600:fdm=marker fdl=1 fdc=0:
-
-endif
diff --git a/indent/scheme.vim b/indent/scheme.vim
index 2e0c747b..475d9cd5 100644
--- a/indent/scheme.vim
+++ b/indent/scheme.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, 'indent/scheme.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scheme', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scheme') == -1
 
 " Vim indent file
 " Language: Scheme
@@ -21,5 +16,3 @@ endif
 
 " Use the Lisp indenting
 runtime! indent/lisp.vim
-
-endif
diff --git a/indent/scss.vim b/indent/scss.vim
index 8d302d30..80a43bd2 100644
--- a/indent/scss.vim
+++ b/indent/scss.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, 'indent/scss.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scss', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
 
 " Vim indent file
 " Language    : SCSS (Sassy CSS)
@@ -96,5 +91,3 @@ unlet s:keepcpo
 
 " vim:set et ts=2 sw=2:
 
-
-endif
diff --git a/indent/sdl.vim b/indent/sdl.vim
index 3083b048..470b7328 100644
--- a/indent/sdl.vim
+++ b/indent/sdl.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, 'indent/sdl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sdl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sdl') == -1
 
 " Vim indent file
 " Language:	SDL
@@ -100,5 +95,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:sw=2
-
-endif
diff --git a/indent/slim.vim b/indent/slim.vim
index 742834e0..95eda92d 100644
--- a/indent/slim.vim
+++ b/indent/slim.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, 'indent/slim.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slim', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
 
 " Vim indent file
 " Language:	Slim
@@ -82,5 +77,3 @@ function! GetSlimIndent()
 endfunction
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/slime.vim b/indent/slime.vim
index 77b902a2..2ba345f1 100644
--- a/indent/slime.vim
+++ b/indent/slime.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, 'indent/slime.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slime', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slime') == -1
 
 " Vim indent file
 " Language:	Slime
@@ -82,5 +77,3 @@ function! GetSlimeIndent()
 endfunction
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/sml.vim b/indent/sml.vim
index f36bac6c..0bc7a389 100644
--- a/indent/sml.vim
+++ b/indent/sml.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, 'indent/sml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sml') == -1
 
 " Vim indent file
 " Language:     SML
@@ -224,5 +219,3 @@ function! GetSMLIndent()
 endfunction
 
 " vim:sw=2
-
-endif
diff --git a/indent/solidity.vim b/indent/solidity.vim
index 638a3239..a7844596 100644
--- a/indent/solidity.vim
+++ b/indent/solidity.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, 'indent/solidity.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('solidity', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
 
 " Vim indent file
 " Language: Solidity
@@ -446,5 +441,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/sql.vim b/indent/sql.vim
index 82667f5a..34c74570 100644
--- a/indent/sql.vim
+++ b/indent/sql.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, 'indent/sql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sql') == -1
 
 " Vim indent file loader
 " Language:    SQL
@@ -46,5 +41,3 @@ exec 'runtime indent/'.filename.'.vim'
 
 
 " vim:sw=4:
-
-endif
diff --git a/indent/sshconfig.vim b/indent/sshconfig.vim
index aedb0218..4d2b3d9b 100644
--- a/indent/sshconfig.vim
+++ b/indent/sshconfig.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, 'indent/sshconfig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sshconfig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sshconfig') == -1
 
 " Vim indent file
 " Language: ssh config file
@@ -41,5 +36,3 @@ function GetSshconfigIndent(lnum)
     return indent(prev_lnum)
   endif
 endfunction
-
-endif
diff --git a/indent/stylus.vim b/indent/stylus.vim
index c89dafb3..3265e301 100644
--- a/indent/stylus.vim
+++ b/indent/stylus.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, 'indent/stylus.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('stylus', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
 
 " Vim indent file
 " Language: Stylus
@@ -136,5 +131,3 @@ function! GetStylusIndent()
 endfunction
 
 " vim:set sw=2;
-
-endif
diff --git a/indent/svelte.vim b/indent/svelte.vim
index 599023a0..e8940f42 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.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, 'indent/svelte.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('svelte', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svelte') == -1
 
 " Vim indent file
 " Language:   Svelte 3 (HTML/JavaScript)
@@ -151,5 +146,3 @@ function! GetSvelteIndent()
 
   return indent
 endfunction
-
-endif
diff --git a/indent/svg.vim b/indent/svg.vim
index 2057c3ef..198efb46 100644
--- a/indent/svg.vim
+++ b/indent/svg.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, 'indent/svg.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('svg-indent', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svg-indent') == -1
 
 " Vim indent file
 "
@@ -112,5 +107,3 @@ endfun
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/indent/swift.vim b/indent/swift.vim
index 48efb354..5c17fc63 100644
--- a/indent/swift.vim
+++ b/indent/swift.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, 'indent/swift.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('swift', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
 
 " File: swift.vim
 " Author: Keith Smiley
@@ -301,5 +296,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/systemverilog.vim b/indent/systemverilog.vim
index a5c423b2..43267f6d 100644
--- a/indent/systemverilog.vim
+++ b/indent/systemverilog.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, 'indent/systemverilog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('systemverilog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemverilog') == -1
 
 " Vim indent file
 " Language:    SystemVerilog
@@ -236,5 +231,4 @@ endfunction
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:sw=2
-endif
+" vim:sw=2
\ No newline at end of file
diff --git a/indent/tcl.vim b/indent/tcl.vim
index 0eedaa29..8ea5dcc5 100644
--- a/indent/tcl.vim
+++ b/indent/tcl.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, 'indent/tcl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tcl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tcl') == -1
 
 " Vim indent file
 " Language:	    	Tcl
@@ -108,5 +103,3 @@ function GetTclIndent()
   
   return ind
 endfunction
-
-endif
diff --git a/indent/teraterm.vim b/indent/teraterm.vim
index c0e6d131..66ad449f 100644
--- a/indent/teraterm.vim
+++ b/indent/teraterm.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, 'indent/teraterm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('teraterm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'teraterm') == -1
 
 " Vim indent file
 " Language:	Tera Term Language (TTL)
@@ -62,5 +57,3 @@ function! GetTeraTermIndent(lnum)
 endfunction
 
 " vim: ts=8 sw=2 sts=2
-
-endif
diff --git a/indent/terraform.vim b/indent/terraform.vim
index 9639d47c..ab932dab 100644
--- a/indent/terraform.vim
+++ b/indent/terraform.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, 'indent/terraform.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('terraform', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
 
 " Only load this file if no other indent file was loaded
 if exists('b:did_indent')
@@ -71,5 +66,3 @@ endfunction
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/tex.vim b/indent/tex.vim
index 4da631a2..22184939 100644
--- a/indent/tex.vim
+++ b/indent/tex.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, 'indent/tex.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tex', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tex') == -1
 
 " Vim indent file
 " Language:     LaTeX
@@ -430,5 +425,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: set sw=4 textwidth=80:
-
-endif
diff --git a/indent/tf.vim b/indent/tf.vim
index 096b1977..5c12f112 100644
--- a/indent/tf.vim
+++ b/indent/tf.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, 'indent/tf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tf') == -1
 
 " Vim indent file
 " Language:     tf (TinyFugue)
@@ -79,5 +74,3 @@ function GetTFIndent()
 	return ind
 
 endfunction
-
-endif
diff --git a/indent/tilde.vim b/indent/tilde.vim
index b412a64b..8df3ede7 100644
--- a/indent/tilde.vim
+++ b/indent/tilde.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, 'indent/tilde.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tilde', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tilde') == -1
 
 "Description: Indent scheme for the tilde weblanguage
 "Author: Tobias Rundström <tobi@tobi.nu>
@@ -43,5 +38,3 @@ function GetTildeIndent(lnum)
 		return -1
 	endif
 endfunction
-
-endif
diff --git a/indent/treetop.vim b/indent/treetop.vim
index 01b80d68..d54e6159 100644
--- a/indent/treetop.vim
+++ b/indent/treetop.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, 'indent/treetop.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('treetop', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'treetop') == -1
 
 " Vim indent file
 " Language:             Treetop
@@ -45,5 +40,3 @@ function GetTreetopIndent()
 
   retur ind
 endfunction
-
-endif
diff --git a/indent/twig.vim b/indent/twig.vim
index d9472ea4..82087c33 100644
--- a/indent/twig.vim
+++ b/indent/twig.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, 'indent/twig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('twig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
 
 if exists("b:ran_once")
 	finish
@@ -83,5 +78,3 @@ fun! s:BuildStructures()
 endfun
 
 call s:BuildStructures()
-
-endif
diff --git a/indent/typescript.vim b/indent/typescript.vim
index a9577906..cc742b97 100644
--- a/indent/typescript.vim
+++ b/indent/typescript.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, 'indent/typescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " Vim indent file
 " Language: TypeScript
@@ -508,5 +503,3 @@ function! Fixedgq(lnum, count)
 
     return 0
 endfunction
-
-endif
diff --git a/indent/typescriptreact.vim b/indent/typescriptreact.vim
index a89ae88d..8253a288 100644
--- a/indent/typescriptreact.vim
+++ b/indent/typescriptreact.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, 'indent/typescriptreact.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 exe 'runtime! indent/typescript.vim'
 " Save the current JavaScript indentexpr.
@@ -117,5 +112,4 @@ fu! GetTsxIndent()
   endif
 
   return ind
-endfu
-endif
+endfu
\ No newline at end of file
diff --git a/indent/vala.vim b/indent/vala.vim
index cbcfbf2c..de3f0fd4 100644
--- a/indent/vala.vim
+++ b/indent/vala.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, 'indent/vala.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vala', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
 
 " Vim indent file
 " Language:         Vala
@@ -90,5 +85,3 @@ function GetValaIndent(lnum)
 	" Fall back on cindent, which does it mostly right
 	return cindent(a:lnum)
 endfunction
-
-endif
diff --git a/indent/vb.vim b/indent/vb.vim
index 5e37b74e..4eb977c8 100644
--- a/indent/vb.vim
+++ b/indent/vb.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, 'indent/vb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('visual-basic', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'visual-basic') == -1
 
 " Vim indent file
 " Language:	VisualBasic (ft=vb) / Basic (ft=basic) / SaxBasic (ft=vb)
@@ -85,5 +80,3 @@ fun! VbGetIndent(lnum)
 endfun
 
 " vim:sw=4
-
-endif
diff --git a/indent/velocity.vim b/indent/velocity.vim
index ba1344bf..01af414b 100644
--- a/indent/velocity.vim
+++ b/indent/velocity.vim
@@ -1,16 +1,9 @@
-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, 'indent/velocity.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('velocity', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'velocity') == -1
 
 if exists("b:did_indent")
     finish
 endif
 
 runtime! indent/html.vim
-
-endif
diff --git a/indent/verilog.vim b/indent/verilog.vim
index 02ed70a2..06d0a2fb 100644
--- a/indent/verilog.vim
+++ b/indent/verilog.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, 'indent/verilog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('verilog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'verilog') == -1
 
 " Language:     Verilog HDL
 " Maintainer:	Chih-Tsun Huang <cthuang@cs.nthu.edu.tw>
@@ -236,5 +231,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:sw=2
-
-endif
diff --git a/indent/vhdl.vim b/indent/vhdl.vim
index c129a763..fd2c2f82 100644
--- a/indent/vhdl.vim
+++ b/indent/vhdl.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, 'indent/vhdl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vhdl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vhdl') == -1
 
 " VHDL indent ('93 syntax)
 " Language:    VHDL
@@ -442,5 +437,3 @@ function GetVHDLindent()
   " return leftover filtered indent
   return ind
 endfunction
-
-endif
diff --git a/indent/vlang.vim b/indent/vlang.vim
index c5b9660a..58680a45 100644
--- a/indent/vlang.vim
+++ b/indent/vlang.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, 'indent/vlang.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('v', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'v') == -1
 
 " Based on the Go identation file.
 "
@@ -73,5 +68,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/indent/vroom.vim b/indent/vroom.vim
index 832019d3..47a68029 100644
--- a/indent/vroom.vim
+++ b/indent/vroom.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, 'indent/vroom.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vroom', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vroom') == -1
 
 " Vim indent file
 " Language:	Vroom (vim testing and executable documentation)
@@ -28,5 +23,3 @@ setlocal autoindent
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/vue.vim b/indent/vue.vim
index e53a528b..b4f37cc2 100644
--- a/indent/vue.vim
+++ b/indent/vue.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, 'indent/vue.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vue', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
 
 " Vim indent file
 " Language: Vue.js
@@ -71,5 +66,3 @@ function! GetVueIndent()
 
   return indent
 endfunction
-
-endif
diff --git a/indent/wast.vim b/indent/wast.vim
index 52cb7ab6..97bd3c8d 100644
--- a/indent/wast.vim
+++ b/indent/wast.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, 'indent/wast.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('wast', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wast') == -1
 
 " Vim indent file
 " Language:     WebAssembly
@@ -24,5 +19,3 @@ setlocal indentexpr=lispindent('.')
 setlocal noautoindent nosmartindent
 
 let b:undo_indent = "setl lisp< indentexpr<"
-
-endif
diff --git a/indent/xf86conf.vim b/indent/xf86conf.vim
index 7932c428..287888c9 100644
--- a/indent/xf86conf.vim
+++ b/indent/xf86conf.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, 'indent/xf86conf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xf86conf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xf86conf') == -1
 
 " Vim indent file
 " Language:             XFree86 Configuration File
@@ -44,5 +39,3 @@ function GetXF86ConfIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/xhtml.vim b/indent/xhtml.vim
index 7134ac81..4f4382b3 100644
--- a/indent/xhtml.vim
+++ b/indent/xhtml.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, 'indent/xhtml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xhtml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xhtml') == -1
 
 " Vim indent file
 " Language:	XHTML
@@ -19,5 +14,3 @@ endif
 
 " Handled like HTML for now.
 runtime! indent/html.vim
-
-endif
diff --git a/indent/xinetd.vim b/indent/xinetd.vim
index e2898b2d..0443b36e 100644
--- a/indent/xinetd.vim
+++ b/indent/xinetd.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, 'indent/xinetd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xinetd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xinetd') == -1
 
 " Vim indent file
 " Language:             xinetd.conf(5) configuration file
@@ -62,5 +57,3 @@ endfunction
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/indent/xsd.vim b/indent/xsd.vim
index 685f44e1..9d0e095f 100644
--- a/indent/xsd.vim
+++ b/indent/xsd.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, 'indent/xsd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xsd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsd') == -1
 
 " Vim indent file
 " Language: 	.xsd files (XML Schema)
@@ -20,5 +15,3 @@ endif
 " Use XML formatting rules
 runtime! indent/xml.vim
 
-
-endif
diff --git a/indent/xslt.vim b/indent/xslt.vim
index d111bfba..c1793e1b 100644
--- a/indent/xslt.vim
+++ b/indent/xslt.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, 'indent/xslt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xslt', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xslt') == -1
 
 " Vim indent file
 " Language:    XSLT .xslt files
@@ -20,5 +15,3 @@ endif
 " Use XML formatting rules
 runtime! indent/xml.vim
 
-
-endif
diff --git a/indent/yacc.vim b/indent/yacc.vim
index c4b16402..37752e48 100644
--- a/indent/yacc.vim
+++ b/indent/yacc.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, 'indent/yacc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('yacc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yacc') == -1
 
 " Vim indent file
 " Language:             YACC input file
@@ -48,5 +43,3 @@ function GetYaccIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/yaml.vim b/indent/yaml.vim
index 3fb7dcc9..274190da 100644
--- a/indent/yaml.vim
+++ b/indent/yaml.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, 'indent/yaml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('yaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
 
 " Vim indent file
 " Language:         YAML
@@ -162,5 +157,3 @@ function GetYAMLIndent(lnum)
 endfunction
 
 let &cpo = s:save_cpo
-
-endif
diff --git a/indent/zig.vim b/indent/zig.vim
index 3f9d590f..c8ff33db 100644
--- a/indent/zig.vim
+++ b/indent/zig.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, 'indent/zig.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
 
 " indent/zig.vim
 
@@ -83,5 +78,3 @@ function! GetZigIndent(lnum)
 
     return cindent(a:lnum)
 endfunction
-
-endif
diff --git a/indent/zimbu.vim b/indent/zimbu.vim
index 987b4727..c6d99cc4 100644
--- a/indent/zimbu.vim
+++ b/indent/zimbu.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, 'indent/zimbu.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zimbu', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zimbu') == -1
 
 " Vim indent file
 " Language:	Zimbu
@@ -135,5 +130,3 @@ endfunc
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif