Fix recursive loading, closes #605

autoload/LaTeXtoUnicode.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/LaTeXtoUnicode.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/LaTeXtoUnicode.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/RstFold.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/RstFold.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/RstFold.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/ada.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/ada.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/ada.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/cargo.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/cargo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/cargo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/cargo/quickfix.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/cargo/quickfix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/cargo/quickfix.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/clojurecomplete.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/clojurecomplete.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/clojurecomplete.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/coffee.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/coffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/coffee.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/crystal/indent.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/crystal/indent.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/crystal/indent.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/crystal_lang.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/crystal_lang.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/crystal_lang.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/csv.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/csv.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/csv.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/dart.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/dart.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/dart.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/db/adapter/ecto.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/db/adapter/ecto.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/db/adapter/ecto.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/ecrystal.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/ecrystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/ecrystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/elixir/indent.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/elixir/indent.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/elixir/indent.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/elixir/util.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/elixir/util.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/elixir/util.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/fish.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/fish.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/fish.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/fsharp.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/fsharp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/fsharp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/fzf_gitignore.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/fzf_gitignore.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/fzf_gitignore.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/go/config.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/go/config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/go/config.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/graphql.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/graphql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/graphql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/htmlcomplete.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/htmlcomplete.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/htmlcomplete.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/jsonnet.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/jsonnet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/jsonnet.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/jsx_pretty/comment.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/jsx_pretty/comment.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/jsx_pretty/comment.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/jsx_pretty/indent.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/jsx_pretty/indent.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/jsx_pretty/indent.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/julia.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/julia.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/julia.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/julia/doc.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/julia/doc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/julia/doc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/julia_blocks.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/julia_blocks.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/julia_blocks.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/julia_latex_symbols.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/julia_latex_symbols.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/julia_latex_symbols.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/ledger.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/ledger.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/ledger.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/nim.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/nim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/nim.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/pony.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/pony.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/pony.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/puppet/align.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/puppet/align.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/puppet/align.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/puppet/ctags.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/puppet/ctags.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/puppet/ctags.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/puppet/format.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/puppet/format.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/puppet/format.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/python/utils.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/python/utils.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/python/utils.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/requirements.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/requirements.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/requirements.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/rubycomplete.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rubycomplete.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/rubycomplete.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/rust.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rust.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/rust.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/rust/debugging.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rust/debugging.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/rust/debugging.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/rust/delimitmate.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rust/delimitmate.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/rust/delimitmate.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/rust/tags.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rust/tags.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/rust/tags.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/rustfmt.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rustfmt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/rustfmt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/smt2.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/smt2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/smt2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/terraform.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/terraform.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/terraform.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/vital/_crystal.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/vital/_crystal/ColorEcho.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/ColorEcho.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal/ColorEcho.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/vital/_crystal/Data/List.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/List.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/List.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/vital/_crystal/Data/String.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/String.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/String.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/vital/_crystal/Process.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Process.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Process.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/vital/_crystal/Web/JSON.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Web/JSON.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Web/JSON.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/vital/crystal.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/crystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/vital/crystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/xml/aria.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/xml/aria.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/xml/aria.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/xml/html5.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/xml/html5.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/xml/html5.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/xml/xsd.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/xml/xsd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/xml/xsd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/zig/config.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/zig/config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/zig/config.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/zig/fmt.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/zig/fmt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/zig/fmt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/zig/list.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/zig/list.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/zig/list.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

autoload/zig/util.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/zig/util.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/zig/util.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/ant.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/ant.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/ant.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/bdf.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/bdf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/bdf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/cake.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/cake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/cake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/cargo.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/cargo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/cargo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/coffee.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/coffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/coffee.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/credo.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/credo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/credo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/cryptol.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/cryptol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/cryptol.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/cs.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/cs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/cs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/cucumber.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/cucumber.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/cucumber.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/dot.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/dot.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/dot.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/eruby.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/eruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/eruby.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/exunit.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/exunit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/exunit.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/fish.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/fish.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/fish.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/go.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/go.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/go.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/gradle.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/gradle.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/gradle.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/gradlew.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/gradlew.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/gradlew.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/haml.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/haml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/haml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/ledger.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/ledger.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/ledger.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/lilypond.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/lilypond.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/lilypond.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/ls.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/ls.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/ls.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/mix.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/mix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/mix.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/nim.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/nim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/nim.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/nix-build.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/nix-build.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/nix-build.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/ocaml.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/ocaml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/ocaml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/powershell.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/powershell.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/powershell.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/python.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/python.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/python.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/rake.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/rake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/rake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/rspec.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/rspec.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/rspec.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/ruby.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/ruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/ruby.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/rubyunit.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/rubyunit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/rubyunit.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/rustc.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/rustc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/rustc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/sass.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/sass.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/sass.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/sbt.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/sbt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/sbt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/swift.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/swift.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/swift.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/tcl.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/tcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/tcl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/tex.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/tex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/tex.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/tidy.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/tidy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/tidy.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

compiler/typescript.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/typescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'compiler/typescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

extras/flow.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'extras/flow.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'extras/flow.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

extras/jsdoc.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'extras/jsdoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'extras/jsdoc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

extras/ngdoc.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'extras/ngdoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'extras/ngdoc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

ftplugin/8th.vim

@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/8th.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'ftplugin/8th.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish