Improve guard to support concatenated files

author: Adam Stankiewicz <sheerun@sher.pl> 2019-09-06 15:54:31 +0200
committer: Adam Stankiewicz <sheerun@sher.pl> 2019-09-06 15:54:31 +0200
commit: 48e07bc5014fecfdff24f75124a65634c216c9e2 (patch)
tree: 2e16f9a515364e27ac451acbc313b1d7ca518790
parent: c8897c9c18ee79d3780dd352aee34bf6498c625d (diff)
download: vim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.tar.gz
vim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.zip
565 files changed, 1137 insertions, 2284 deletions
diff --git a/after/autoload/styledcomplete.vim b/after/autoload/styledcomplete.vim
index efa992c4..68886106 100644
--- a/after/autoload/styledcomplete.vim
+++ b/after/autoload/styledcomplete.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'styled-components') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'styled-components') == -1
 " Vim completion script
 " Language:   styled-components (js/ts)
 " Maintainer: Karl Fleischmann <fleischmann.karl@gmail.com>
@@ -19,3 +16,4 @@ fun! styledcomplete#CompleteSC(findstart, base)
     return s:funcref(a:findstart, a:base)
   endif
 endfun
+endif
diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim
index 3c66372a..8e485bbd 100644
--- a/after/ftplugin/cabal.vim
+++ b/after/ftplugin/cabal.vim
@@ -1,7 +1,5 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 setlocal comments=s1fl:{-,mb:-,ex:-},:--
 setlocal iskeyword+=-,.,*
 setlocal commentstring=--\ %s
+endif
diff --git a/after/ftplugin/coffee.vim b/after/ftplugin/coffee.vim
index 2060d276..2e3f7170 100644
--- a/after/ftplugin/coffee.vim
+++ b/after/ftplugin/coffee.vim
@@ -1,9 +1,7 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cjsx') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
 if exists("loaded_matchit")
   let b:match_ignorecase = 0
   let b:match_words = '(:),\[:\],{:},<:>,' .
     \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
 endif
+endif
diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim
index 2d3d6b33..0255bdd7 100644
--- a/after/ftplugin/haskell.vim
+++ b/after/ftplugin/haskell.vim
@@ -1,6 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--
 setlocal iskeyword+='
+endif
diff --git a/after/ftplugin/idris.vim b/after/ftplugin/idris.vim
index ce46b796..c006b7ab 100644
--- a/after/ftplugin/idris.vim
+++ b/after/ftplugin/idris.vim
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'idris') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 setlocal iskeyword+='
+endif
diff --git a/after/ftplugin/javascript.vim b/after/ftplugin/javascript.vim
index 463b854a..2ca2fd1c 100644
--- a/after/ftplugin/javascript.vim
+++ b/after/ftplugin/javascript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 " Vim filetype plugin file
 " Language:     JavaScript
 " Maintainer:   vim-javascript community
@@ -14,10 +11,8 @@ if exists('b:undo_ftplugin')
 else
   let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<'
 endif
-if exists('g:polyglot_disabled') && (index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-  finish
 endif
-
+if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim ftplugin file
 "
@@ -49,10 +44,8 @@ augroup jsx_comment
 augroup end
 
 setlocal suffixesadd+=.jsx
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'styled-components') != -1
-  finish
 endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'styled-components') == -1
 " Vim filetype plugin file
 " Language:   styled-components (js/ts)
 " Maintainer: Karl Fleischmann <fleischmann.karl@gmail.com>
@@ -90,3 +83,4 @@ if exists('&ofu')
   endif
   setl omnifunc=styledcomplete#CompleteSC
 endif
+endif
diff --git a/after/ftplugin/llvm.vim b/after/ftplugin/llvm.vim
index 70f196c8..ece9019f 100644
--- a/after/ftplugin/llvm.vim
+++ b/after/ftplugin/llvm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'llvm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 " Copyright (c) 2018 rhysd
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -475,3 +472,4 @@ endfunction
 if !exists(':LLI')
     command! -buffer -nargs=? -bar -complete=file LLI call <SID>run_lli(<f-args>)
 endif
+endif
diff --git a/after/ftplugin/puppet.vim b/after/ftplugin/puppet.vim
index 934e4b03..f78ebb80 100644
--- a/after/ftplugin/puppet.vim
+++ b/after/ftplugin/puppet.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 if !exists('g:puppet_align_hashes')
     let g:puppet_align_hashes = 1
 endif
@@ -9,3 +6,4 @@ endif
 if g:puppet_align_hashes
     inoremap <buffer> <silent> => =><Esc>:call puppet#align#AlignHashrockets()<CR>$a
 endif
+endif
diff --git a/after/ftplugin/typescript.vim b/after/ftplugin/typescript.vim
index d307f5d4..4f158684 100644
--- a/after/ftplugin/typescript.vim
+++ b/after/ftplugin/typescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && (index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
 " modified from html.vim
 " For matchit plugin
 if exists("loaded_matchit")
@@ -25,7 +22,6 @@ augroup jsx_comment
 augroup end
 
 setlocal suffixesadd+=.tsx
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'styled-components') != -1
-  finish
 endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'styled-components') == -1
+endif
diff --git a/after/ftplugin/yaml.vim b/after/ftplugin/yaml.vim
index a6b6d194..1b631079 100644
--- a/after/ftplugin/yaml.vim
+++ b/after/ftplugin/yaml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'yaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
 " Vim indent file
 " Language: Yaml
 " Author: Henrique Barcelos
@@ -9,3 +6,4 @@ endif
 " URL: https://github.com/hjpbarcelos
 setlocal autoindent sw=2 ts=2 expandtab
 " vim:set sw=2:
+endif
diff --git a/after/indent/javascript.vim b/after/indent/javascript.vim
index 8c2254d6..90a94349 100644
--- a/after/indent/javascript.vim
+++ b/after/indent/javascript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && (index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim indent file
 "
@@ -31,10 +28,8 @@ endfunction
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'styled-components') != -1
-  finish
 endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'styled-components') == -1
 " Vim syntax file
 " Language:   styled-components (js/ts)
 " Maintainer: Karl Fleischmann <fleischmann.karl@gmail.com>
@@ -204,3 +199,4 @@ fu! GetStyledIndent()
   " if all else fails indent according to C-syntax
   return cindent(v:lnum)
 endfu
+endif
diff --git a/after/indent/jsx.vim b/after/indent/jsx.vim
index 3f25a7f1..ac4ceabd 100644
--- a/after/indent/jsx.vim
+++ b/after/indent/jsx.vim
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'styled-components') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'styled-components') == -1
 runtime! indent/javascript.vim
+endif
diff --git a/after/indent/objc.vim b/after/indent/objc.vim
index 1bcc217a..9c64da42 100644
--- a/after/indent/objc.vim
+++ b/after/indent/objc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'objc') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
 " Vim indent file
 " Language:	Objective-C
 " Maintainer:	Bjorn Winckler <bjorn.winckler@gmail.com>
@@ -95,3 +92,4 @@ endfunction
 " Restore 'cpo' options
 let &cpo = s:save_cpo
 unlet s:save_cpo
+endif
diff --git a/after/indent/typescript.vim b/after/indent/typescript.vim
index acc283f0..c7fbc225 100644
--- a/after/indent/typescript.vim
+++ b/after/indent/typescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && (index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim indent file
 "
@@ -32,8 +29,7 @@ endfunction
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'styled-components') != -1
-  finish
 endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'styled-components') == -1
 runtime! indent/javascript.vim
+endif
diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index 4b801734..48446d7d 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c++11') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c++11') == -1
 " Vim syntax file
 " Language: C Additions
 " Maintainer: Jon Haggblad <jon@haeggblad.com>
@@ -306,3 +303,4 @@ hi def link cBoolean Boolean
 "hi def link cDelimiter Delimiter
 " foldmethod=syntax fix, courtesy of Ivan Freitas
 "hi def link cBraces Delimiter
+endif
diff --git a/after/syntax/coffee.vim b/after/syntax/coffee.vim
index 4ee795f0..bd48541e 100644
--- a/after/syntax/coffee.vim
+++ b/after/syntax/coffee.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cjsx') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
 if exists('b:current_syntax')
   let s:current_syntax=b:current_syntax
   unlet b:current_syntax
@@ -29,3 +26,4 @@ hi def link cjsxTagName         Function
 hi def link cjsxEntity          Statement
 hi def link cjsxEntityPunct     Type
 hi def link cjsxAttribProperty  Type
+endif
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index ae11705e..b85c63bd 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c++11') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c++11') == -1
 " Vim syntax file
 " Language: C++ Additions
 " Maintainer: Jon Haggblad <jon@haeggblad.com>
@@ -2103,3 +2100,4 @@ if version >= 508 || !exists("did_cpp_syntax_inits")
   HiLink cppRawDelimiter    Delimiter
   delcommand HiLink
 endif
+endif
diff --git a/after/syntax/haskell.vim b/after/syntax/haskell.vim
index db454f2f..03a26e88 100644
--- a/after/syntax/haskell.vim
+++ b/after/syntax/haskell.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dhall') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dhall') == -1
 " store and remove current syntax value
 let old_syntax = b:current_syntax
 unlet b:current_syntax
@@ -15,3 +12,4 @@ hi def link quasiQuote Underlined
 
 " restore current syntax value
 let b:current_syntax = old_syntax
+endif
diff --git a/after/syntax/help.vim b/after/syntax/help.vim
index a4bc0bc7..4c0dc3d3 100644
--- a/after/syntax/help.vim
+++ b/after/syntax/help.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 " Extends standard help syntax with highlighting of Scala code.
 "
 " Place code between !sc! and !/sc! delimiters. These will be hidden if Vim is
@@ -16,3 +13,4 @@ if has('conceal')
 else
   syntax region rgnScala matchgroup=Ignore start='!sc!' end='!/sc!' contains=@ScalaCode
 endif
+endif
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index fcb7fd51..4fd6e593 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Vim syntax file
 " Language:     HTML (version 5.1)
 " Last Change:  2017 Feb 15
@@ -14,3 +11,4 @@ endif
 " https://github.com/w3c/html/issues/694
 syntax region htmlComment start=+<!--+ end=+-->+ contains=@Spell
 syntax region htmlComment start=+<!DOCTYPE+ keepend end=+>+
+endif
diff --git a/after/syntax/idris.vim b/after/syntax/idris.vim
index bef36f62..3acdcbec 100644
--- a/after/syntax/idris.vim
+++ b/after/syntax/idris.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'idris') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 " This script allows for unicode concealing of certain characters
 " For instance -> goes to →
 "
@@ -80,3 +77,4 @@ hi link idrNiceOperator Operator
 hi! link Conceal Operator
 setlocal conceallevel=2
 
+endif
diff --git a/after/syntax/javascript.vim b/after/syntax/javascript.vim
index 1d2064b5..50a22712 100644
--- a/after/syntax/javascript.vim
+++ b/after/syntax/javascript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && (index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim syntax file
 "
@@ -60,10 +57,8 @@ let b:current_syntax = 'javascript.jsx'
 
 let &cpo = s:jsx_cpo
 unlet s:jsx_cpo
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'styled-components') != -1
-  finish
 endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'styled-components') == -1
 " Vim syntax file
 " Language:   styled-components (js/ts)
 " Maintainer: Karl Fleischmann <fleischmann.karl@gmail.com>
@@ -259,3 +254,4 @@ hi def link styledXmlRegion        String
 if exists("s:current_syntax")
   let b:current_syntax=s:current_syntax
 endif
+endif
diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim
index edc8eea1..e9a0ff3a 100644
--- a/after/syntax/javascript/graphql.vim
+++ b/after/syntax/javascript/graphql.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
   unlet b:current_syntax
@@ -25,3 +22,4 @@ hi def link graphqlTemplateExpression jsTemplateExpression
 
 syn cluster jsExpression add=graphqlTaggedTemplate
 syn cluster graphqlTaggedTemplate add=graphqlTemplateString
+endif
diff --git a/after/syntax/jsx_pretty.vim b/after/syntax/jsx_pretty.vim
index f37a084b..d2f5d383 100644
--- a/after/syntax/jsx_pretty.vim
+++ b/after/syntax/jsx_pretty.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && (index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
 let s:highlight_close_tag = get(g:, 'vim_jsx_pretty_highlight_close_tag', 0)
 
 " <tag id="sample">
@@ -214,3 +211,4 @@ if s:vim_jsx_pretty_colorful_config == 1
   highlight def link jsFuncArgs Type
 endif
 
+endif
diff --git a/after/syntax/llvm.vim b/after/syntax/llvm.vim
index aae8711c..18767d57 100644
--- a/after/syntax/llvm.vim
+++ b/after/syntax/llvm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'llvm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 " Copyright (c) 2018 rhysd
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -24,3 +21,4 @@ endif
 
 syn keyword llvmKeyword attributes
 syn match llvmNoName /#\d\+\>/
+endif
diff --git a/after/syntax/mdx.vim b/after/syntax/mdx.vim
index 46f73946..68caa276 100644
--- a/after/syntax/mdx.vim
+++ b/after/syntax/mdx.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mdx') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mdx') == -1
 
 " based on mxw/vim-jsx
 
@@ -43,3 +40,4 @@ syn cluster jsExpression add=jsxRegion
 
 " Allow jsxRegion to contain reserved words.
 syn cluster javascriptNoReserved add=jsxRegion
+endif
diff --git a/after/syntax/mma.vim b/after/syntax/mma.vim
index f8e7a271..c2ab7b76 100644
--- a/after/syntax/mma.vim
+++ b/after/syntax/mma.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mathematica') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
 "Vim conceal file
 " Language: Mathematica
 " Maintainer:   Voldikss <dyzplus@gmail.com>
@@ -1448,3 +1445,4 @@ endif
 hi! link Conceal Normal
 setlocal conceallevel=2
 
+endif
diff --git a/after/syntax/objc.vim b/after/syntax/objc.vim
index d9874e20..cebedf20 100644
--- a/after/syntax/objc.vim
+++ b/after/syntax/objc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'objc') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
 " ARC type modifiers
 syn keyword objcTypeModifier __bridge __bridge_retained __bridge_transfer __autoreleasing __strong __weak __unsafe_unretained
 
@@ -21,3 +18,4 @@ syn match objcDirective "@property\|@synthesize\|@dynamic\|@package"
 
 " Highlight property attributes as if they were type modifiers
 hi def link objcPropertyAttribute objcTypeModifier
+endif
diff --git a/after/syntax/reason.vim b/after/syntax/reason.vim
index 14d5abfe..7615be2b 100644
--- a/after/syntax/reason.vim
+++ b/after/syntax/reason.vim
@@ -1,4 +1,2 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'reason') != -1
-  finish
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reason') == -1
 endif
-
diff --git a/after/syntax/rspec.vim b/after/syntax/rspec.vim
index 653f7d63..bd447957 100644
--- a/after/syntax/rspec.vim
+++ b/after/syntax/rspec.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rspec') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rspec') == -1
 "
 " An rspec syntax file
 " Originally from http://www.vim.org/scripts/script.php?script_id=2286
@@ -34,3 +31,4 @@ syntax keyword rspecMessageExpectation advise any_args any_number_of_times anyth
 highlight link rspecMessageExpectation Function
 
 let b:current_syntax = 'rspec'
+endif
diff --git a/after/syntax/ruby.vim b/after/syntax/ruby.vim
index a9d2ea31..551969c9 100644
--- a/after/syntax/ruby.vim
+++ b/after/syntax/ruby.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'yard') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yard') == -1
 " Ruby syntax extensions for highlighting YARD documentation.
 "
 " Author: Joel Holdbrooks <https://github.com/noprompt>
@@ -128,3 +125,4 @@ hi def link yardParametricType yardComment
 hi def link yardArrow yardComment
 hi def link yardHashAngle yardComment
 hi def link yardHashCurly yardComment
+endif
diff --git a/after/syntax/rust.vim b/after/syntax/rust.vim
index ace3ea20..8210c9f1 100644
--- a/after/syntax/rust.vim
+++ b/after/syntax/rust.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 scriptencoding utf-8
 
 if !get(g:, 'rust_conceal', 0) || !has('conceal') || &encoding !=# 'utf-8'
@@ -43,3 +40,4 @@ if !get(g:, 'rust_conceal_mod_path', 0)
 endif
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/after/syntax/tex.vim b/after/syntax/tex.vim
index 444dabda..fd515891 100644
--- a/after/syntax/tex.vim
+++ b/after/syntax/tex.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " adds support for cleverref package
 " \Cref, \cref, \cpageref, \labelcref, \labelcpageref
 syn region texRefZone		matchgroup=texStatement start="\\Cref{"				end="}\|%stopzone\>"	contains=@texRefGroup
@@ -11,3 +8,4 @@ syn region texRefZone		matchgroup=texStatement start="\\\(label\|\)c\(page\|\)re
 syn region texZone start="\\begin{lstlisting}" end="\\end{lstlisting}\|%stopzone\>"
 syn match texInputFile  "\\lstinputlisting\s*\(\[.*\]\)\={.\{-}}" contains=texStatement,texInputCurlies,texInputFileOpt
 syn match texZone "\\lstinline\s*\(\[.*\]\)\={.\{-}}"
+endif
diff --git a/after/syntax/typescript.vim b/after/syntax/typescript.vim
index df500404..86719158 100644
--- a/after/syntax/typescript.vim
+++ b/after/syntax/typescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && (index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim syntax file
 "
@@ -48,10 +45,8 @@ let b:current_syntax = 'typescript.tsx'
 
 let &cpo = s:jsx_cpo
 unlet s:jsx_cpo
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'styled-components') != -1
-  finish
 endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'styled-components') == -1
 runtime! syntax/javascript.vim
 
 " define custom API section, that contains typescript annotations
@@ -114,3 +109,4 @@ syn cluster typescriptValue add=styledPrefix,jsFuncCall,styledTypescriptPrefix
 syn match typescriptIdentifierName extend
       \ "\<css\>\|\<keyframes\>\|\<injectGlobal\>\|\<fontFace\>\|\<createGlobalStyle\>"
       \ nextgroup=styledDefinition
+endif
diff --git a/after/syntax/typescript/graphql.vim b/after/syntax/typescript/graphql.vim
index fc070daa..23f28e93 100644
--- a/after/syntax/typescript/graphql.vim
+++ b/after/syntax/typescript/graphql.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
   unlet b:current_syntax
@@ -24,3 +21,4 @@ hi def link graphqlTemplateExpression typescriptTemplateSubstitution
 
 syn cluster typescriptExpression add=graphqlTaggedTemplate
 syn cluster graphqlTaggedTemplate add=graphqlTemplateString
+endif
diff --git a/after/syntax/yaml.vim b/after/syntax/yaml.vim
index 5a9e7c37..20cd2fb5 100644
--- a/after/syntax/yaml.vim
+++ b/after/syntax/yaml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'yaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
 " To make this file do stuff, add something like the following (without the
 " leading ") to your ~/.vimrc:
 " au BufNewFile,BufRead *.yaml,*.yml so ~/src/PyYaml/YAML.vim
@@ -63,3 +60,4 @@ hi link yamlInline	Operator
 hi link yamlBlock	Operator
 hi link yamlString	String
 hi link yamlEscape	Special
+endif
diff --git a/autoload/LaTeXtoUnicode.vim b/autoload/LaTeXtoUnicode.vim
index dfaa66fe..19a759a2 100644
--- a/autoload/LaTeXtoUnicode.vim
+++ b/autoload/LaTeXtoUnicode.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Support for LaTex-to-Unicode conversion as in the Julia REPL "
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -652,3 +649,4 @@ function! LaTeXtoUnicode#Toggle()
   endif
   return
 endfunction
+endif
diff --git a/autoload/RstFold.vim b/autoload/RstFold.vim
index 1f53d67f..4d865808 100644
--- a/autoload/RstFold.vim
+++ b/autoload/RstFold.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rst') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
 " Author: Antony Lee <anntzer.lee@gmail.com>
 " Description: Helper functions for reStructuredText syntax folding
 " Last Modified: 2018-12-29
@@ -64,3 +61,4 @@ function RstFold#GetRstFoldText()
   let text = thisline =~ '^\([=`:.''"~^_*+#-]\)\1\+$' ? getline(v:foldstart + 1) : thisline
   return indent . text
 endfunction
+endif
diff --git a/autoload/cargo.vim b/autoload/cargo.vim
index fe28ef3a..ea63bd7a 100644
--- a/autoload/cargo.vim
+++ b/autoload/cargo.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 function! cargo#Load() 
     " Utility call to get this script loaded, for debugging
 endfunction
@@ -117,3 +114,4 @@ function! cargo#runtarget(args)
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/autoload/cargo/quickfix.vim b/autoload/cargo/quickfix.vim
index ac66d298..b108da2f 100644
--- a/autoload/cargo/quickfix.vim
+++ b/autoload/cargo/quickfix.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 function! cargo#quickfix#CmdPre() abort
     if &filetype ==# 'rust' && get(b:, 'current_compiler', '') ==# 'cargo'
         " Preserve the current directory, and 'lcd' to the nearest Cargo file.
@@ -28,3 +25,4 @@ function! cargo#quickfix#CmdPost() abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index b8dc71c9..88aacd74 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'clojure') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
 " Vim completion script
 " Language:     Clojure
 " Maintainer:   Sung Pae <self@sungpae.com>
@@ -24,3 +21,4 @@ function! clojurecomplete#Complete(findstart, base)
 endfunction
 
 " vim:sts=8:sw=8:ts=8:noet
+endif
diff --git a/autoload/coffee.vim b/autoload/coffee.vim
index beeed729..b308f4c1 100644
--- a/autoload/coffee.vim
+++ b/autoload/coffee.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -56,3 +53,4 @@ function! coffee#CoffeeSetUpErrorFormat()
                          \%f:%l:%c:\ error:\ %m,
                          \%-G%.%#
 endfunction
+endif
diff --git a/autoload/crystal_lang.vim b/autoload/crystal_lang.vim
index 56221246..2acfdb76 100644
--- a/autoload/crystal_lang.vim
+++ b/autoload/crystal_lang.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 let s:save_cpo = &cpo
 set cpo&vim
 
@@ -342,3 +339,4 @@ endfunction
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
+endif
diff --git a/autoload/csv.vim b/autoload/csv.vim
index dcca5e81..66fc6a17 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'csv') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csv') == -1
 " Filetype plugin for editing CSV files. "{{{1
 " Author:  Christian Brabandt <cb@256bit.org>
 " Version: 0.31
@@ -3189,3 +3186,4 @@ endfun
 
 " Vim Modeline " {{{2
 " vim: set foldmethod=marker et sw=0 sts=-1 ts=4:
+endif
diff --git a/autoload/dart.vim b/autoload/dart.vim
index 82859463..39ebc9e3 100644
--- a/autoload/dart.vim
+++ b/autoload/dart.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dart') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
 
 function! s:error(text) abort
   echohl Error
@@ -186,3 +183,4 @@ function! dart#setModifiable() abort
     setlocal nomodifiable
   endif
 endfunction
+endif
diff --git a/autoload/db/adapter/ecto.vim b/autoload/db/adapter/ecto.vim
index 54ee3396..e8e543ba 100644
--- a/autoload/db/adapter/ecto.vim
+++ b/autoload/db/adapter/ecto.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 let s:path = expand('<sfile>:h')
 let s:cmd = join(['mix', 'run', '--no-start', '--no-compile', shellescape(s:path.'/get_repos.exs')])
 
@@ -22,3 +19,4 @@ endfunction
 function! db#adapter#ecto#complete_opaque(url) abort
     return map(s:repo_list(), 'v:val[0]')
 endfunction
+endif
diff --git a/autoload/elixir/indent.vim b/autoload/elixir/indent.vim
index 74d7344c..2924f0e6 100644
--- a/autoload/elixir/indent.vim
+++ b/autoload/elixir/indent.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if !exists("g:elixir_indent_max_lookbehind")
   let g:elixir_indent_max_lookbehind = 30
 endif
@@ -363,3 +360,4 @@ function! elixir#indent#handle_inside_generic_block(context)
     return -1
   endif
 endfunction
+endif
diff --git a/autoload/elixir/util.vim b/autoload/elixir/util.vim
index f02e1b87..d6b6541a 100644
--- a/autoload/elixir/util.vim
+++ b/autoload/elixir/util.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 function! elixir#util#get_filename(word) abort
   let word = a:word
 
@@ -26,3 +23,4 @@ function! elixir#util#get_filename(word) abort
 
   return word
 endfunction
+endif
diff --git a/autoload/elm.vim b/autoload/elm.vim
index d58ddaab..46ada03b 100644
--- a/autoload/elm.vim
+++ b/autoload/elm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
 let s:errors = []
 
 function! s:elmOracle(...) abort
@@ -383,3 +380,4 @@ function! s:ExecuteInRoot(cmd) abort
 
 	return l:out
 endfunction
+endif
diff --git a/autoload/elm/util.vim b/autoload/elm/util.vim
index 6d1014e0..cd509cc1 100644
--- a/autoload/elm/util.vim
+++ b/autoload/elm/util.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
 " IsWin returns 1 if current OS is Windows or 0 otherwise
 fun! elm#util#IsWin() abort
   let l:win = ['win16', 'win32', 'win32unix', 'win64', 'win95']
@@ -182,3 +179,4 @@ function! s:error(msg)
 	echohl NONE
 	let v:errmsg = a:msg
 endfunction
+endif
diff --git a/autoload/fish.vim b/autoload/fish.vim
index 5b86736e..2ad976d7 100644
--- a/autoload/fish.vim
+++ b/autoload/fish.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 function! fish#Indent()
     let l:shiftwidth = shiftwidth()
     let l:prevlnum = prevnonblank(v:lnum - 1)
@@ -69,3 +66,4 @@ endfunction
 function! fish#errorformat()
     return '%Afish: %m,%-G%*\\ ^,%-Z%f (line %l):%s'
 endfunction
+endif
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index e3f16179..ed03d910 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 " don't spam the user when Vim is started in Vi compatibility mode
 let s:cpo_save = &cpo
 set cpo&vim
@@ -494,3 +491,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/autoload/graphql.vim b/autoload/graphql.vim
index cce43556..85b654ad 100644
--- a/autoload/graphql.vim
+++ b/autoload/graphql.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 " Vim plugin
 " Language: GraphQL
 " Maintainer: Jon Parise <jon@indelible.org>
@@ -14,3 +11,4 @@ let g:autoloaded_graphql = 1
 function! graphql#javascript_tags() abort
   return get(g:, 'graphql_javascript_tags', ['gql', 'graphql', 'Relay.QL'])
 endfunction
+endif
diff --git a/autoload/htmlcomplete.vim b/autoload/htmlcomplete.vim
index ef32c64d..002a6f0e 100644
--- a/autoload/htmlcomplete.vim
+++ b/autoload/htmlcomplete.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Vim completion script
 " Language:     HTML and XHTML
 " Maintainer:   Mikolaj Machowski ( mikmach AT wp DOT pl )
@@ -843,3 +840,4 @@ function! htmlcomplete#CheckDoctype() " {{{
 endfunction
 " }}}
 " vim:set foldmethod=marker:
+endif
diff --git a/autoload/jsx_pretty/comment.vim b/autoload/jsx_pretty/comment.vim
index 325baaea..932d5535 100644
--- a/autoload/jsx_pretty/comment.vim
+++ b/autoload/jsx_pretty/comment.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && (index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
 function! jsx_pretty#comment#update_commentstring(original)
   let syn_current = s:syn_name(line('.'), col('.'))
   let syn_start = s:syn_name(line('.'), 1)
@@ -39,3 +36,4 @@ function! s:syn_contains(lnum, cnum, syn_name)
   let syn_names = map(stack, 'synIDattr(v:val, "name")')
   return index(syn_names, a:syn_name) >= 0
 endfunction
+endif
diff --git a/autoload/jsx_pretty/indent.vim b/autoload/jsx_pretty/indent.vim
index 67170b46..4c108416 100644
--- a/autoload/jsx_pretty/indent.vim
+++ b/autoload/jsx_pretty/indent.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && (index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
 if exists('*shiftwidth')
   function! s:sw()
     return shiftwidth()
@@ -216,3 +213,4 @@ function! jsx_pretty#indent#get(js_indent)
   endif
 
 endfunction
+endif
diff --git a/autoload/julia.vim b/autoload/julia.vim
index c3c949ac..f2fc6123 100644
--- a/autoload/julia.vim
+++ b/autoload/julia.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 function! julia#set_syntax_version(jvers)
   if &filetype != "julia"
     echo "Not a Julia file"
@@ -186,3 +183,4 @@ function! julia#gotodefinition()
 endfunction
 
 endif
+endif
diff --git a/autoload/julia/doc.vim b/autoload/julia/doc.vim
index c2660143..1dee5aed 100644
--- a/autoload/julia/doc.vim
+++ b/autoload/julia/doc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 " path to the julia binary to communicate with
 if has('win32') || has('win64')
   if exists('g:julia#doc#juliapath')
@@ -244,3 +241,4 @@ function! s:likely(str) abort
   let output = systemlist(cmd)
   return split(matchstr(output[0], '\C^search: \zs.*'))
 endfunction
+endif
diff --git a/autoload/julia_blocks.vim b/autoload/julia_blocks.vim
index 0f4d2bb0..46b18484 100644
--- a/autoload/julia_blocks.vim
+++ b/autoload/julia_blocks.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 " Facilities for moving around Julia blocks (e.g. if/end, function/end etc.)
 " (AKA a collection of horrible hacks)
 
@@ -796,3 +793,4 @@ function! s:cursor_moved(...)
   let b:jlblk_did_select = b:jlblk_doing_select
   let b:jlblk_doing_select = 0
 endfunction
+endif
diff --git a/autoload/julia_latex_symbols.vim b/autoload/julia_latex_symbols.vim
index d0daf6fc..51deacc8 100644
--- a/autoload/julia_latex_symbols.vim
+++ b/autoload/julia_latex_symbols.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 " This file is autogenerated from the script 'generate_latex_symbols_table.jl'
 " The symbols are based on Julia version 1.3.0-DEV.263
 
@@ -3332,3 +3329,4 @@ function! julia_latex_symbols#get_dict()
     \ '\:baggage_claim:': '🛄',
     \ '\:left_luggage:': '🛅'}
 endfunction
+endif
diff --git a/autoload/pony.vim b/autoload/pony.vim
index fd14136e..52e1981a 100644
--- a/autoload/pony.vim
+++ b/autoload/pony.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pony') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
 " Vim plugin file
 " Language:     Pony
 " Maintainer:   Jak Wings
@@ -534,3 +531,4 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/autoload/puppet/align.vim b/autoload/puppet/align.vim
index 54a57599..c45bc90f 100644
--- a/autoload/puppet/align.vim
+++ b/autoload/puppet/align.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 function! puppet#align#IndentLevel(lnum)
     return indent(a:lnum) / &shiftwidth
 endfunction
@@ -70,3 +67,4 @@ function! puppet#align#AlignHashrockets(...) abort
         endif
     endfor
 endfunction
+endif
diff --git a/autoload/puppet/ctags.vim b/autoload/puppet/ctags.vim
index 5547f42e..469b1213 100644
--- a/autoload/puppet/ctags.vim
+++ b/autoload/puppet/ctags.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 if !exists('s:ctags_type')
   let s:ctags_type = 0
@@ -38,3 +35,4 @@ function! puppet#ctags#Type()
   return s:ctags_type
 endfunction
 
+endif
diff --git a/autoload/puppet/format.vim b/autoload/puppet/format.vim
index f60bd782..c608f228 100644
--- a/autoload/puppet/format.vim
+++ b/autoload/puppet/format.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 "
 " Simple format using puppet's l:indents and align hashrockets function
 function! puppet#format#Format() abort
@@ -59,3 +56,4 @@ function! puppet#format#Fallback(start_lnum, end_lnum) abort
 
 endfunction
 
+endif
diff --git a/autoload/python/utils.vim b/autoload/python/utils.vim
index 2ae781ae..8a8170d6 100644
--- a/autoload/python/utils.vim
+++ b/autoload/python/utils.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-compiler') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
 " Sometimes Python issues debugging messages
 " which don't belong to a call stack context
 " this function filters these messages
@@ -19,3 +16,4 @@ function! python#utils#fix_qflist() " {{{
     call setqflist(l:traceback)
   endif
 endfunction " }}}
+endif
diff --git a/autoload/rubycomplete.vim b/autoload/rubycomplete.vim
index 3f9a01f9..02a2d014 100644
--- a/autoload/rubycomplete.vim
+++ b/autoload/rubycomplete.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim completion script
 " Language:		Ruby
 " Maintainer:		Mark Guzman <segfault@hasno.info>
@@ -878,3 +875,4 @@ call s:DefRuby()
 "}}} ruby-side code
 
 " vim:tw=78:sw=4:ts=8:et:fdm=marker:ft=vim:norl:
+endif
diff --git a/autoload/rust.vim b/autoload/rust.vim
index 7aff515b..1051c842 100644
--- a/autoload/rust.vim
+++ b/autoload/rust.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Author: Kevin Ballard
 " Description: Helper functions for Rust commands/mappings
 " Last Modified: May 27, 2014
@@ -548,3 +545,4 @@ endfunction
 " }}}1
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/autoload/rust/debugging.vim b/autoload/rust/debugging.vim
index 6392a024..40a691c3 100644
--- a/autoload/rust/debugging.vim
+++ b/autoload/rust/debugging.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " For debugging, inspired by https://github.com/w0rp/rust/blob/master/autoload/rust/debugging.vim
 
 let s:global_variable_list = [
@@ -105,3 +102,4 @@ function! rust#debugging#InfoToFile(filename) abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/autoload/rust/delimitmate.vim b/autoload/rust/delimitmate.vim
index 5e599f6a..8d88a8f4 100644
--- a/autoload/rust/delimitmate.vim
+++ b/autoload/rust/delimitmate.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 let s:delimitMate_extra_excluded_regions = ',rustLifetimeCandidate,rustGenericLifetimeCandidate'
 
 " For this buffer, when delimitMate issues the `User delimitMate_map`
@@ -46,3 +43,4 @@ endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
 
+endif
diff --git a/autoload/rust/tags.vim b/autoload/rust/tags.vim
index 74e2f9f0..d3a3e645 100644
--- a/autoload/rust/tags.vim
+++ b/autoload/rust/tags.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Tagbar support code, for the sake of not automatically overriding its
 " configuration in case Universal Ctags is detected.
 
@@ -19,3 +16,4 @@ function! rust#tags#IsUCtags() abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/autoload/rustfmt.vim b/autoload/rustfmt.vim
index f469ac13..4118eef4 100644
--- a/autoload/rustfmt.vim
+++ b/autoload/rustfmt.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Author: Stephen Sugden <stephen@stephensugden.com>
 "
 " Adapted from https://github.com/fatih/vim-go
@@ -264,3 +261,4 @@ endfunction
 
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/autoload/smt2.vim b/autoload/smt2.vim
index fd87febe..655e0d3f 100644
--- a/autoload/smt2.vim
+++ b/autoload/smt2.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'smt2') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smt2') == -1
 " Invokes the solver on current file
 function! smt2#RunSolver()
     silent !clear
@@ -32,3 +29,4 @@ function! smt2#PrintSolverVersion()
     silent !clear
     execute "!" . g:smt2_solver_command . " " . g:smt2_solver_version_switch
 endfunction
+endif
diff --git a/autoload/terraform.vim b/autoload/terraform.vim
index 8554022e..7ddfd9d1 100644
--- a/autoload/terraform.vim
+++ b/autoload/terraform.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'terraform') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
 function! terraform#fmt()
   if !filereadable(expand('%:p'))
     return
@@ -58,3 +55,4 @@ function! terraform#commands(A, L, P)
   \ 'state'
   \ ]
 endfunction
+endif
diff --git a/autoload/vifm/edit.vim b/autoload/vifm/edit.vim
index c92baeeb..c19155a9 100644
--- a/autoload/vifm/edit.vim
+++ b/autoload/vifm/edit.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
 " common functions for vifm command-line editing buffer filetype plugins
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: August 18, 2013
@@ -16,3 +13,4 @@ function! vifm#edit#Init()
     " Start buffer editing in insert mode
     startinsert
 endfunction
+endif
diff --git a/autoload/vifm/globals.vim b/autoload/vifm/globals.vim
index 74b49a04..f7ae6a98 100644
--- a/autoload/vifm/globals.vim
+++ b/autoload/vifm/globals.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
 " common functions for vifm plugin related to globals
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: November 03, 2018
@@ -33,3 +30,4 @@ function! vifm#globals#Init()
         let g:vifm_embed_term = has('gui_running')
     endif
 endfunction
+endif
diff --git a/autoload/vital/_crystal.vim b/autoload/vital/_crystal.vim
index d2c1b560..08972e34 100644
--- a/autoload/vital/_crystal.vim
+++ b/autoload/vital/_crystal.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 let s:_plugin_name = expand('<sfile>:t:r')
 
 function! vital#{s:_plugin_name}#new() abort
@@ -11,3 +8,4 @@ endfunction
 function! vital#{s:_plugin_name}#function(funcname) abort
   silent! return function(a:funcname)
 endfunction
+endif
diff --git a/autoload/vital/_crystal/ColorEcho.vim b/autoload/vital/_crystal/ColorEcho.vim
index 54c7927b..de55e0e6 100644
--- a/autoload/vital/_crystal/ColorEcho.vim
+++ b/autoload/vital/_crystal/ColorEcho.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
 " Do not mofidify the code nor insert new lines before '" ___vital___'
@@ -189,3 +186,4 @@ endfunction
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
+endif
diff --git a/autoload/vital/_crystal/Data/List.vim b/autoload/vital/_crystal/Data/List.vim
index 7c83136b..8595fa53 100644
--- a/autoload/vital/_crystal/Data/List.vim
+++ b/autoload/vital/_crystal/Data/List.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
 " Do not mofidify the code nor insert new lines before '" ___vital___'
@@ -466,3 +463,4 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
+endif
diff --git a/autoload/vital/_crystal/Data/String.vim b/autoload/vital/_crystal/Data/String.vim
index 2f822225..e8c72a47 100644
--- a/autoload/vital/_crystal/Data/String.vim
+++ b/autoload/vital/_crystal/Data/String.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
 " Do not mofidify the code nor insert new lines before '" ___vital___'
@@ -629,3 +626,4 @@ endfunction
 let &cpo = s:save_cpo
 unlet s:save_cpo
 " vim:set et ts=2 sts=2 sw=2 tw=0:
+endif
diff --git a/autoload/vital/_crystal/Process.vim b/autoload/vital/_crystal/Process.vim
index 2ea6d584..5f19af55 100644
--- a/autoload/vital/_crystal/Process.vim
+++ b/autoload/vital/_crystal/Process.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
 " Do not mofidify the code nor insert new lines before '" ___vital___'
@@ -175,3 +172,4 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
+endif
diff --git a/autoload/vital/_crystal/Web/JSON.vim b/autoload/vital/_crystal/Web/JSON.vim
index 39bfd724..ef9cd5e9 100644
--- a/autoload/vital/_crystal/Web/JSON.vim
+++ b/autoload/vital/_crystal/Web/JSON.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
 " Do not mofidify the code nor insert new lines before '" ___vital___'
@@ -180,3 +177,4 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
+endif
diff --git a/autoload/vital/crystal.vim b/autoload/vital/crystal.vim
index 15e7487b..f5858108 100644
--- a/autoload/vital/crystal.vim
+++ b/autoload/vital/crystal.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 let s:plugin_name = expand('<sfile>:t:r')
 let s:vital_base_dir = expand('<sfile>:h')
 let s:project_root = expand('<sfile>:h:h:h')
@@ -330,3 +327,4 @@ else
     return a:list
   endfunction
 endif
+endif
diff --git a/autoload/vital/crystal.vital b/autoload/vital/crystal.vital
index 3deaa053..19e5f642 100644
--- a/autoload/vital/crystal.vital
+++ b/autoload/vital/crystal.vital
@@ -1,10 +1,8 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 crystal
 bee84ae23effb0510137ad177e98c94d8b3657a6
 
 Process
 Web.JSON
 ColorEcho
+endif
diff --git a/autoload/xml/aria.vim b/autoload/xml/aria.vim
index 40fbfc69..6d2d1a01 100644
--- a/autoload/xml/aria.vim
+++ b/autoload/xml/aria.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Vim completion for WAI-ARIA data file
 " Language:       HTML + WAI-ARIA
 " Maintainer:     othree <othree@gmail.com>
@@ -459,3 +456,4 @@ let g:xmldata_aria = {
     \ 'default_role': default_role,
     \ 'vimariaattrinfo': aria_attributes_value
 \ }
+endif
diff --git a/autoload/xml/html5.vim b/autoload/xml/html5.vim
index 60ce2460..a8ab04dc 100644
--- a/autoload/xml/html5.vim
+++ b/autoload/xml/html5.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Vim completion for HTML5 data file
 " Language:	    HTML (version 5.1 Draft 2016 Jan 13)
 " Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
@@ -872,3 +869,4 @@ let g:xmldata_html5 = {
     \ 'wbr': ['/>', ''],
 \ },
 \ }
+endif
diff --git a/autoload/zig/config.vim b/autoload/zig/config.vim
index 9a87fa1c..f208af45 100644
--- a/autoload/zig/config.vim
+++ b/autoload/zig/config.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'zig') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 function! zig#config#ListTypeCommands() abort
   return get(g:, 'zig_list_type_commands', {})
 endfunction
@@ -41,3 +38,4 @@ endfunction
 function! zig#config#Debug() abort
   return get(g:, 'zig_debug', [])
 endfunction
+endif
diff --git a/autoload/zig/fmt.vim b/autoload/zig/fmt.vim
index cc7862c7..47c49cd4 100644
--- a/autoload/zig/fmt.vim
+++ b/autoload/zig/fmt.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'zig') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 " Adapted from fatih/vim-go: autoload/go/fmt.vim
 "
 " Copyright 2011 The Go Authors. All rights reserved.
@@ -168,3 +165,4 @@ function! zig#fmt#ToggleFmtAutoSave() abort
 endfunction
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/autoload/zig/list.vim b/autoload/zig/list.vim
index 97ebf47f..9716e8c9 100644
--- a/autoload/zig/list.vim
+++ b/autoload/zig/list.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'zig') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 " Adapted from fatih/vim-go: autoload/go/list.vim
 "
 " Copyright 2011 The Go Authors. All rights reserved.
@@ -160,3 +157,4 @@ function! zig#list#Type(for) abort
 endfunction
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/autoload/zig/util.vim b/autoload/zig/util.vim
index bb2df40c..8545d48b 100644
--- a/autoload/zig/util.vim
+++ b/autoload/zig/util.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'zig') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 " Adapted from vim-go: autoload/go/util.vim
 "
 " Copyright 2011 The Go Authors. All rights reserved.
@@ -392,3 +389,4 @@ function! zig#util#HasDebug(flag)
 endfunction
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/compiler/cake.vim b/compiler/cake.vim
index 159bd59e..c5ca4b6a 100644
--- a/compiler/cake.vim
+++ b/compiler/cake.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -17,3 +14,4 @@ call coffee#CoffeeSetUpVariables()
 exec 'CompilerSet makeprg=' . escape(g:coffee_cake . ' ' .
 \                                    g:coffee_cake_options . ' $*', ' ')
 call coffee#CoffeeSetUpErrorFormat()
+endif
diff --git a/compiler/cargo.vim b/compiler/cargo.vim
index f616067b..25a4dcdb 100644
--- a/compiler/cargo.vim
+++ b/compiler/cargo.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Vim compiler file
 " Compiler:         Cargo Compiler
 " Maintainer:       Damien Radtke <damienradtke@gmail.com>
@@ -51,3 +48,4 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/compiler/coffee.vim b/compiler/coffee.vim
index d68bf74d..46a248e1 100644
--- a/compiler/coffee.vim
+++ b/compiler/coffee.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -84,3 +81,4 @@ augroup CoffeeUpdateMakePrg
     autocmd BufWritePre,BufFilePost          call s:UpdateMakePrg()
   endif
 augroup END
+endif
diff --git a/compiler/credo.vim b/compiler/credo.vim
index 100abb4e..5fdc99ab 100644
--- a/compiler/credo.vim
+++ b/compiler/credo.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if exists('current_compiler')
     finish
 endif
@@ -13,3 +10,4 @@ endif
 
 CompilerSet errorformat=%f:%l:%c:\ %t:\ %m,%f:%l:\ %t:\ %m
 CompilerSet makeprg=mix\ credo\ suggest\ --format=flycheck
+endif
diff --git a/compiler/cryptol.vim b/compiler/cryptol.vim
index 2fe14ff4..9e4779c6 100644
--- a/compiler/cryptol.vim
+++ b/compiler/cryptol.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cryptol') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
 " Vim compiler file
 " Compiler:         Cryptol version 1.8.19-academic Compiler
 " Maintainer:       Edward O'Callaghan <victoredwardocallaghan AT gmail DOT com>
@@ -22,3 +19,4 @@ CompilerSet errorformat&     " use the default 'errorformat'
 
 " "%<" means the current file name without extension.
 CompilerSet makeprg=cryptol\ -o\ %<\ %
+endif
diff --git a/compiler/cucumber.vim b/compiler/cucumber.vim
index 54e34848..c9223cba 100644
--- a/compiler/cucumber.vim
+++ b/compiler/cucumber.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cucumber') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 " Vim compiler file
 " Compiler:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -31,3 +28,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
+endif
diff --git a/compiler/eruby.vim b/compiler/eruby.vim
index 04c0ffdc..5045c882 100644
--- a/compiler/eruby.vim
+++ b/compiler/eruby.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim compiler file
 " Language:		eRuby
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
@@ -41,3 +38,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/compiler/eslint.vim b/compiler/eslint.vim
index 0aeb3a4c..1a10be93 100644
--- a/compiler/eslint.vim
+++ b/compiler/eslint.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 " Vim compiler plugin
 " Language:     JavaScript
 " Maintainer:   vim-javascript community
@@ -18,3 +15,4 @@ endif
 
 CompilerSet makeprg=eslint\ -f\ compact\ %
 CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m
+endif
diff --git a/compiler/exunit.vim b/compiler/exunit.vim
index 207ab5da..e459603b 100644
--- a/compiler/exunit.vim
+++ b/compiler/exunit.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if exists("current_compiler")
   finish
 endif
@@ -27,3 +24,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/compiler/fish.vim b/compiler/fish.vim
index 827ef3b4..9daba2e3 100644
--- a/compiler/fish.vim
+++ b/compiler/fish.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 if exists('current_compiler')
     finish
 endif
@@ -9,3 +6,4 @@ let current_compiler = 'fish'
 
 CompilerSet makeprg=fish\ --no-execute\ %
 execute 'CompilerSet errorformat='.escape(fish#errorformat(), ' ')
+endif
diff --git a/compiler/go.vim b/compiler/go.vim
index 9564df22..e5d1e061 100644
--- a/compiler/go.vim
+++ b/compiler/go.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 " Copyright 2013 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
 " license that can be found in the LICENSE file.
@@ -51,3 +48,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/compiler/gradle.vim b/compiler/gradle.vim
index 4d867c8a..6b1d83d2 100644
--- a/compiler/gradle.vim
+++ b/compiler/gradle.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'gradle') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gradle') == -1
 " Vim Compiler File
 " Compiler: gradle
 
@@ -26,3 +23,4 @@ CompilerSet errorformat=
     \%E%f:\ %\\d%\\+:\ %m\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
     \%E%>%f:\ %\\d%\\+:\ %m,%C\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
     \%-G%.%#
+endif
diff --git a/compiler/gradlew.vim b/compiler/gradlew.vim
index aeb73eaa..6715b44d 100644
--- a/compiler/gradlew.vim
+++ b/compiler/gradlew.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'gradle') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gradle') == -1
 " Vim Compiler File
 " Compiler: gradlew
 
@@ -26,3 +23,4 @@ CompilerSet errorformat=
     \%E%f:\ %\\d%\\+:\ %m\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
     \%E%>%f:\ %\\d%\\+:\ %m,%C\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
     \%-G%.%#
+endif
diff --git a/compiler/haml.vim b/compiler/haml.vim
index 084ca48a..cb0127e2 100644
--- a/compiler/haml.vim
+++ b/compiler/haml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 " Vim compiler file
 " Compiler:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -30,3 +27,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
+endif
diff --git a/compiler/lilypond.vim b/compiler/lilypond.vim
index 6d398030..80cdcf5e 100644
--- a/compiler/lilypond.vim
+++ b/compiler/lilypond.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'lilypond') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 " LilyPond compiler file
 " Language:     LilyPond
 " Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
@@ -21,3 +18,4 @@ setlocal makeprg=lilypond\ $*
 " (how to see multiple-line error messages?)
 setlocal errorformat=%f:%l:%c:\ %m,%f:%l:\ %m,In\ file\ included\ from\ %f:%l:,\^I\^Ifrom\ %f:%l%m
 "
+endif
diff --git a/compiler/ls.vim b/compiler/ls.vim
index b8bc8a6b..581cf2b9 100644
--- a/compiler/ls.vim
+++ b/compiler/ls.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'livescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 " Language:    LiveScript
 " Maintainer:  George Zahariev
 " URL:         http://github.com/gkz/vim-ls
@@ -76,3 +73,4 @@ augroup LiveScriptUpdateMakePrg
     autocmd BufFilePost,BufWritePost          call s:UpdateMakePrg()
   endif
 augroup END
+endif
diff --git a/compiler/mix.vim b/compiler/mix.vim
index 17762815..a771ed15 100644
--- a/compiler/mix.vim
+++ b/compiler/mix.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if exists('current_compiler')
     finish
 endif
@@ -18,3 +15,4 @@ CompilerSet errorformat=
             \%E==\ Compilation\ error\ in\ file\ %f\ ==,
             \%C**\ (%\\w%\\+)\ %f:%l:\ %m,%Z
 
+endif
diff --git a/compiler/nim.vim b/compiler/nim.vim
index 51021694..637bd4a9 100644
--- a/compiler/nim.vim
+++ b/compiler/nim.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nim') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 if exists("current_compiler")
   finish
 endif
@@ -27,3 +24,4 @@ unlet s:cpo_save
 
 let g:syntastic_nim_checkers = ['nim']
 
+endif
diff --git a/compiler/nix-build.vim b/compiler/nix-build.vim
index 7544ba1a..8298e2c9 100644
--- a/compiler/nix-build.vim
+++ b/compiler/nix-build.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nix') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 if exists('current_compiler')
     finish
 endif
@@ -13,3 +10,4 @@ endif
 
 CompilerSet errorformat=error:\ %m\ at\ %f:%l:%c,builder\ for\ \'%m\'\ failed\ with\ exit\ code\ %n,fixed-output\ derivation\ produced\ path\ \'%s\'\ with\ %m
 CompilerSet makeprg=nix-build
+endif
diff --git a/compiler/ocaml.vim b/compiler/ocaml.vim
index 25ea01a3..b6de8420 100644
--- a/compiler/ocaml.vim
+++ b/compiler/ocaml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Vim Compiler File
 " Compiler:    ocaml
 " Maintainer:  Markus Mottl <markus.mottl@gmail.com>
@@ -57,3 +54,4 @@ CompilerSet errorformat =
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/compiler/python.vim b/compiler/python.vim
index cd68c684..63930793 100644
--- a/compiler/python.vim
+++ b/compiler/python.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-compiler') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
 " Vim compiler file
 " Compiler:	Unit testing tool for Python
 " Maintainer:	Ali Aliev <ali@aliev.me>
@@ -69,3 +66,4 @@ else
 endif
 
 " vim:foldmethod=marker:foldlevel=0
+endif
diff --git a/compiler/rake.vim b/compiler/rake.vim
index 2d9d703f..28a0e7d1 100644
--- a/compiler/rake.vim
+++ b/compiler/rake.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim compiler file
 " Language:		Rake
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -41,3 +38,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/compiler/rspec.vim b/compiler/rspec.vim
index f7102fda..8c9c020f 100644
--- a/compiler/rspec.vim
+++ b/compiler/rspec.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim compiler file
 " Language:		RSpec
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -37,3 +34,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/compiler/ruby.vim b/compiler/ruby.vim
index ab537481..ef88462d 100644
--- a/compiler/ruby.vim
+++ b/compiler/ruby.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim compiler file
 " Language:		Ruby
 " Function:		Syntax check and/or error reporting
@@ -46,3 +43,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/compiler/rubyunit.vim b/compiler/rubyunit.vim
index b99c73bf..884d05ac 100644
--- a/compiler/rubyunit.vim
+++ b/compiler/rubyunit.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim compiler file
 " Language:		Test::Unit - Ruby Unit Testing Framework
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
@@ -37,3 +34,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/compiler/rustc.vim b/compiler/rustc.vim
index 876dab5a..cb14dccf 100644
--- a/compiler/rustc.vim
+++ b/compiler/rustc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Vim compiler file
 " Compiler:         Rust Compiler
 " Maintainer:       Chris Morgan <me@chrismorgan.info>
@@ -59,3 +56,4 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/compiler/sbt.vim b/compiler/sbt.vim
index e5aa4d14..6125bf29 100644
--- a/compiler/sbt.vim
+++ b/compiler/sbt.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 " Vim compiler file
 " Language:             Scala SBT (http://www.scala-sbt.org/)
 " Maintainer:           Derek Wyatt
@@ -32,3 +29,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 et:
+endif
diff --git a/compiler/typescript.vim b/compiler/typescript.vim
index 48c60ab3..6e60b8c6 100644
--- a/compiler/typescript.vim
+++ b/compiler/typescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 if exists('current_compiler')
   finish
 endif
@@ -23,3 +20,4 @@ endif
 let &l:makeprg = g:typescript_compiler_binary . ' ' . g:typescript_compiler_options . ' $* %'
 
 CompilerSet errorformat=%+A\ %#%f\ %#(%l\\\,%c):\ %m,%C%m
+endif
diff --git a/extras/flow.vim b/extras/flow.vim
index 67b7671b..7a266036 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 syntax region  jsFlowDefinition     contained                        start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen
 syntax region  jsFlowArgumentDef    contained                        start=/:/    end=/\%(\s*[,)]\|=>\@!\)\@=/ contains=@jsFlowCluster
 syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster,jsComment fold
@@ -111,3 +108,4 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowObjectFuncName     jsObjectFuncName
   delcommand HiLink
 endif
+endif
diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim
index d7250f81..cad3df30 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 "" syntax coloring for javadoc comments (HTML)
 syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
 
@@ -41,3 +38,4 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsDocParam             Label
   delcommand HiLink
 endif
+endif
diff --git a/extras/ngdoc.vim b/extras/ngdoc.vim
index 90eceadf..f1384556 100644
--- a/extras/ngdoc.vim
+++ b/extras/ngdoc.vim
@@ -1,7 +1,5 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 syntax match  jsDocTags         contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite
 syntax match  jsDocType         contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
 syntax match  jsDocParam        contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|{\|}\|\/\|\[\|]\|=\)\+"
+endif
diff --git a/ftplugin/Dockerfile.vim b/ftplugin/Dockerfile.vim
index 977be845..f1335d79 100644
--- a/ftplugin/Dockerfile.vim
+++ b/ftplugin/Dockerfile.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dockerfile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
 " Define comment string
 setlocal commentstring=#\ %s
 
@@ -35,3 +32,4 @@ inoreabbr <silent> <buffer> workdir <C-R>=DockerfileReplaceInstruction("workdir"
 inoreabbr <silent> <buffer> arg <C-R>=DockerfileReplaceInstruction("arg", "ARG")<CR>
 inoreabbr <silent> <buffer> onbuild <C-R>=DockerfileReplaceInstruction("onbuild", "ONBUILD")<CR>
 inoreabbr <silent> <buffer> stopsignal <C-R>=DockerfileReplaceInstruction("stopsignal", "STOPSIGNAL")<CR>
+endif
diff --git a/ftplugin/ansible.vim b/ftplugin/ansible.vim
index 491cd803..7ee5166a 100644
--- a/ftplugin/ansible.vim
+++ b/ftplugin/ansible.vim
@@ -1,10 +1,8 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 " Slow yaml highlighting workaround
 if exists('+regexpengine') && ('&regexpengine' == 0)
   setlocal regexpengine=1
 endif
 set isfname+=@-@
 set path+=./../templates,./../files,templates,files
+endif
diff --git a/ftplugin/ansible_hosts.vim b/ftplugin/ansible_hosts.vim
index 8b3fbe93..e2ecc4b3 100644
--- a/ftplugin/ansible_hosts.vim
+++ b/ftplugin/ansible_hosts.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 if exists("b:did_ftplugin")
   finish
 else
@@ -11,3 +8,4 @@ endif
 setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions-=c
 
 let b:undo_ftplugin = "setl comments< commentstring< formatoptions<"
+endif
diff --git a/ftplugin/blade.vim b/ftplugin/blade.vim
index cbc8513a..a5f98824 100644
--- a/ftplugin/blade.vim
+++ b/ftplugin/blade.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'blade') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
 " Vim filetype plugin
 " Language:     Blade (Laravel)
 " Maintainer:   Jason Walton <jwalton512@gmail.com>
@@ -35,3 +32,4 @@ if exists('loaded_matchit') && exists('b:match_words')
     let b:match_skip = 'synIDattr(synID(line("."), col("."), 0), "name") !=# "bladeKeyword"'
     let b:match_ignorecase = 0
 endif
+endif
diff --git a/ftplugin/caddyfile.vim b/ftplugin/caddyfile.vim
index 1339ca94..a90e010d 100644
--- a/ftplugin/caddyfile.vim
+++ b/ftplugin/caddyfile.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'caddyfile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
 " Language:	    Caddyfile
 " Author:	    Josh Glendenning <josh@isobit.io>
 
@@ -26,3 +23,4 @@ else
 	let g:NERDCustomDelimiters = {'caddyfile': s:delimiters}
 endif
 unlet s:delimiters
+endif
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
index 0ed94392..0563e066 100644
--- a/ftplugin/clojure.vim
+++ b/ftplugin/clojure.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'clojure') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
 " Vim filetype plugin file
 " Language:     Clojure
 " Author:       Meikel Brandmeyer <mb@kotka.de>
@@ -97,3 +94,4 @@ let &cpo = s:cpo_save
 unlet! s:cpo_save s:setting s:dir
 
 " vim:sts=8:sw=8:ts=8:noet
+endif
diff --git a/ftplugin/coffee.vim b/ftplugin/coffee.vim
index 7084424e..2ccafc1f 100644
--- a/ftplugin/coffee.vim
+++ b/ftplugin/coffee.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -407,3 +404,4 @@ command! -buffer -range=% -bar -nargs=* CoffeeRun
 \        call s:CoffeeRun(<line1>, <line2>, <q-args>)
 command! -buffer -range=% -bang -bar -nargs=* CoffeeLint
 \        call s:CoffeeLint(<line1>, <line2>, <q-bang>, <q-args>)
+endif
diff --git a/ftplugin/cryptol/folding.vim b/ftplugin/cryptol/folding.vim
index a74c8bc4..8c70c104 100644
--- a/ftplugin/cryptol/folding.vim
+++ b/ftplugin/cryptol/folding.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cryptol') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
 " Copyright © 2013 Edward O'Callaghan. All Rights Reserved.
 
 "setlocal foldmethod=indent
@@ -48,3 +45,4 @@ function! GetPotionFold(lnum)
         return '>' . next_indent
     endif
 endfunction
+endif
diff --git a/ftplugin/crystal.vim b/ftplugin/crystal.vim
index 8ebdaed8..b6e10338 100644
--- a/ftplugin/crystal.vim
+++ b/ftplugin/crystal.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 if exists('b:did_ftplugin')
   finish
 endif
@@ -82,3 +79,4 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/ftplugin/csv.vim b/ftplugin/csv.vim
index 2545b37f..ad4c0bec 100644
--- a/ftplugin/csv.vim
+++ b/ftplugin/csv.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'csv') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csv') == -1
 " Filetype plugin for editing CSV files. "{{{1
 " Author:  Christian Brabandt <cb@256bit.org>
 " Version: 0.31
@@ -36,3 +33,4 @@ unlet s:cpo_save
 
 " Vim Modeline " {{{2
 " vim: set foldmethod=marker et sw=0 sts=-1 ts=4:
+endif
diff --git a/ftplugin/cucumber.vim b/ftplugin/cucumber.vim
index a07db5da..cf4c7b78 100644
--- a/ftplugin/cucumber.vim
+++ b/ftplugin/cucumber.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cucumber') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 " Vim filetype plugin
 " Language:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -152,3 +149,4 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:set sts=2 sw=2:
+endif
diff --git a/ftplugin/dart.vim b/ftplugin/dart.vim
index 71114b0a..23b709c0 100644
--- a/ftplugin/dart.vim
+++ b/ftplugin/dart.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dart') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
 if exists('b:did_ftplugin')
   finish
 endif
@@ -31,3 +28,4 @@ setlocal includeexpr=dart#resolveUri(v:fname)
 setlocal isfname+=:
 
 let b:undo_ftplugin = 'setl et< fo< sw< sts< com< cms< inex< isf<'
+endif
diff --git a/ftplugin/dhall.vim b/ftplugin/dhall.vim
index 7afad55f..7ce258c5 100644
--- a/ftplugin/dhall.vim
+++ b/ftplugin/dhall.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dhall') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dhall') == -1
 if exists('b:dhall_ftplugin')
 	finish
 endif
@@ -37,3 +34,4 @@ endif
 augroup dhall
     au BufNewFile,BufRead *.dhall setl shiftwidth=2
 augroup END
+endif
diff --git a/ftplugin/docker-compose.vim b/ftplugin/docker-compose.vim
index 45a103fc..44361375 100644
--- a/ftplugin/docker-compose.vim
+++ b/ftplugin/docker-compose.vim
@@ -1,9 +1,7 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dockerfile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
 " Define comment string
 setlocal commentstring=#\ %s
 
 " Enable automatic comment insertion
 setlocal formatoptions+=cro
+endif
diff --git a/ftplugin/eelixir.vim b/ftplugin/eelixir.vim
index 7c1b2b9c..4575f568 100644
--- a/ftplugin/eelixir.vim
+++ b/ftplugin/eelixir.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if exists("b:did_ftplugin")
   finish
 endif
@@ -109,3 +106,4 @@ let b:undo_ftplugin = "setl cms< " .
       \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
 
 let &cpo = s:save_cpo
+endif
diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim
index 5354a6c1..57f5a6f7 100644
--- a/ftplugin/elixir.vim
+++ b/ftplugin/elixir.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if exists('b:did_ftplugin')
   finish
 endif
@@ -53,3 +50,4 @@ onoremap <buffer> <silent> <expr> [] ':silent keeppatterns ?'.b:block_end  .'<CR
 
 let b:undo_ftplugin = 'setlocal sw< sts< et< isk< com< cms< path< inex< sua< def< fo<'.
       \ '| unlet! b:match_ignorecase b:match_words b:block_begin b:block_end'
+endif
diff --git a/ftplugin/elm.vim b/ftplugin/elm.vim
index 04b829d2..9c923b5a 100644
--- a/ftplugin/elm.vim
+++ b/ftplugin/elm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
 " plugin for Elm (http://elm-lang.org/)
 
 if exists('b:did_ftplugin')
@@ -111,3 +108,4 @@ let &l:path =
 setlocal includeexpr=GetElmFilename(v:fname)
 setlocal include=^\\s*import\\s\\+
 setlocal suffixesadd=.elm
+endif
diff --git a/ftplugin/elm/tagbar.vim b/ftplugin/elm/tagbar.vim
index 4e1ce756..4ae5b10c 100644
--- a/ftplugin/elm/tagbar.vim
+++ b/ftplugin/elm/tagbar.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
 if !executable('ctags')
     finish
 elseif globpath(&runtimepath, 'plugin/tagbar.vim') ==? ''
@@ -22,3 +19,4 @@ function! s:SetTagbar()
 endfunction
 
 call s:SetTagbar()
+endif
diff --git a/ftplugin/ember-script.vim b/ftplugin/ember-script.vim
index 49387198..2846bd12 100644
--- a/ftplugin/ember-script.vim
+++ b/ftplugin/ember-script.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emberscript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
 " Language:    ember-script
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>>
 " URL:         http://github.com/yalesov/vim-ember-script
@@ -23,3 +20,4 @@ else
 endif
 setlocal comments=:#
 setlocal commentstring=#\ %s
+endif
diff --git a/ftplugin/emblem.vim b/ftplugin/emblem.vim
index e3a80a42..eec84036 100644
--- a/ftplugin/emblem.vim
+++ b/ftplugin/emblem.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emblem') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
 " Language:    emblem
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>
 " URL:         http://github.com/yalesov/vim-emblem
@@ -19,3 +16,4 @@ setlocal smartindent
 setlocal formatoptions=q
 setlocal comments=:/
 setlocal commentstring=/\ %s
+endif
diff --git a/ftplugin/eruby.vim b/ftplugin/eruby.vim
index 483f40c9..ba813b9e 100644
--- a/ftplugin/eruby.vim
+++ b/ftplugin/eruby.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim filetype plugin
 " Language:		eRuby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -133,3 +130,4 @@ function! ErubyAtCursor() abort
 endfunction
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/ftplugin/fish.vim b/ftplugin/fish.vim
index 3784b4c4..6097e2ab 100644
--- a/ftplugin/fish.vim
+++ b/ftplugin/fish.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 setlocal comments=:#
 setlocal commentstring=#%s
 setlocal define=\\v^\\s*function>
@@ -41,3 +38,4 @@ let b:match_words =
 let b:endwise_addition = 'end'
 let b:endwise_words = 'begin,function,if,switch,while,for'
 let b:endwise_syngroups = 'fishKeyword,fishConditional,fishRepeat'
+endif
diff --git a/ftplugin/git.vim b/ftplugin/git.vim
index 7aca0e5b..6bd9098d 100644
--- a/ftplugin/git.vim
+++ b/ftplugin/git.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim filetype plugin
 " Language:	generic git output
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -43,3 +40,4 @@ endif
 
 setlocal includeexpr=substitute(v:fname,'^[^/]\\+/','','')
 let b:undo_ftplugin = "setl keywordprg< path< includeexpr<"
+endif
diff --git a/ftplugin/gitcommit.vim b/ftplugin/gitcommit.vim
index 3eb77a67..723b2915 100644
--- a/ftplugin/gitcommit.vim
+++ b/ftplugin/gitcommit.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim filetype plugin
 " Language:	git commit file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -68,3 +65,4 @@ function! s:gitdiffcached(bang,gitdir,...)
   nnoremap <buffer> <silent> q :q<CR>
   setlocal buftype=nowrite nobuflisted noswapfile nomodifiable filetype=git
 endfunction
+endif
diff --git a/ftplugin/gitconfig.vim b/ftplugin/gitconfig.vim
index 325b771e..0f0d705b 100644
--- a/ftplugin/gitconfig.vim
+++ b/ftplugin/gitconfig.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim filetype plugin
 " Language:	git config file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -17,3 +14,4 @@ setlocal formatoptions-=t formatoptions+=croql
 setlocal comments=:#,:; commentstring=;\ %s
 
 let b:undo_ftplugin = "setl fo< com< cms<"
+endif
diff --git a/ftplugin/gitrebase.vim b/ftplugin/gitrebase.vim
index e28d83c0..202f676e 100644
--- a/ftplugin/gitrebase.vim
+++ b/ftplugin/gitrebase.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim filetype plugin
 " Language:	git rebase --interactive
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -47,3 +44,4 @@ endif
 nnoremap <buffer> <expr> K col('.') < 7 && expand('<Lt>cword>') =~ '\X' && getline('.') =~ '^\w\+\s\+\x\+\>' ? 'wK' : 'K'
 
 let b:undo_ftplugin = b:undo_ftplugin . "|nunmap <buffer> K"
+endif
diff --git a/ftplugin/gitsendemail.vim b/ftplugin/gitsendemail.vim
index baf6080e..30aed3f6 100644
--- a/ftplugin/gitsendemail.vim
+++ b/ftplugin/gitsendemail.vim
@@ -1,10 +1,8 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim filetype plugin
 " Language:	git send-email message
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
 " Last Change:	2009 Dec 24
 
 runtime! ftplugin/mail.vim
+endif
diff --git a/ftplugin/graphql.vim b/ftplugin/graphql.vim
index 7734acee..492fe107 100644
--- a/ftplugin/graphql.vim
+++ b/ftplugin/graphql.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 " Vim filetype plugin
 " Language: GraphQL
 " Maintainer: Jon Parise <jon@indelible.org>
@@ -20,3 +17,4 @@ setlocal shiftwidth=2
 setlocal expandtab
 
 let b:undo_ftplugin = 'setlocal com< cms< fo< isk< sts< sw< et<'
+endif
diff --git a/ftplugin/haml.vim b/ftplugin/haml.vim
index ddcae644..7fa8efa4 100644
--- a/ftplugin/haml.vim
+++ b/ftplugin/haml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 " Vim filetype plugin
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -73,3 +70,4 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set sw=2:
+endif
diff --git a/ftplugin/hcl.vim b/ftplugin/hcl.vim
index c648150c..a48f406b 100644
--- a/ftplugin/hcl.vim
+++ b/ftplugin/hcl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'hcl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hcl') == -1
 " File: ftplugin/hcl.vim
 " Author: BABAROT <b4b4r07@gmail.com>
 " Description: FileType Plugin for HCL
@@ -39,3 +36,4 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim: set et sw=4 ts=4:
+endif
diff --git a/ftplugin/hive.vim b/ftplugin/hive.vim
index 70daab7d..c7ceb774 100644
--- a/ftplugin/hive.vim
+++ b/ftplugin/hive.vim
@@ -1,6 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'hive') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hive') == -1
 setlocal comments=:--
 setlocal commentstring=--\ %s
+endif
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
index 87fed79d..7b856136 100644
--- a/ftplugin/html.vim
+++ b/ftplugin/html.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Maintainer:  	othree <othree@gmail.com>
 " URL:		      http://github.com/othree/html5.vim
 " Last Change:  2014-05-02
@@ -11,3 +8,4 @@ endif
 " setlocal iskeyword+=-
 
 setlocal commentstring=<!--%s-->
+endif
diff --git a/ftplugin/i3config.vim b/ftplugin/i3config.vim
index 41de3247..f5451e80 100644
--- a/ftplugin/i3config.vim
+++ b/ftplugin/i3config.vim
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'i3') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'i3') == -1
 setlocal commentstring=#\ %s
+endif
diff --git a/ftplugin/idris.vim b/ftplugin/idris.vim
index ce18060d..777b6cfd 100644
--- a/ftplugin/idris.vim
+++ b/ftplugin/idris.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'idris') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 if bufname('%') == "idris-response"
   finish
 endif
@@ -344,3 +341,4 @@ menu Idris.Proof\ Search\ with\ hints <LocalLeader>p
 
 au BufHidden idris-response call IdrisHideResponseWin()
 au BufEnter idris-response call IdrisShowResponseWin()
+endif
diff --git a/ftplugin/ion.vim b/ftplugin/ion.vim
index 7cb349b9..1a056112 100644
--- a/ftplugin/ion.vim
+++ b/ftplugin/ion.vim
@@ -1,9 +1,7 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ion') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ion') == -1
 
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
 
 setlocal commentstring=#%s
+endif
diff --git a/ftplugin/jbuild.vim b/ftplugin/jbuild.vim
index 1ac4801d..628620ad 100644
--- a/ftplugin/jbuild.vim
+++ b/ftplugin/jbuild.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 if exists("b:did_ftplugin")
   finish
 endif
@@ -14,3 +11,4 @@ setl commentstring=;\ %s
 setl comments=:;
 
 setl iskeyword+=#,?,.,/
+endif
diff --git a/ftplugin/json.vim b/ftplugin/json.vim
index 132bea4b..f8185ca5 100644
--- a/ftplugin/json.vim
+++ b/ftplugin/json.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'json') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
 " Vim syntax file
 " Language:	JSON
 " Maintainer:	Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json
@@ -40,3 +37,4 @@ if has('conceal')
 	"maybe g:vim_json_syntax_conceal could be settable to 0,1,2 to map
 	"directly to vim's conceallevels? unsure if anyone cares
 endif
+endif
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index bdfe9877..27930727 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 " Vim filetype plugin file
 " Language:	Julia
 " Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
@@ -109,3 +106,4 @@ let b:undo_ftplugin .= " | delcommand JuliaDoc | delcommand JuliaDocKeywordprg"
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
+endif
diff --git a/ftplugin/juliadoc.vim b/ftplugin/juliadoc.vim
index b56a45d2..aa21646e 100644
--- a/ftplugin/juliadoc.vim
+++ b/ftplugin/juliadoc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 " Vim filetype plugin file
 " Language: Julia document
 
@@ -32,3 +29,4 @@ let b:undo_ftplugin .= " | delcommand JuliaDoc | delcommand JuliaDocKeywordprg"
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
+endif
diff --git a/ftplugin/kotlin.vim b/ftplugin/kotlin.vim
index 519a153a..aefa76c9 100644
--- a/ftplugin/kotlin.vim
+++ b/ftplugin/kotlin.vim
@@ -1,9 +1,7 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'kotlin') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
 if exists('b:did_ftplugin') | finish | endif
 let b:did_ftplugin = 1
 
 setlocal comments=://
 setlocal commentstring=//\ %s
+endif
diff --git a/ftplugin/latex-box/common.vim b/ftplugin/latex-box/common.vim
index 1eccacd4..938d97b2 100644
--- a/ftplugin/latex-box/common.vim
+++ b/ftplugin/latex-box/common.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box common functions
 
 " Error Format {{{
@@ -415,3 +412,4 @@ endfunction
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/latex-box/complete.vim b/ftplugin/latex-box/complete.vim
index 365ea14f..74f98696 100644
--- a/ftplugin/latex-box/complete.vim
+++ b/ftplugin/latex-box/complete.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box completion
 
 setlocal omnifunc=LatexBox_Complete
@@ -934,3 +931,4 @@ command! LatexLabels call <SID>PromptLabelList()
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/latex-box/findmain.vim b/ftplugin/latex-box/findmain.vim
index a52d745e..a06358b5 100644
--- a/ftplugin/latex-box/findmain.vim
+++ b/ftplugin/latex-box/findmain.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LatexBox_GetMainFileName: gets the name of the main file being compiled. {{{
 " Description:  returns the full path name of the main file.
 "               This function checks for the existence of a .latexmain file
@@ -64,3 +61,4 @@ function! LatexBox_GetMainFileName(...)
 	"       certain platforms.
 	return lheadfile
 endfunction
+endif
diff --git a/ftplugin/latex-box/folding.vim b/ftplugin/latex-box/folding.vim
index 6311ebf2..1dac48d5 100644
--- a/ftplugin/latex-box/folding.vim
+++ b/ftplugin/latex-box/folding.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " Folding support for LaTeX
 
 "
@@ -380,3 +377,4 @@ endfunction
 
 " {{{1 Footer
 " vim:fdm=marker:ff=unix:ts=4:sw=4
+endif
diff --git a/ftplugin/latex-box/latexmk.vim b/ftplugin/latex-box/latexmk.vim
index bee760a5..c1b917b7 100644
--- a/ftplugin/latex-box/latexmk.vim
+++ b/ftplugin/latex-box/latexmk.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box latexmk functions
 
 " Options and variables {{{
@@ -556,3 +553,4 @@ endif
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/latex-box/mappings.vim b/ftplugin/latex-box/mappings.vim
index ccfb5d8d..7d2e0633 100644
--- a/ftplugin/latex-box/mappings.vim
+++ b/ftplugin/latex-box/mappings.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box mappings
 
 if exists("g:LatexBox_no_mappings")
@@ -108,3 +105,4 @@ vnoremap <buffer> <silent> [[ :<c-u>call <SID>LatexBoxNextSection(0,1,1)<CR>
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/latex-box/motion.vim b/ftplugin/latex-box/motion.vim
index b9614d72..9caa0ed5 100644
--- a/ftplugin/latex-box/motion.vim
+++ b/ftplugin/latex-box/motion.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box motion functions
 
 " Motion options {{{
@@ -546,3 +543,4 @@ command! LatexTOCToggle call LatexBox_TOC(1)
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/latextoc.vim b/ftplugin/latextoc.vim
index 9553b211..1c4c4953 100644
--- a/ftplugin/latextoc.vim
+++ b/ftplugin/latextoc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " {{{1 Settings
 setlocal buftype=nofile
 setlocal bufhidden=wipe
@@ -204,3 +201,4 @@ nnoremap <buffer> <silent> <Esc>OD h
 " }}}1
 
 " vim:fdm=marker:ff=unix:et:ts=4:sw=4
+endif
diff --git a/ftplugin/less.vim b/ftplugin/less.vim
index 55a282dc..5fb1f5f3 100644
--- a/ftplugin/less.vim
+++ b/ftplugin/less.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'less') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 " Vim filetype plugin
 " Language:	    LessCSS
 " Author:	    Tim Pope <vimNOSPAM@tpope.org>
@@ -28,3 +25,4 @@ setlocal fo=croql
 let &l:include = '^\s*@import\s\+\%(url(\)\=["'']\='
 
 " vim:set sw=2:
+endif
diff --git a/ftplugin/lilypond.vim b/ftplugin/lilypond.vim
index b755a6bb..a0e1a137 100644
--- a/ftplugin/lilypond.vim
+++ b/ftplugin/lilypond.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'lilypond') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 " LilyPond filetype plugin
 " Language:     LilyPond (ft=ly)
 " Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
@@ -59,3 +56,4 @@ setlocal dictionary-=$VIM/syntax/lilypond-words dictionary+=$VIM/syntax/lilypond
 setlocal complete-=k complete+=k
 "
 setlocal showmatch
+endif
diff --git a/ftplugin/litcoffee.vim b/ftplugin/litcoffee.vim
index 9bb4f697..6dfb197c 100644
--- a/ftplugin/litcoffee.vim
+++ b/ftplugin/litcoffee.vim
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 runtime ftplugin/coffee.vim
+endif
diff --git a/ftplugin/llvm.vim b/ftplugin/llvm.vim
index 0006c288..b2c65f4e 100644
--- a/ftplugin/llvm.vim
+++ b/ftplugin/llvm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'llvm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 " Vim filetype plugin file
 " Language: LLVM Assembly
 " Maintainer: The LLVM team, http://llvm.org/
@@ -14,3 +11,4 @@ let b:did_ftplugin = 1
 setlocal softtabstop=2 shiftwidth=2
 setlocal expandtab
 setlocal comments+=:;
+endif
diff --git a/ftplugin/ls.vim b/ftplugin/ls.vim
index a0b86468..b40ca5ea 100644
--- a/ftplugin/ls.vim
+++ b/ftplugin/ls.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'livescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 " Language:    LiveScript
 " Maintainer:  George Zahariev
 " URL:         http://github.com/gkz/vim-ls
@@ -206,3 +203,4 @@ command! -range=% -bar -nargs=* -complete=customlist,s:LiveScriptCompileComplete
 \        LiveScriptCompile call s:LiveScriptCompile(<line1>, <line2>, <q-args>)
 " Run some LiveScript.
 command! -range=% -bar LiveScriptRun <line1>,<line2>:w !lsc -sp
+endif
diff --git a/ftplugin/mail_vifm.vim b/ftplugin/mail_vifm.vim
index 7da4b3fb..9dc2cbb5 100644
--- a/ftplugin/mail_vifm.vim
+++ b/ftplugin/mail_vifm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
 " Mail file type extension to pick files for attachments via vifm
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: January 02, 2018
@@ -66,3 +63,4 @@ endfunction
 nnoremap <buffer> <silent> <localleader>a :call <sid>AddMailAttachments()<cr>
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
+endif
diff --git a/ftplugin/mako.vim b/ftplugin/mako.vim
index 1caf0e0c..b20b9593 100644
--- a/ftplugin/mako.vim
+++ b/ftplugin/mako.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mako') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
 " Vim filetype plugin file
 " Language:     Mako
 " Maintainer:   Randy Stauner <randy@magnificent-tears.com>
@@ -13,3 +10,4 @@ let b:did_ftplugin = 1
 
 setlocal comments=:##
 setlocal commentstring=##%s
+endif
diff --git a/ftplugin/meson.vim b/ftplugin/meson.vim
index 870f0052..8949b6ee 100644
--- a/ftplugin/meson.vim
+++ b/ftplugin/meson.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'meson') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'meson') == -1
 " Vim filetype plugin file
 " Language:	meson
 " Original Author:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -17,3 +14,4 @@ setlocal softtabstop=2
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
+endif
diff --git a/ftplugin/mma.vim b/ftplugin/mma.vim
index c1f8a5a3..237f1da8 100644
--- a/ftplugin/mma.vim
+++ b/ftplugin/mma.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mathematica') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
 "Vim filetype plugin
 " Language: Mathematica
 " Maintainer: R. Menon <rsmenon@icloud.com>
@@ -61,3 +58,4 @@ unlet s:cpo_save
 "}
 
 " vim: set foldmarker={,} foldlevel=0 foldmethod=marker:
+endif
diff --git a/ftplugin/moon.vim b/ftplugin/moon.vim
index e8adbf2f..e99de496 100644
--- a/ftplugin/moon.vim
+++ b/ftplugin/moon.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'moonscript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
 " Language:    MoonScript
 " Maintainer:  leafo <leafot@gmail.com>
 " Based On:    CoffeeScript by Mick Koch <kchmck@gmail.com>
@@ -18,3 +15,4 @@ setlocal comments=:--
 setlocal commentstring=--\ %s
 
 let b:undo_ftplugin = "setlocal commentstring< comments< formatoptions<"
+endif
diff --git a/ftplugin/mustache.vim b/ftplugin/mustache.vim
index c0eb6221..03889841 100644
--- a/ftplugin/mustache.vim
+++ b/ftplugin/mustache.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'handlebars') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 if exists('b:loaded_mustache_handlebars')
   finish
 endif
@@ -125,3 +122,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nofoldenable
+endif
diff --git a/ftplugin/nginx.vim b/ftplugin/nginx.vim
index 6ba4d016..08f9b340 100644
--- a/ftplugin/nginx.vim
+++ b/ftplugin/nginx.vim
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nginx') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
 setlocal commentstring=#\ %s
+endif
diff --git a/ftplugin/nix.vim b/ftplugin/nix.vim
index c80b825a..40444150 100644
--- a/ftplugin/nix.vim
+++ b/ftplugin/nix.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nix') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 " Vim filetype plugin
 " Language:    Nix
 " Maintainer:  Daiderd Jordan <daiderd@gmail.com>
@@ -23,3 +20,4 @@ if get(g:, 'nix_recommended_style', 1)
     \ softtabstop=2
     \ expandtab 
 endif
+endif
diff --git a/ftplugin/oasis.vim b/ftplugin/oasis.vim
index 8471329f..51442403 100644
--- a/ftplugin/oasis.vim
+++ b/ftplugin/oasis.vim
@@ -1,7 +1,5 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 setlocal comments=:#
 setlocal commentstring=#\ %s
+endif
diff --git a/ftplugin/objc.vim b/ftplugin/objc.vim
index b3cfc708..5378f43b 100644
--- a/ftplugin/objc.vim
+++ b/ftplugin/objc.vim
@@ -1,10 +1,8 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'objc') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
 " Use C++ style comment strings with commentary.vim
 setl commentstring=//%s
 
 " Search for include files inside frameworks (used for gf etc.)
 setl includeexpr=substitute(v:fname,'\\([^/]\\+\\)/\\(.\\+\\)','/System/Library/Frameworks/\\1.framework/Headers/\\2','')
 
+endif
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index 77f8fef0..9c8f7908 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Language:    OCaml
 " Maintainer:  David Baelde        <firstname.name@ens-lyon.org>
 "              Mike Leary          <leary@nwlink.com>
@@ -642,3 +639,4 @@ let &cpoptions=s:cposet
 unlet s:cposet
 
 " vim:sw=2 fdm=indent
+endif
diff --git a/ftplugin/ocamlbuild_tags.vim b/ftplugin/ocamlbuild_tags.vim
index 8471329f..51442403 100644
--- a/ftplugin/ocamlbuild_tags.vim
+++ b/ftplugin/ocamlbuild_tags.vim
@@ -1,7 +1,5 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 setlocal comments=:#
 setlocal commentstring=#\ %s
+endif
diff --git a/ftplugin/omake.vim b/ftplugin/omake.vim
index ec3b428c..c38328a0 100644
--- a/ftplugin/omake.vim
+++ b/ftplugin/omake.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Vim filetype plugin file
 " Language:	OMake
 
@@ -26,3 +23,4 @@ setlocal expandtab
 
 " Including files.
 let &l:include = '^\s*include'
+endif
diff --git a/ftplugin/opencl.vim b/ftplugin/opencl.vim
index 86d640ff..d3daecac 100644
--- a/ftplugin/opencl.vim
+++ b/ftplugin/opencl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'opencl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
 if exists("b:did_ftplugin") | finish | endif
 
 if version > 600
@@ -17,3 +14,4 @@ setlocal smarttab
 setlocal smartindent
 
 let b:did_ftplugin = 1
+endif
diff --git a/ftplugin/perl.vim b/ftplugin/perl.vim
index 0546d96a..cb1172e7 100644
--- a/ftplugin/perl.vim
+++ b/ftplugin/perl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Vim filetype plugin file
 " Language:      Perl
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -91,3 +88,4 @@ let b:match_words = '\<if\>:\<elsif\>:\<else\>'
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
+endif
diff --git a/ftplugin/plantuml.vim b/ftplugin/plantuml.vim
index 46d26dac..ab6d331b 100644
--- a/ftplugin/plantuml.vim
+++ b/ftplugin/plantuml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'plantuml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
 scriptencoding utf-8
 " Vim filetype plugin file
 " Language:     PlantUML
@@ -46,3 +43,4 @@ let b:endwise_syngroups = 'plantumlKeyword'
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/ftplugin/pony.vim b/ftplugin/pony.vim
index c168cb97..7168d6be 100644
--- a/ftplugin/pony.vim
+++ b/ftplugin/pony.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pony') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
 " Vim filetype plugin file
 " Language:     Pony
 " Maintainer:   Jak Wings
@@ -42,3 +39,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 let b:did_ftplugin = 1
+endif
diff --git a/ftplugin/ps1.vim b/ftplugin/ps1.vim
index 0357f9df..c7a19fc4 100644
--- a/ftplugin/ps1.vim
+++ b/ftplugin/ps1.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'powershell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 " Vim filetype plugin file
 " Language:           Windows PowerShell
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -36,3 +33,4 @@ endif
 let b:undo_ftplugin = "setlocal tw< cms< fo<" .
 			\ " | unlet! b:browsefilter"
 
+endif
diff --git a/ftplugin/ps1xml.vim b/ftplugin/ps1xml.vim
index 0365f588..4b1b3485 100644
--- a/ftplugin/ps1xml.vim
+++ b/ftplugin/ps1xml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'powershell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 " Vim filetype plugin file
 " Language:           Windows PowerShell
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -33,3 +30,4 @@ endif
 let b:undo_ftplugin = "setlocal tw< cms< fo<" .
       \ " | unlet! b:browsefilter"
 
+endif
diff --git a/ftplugin/pug.vim b/ftplugin/pug.vim
index 1aa33607..32b8f76e 100644
--- a/ftplugin/pug.vim
+++ b/ftplugin/pug.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pug') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
 " Vim filetype plugin
 " Language: Pug
 " Maintainer: Joshua Borton
@@ -59,3 +56,4 @@ let b:undo_ftplugin = "setl cms< com< "
 let &cpo = s:save_cpo
 
 " vim:set sw=2:
+endif
diff --git a/ftplugin/puppet.vim b/ftplugin/puppet.vim
index 0796f743..876b4748 100644
--- a/ftplugin/puppet.vim
+++ b/ftplugin/puppet.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 setl ts=2
 setl sts=2
 setl sw=2
@@ -9,3 +6,4 @@ setl et
 setl keywordprg=puppet\ describe\ --providers
 setl iskeyword=-,:,@,48-57,_,192-255
 setl cms=#\ %s
+endif
diff --git a/ftplugin/puppet_tagbar.vim b/ftplugin/puppet_tagbar.vim
index b607ccb0..9fdf69c7 100644
--- a/ftplugin/puppet_tagbar.vim
+++ b/ftplugin/puppet_tagbar.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 " Puppet set up for Tagbar plugin
 " (https://github.com/majutsushi/tagbar).
 
@@ -46,3 +43,4 @@ endif
 
 let g:tagbar_type_puppet.deffile = puppet#ctags#OptionFile()
 
+endif
diff --git a/ftplugin/purescript.vim b/ftplugin/purescript.vim
index 2030b86a..b637d347 100644
--- a/ftplugin/purescript.vim
+++ b/ftplugin/purescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'purescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
 setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--\ \|,:--
 setlocal include=^import
 setlocal includeexpr=printf('%s.purs',substitute(v:fname,'\\.','/','g'))
@@ -40,3 +37,4 @@ fun! InitPureScript()
   call add(s:PS, [dir, &l:path])
 endfun
 call InitPureScript()
+endif
diff --git a/ftplugin/qml.vim b/ftplugin/qml.vim
index e4320790..b4043b32 100644
--- a/ftplugin/qml.vim
+++ b/ftplugin/qml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'qml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
 " Vim filetype plugin file
 " Language: qml
 " Last change: 2014 Feb 8
@@ -39,3 +36,4 @@ setlocal formatoptions+=croql
 
 let &cpoptions = s:cpoptions_save
 unlet s:cpoptions_save
+endif
diff --git a/ftplugin/racket.vim b/ftplugin/racket.vim
index 84d6ddaa..3f76c298 100644
--- a/ftplugin/racket.vim
+++ b/ftplugin/racket.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'racket') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
 " Language:     Racket
 " Maintainer:   Will Langstroth <will@langstroth.com>
 " URL:          http://github.com/wlangstroth/vim-racket
@@ -61,3 +58,4 @@ nnoremap <buffer> <f9> :!racket -t %<cr>
 
 "setl commentstring=;;%s
 setl commentstring=#\|\ %s\ \|#
+endif
diff --git a/ftplugin/raml.vim b/ftplugin/raml.vim
index 4cf8f5c2..21af8307 100644
--- a/ftplugin/raml.vim
+++ b/ftplugin/raml.vim
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'raml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raml') == -1
 set ts=2 sts=2 sw=2 et
+endif
diff --git a/ftplugin/rst.vim b/ftplugin/rst.vim
index 064bd88e..5fc87d21 100644
--- a/ftplugin/rst.vim
+++ b/ftplugin/rst.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rst') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
 " reStructuredText filetype plugin file
 " Language: reStructuredText documentation format
 " Maintainer: Marshall Ward <marshall.ward@gmail.com>
@@ -49,3 +46,4 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
index 4edbbad6..81d9ad99 100644
--- a/ftplugin/ruby.vim
+++ b/ftplugin/ruby.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim filetype plugin
 " Language:		Ruby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -436,3 +433,4 @@ endfunction
 "
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/ftplugin/rust.vim b/ftplugin/rust.vim
index 7f29cf38..3f8d9170 100644
--- a/ftplugin/rust.vim
+++ b/ftplugin/rust.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Language:     Rust
 " Description:  Vim ftplugin for Rust
 " Maintainer:   Chris Morgan <me@chrismorgan.info>
@@ -203,3 +200,4 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/ftplugin/rust/tagbar.vim b/ftplugin/rust/tagbar.vim
index 3de5d8a9..af01a818 100644
--- a/ftplugin/rust/tagbar.vim
+++ b/ftplugin/rust/tagbar.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 "
 " Support for Tagbar -- https://github.com/majutsushi/tagbar
 "
@@ -42,3 +39,4 @@ unlet s:save_cpo
 
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/ftplugin/scala.vim b/ftplugin/scala.vim
index d843daa9..199aed94 100644
--- a/ftplugin/scala.vim
+++ b/ftplugin/scala.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 " Vim filetype plugin
 " Language:             Scala
 " Maintainer:           Derek Wyatt
@@ -178,3 +175,4 @@ noremap <script> <buffer> <silent> ]] :call <SID>NextSection(0)<cr>
 noremap <script> <buffer> <silent> [[ :call <SID>NextSection(1)<cr>
 
 " vim:set sw=2 sts=2 ts=8 et:
+endif
diff --git a/ftplugin/scala.xpt.vim b/ftplugin/scala.xpt.vim
index 86995e0d..2660d4c6 100644
--- a/ftplugin/scala.xpt.vim
+++ b/ftplugin/scala.xpt.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 XPTemplate priority=lang
 
@@ -31,3 +28,4 @@ trait `derived^`trait^Component extends `trait^Component {
 		`body2^
 	}
 }
+endif
diff --git a/ftplugin/scala/tagbar.vim b/ftplugin/scala/tagbar.vim
index e53b5591..5728e98a 100644
--- a/ftplugin/scala/tagbar.vim
+++ b/ftplugin/scala/tagbar.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 "
 " Support for Tagbar -- https://github.com/majutsushi/tagbar
 "
@@ -33,3 +30,4 @@ let g:tagbar_type_scala = {
 if get(g:, 'scala_use_builtin_tagbar_defs', 1)
   let g:tagbar_type_scala.deffile = expand('<sfile>:p:h:h:h') . '/ctags/scala.ctags'
 endif
+endif
diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim
index c723d957..ebc6889a 100644
--- a/ftplugin/scss.vim
+++ b/ftplugin/scss.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scss') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
 if exists('b:did_indent') && b:did_indent
   " be kind. allow users to override this. Does it work?
   finish
@@ -15,3 +12,4 @@ setlocal formatoptions+=ro
 
 " SCSS comments are either /* */ or //
 setlocal comments=s1:/*,mb:*,ex:*/,://
+endif
diff --git a/ftplugin/sexplib.vim b/ftplugin/sexplib.vim
index 373eef3a..23b689db 100644
--- a/ftplugin/sexplib.vim
+++ b/ftplugin/sexplib.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Language:    Sexplib
 " Maintainer:  Markus Mottl        <markus.mottl@gmail.com>
 " URL:         http://www.ocaml.info/vim/ftplugin/sexplib.vim
@@ -16,3 +13,4 @@ let b:did_ftplugin=1
 " Comment string
 setl commentstring=;\ %s
 setl comments=:;
+endif
diff --git a/ftplugin/slim.vim b/ftplugin/slim.vim
index 83a768bf..ff430c50 100644
--- a/ftplugin/slim.vim
+++ b/ftplugin/slim.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'slim') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
 if exists("b:did_ftplugin")
   finish
 endif
@@ -27,3 +24,4 @@ let b:undo_ftplugin = "setl isk<" . " | " . s:undo_ftplugin
 
 setlocal iskeyword+=-
 setlocal commentstring=/%s
+endif
diff --git a/ftplugin/smt2.vim b/ftplugin/smt2.vim
index f84af275..9d4a81c0 100644
--- a/ftplugin/smt2.vim
+++ b/ftplugin/smt2.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'smt2') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smt2') == -1
 setlocal iskeyword+=-,:,#,',$
 
 " If no command for invoking a solver is specified in ~/.vimrc, test if either
@@ -27,3 +24,4 @@ nnoremap <silent> <buffer> <localleader>v :call smt2#PrintSolverVersion()<cr>
 
 " Comment String
 setlocal commentstring=;%s
+endif
diff --git a/ftplugin/solidity.vim b/ftplugin/solidity.vim
index 1971f587..8bbbcd2c 100644
--- a/ftplugin/solidity.vim
+++ b/ftplugin/solidity.vim
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'solidity') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
 setlocal commentstring=//\ %s
+endif
diff --git a/ftplugin/stylus.vim b/ftplugin/stylus.vim
index 7cd92a64..0cc4d194 100644
--- a/ftplugin/stylus.vim
+++ b/ftplugin/stylus.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'stylus') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
 " Vim filetype plugin
 " Language: Stylus
 " Maintainer: Marc Harter
@@ -65,3 +62,4 @@ let &cpo = s:save_cpo
 command! Stylus !clear; cat % | stylus
 
 " vim:set sw=2:
+endif
diff --git a/ftplugin/swift.vim b/ftplugin/swift.vim
index 0d3eaafd..6e731d39 100644
--- a/ftplugin/swift.vim
+++ b/ftplugin/swift.vim
@@ -1,8 +1,6 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'swift') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
 setlocal commentstring=//\ %s
 " @-@ adds the literal @ to iskeyword for @IBAction and similar
 setlocal iskeyword+=@-@,#
 setlocal completefunc=syntaxcomplete#Complete
+endif
diff --git a/ftplugin/tablegen.vim b/ftplugin/tablegen.vim
index 94909ef5..b5c9f471 100644
--- a/ftplugin/tablegen.vim
+++ b/ftplugin/tablegen.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'llvm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 " Vim filetype plugin file
 " Language: LLVM TableGen
 " Maintainer: The LLVM team, http://llvm.org/
@@ -14,3 +11,4 @@ let b:did_ftplugin = 1
 setlocal matchpairs+=<:>
 setlocal softtabstop=2 shiftwidth=2
 setlocal expandtab
+endif
diff --git a/ftplugin/terraform.vim b/ftplugin/terraform.vim
index 9b4cc2bd..83591f04 100644
--- a/ftplugin/terraform.vim
+++ b/ftplugin/terraform.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'terraform') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
 " terraform.vim - basic vim/terraform integration
 " Maintainer: HashiVim <https://github.com/hashivim>
 
@@ -63,3 +60,4 @@ endif
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/ftplugin/tex_LatexBox.vim b/ftplugin/tex_LatexBox.vim
index ec85ba1d..14df8f94 100644
--- a/ftplugin/tex_LatexBox.vim
+++ b/ftplugin/tex_LatexBox.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box plugin for Vim
 " Maintainer: David Munger
 " Email: mungerd@gmail.com
@@ -35,3 +32,4 @@ if !exists('b:LatexBox_loaded')
 endif
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/textile.vim b/ftplugin/textile.vim
index 4741f852..681c04db 100644
--- a/ftplugin/textile.vim
+++ b/ftplugin/textile.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'textile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'textile') == -1
 " textile.vim
 "
 " Tim Harper (tim.theenchanter.com)
@@ -61,3 +58,4 @@ function! TextileRenderBufferToTab()
   set syntax=html
 endfunction
 
+endif
diff --git a/ftplugin/tmux.vim b/ftplugin/tmux.vim
index 86f87f63..b25ab68f 100644
--- a/ftplugin/tmux.vim
+++ b/ftplugin/tmux.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'tmux') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tmux') == -1
 " Vim filetype plugin file
 " Language: tmux(1) configuration file
 " URL: https://github.com/ericpruitt/tmux.vim/
@@ -14,3 +11,4 @@ endif
 let b:did_ftplugin = 1
 
 setlocal commentstring=#\ %s
+endif
diff --git a/ftplugin/toml.vim b/ftplugin/toml.vim
index e0b4adc1..77a02d05 100644
--- a/ftplugin/toml.vim
+++ b/ftplugin/toml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'toml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'toml') == -1
 " File: ftplugin/toml.vim
 " Author: Kevin Ballard <kevin@sb.org>
 " Description: FileType Plugin for Toml
@@ -23,3 +20,4 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim: set et sw=4 ts=4:
+endif
diff --git a/ftplugin/tsx.vim b/ftplugin/tsx.vim
index b6c76481..b6a6e6a9 100644
--- a/ftplugin/tsx.vim
+++ b/ftplugin/tsx.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 " modified from mxw/vim-jsx from html.vim
 if exists("loaded_matchit") && !exists('b:tsx_match_words')
   let b:match_ignorecase = 0
@@ -13,3 +10,4 @@ if exists("loaded_matchit") && !exists('b:tsx_match_words')
 endif
 
 set suffixesadd+=.tsx
+endif
diff --git a/ftplugin/tt2html.vim b/ftplugin/tt2html.vim
index 62461824..bd79624b 100644
--- a/ftplugin/tt2html.vim
+++ b/ftplugin/tt2html.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Language:      TT2 embedded with HTML
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Homepage:      http://github.com/vim-perl/vim-perl
@@ -15,3 +12,4 @@ endif
 
 " Just use the HTML plugin for now.
 runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
+endif
diff --git a/ftplugin/twig.vim b/ftplugin/twig.vim
index 086e938f..20f31ec2 100644
--- a/ftplugin/twig.vim
+++ b/ftplugin/twig.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'twig') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
 " Vim filetype plugin
 " Language: Twig
 " Maintainer: F. Gabriel Gosselin <gabrielNOSPAM@evidens.ca>
@@ -42,3 +39,4 @@ else
 endif
 
 " vim:set sw=2:
+endif
diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim
index b3d4c9c4..065ebe18 100644
--- a/ftplugin/typescript.vim
+++ b/ftplugin/typescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 " set Vi-incompatible, compiler and commentstring
 
 if exists("b:did_ftplugin")
@@ -84,3 +81,4 @@ let g:tagbar_type_typescript = {
 if get(g:, 'typescript_use_builtin_tagbar_defs', 1)
   let g:tagbar_type_typescript.deffile = expand('<sfile>:p:h:h') . '/ctags/typescript.ctags'
 endif
+endif
diff --git a/ftplugin/vifm-cmdedit.vim b/ftplugin/vifm-cmdedit.vim
index 14f70187..2b3c926b 100644
--- a/ftplugin/vifm-cmdedit.vim
+++ b/ftplugin/vifm-cmdedit.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
 " vifm command-line editing buffer filetype plugin
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: August 18, 2013
@@ -21,3 +18,4 @@ set syntax=vifm
 call vifm#edit#Init()
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
+endif
diff --git a/ftplugin/vifm-edit.vim b/ftplugin/vifm-edit.vim
index f2021ed3..450cfc0d 100644
--- a/ftplugin/vifm-edit.vim
+++ b/ftplugin/vifm-edit.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
 " vifm command-line editing buffer filetype plugin
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: August 18, 2013
@@ -15,3 +12,4 @@ let b:did_ftplugin = 1
 call vifm#edit#Init()
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
+endif
diff --git a/ftplugin/vifm-rename.vim b/ftplugin/vifm-rename.vim
index b7d0ed26..e806e212 100644
--- a/ftplugin/vifm-rename.vim
+++ b/ftplugin/vifm-rename.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
 " Filetype plugin for vifm rename buffer
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: October 05, 2014
@@ -60,3 +57,4 @@ setlocal cursorbind
 setlocal scrollbind
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
+endif
diff --git a/ftplugin/vifm.vim b/ftplugin/vifm.vim
index 03e06e07..251d19fa 100644
--- a/ftplugin/vifm.vim
+++ b/ftplugin/vifm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
 " vifmrc filetype plugin
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: July 08, 2016
@@ -48,3 +45,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
+endif
diff --git a/ftplugin/vue.vim b/ftplugin/vue.vim
index 8aded135..f7727131 100644
--- a/ftplugin/vue.vim
+++ b/ftplugin/vue.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vue') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
 " Vim filetype plugin
 " Language: Vue.js
 " Maintainer: Eduardo San Martin Morote
@@ -21,3 +18,4 @@ if !exists('g:no_plugin_maps') && !exists('g:no_vue_maps')
   nnoremap <silent> <buffer> [] :call search('^</\(template\<Bar>script\<Bar>style\)', 'bW')<CR>
   nnoremap <silent> <buffer> ][ :call search('^</\(template\<Bar>script\<Bar>style\)', 'W')<CR>
 endif
+endif
diff --git a/ftplugin/xs.vim b/ftplugin/xs.vim
index 1b44ab93..a13cb85d 100644
--- a/ftplugin/xs.vim
+++ b/ftplugin/xs.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Vim filetype plugin file
 " Language:      XS (Perl extension interface language)
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -16,3 +13,4 @@ endif
 
 " Just use the C plugin for now.
 runtime! ftplugin/c.vim ftplugin/c_*.vim ftplugin/c/*.vim
+endif
diff --git a/ftplugin/zig.vim b/ftplugin/zig.vim
index 38008957..e7b0712d 100644
--- a/ftplugin/zig.vim
+++ b/ftplugin/zig.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'zig') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 " Only do this when not done yet for this buffer
 if (exists("b:did_ftplugin"))
   finish
@@ -16,3 +13,4 @@ set shiftwidth=4
 setlocal suffixesadd=.zig
 setlocal commentstring=//\ %s
 setlocal makeprg=zig\ build
+endif
diff --git a/indent/Dockerfile.vim b/indent/Dockerfile.vim
index 1eefd26a..c6e62f1b 100644
--- a/indent/Dockerfile.vim
+++ b/indent/Dockerfile.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dockerfile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
 if exists('b:did_indent') | finish | endif
 let b:did_indent = 1
 
@@ -25,3 +22,4 @@ endfunction
 
 
 set indentexpr=DockerfileIndent(v:lnum)
+endif
diff --git a/indent/Jenkinsfile.vim b/indent/Jenkinsfile.vim
index 79d09bb8..150a6604 100644
--- a/indent/Jenkinsfile.vim
+++ b/indent/Jenkinsfile.vim
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jenkins') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jenkins') == -1
 runtime indent/groovy.vim
+endif
diff --git a/indent/ansible.vim b/indent/ansible.vim
index e8ad6a73..bc224e3a 100644
--- a/indent/ansible.vim
+++ b/indent/ansible.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 let s:save_cpo = &cpo
 set cpo&vim
 
@@ -61,3 +58,4 @@ function GetAnsibleIndent(lnum)
 endfunction
 
 let &cpo = s:save_cpo
+endif
diff --git a/indent/applescript.vim b/indent/applescript.vim
index 41b9884b..c5435824 100644
--- a/indent/applescript.vim
+++ b/indent/applescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'applescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'applescript') == -1
 "Plugin Name: applescript indent file.
 "Author: mityu
 "Last Change: 02-May-2017.
@@ -79,3 +76,4 @@ let &cpo=s:cpo_save
 unlet s:cpo_save
 
 " vim: foldmethod=marker
+endif
diff --git a/indent/arduino.vim b/indent/arduino.vim
index d29cbba7..6432bc4c 100644
--- a/indent/arduino.vim
+++ b/indent/arduino.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'arduino') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arduino') == -1
 " Vim indent file
 " Language:	Arduino
 " Maintainer:	Kevin Sjöberg <kev.sjoberg@gmail.com>
@@ -17,3 +14,4 @@ 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 c04d94dd..4fb87f0b 100644
--- a/indent/autohotkey.vim
+++ b/indent/autohotkey.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'autohotkey') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'autohotkey') == -1
 " Vim indent file
 " Language:   AutoHotkey
 " Maintainer: Hirotoshi Namikawa <hnamikaw1@gmail.com>
@@ -221,3 +218,4 @@ function! GetAutoHotkeyIndent()
 endfunction
 
 let b:did_indent = 1
+endif
diff --git a/indent/blade.vim b/indent/blade.vim
index cd865cd9..6e4e631c 100644
--- a/indent/blade.vim
+++ b/indent/blade.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'blade') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
 " Vim indent file
 " Language:     Blade (Laravel)
 " Maintainer:   Jason Walton <jwalton512@gmail.com>
@@ -97,3 +94,4 @@ function! GetBladeIndent()
 
     return indent
 endfunction
+endif
diff --git a/indent/cabal.vim b/indent/cabal.vim
index e4d80e82..2e1619e0 100644
--- a/indent/cabal.vim
+++ b/indent/cabal.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 " indentation for cabal
 "
 " author: raichoo (raichoo@googlemail.com)
@@ -33,3 +30,4 @@ function! GetCabalIndent()
     return match(l:prevline, '\S')
   endif
 endfunction
+endif
diff --git a/indent/caddyfile.vim b/indent/caddyfile.vim
index 885a9495..ca24b9fe 100644
--- a/indent/caddyfile.vim
+++ b/indent/caddyfile.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'caddyfile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
 if exists('b:did_indent')
 	finish
 endif
@@ -43,3 +40,4 @@ function! GetCaddyfileIndent(lnum)
 
 	return ind
 endfunction
+endif
diff --git a/indent/clojure.vim b/indent/clojure.vim
index 4ad30821..9aa7fdbc 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'clojure') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
 " Vim indent file
 " Language:     Clojure
 " Author:       Meikel Brandmeyer <mb@kotka.de>
@@ -405,3 +402,4 @@ 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 2ab2dc34..f84b5cdf 100644
--- a/indent/cmake.vim
+++ b/indent/cmake.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cmake') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmake') == -1
 " Vim indent file
 " Language:     CMake (ft=cmake)
 " Author:       Andy Cedilnik <andy.cedilnik@kitware.com>
@@ -91,3 +88,4 @@ endfun
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
+endif
diff --git a/indent/coffee.vim b/indent/coffee.vim
index bf39c733..0d0f1ba6 100644
--- a/indent/coffee.vim
+++ b/indent/coffee.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -430,3 +427,4 @@ function! GetCoffeeIndent(curlnum)
   " No special rules applied, so use the default policy.
   exec 'return' s:GetDefaultPolicy(a:curlnum)
 endfunction
+endif
diff --git a/indent/crystal.vim b/indent/crystal.vim
index 836a9369..177462e5 100644
--- a/indent/crystal.vim
+++ b/indent/crystal.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
   finish
@@ -637,3 +634,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 et:
+endif
diff --git a/indent/cucumber.vim b/indent/cucumber.vim
index e4ad953e..ea098447 100644
--- a/indent/cucumber.vim
+++ b/indent/cucumber.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cucumber') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 " Vim indent file
 " Language:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -77,3 +74,4 @@ function! GetCucumberIndent()
 endfunction
 
 " vim:set sts=2 sw=2:
+endif
diff --git a/indent/cython.vim b/indent/cython.vim
index 2b8fef1e..2bf211d8 100644
--- a/indent/cython.vim
+++ b/indent/cython.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-indent') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-indent') == -1
 " PEP8 compatible Python indent file
 " Language:         Python
 " Maintainer:       Daniel Hahler <https://daniel.hahler.de/>
@@ -456,3 +453,4 @@ function! GetPythonPEPIndent(lnum)
 
     return s:indent_like_previous_line(a:lnum)
 endfunction
+endif
diff --git a/indent/d.vim b/indent/d.vim
index 13a6ddf8..878b4c28 100644
--- a/indent/d.vim
+++ b/indent/d.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dlang') != -1
-  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).
 "
 " Language:     D
@@ -79,3 +76,4 @@ function GetDIndent()
 
   return cind
 endfunction
+endif
diff --git a/indent/dart.vim b/indent/dart.vim
index 1900e99c..b7a932f9 100644
--- a/indent/dart.vim
+++ b/indent/dart.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dart') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
 if exists('b:did_indent')
   finish
 endif
@@ -37,3 +34,4 @@ function! DartIndent()
 
   return indentTo
 endfunction
+endif
diff --git a/indent/dune.vim b/indent/dune.vim
index 3f8e7e87..6f3e709b 100644
--- a/indent/dune.vim
+++ b/indent/dune.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Vim indent file
 " Language: dune
 
@@ -12,3 +9,4 @@ 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/eelixir.vim b/indent/eelixir.vim
index 0c98c162..5ad0fd77 100644
--- a/indent/eelixir.vim
+++ b/indent/eelixir.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if exists("b:did_indent")
   finish
 endif
@@ -74,3 +71,4 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/indent/elixir.vim b/indent/elixir.vim
index b2aa7ea7..212070df 100644
--- a/indent/elixir.vim
+++ b/indent/elixir.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if exists("b:did_indent")
   finish
 end
@@ -17,3 +14,4 @@ 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 db86e289..d4ebdb60 100644
--- a/indent/elm.vim
+++ b/indent/elm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
 " indentation for Elm (http://elm-lang.org/)
 
 " Only load this indent file when no other was loaded.
@@ -113,3 +110,4 @@ function! GetElmIndent()
 
 	return l:ind
 endfunc
+endif
diff --git a/indent/ember-script.vim b/indent/ember-script.vim
index 8a28d875..618d4193 100644
--- a/indent/ember-script.vim
+++ b/indent/ember-script.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emberscript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
 " Language:    ember-script
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>>
 " URL:         http://github.com/yalesov/vim-ember-script
@@ -16,3 +13,4 @@ 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 67132c0c..4a1fea00 100644
--- a/indent/emblem.vim
+++ b/indent/emblem.vim
@@ -1,10 +1,8 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emblem') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
 " Language:    emblem
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>
 " URL:         http://github.com/yalesov/vim-emblem
 " Version:     2.0.1
 " Last Change: 2016 Jul 6
 " License:     ISC
+endif
diff --git a/indent/erlang.vim b/indent/erlang.vim
index 04eb2d44..7c3f6b5c 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'erlang') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
 " Vim indent file
 " Language:     Erlang (http://www.erlang.org)
 " Author:       Csaba Hoch <csaba.hoch@gmail.com>
@@ -1485,3 +1482,4 @@ 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 7d3966cb..c6cbb3d8 100644
--- a/indent/eruby.vim
+++ b/indent/eruby.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim indent file
 " Language:		eRuby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -112,3 +109,4 @@ let &cpo = s:cpo_sav
 unlet! s:cpo_sav
 
 " vim:set sw=2 sts=2 ts=8 noet:
+endif
diff --git a/indent/fish.vim b/indent/fish.vim
index dfdd5bca..3b0b62b4 100644
--- a/indent/fish.vim
+++ b/indent/fish.vim
@@ -1,6 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
-  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/fsharp.vim b/indent/fsharp.vim
index b227cec0..0d320253 100644
--- a/indent/fsharp.vim
+++ b/indent/fsharp.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fsharp') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
 " Vim indent file
 " Language:     FSharp
 " Maintainers:  Jean-Francois Yuen   <jfyuen@happycoders.org>
@@ -251,3 +248,4 @@ function! GetFsharpIndent()
 endfunction
 
 " vim: sw=4 et sts=4
+endif
diff --git a/indent/gitconfig.vim b/indent/gitconfig.vim
index fd2ed5a9..0a156511 100644
--- a/indent/gitconfig.vim
+++ b/indent/gitconfig.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim indent file
 " Language:	git config file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -40,3 +37,4 @@ function! GetGitconfigIndent()
     return -1
   endif
 endfunction
+endif
diff --git a/indent/glsl.vim b/indent/glsl.vim
index 7690e654..657b1275 100644
--- a/indent/glsl.vim
+++ b/indent/glsl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'glsl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
 " Language: OpenGL Shading Language
 " Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
 
@@ -13,3 +10,4 @@ setlocal autoindent cindent
 setlocal formatoptions+=roq
 
 " vim:set sts=2 sw=2 :
+endif
diff --git a/indent/go.vim b/indent/go.vim
index 8847a118..81d33a08 100644
--- a/indent/go.vim
+++ b/indent/go.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  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
 " license that can be found in the LICENSE file.
@@ -88,3 +85,4 @@ 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 60c38fe0..2988cfc8 100644
--- a/indent/gohtmltmpl.vim
+++ b/indent/gohtmltmpl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 if exists("b:did_indent")
   finish
 endif
@@ -56,3 +53,4 @@ 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 1bf93abb..71076764 100644
--- a/indent/graphql.vim
+++ b/indent/graphql.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 " Vim indent file
 " Language: GraphQL
 " Maintainer: Jon Parise <jon@indelible.org>
@@ -79,3 +76,4 @@ endfunction
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/indent/groovy.vim b/indent/groovy.vim
index 3143239e..0f1bafd7 100644
--- a/indent/groovy.vim
+++ b/indent/groovy.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'groovy-indent') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'groovy-indent') == -1
 " Vim indent file
 " Language:	Groovy
 " Maintainer:	Toby Allsopp <toby.allsopp@peace.com> (resigned)
@@ -165,3 +162,4 @@ function GetGroovyIndent()
 endfunction
 
 " vi: sw=2 et
+endif
diff --git a/indent/haml.vim b/indent/haml.vim
index c5c73c88..55bd0d2e 100644
--- a/indent/haml.vim
+++ b/indent/haml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 " Vim indent file
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -76,3 +73,4 @@ function! GetHamlIndent()
 endfunction
 
 " vim:set sw=2:
+endif
diff --git a/indent/handlebars.vim b/indent/handlebars.vim
index 2253a7a3..eb7a9b78 100644
--- a/indent/handlebars.vim
+++ b/indent/handlebars.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'handlebars') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 " Mustache & Handlebars syntax
 " Language:	Mustache, Handlebars
 " Maintainer:	Juvenn Woo <machese@gmail.com>
@@ -127,3 +124,4 @@ function! GetHandlebarsIndent(...)
 
   return ind
 endfunction
+endif
diff --git a/indent/haskell.vim b/indent/haskell.vim
index a3f1be3e..e752f8d8 100644
--- a/indent/haskell.vim
+++ b/indent/haskell.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 " indentation for haskell
 "
 " author: raichoo (raichoo@googlemail.com)
@@ -511,3 +508,4 @@ function! GetHaskellIndent()
 
   return -1
 endfunction
+endif
diff --git a/indent/hcl.vim b/indent/hcl.vim
index e4a16819..5b8b8fde 100644
--- a/indent/hcl.vim
+++ b/indent/hcl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'hcl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hcl') == -1
 if exists('b:did_indent')
   finish
 endif
@@ -13,3 +10,4 @@ setlocal cindent
 
 " don't de-indent comments (cindent treats them like preprocessor directives)
 setlocal cinkeys-=0#
+endif
diff --git a/indent/html.vim b/indent/html.vim
index 25389520..55c63200 100644
--- a/indent/html.vim
+++ b/indent/html.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Vim indent script for HTML
 " Header: "{{{
 " Maintainer:	Bram Moolenaar
@@ -1063,3 +1060,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: fdm=marker ts=8 sw=2 tw=78
+endif
diff --git a/indent/idris.vim b/indent/idris.vim
index b7b9015d..86aae692 100644
--- a/indent/idris.vim
+++ b/indent/idris.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'idris') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 " indentation for idris (idris-lang.org)
 "
 " Based on haskell indentation by motemen <motemen@gmail.com>
@@ -146,3 +143,4 @@ function! GetIdrisIndent()
 
   return match(prevline, '\S')
 endfunction
+endif
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 49154dbb..cda92db9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 " Vim indent file
 " Language: Javascript
 " Maintainer: Chris Paul ( https://github.com/bounceme )
@@ -479,3 +476,4 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/indent/jinja.vim b/indent/jinja.vim
index 759d3ee9..94f70ce5 100644
--- a/indent/jinja.vim
+++ b/indent/jinja.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jinja') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jinja') == -1
 " Vim indent file
 " Language:	Jinja HTML template
 " Maintainer:	Evan Hammer <evan@evanhammer.com>
@@ -82,3 +79,4 @@ function! GetDjangoIndent(...)
 
     return ind
 endfunction
+endif
diff --git a/indent/json.vim b/indent/json.vim
index 9a4f8bde..460cb049 100644
--- a/indent/json.vim
+++ b/indent/json.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'json') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
 " Vim indent file
 " Language:		JSON
 " Mantainer:		Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json
@@ -179,3 +176,4 @@ unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 noet:
 
+endif
diff --git a/indent/jst.vim b/indent/jst.vim
index 493bbdae..806033dd 100644
--- a/indent/jst.vim
+++ b/indent/jst.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jst') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jst') == -1
 if exists("b:did_indent")
   finish
 endif
@@ -77,3 +74,4 @@ endfunction
 
 " vim:set sw=2 sts=2 ts=8 noet:
 
+endif
diff --git a/indent/julia.vim b/indent/julia.vim
index b8453f73..1d5e5d0f 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 " Vim indent file
 " Language:	Julia
 " Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
@@ -387,3 +384,4 @@ function GetJuliaIndent()
 
   return ind
 endfunction
+endif
diff --git a/indent/kotlin.vim b/indent/kotlin.vim
index 56211b36..e574c006 100644
--- a/indent/kotlin.vim
+++ b/indent/kotlin.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'kotlin') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
 " Vim indent file
 " Language: Kotlin
 " Maintainer: Alexander Udalov
@@ -58,3 +55,4 @@ function! GetKotlinIndent()
 
     return prev_indent
 endfunction
+endif
diff --git a/indent/less.vim b/indent/less.vim
index afb048b4..44f6fc02 100644
--- a/indent/less.vim
+++ b/indent/less.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'less') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 " Vim indent file
 " Language:            LessCSS
 " Maintainer:        Leonard Ehrenfried <leonard.ehrenfried@web.de>
@@ -11,4 +8,4 @@ if exists("b:did_indent")
   finish
 endif
 
-runtime! indent/css.vim
-\ No newline at end of file
+runtime! indent/css.vimendif
diff --git a/indent/lilypond.vim b/indent/lilypond.vim
index 169a6758..8e2ca02a 100644
--- a/indent/lilypond.vim
+++ b/indent/lilypond.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'lilypond') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 " LilyPond indent file
 " Language:     LilyPond
 " Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
@@ -62,3 +59,4 @@ endfunction
 "
 "
 "
+endif
diff --git a/indent/litcoffee.vim b/indent/litcoffee.vim
index ca747ea0..d8382308 100644
--- a/indent/litcoffee.vim
+++ b/indent/litcoffee.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 if exists('b:did_indent')
   finish
 endif
@@ -24,3 +21,4 @@ function GetLitCoffeeIndent()
   endif
 endfunc
 
+endif
diff --git a/indent/llvm.vim b/indent/llvm.vim
index 90829c25..94c89a04 100644
--- a/indent/llvm.vim
+++ b/indent/llvm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'llvm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 " Vim indent file
 " Language:   llvm
 " Maintainer: The LLVM team, http://llvm.org/
@@ -74,3 +71,4 @@ function! GetLLVMIndent()
 
   return ind
 endfunction
+endif
diff --git a/indent/ls.vim b/indent/ls.vim
index 975c5dab..0f2d7b22 100644
--- a/indent/ls.vim
+++ b/indent/ls.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'livescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 " Language:    LiveScript
 " Maintainer:  George Zahariev
 " URL:         http://github.com/gkz/vim-ls
@@ -266,3 +263,4 @@ function! GetLiveScriptIndent(curlinenum)
 
   return indent
 endfunction
+endif
diff --git a/indent/lua.vim b/indent/lua.vim
index 5f37ae03..4bd6e2b4 100644
--- a/indent/lua.vim
+++ b/indent/lua.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'lua') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lua') == -1
 " Vim indent file
 " Language: Lua
 " URL: https://github.com/tbastos/vim-lua
@@ -118,3 +115,4 @@ function GetLuaIndent()
   return indent(prev_line) + (shiftwidth() * i)
 
 endfunction
+endif
diff --git a/indent/mako.vim b/indent/mako.vim
index 48b5c5c5..c99202f6 100644
--- a/indent/mako.vim
+++ b/indent/mako.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mako') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
 " Vim indent file
 " Language: Mako
 " Author: Scott Torborg <storborg@mit.edu>
@@ -430,3 +427,4 @@ fun! <SID>HtmlIndentSum(lnum, style)
 endfun
 
 " vim: set ts=4 sw=4:
+endif
diff --git a/indent/markdown.vim b/indent/markdown.vim
index 3bba57ac..60205111 100644
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'markdown') != -1
-  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
 
@@ -77,3 +74,4 @@ function GetMarkdownIndent()
         return ind
     endif
 endfunction
+endif
diff --git a/indent/meson.vim b/indent/meson.vim
index 738d86fa..a546f944 100644
--- a/indent/meson.vim
+++ b/indent/meson.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'meson') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'meson') == -1
 " Vim indent file
 " Language:		Meson
 " Maintainer:		Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
@@ -181,3 +178,4 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:sw=2
+endif
diff --git a/indent/moon.vim b/indent/moon.vim
index b758b0e8..7fe985d3 100644
--- a/indent/moon.vim
+++ b/indent/moon.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'moonscript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
 " Language:    MoonScript
 " Maintainer:  leafo <leafot@gmail.com>
 " Based On:    CoffeeScript by Mick Koch <kchmck@gmail.com>
@@ -325,3 +322,4 @@ function! GetMoonIndent(curlinenum)
 
   return indent
 endfunction
+endif
diff --git a/indent/nginx.vim b/indent/nginx.vim
index df8ccaef..0aefe740 100644
--- a/indent/nginx.vim
+++ b/indent/nginx.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nginx') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
 if exists("b:did_indent")
     finish
 endif
@@ -13,3 +10,4 @@ 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 94250b70..b61ee8b3 100644
--- a/indent/nim.vim
+++ b/indent/nim.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nim') != -1
-  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")
   finish
@@ -144,3 +141,4 @@ endfunction
 
 " vim:sw=2
 
+endif
diff --git a/indent/nix.vim b/indent/nix.vim
index 54abd430..e70a06a5 100644
--- a/indent/nix.vim
+++ b/indent/nix.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nix') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 " Vim indent file
 " Language:    Nix
 " Maintainer:  Daiderd Jordan <daiderd@gmail.com>
@@ -105,3 +102,4 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/indent/ocaml.vim b/indent/ocaml.vim
index 2da3e15b..9c10ac6f 100644
--- a/indent/ocaml.vim
+++ b/indent/ocaml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Vim indent file
 " Language:     OCaml
 " Maintainers:  Jean-Francois Yuen   <jfyuen@happycoders.org>
@@ -275,3 +272,4 @@ function! GetOCamlIndent()
 endfunction
 
 " vim:sw=2
+endif
diff --git a/indent/omake.vim b/indent/omake.vim
index cac4521a..5d610650 100644
--- a/indent/omake.vim
+++ b/indent/omake.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Vim indent file
 " Language:         OMakefile
 
@@ -116,3 +113,4 @@ function GetMakeIndent()
     endif
   endif
 endfunction
+endif
diff --git a/indent/opencl.vim b/indent/opencl.vim
index 6bd47ddc..c97c54e6 100644
--- a/indent/opencl.vim
+++ b/indent/opencl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'opencl') != -1
-  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")
   finish
@@ -12,3 +9,4 @@ if version > 600
 endif
 
 let b:did_indent = 1
+endif
diff --git a/indent/perl.vim b/indent/perl.vim
index 9733f52a..46895815 100644
--- a/indent/perl.vim
+++ b/indent/perl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Vim indent file
 " Language:      Perl 5
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -182,3 +179,4 @@ 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 9c99b0c5..0f60bf1a 100644
--- a/indent/pgsql.vim
+++ b/indent/pgsql.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pgsql') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pgsql') == -1
 " Vim indent file
 " Language:    SQL
 " Author:  David Fishburn <dfishburn dot vim at gmail dot com>
@@ -391,3 +388,4 @@ 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 919a0c86..7f33b156 100644
--- a/indent/plantuml.vim
+++ b/indent/plantuml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'plantuml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
 scriptencoding utf-8
 " Vim indent file
 " Language:     PlantUML
@@ -87,3 +84,4 @@ function! s:getIncIndent() abort
         \ '^\s*skinparam\>.*{\s*$\|' .
         \ s:typeKeywordIncPattern()
 endfunction
+endif
diff --git a/indent/pony.vim b/indent/pony.vim
index 5db42cae..67ce483b 100644
--- a/indent/pony.vim
+++ b/indent/pony.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pony') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
 " Vim indent file
 " Language:     Pony
 " Maintainer:   Jak Wings
@@ -39,3 +36,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 let b:did_indent = 1
+endif
diff --git a/indent/proto.vim b/indent/proto.vim
index 4520d170..d94a4f18 100644
--- a/indent/proto.vim
+++ b/indent/proto.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'protobuf') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protobuf') == -1
 " Vim indent file
 " Language:	Protobuf
 " Maintainer:	Johannes Zellner <johannes@zellner.org>
@@ -19,3 +16,4 @@ setlocal expandtab
 setlocal shiftwidth=2
 
 let b:undo_indent = "setl cin<"
+endif
diff --git a/indent/ps1.vim b/indent/ps1.vim
index e0b01e0d..96ca8b2c 100644
--- a/indent/ps1.vim
+++ b/indent/ps1.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'powershell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 " Vim indent file
 " Language:           Windows PowerShell
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -22,3 +19,4 @@ inoremap <buffer> # X#
 
 let b:undo_indent = "setl si<"
 
+endif
diff --git a/indent/pug.vim b/indent/pug.vim
index c4f71cde..cfb363cc 100644
--- a/indent/pug.vim
+++ b/indent/pug.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pug') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
 " Vim indent file
 " Language: Pug
 " Maintainer: Joshua Borton
@@ -72,3 +69,4 @@ function! GetPugIndent()
 endfunction
 
 " vim:set sw=2:
+endif
diff --git a/indent/puppet.vim b/indent/puppet.vim
index 977e8606..a3a494a0 100644
--- a/indent/puppet.vim
+++ b/indent/puppet.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 " Vim indent file
 " Language: Puppet
 " Maintainer:   Todd Zullinger <tmz@pobox.com>
@@ -138,3 +135,4 @@ function! GetPuppetIndent(...)
 
     return ind
 endfunction
+endif
diff --git a/indent/purescript.vim b/indent/purescript.vim
index 0d152b57..780a06a1 100644
--- a/indent/purescript.vim
+++ b/indent/purescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'purescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
 " indentation for purescript
 "
 " Based on idris indentation
@@ -278,3 +275,4 @@ function! GetPurescriptIndent()
 
   return match(prevline, '\S')
 endfunction
+endif
diff --git a/indent/python.vim b/indent/python.vim
index 2b8fef1e..2bf211d8 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-indent') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-indent') == -1
 " PEP8 compatible Python indent file
 " Language:         Python
 " Maintainer:       Daniel Hahler <https://daniel.hahler.de/>
@@ -456,3 +453,4 @@ function! GetPythonPEPIndent(lnum)
 
     return s:indent_like_previous_line(a:lnum)
 endfunction
+endif
diff --git a/indent/qml.vim b/indent/qml.vim
index 7e1c2019..9187f60f 100644
--- a/indent/qml.vim
+++ b/indent/qml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'qml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
 " Vim indent file
 " Language:     QML
 " Author:       Robert Kieffer
@@ -61,3 +58,4 @@ function! GetJsIndent()
 
   return ind
 endfunction
+endif
diff --git a/indent/racket.vim b/indent/racket.vim
index 2bbbb6c3..f6b1e06d 100644
--- a/indent/racket.vim
+++ b/indent/racket.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'racket') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
 " Language:     Racket
 " Maintainer:   Will Langstroth <will@langstroth.com>
 " URL:          http://github.com/wlangstroth/vim-racket
@@ -14,3 +11,4 @@ let b:did_indent = 1
 setlocal ai nosi
 
 let b:undo_indent = "setl ai< si<"
+endif
diff --git a/indent/reason.vim b/indent/reason.vim
index 4901a4f5..0e8c3b74 100644
--- a/indent/reason.vim
+++ b/indent/reason.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'reason') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reason') == -1
 " Vim indent file
 " Language:         Reason (adapted from Rust)
 " Author:           Chris Morgan <me@chrismorgan.info> (Modifications by Jordan W)
@@ -219,3 +216,4 @@ function GetReasonIndent(lnum)
 	" Fall back on cindent, which does it mostly right
 	return cindent(a:lnum)
 endfunction
+endif
diff --git a/indent/ruby.vim b/indent/ruby.vim
index 56c1aa12..dad86a8c 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim indent file
 " Language:		Ruby
 " Maintainer:		Andrew Radev <andrey.radev@gmail.com>
@@ -954,3 +951,4 @@ 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 68178070..a744008f 100644
--- a/indent/rust.vim
+++ b/indent/rust.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Vim indent file
 " Language:         Rust
 " Author:           Chris Morgan <me@chrismorgan.info>
@@ -281,3 +278,4 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/indent/scala.vim b/indent/scala.vim
index 2fcb3378..d70b35df 100644
--- a/indent/scala.vim
+++ b/indent/scala.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 " Vim indent file
 " Language         : Scala (http://scala-lang.org/)
 " Original Author  : Stefan Matthias Aust
@@ -608,3 +605,4 @@ endfunction
 
 " vim:set sw=2 sts=2 ts=8 et:
 " vim600:fdm=marker fdl=1 fdc=0:
+endif
diff --git a/indent/scss.vim b/indent/scss.vim
index f602f358..efbd1812 100644
--- a/indent/scss.vim
+++ b/indent/scss.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scss') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
 " Vim indent file
 " Language    : SCSS (Sassy CSS)
 " Maintainer  : Daniel Hofstetter (daniel.hofstetter@42dh.com)
@@ -91,3 +88,4 @@ unlet s:keepcpo
 
 " vim:set et ts=2 sw=2:
 
+endif
diff --git a/indent/slim.vim b/indent/slim.vim
index 75220e2b..43dfd5be 100644
--- a/indent/slim.vim
+++ b/indent/slim.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'slim') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
 " Vim indent file
 " Language:	Slim
 
@@ -77,3 +74,4 @@ function! GetSlimIndent()
 endfunction
 
 " vim:set sw=2:
+endif
diff --git a/indent/slime.vim b/indent/slime.vim
index e986847c..50cd6d24 100644
--- a/indent/slime.vim
+++ b/indent/slime.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'slime') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slime') == -1
 " Vim indent file
 " Language:	Slime
 
@@ -77,3 +74,4 @@ function! GetSlimeIndent()
 endfunction
 
 " vim:set sw=2:
+endif
diff --git a/indent/solidity.vim b/indent/solidity.vim
index 32917b43..682a0e48 100644
--- a/indent/solidity.vim
+++ b/indent/solidity.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'solidity') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
 " Vim indent file
 " Language: Solidity
 " Acknowledgement: Based off of vim-javascript
@@ -441,3 +438,4 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/indent/stylus.vim b/indent/stylus.vim
index 16fb86e6..94f59678 100644
--- a/indent/stylus.vim
+++ b/indent/stylus.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'stylus') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
 " Vim indent file
 " Language: Stylus
 " Maintainer: Marc Harter
@@ -131,3 +128,4 @@ function! GetStylusIndent()
 endfunction
 
 " vim:set sw=2;
+endif
diff --git a/indent/svelte.vim b/indent/svelte.vim
index ef0569ed..d4939adb 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'svelte') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svelte') == -1
 " Vim indent file
 " Language:   Svelte 3 (HTML/JavaScript)
 " Author:     Evan Lecklider <evan@lecklider.com>
@@ -146,3 +143,4 @@ function! GetSvelteIndent()
 
   return indent
 endfunction
+endif
diff --git a/indent/svg.vim b/indent/svg.vim
index 8e22f3bf..90d1dfaf 100644
--- a/indent/svg.vim
+++ b/indent/svg.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'svg-indent') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svg-indent') == -1
 " Vim indent file
 "
 " Language: svg
@@ -107,3 +104,4 @@ endfun
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
+endif
diff --git a/indent/swift.vim b/indent/swift.vim
index f4448806..247197cb 100644
--- a/indent/swift.vim
+++ b/indent/swift.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'swift') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
 " File: swift.vim
 " Author: Keith Smiley
 " Description: The indent file for Swift
@@ -296,3 +293,4 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/indent/terraform.vim b/indent/terraform.vim
index 74b7808a..81fb938c 100644
--- a/indent/terraform.vim
+++ b/indent/terraform.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'terraform') != -1
-  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')
   finish
@@ -56,3 +53,4 @@ endfunction
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/indent/tex.vim b/indent/tex.vim
index 31abcd57..c498c0c4 100644
--- a/indent/tex.vim
+++ b/indent/tex.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX indent file (part of LaTeX Box)
 " Maintainer: David Munger (mungerd@gmail.com)
 
@@ -138,3 +135,4 @@ if v:version > 703 || (v:version == 703 && has('patch598'))
 endif
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/indent/tsx.vim b/indent/tsx.vim
index 906ee222..d6ab43a2 100644
--- a/indent/tsx.vim
+++ b/indent/tsx.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 " Save the current JavaScript indentexpr.
 let b:tsx_ts_indentexpr = &indentexpr
 
@@ -112,3 +109,4 @@ fu! GetTsxIndent()
 
   return ind
 endfu
+endif
diff --git a/indent/twig.vim b/indent/twig.vim
index 69d60524..240181be 100644
--- a/indent/twig.vim
+++ b/indent/twig.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'twig') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
 if exists("b:ran_once")
 	finish
 endif
@@ -78,3 +75,4 @@ fun! s:BuildStructures()
 endfun
 
 call s:BuildStructures()
+endif
diff --git a/indent/typescript.vim b/indent/typescript.vim
index deb4f18c..ce94f32a 100644
--- a/indent/typescript.vim
+++ b/indent/typescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 " Vim indent file
 " Language: TypeScript
 " Acknowledgement: Based off of vim-ruby maintained by Nikolai Weibull http://vim-ruby.rubyforge.org
@@ -503,3 +500,4 @@ function! Fixedgq(lnum, count)
 
     return 0
 endfunction
+endif
diff --git a/indent/vala.vim b/indent/vala.vim
index fa3aac3d..288885b5 100644
--- a/indent/vala.vim
+++ b/indent/vala.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
 " Vim indent file
 " Language:         Vala
 " Author:           Adrià Arrufat <adria.arrufat@protonmail.ch>
@@ -85,3 +82,4 @@ function GetValaIndent(lnum)
 	" Fall back on cindent, which does it mostly right
 	return cindent(a:lnum)
 endfunction
+endif
diff --git a/indent/velocity.vim b/indent/velocity.vim
index 6ac23863..2f6fe153 100644
--- a/indent/velocity.vim
+++ b/indent/velocity.vim
@@ -1,9 +1,7 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vm') == -1
 if exists("b:did_indent")
     finish
 endif
 
 runtime! indent/html.vim
+endif
diff --git a/indent/vue.vim b/indent/vue.vim
index 2acc65ac..a07f28ab 100644
--- a/indent/vue.vim
+++ b/indent/vue.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vue') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
 " Vim indent file
 " Language: Vue.js
 " Maintainer: Eduardo San Martin Morote
@@ -66,3 +63,4 @@ function! GetVueIndent()
 
   return indent
 endfunction
+endif
diff --git a/plugin_guard.vim.template b/plugin_guard.vim.template
index 5a3171a2..f2c9883d 100644
--- a/plugin_guard.vim.template
+++ b/plugin_guard.vim.template
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, '%%PACK%%') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, '%%PACK%%') == -1
 %%CONTENT%%
+endif
diff --git a/plugin_guard_jsx.vim.template b/plugin_guard_jsx.vim.template
index a6b41027..ffa94905 100644
--- a/plugin_guard_jsx.vim.template
+++ b/plugin_guard_jsx.vim.template
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && (index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
 %%CONTENT%%
+endif
diff --git a/syntax/Dockerfile.vim b/syntax/Dockerfile.vim
index d9e26353..bc620057 100644
--- a/syntax/Dockerfile.vim
+++ b/syntax/Dockerfile.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dockerfile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
 " Vim syntax file
 " Language: Dockerfile
 " Maintainer: Eugene Kalinin
@@ -61,3 +58,4 @@ hi link dockerfileTodo      Todo
 hi link bashStatement       Function
 
 let b:current_syntax = "dockerfile"
+endif
diff --git a/syntax/Jenkinsfile.vim b/syntax/Jenkinsfile.vim
index 84ab11d0..3c0bc4b0 100644
--- a/syntax/Jenkinsfile.vim
+++ b/syntax/Jenkinsfile.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jenkins') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jenkins') == -1
 runtime syntax/groovy.vim
 syn keyword jenkinsfileBuiltInVariable currentBuild
 
@@ -128,3 +125,4 @@ hi link jenkinsFileDockerKeyword     jenkinsfilePipelineStep
 let b:current_syntax = 'Jenkinsfile'
 
 " vim:set et sw=0 ts=2 ft=vim tw=78:
+endif
diff --git a/syntax/ansible.vim b/syntax/ansible.vim
index e6cb1565..a8032ff1 100644
--- a/syntax/ansible.vim
+++ b/syntax/ansible.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 " Vim syntax file
 " Language: Ansible YAML/Jinja templates
 " Maintainer: Dave Honneffer <pearofducks@gmail.com>
@@ -106,3 +103,4 @@ else
 endif
 
 let b:current_syntax = "ansible"
+endif
diff --git a/syntax/ansible_hosts.vim b/syntax/ansible_hosts.vim
index 22791bda..cad58884 100644
--- a/syntax/ansible_hosts.vim
+++ b/syntax/ansible_hosts.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 " Vim syntax file
 " Language: Ansible hosts files
 " Maintainer: Dave Honneffer <pearofducks@gmail.com>
@@ -33,3 +30,4 @@ if exists("g:ansible_attribute_highlight")
 endif
 
 let b:current_syntax = "ansible_hosts"
+endif
diff --git a/syntax/apiblueprint.vim b/syntax/apiblueprint.vim
index 282fa0fa..a2b21b35 100644
--- a/syntax/apiblueprint.vim
+++ b/syntax/apiblueprint.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'apiblueprint') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'apiblueprint') == -1
 runtime! syntax/markdown.vim
 unlet! b:current_syntax
 
@@ -36,3 +33,4 @@ highlight default link apibActionRelationKey Identifier
 
 let b:current_syntax = 'apiblueprint'
 
+endif
diff --git a/syntax/applescript.vim b/syntax/applescript.vim
index 91597b61..8a083c48 100644
--- a/syntax/applescript.vim
+++ b/syntax/applescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'applescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'applescript') == -1
 " Vim syntax file
 " Language:    AppleScript
 " Maintainer:  Jim Eberle <jim.eberle@fastnlight.com>
@@ -247,3 +244,4 @@ hi def link scptTodo Todo
 
 let b:current_syntax = "applescript"
 
+endif
diff --git a/syntax/arduino.vim b/syntax/arduino.vim
index 177b36db..3b3ed772 100644
--- a/syntax/arduino.vim
+++ b/syntax/arduino.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'arduino') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arduino') == -1
 " Vim syntax file
 " Language:    Arduino
 " Maintainer:  Sudar <sudar@sudarmuthu.com>
@@ -168,3 +165,4 @@ hi def link arduinoType Type
 hi def link arduinoConstant Constant
 hi def link arduinoFunc Function
 hi def link arduinoIdentifier Identifier
+endif
diff --git a/syntax/asciidoc.vim b/syntax/asciidoc.vim
index fcfda6b0..eb0d9f02 100644
--- a/syntax/asciidoc.vim
+++ b/syntax/asciidoc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'asciidoc') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asciidoc') == -1
 " Vim syntax file
 " Language:     AsciiDoc
 " Author:       Stuart Rackham <srackham@gmail.com> (inspired by Felix
@@ -185,3 +182,4 @@ hi def link asciidocURL Macro
 let b:current_syntax = "asciidoc"
 
 " vim: wrap et sw=2 sts=2:
+endif
diff --git a/syntax/asl.vim b/syntax/asl.vim
index 67f3237f..3e89f444 100644
--- a/syntax/asl.vim
+++ b/syntax/asl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'acpiasl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'acpiasl') == -1
 " Vim syntax file
 " Language: ACPI ASL files
 " Maintainer: Martin L Roth <gaumless@gmail.com>
@@ -110,3 +107,4 @@ hi def link aslNumber            Number
 let b:current_syntax = "asl"
 syn sync minlines=200
 
+endif
diff --git a/syntax/basic/class.vim b/syntax/basic/class.vim
index ab834390..2cefe76d 100644
--- a/syntax/basic/class.vim
+++ b/syntax/basic/class.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 "don't add typescriptMembers to nextgroup, let outer scope match it
 " so we won't match abstract method outside abstract class
 syntax keyword typescriptAbstract              abstract
@@ -67,3 +64,4 @@ syntax region typescriptInterfaceTypeArguments matchgroup=typescriptTypeBrackets
   \ contained skipwhite
 
 syntax match typescriptInterfaceComma /,/ contained nextgroup=typescriptInterfaceHeritage skipwhite skipnl
+endif
diff --git a/syntax/basic/cluster.vim b/syntax/basic/cluster.vim
index 0188aa98..07775a18 100644
--- a/syntax/basic/cluster.vim
+++ b/syntax/basic/cluster.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 "Block VariableStatement EmptyStatement ExpressionStatement IfStatement IterationStatement ContinueStatement BreakStatement ReturnStatement WithStatement LabelledStatement SwitchStatement ThrowStatement TryStatement DebuggerStatement
 syntax cluster typescriptStatement
   \ contains=typescriptBlock,typescriptVariable,
@@ -40,3 +37,4 @@ syntax cluster typescriptValue
   \ contains=@typescriptExpression,typescriptObjectLiteral
 
 syntax cluster typescriptEventExpression       contains=typescriptArrowFuncDef,typescriptParenExp,@typescriptValue,typescriptRegexpString,@typescriptEventTypes,typescriptOperator,typescriptGlobal,jsxRegion
+endif
diff --git a/syntax/basic/decorator.vim b/syntax/basic/decorator.vim
index c27b9b7e..c61ca643 100644
--- a/syntax/basic/decorator.vim
+++ b/syntax/basic/decorator.vim
@@ -1,7 +1,5 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax match typescriptDecorator /@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>/
   \ nextgroup=typescriptArgumentList,typescriptTypeArguments
   \ contains=@_semantic,typescriptDotNotation
+endif
diff --git a/syntax/basic/doc.vim b/syntax/basic/doc.vim
index d5e43e34..88a2c08d 100644
--- a/syntax/basic/doc.vim
+++ b/syntax/basic/doc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 "Syntax coloring for Node.js shebang line
 syntax match   shellbang "^#!.*node\>"
 syntax match   shellbang "^#!.*iojs\>"
@@ -85,3 +82,4 @@ if main_syntax == "typescript"
 endif
 
 syntax case match
+endif
diff --git a/syntax/basic/function.vim b/syntax/basic/function.vim
index db93b368..782a58aa 100644
--- a/syntax/basic/function.vim
+++ b/syntax/basic/function.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptAsyncFuncKeyword      async
   \ nextgroup=typescriptFuncKeyword,typescriptArrowFuncDef
   \ skipwhite
@@ -69,3 +66,4 @@ syntax region typescriptParamImpl matchgroup=typescriptParens
   \ contains=typescriptDecorator,@typescriptParameterList,@typescriptComments
   \ nextgroup=typescriptReturnAnnotation,typescriptBlock
   \ contained skipwhite skipnl
+endif
diff --git a/syntax/basic/identifiers.vim b/syntax/basic/identifiers.vim
index 2a88102c..6a774f1b 100644
--- a/syntax/basic/identifiers.vim
+++ b/syntax/basic/identifiers.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax cluster afterIdentifier contains=
   \ typescriptDotNotation,
   \ typescriptFuncCallArg,
@@ -31,3 +28,4 @@ syntax region  typescriptParenExp              matchgroup=typescriptParens start
 syntax region  typescriptFuncCallArg           contained matchgroup=typescriptParens start=/(/ end=/)/ contains=@typescriptValue,@typescriptComments nextgroup=@typescriptSymbols,typescriptDotNotation skipwhite skipempty skipnl
 syntax region  typescriptEventFuncCallArg      contained matchgroup=typescriptParens start=/(/ end=/)/ contains=@typescriptEventExpression
 syntax region  typescriptEventString           contained start=/\z(["']\)/  skip=/\\\\\|\\\z1\|\\\n/  end=/\z1\|$/ contains=typescriptASCII,@events
+endif
diff --git a/syntax/basic/keyword.vim b/syntax/basic/keyword.vim
index 999dca07..b658b334 100644
--- a/syntax/basic/keyword.vim
+++ b/syntax/basic/keyword.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 "Import
 syntax keyword typescriptImport                from as import
 syntax keyword typescriptExport                export
@@ -93,3 +90,4 @@ syntax cluster typescriptAmbients contains=
   \ typescriptAbstract,
   \ typescriptEnumKeyword,typescriptEnum,
   \ typescriptModule
+endif
diff --git a/syntax/basic/literal.vim b/syntax/basic/literal.vim
index 315d6123..fca1b54f 100644
--- a/syntax/basic/literal.vim
+++ b/syntax/basic/literal.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 "Syntax in the JavaScript code
 
 " String
@@ -45,3 +42,4 @@ syntax match typescriptNumber /\d[0-9_]*\.\d[0-9_]*\|\d[0-9_]*\|\.\d[0-9]*/
   \ nextgroup=typescriptExponent,@typescriptSymbols skipwhite skipempty
 syntax match typescriptExponent /[eE][+-]\=\d[0-9]*\>/
   \ nextgroup=@typescriptSymbols skipwhite skipempty contained
+endif
diff --git a/syntax/basic/members.vim b/syntax/basic/members.vim
index 45fafbcc..17465093 100644
--- a/syntax/basic/members.vim
+++ b/syntax/basic/members.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptConstructor           contained constructor
   \ nextgroup=@typescriptCallSignature
   \ skipwhite skipempty
@@ -48,3 +45,4 @@ syntax region  typescriptComputedMember   contained matchgroup=typescriptPropert
   \ contains=@typescriptValue,typescriptMember,typescriptMappedIn
   \ nextgroup=@memberNextGroup
   \ skipwhite skipempty
+endif
diff --git a/syntax/basic/object.vim b/syntax/basic/object.vim
index 533201c3..eadaba0a 100644
--- a/syntax/basic/object.vim
+++ b/syntax/basic/object.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax region  typescriptObjectLiteral         matchgroup=typescriptBraces
   \ start=/{/ end=/}/
   \ contains=@typescriptComments,typescriptObjectLabel,typescriptStringProperty,typescriptComputedPropertyName
@@ -30,3 +27,4 @@ syntax match typescriptRestOrSpread /\.\.\./ contained
 syntax match typescriptObjectSpread /\.\.\./ contained containedin=typescriptObjectLiteral,typescriptArray nextgroup=@typescriptValue
 
 syntax match typescriptObjectColon contained /:/ nextgroup=@typescriptValue skipwhite skipempty
+endif
diff --git a/syntax/basic/patch.vim b/syntax/basic/patch.vim
index ea4adfa2..127059d5 100644
--- a/syntax/basic/patch.vim
+++ b/syntax/basic/patch.vim
@@ -1,9 +1,7 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 " patch for generated code
 syntax keyword typescriptGlobal Promise
   \ nextgroup=typescriptGlobalPromiseDot,typescriptFuncCallArg,typescriptTypeArguments oneline
 syntax keyword typescriptGlobal Map WeakMap
   \ nextgroup=typescriptGlobalPromiseDot,typescriptFuncCallArg,typescriptTypeArguments oneline
+endif
diff --git a/syntax/basic/reserved.vim b/syntax/basic/reserved.vim
index cf6467c2..b5940510 100644
--- a/syntax/basic/reserved.vim
+++ b/syntax/basic/reserved.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax cluster typescriptStrings               contains=typescriptProp,typescriptString,typescriptTemplate,@typescriptComments,typescriptDocComment,typescriptRegexpString,typescriptPropertyName
 
 syntax cluster typescriptNoReserved contains=
@@ -33,3 +30,4 @@ syntax keyword typescriptReserved containedin=ALLBUT,@typescriptNoReserved volat
 syntax keyword typescriptReserved containedin=ALLBUT,@typescriptNoReserved class
 syntax keyword typescriptReserved containedin=ALLBUT,@typescriptNoReserved var
 syntax keyword typescriptReserved containedin=ALLBUT,@typescriptNoReserved function
+endif
diff --git a/syntax/basic/symbols.vim b/syntax/basic/symbols.vim
index 978694e1..93adb687 100644
--- a/syntax/basic/symbols.vim
+++ b/syntax/basic/symbols.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 " + - ^ ~
 syntax match typescriptUnaryOp /[+\-~!]/
  \ nextgroup=@typescriptValue
@@ -40,3 +37,4 @@ syntax match   typescriptBinaryOp contained /-\(-\|=\)\?/ nextgroup=@typescriptV
 syntax match typescriptBinaryOp contained /\*\*=\?/ nextgroup=@typescriptValue
 
 syntax cluster typescriptSymbols               contains=typescriptBinaryOp,typescriptKeywordOp,typescriptTernary,typescriptAssign,typescriptCastKeyword
+endif
diff --git a/syntax/basic/type.vim b/syntax/basic/type.vim
index 6f9097b0..b2f849fc 100644
--- a/syntax/basic/type.vim
+++ b/syntax/basic/type.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 " Types
 syntax match typescriptOptionalMark /?/ contained
 
@@ -189,3 +186,4 @@ syntax region typescriptAliasDeclaration matchgroup=typescriptUnion
 syntax keyword typescriptReadonlyArrayKeyword readonly
   \ nextgroup=@typescriptPrimaryType
   \ skipwhite
+endif
diff --git a/syntax/blade.vim b/syntax/blade.vim
index 21b41b58..7d622d63 100644
--- a/syntax/blade.vim
+++ b/syntax/blade.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'blade') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
 " Vim syntax file
 " Language:     Blade (Laravel)
 " Maintainer:   Jason Walton <jwalton512@gmail.com>
@@ -75,3 +72,4 @@ let b:current_syntax = 'blade'
 if exists('main_syntax') && main_syntax == 'blade'
     unlet main_syntax
 endif
+endif
diff --git a/syntax/c.vim b/syntax/c.vim
index 58a66daa..701a52c6 100644
--- a/syntax/c.vim
+++ b/syntax/c.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c/c++') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c/c++') == -1
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
@@ -491,3 +488,4 @@ unlet s:ft
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
+endif
diff --git a/syntax/cabal.vim b/syntax/cabal.vim
index f1571f4a..25e262a7 100644
--- a/syntax/cabal.vim
+++ b/syntax/cabal.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 " syntax highlighting for cabal
 "
 " author: raichoo (raichoo@googlemail.com)
@@ -53,3 +50,4 @@ highlight def link cabalDocNewline Operator
 highlight def link cabalDocCode Macro
 
 let b:current_syntax = "cabal"
+endif
diff --git a/syntax/caddyfile.vim b/syntax/caddyfile.vim
index aeec90b6..79ecc36f 100644
--- a/syntax/caddyfile.vim
+++ b/syntax/caddyfile.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'caddyfile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
 " Language: Caddyfile
 " Author:   Josh Glendenning <josh@isobit.io>
 
@@ -31,3 +28,4 @@ hi link caddyString String
 hi link caddyComment Comment
 
 let b:current_syntax = "caddyfile"
+endif
diff --git a/syntax/carp.vim b/syntax/carp.vim
index 093bbbd3..e6503621 100644
--- a/syntax/carp.vim
+++ b/syntax/carp.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'carp') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'carp') == -1
 " Vim syntax file
 " Language:     Carp
 " Maintainer:   Veit Heller <veit@veitheller.de>
@@ -167,3 +164,4 @@ if version >= 508 || !exists("carp_syntax_init")
 endif
 
 let b:current_syntax = "carp"
+endif
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index 12b526a3..2d444294 100644
--- a/syntax/clojure.vim
+++ b/syntax/clojure.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'clojure') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
 " Vim syntax file
 " Language:     Clojure
 " Authors:      Toralf Wittner <toralf.wittner@gmail.com>
@@ -225,3 +222,4 @@ let &cpo = s:cpo_sav
 unlet! s:cpo_sav
 
 " vim:sts=8:sw=8:ts=8:noet
+endif
diff --git a/syntax/cmake.vim b/syntax/cmake.vim
index 9c6c1917..a67a3754 100644
--- a/syntax/cmake.vim
+++ b/syntax/cmake.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cmake') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmake') == -1
 " Vim syntax file
 " Program:      CMake - Cross-Platform Makefile Generator
 " Version:      cmake version 3.14.20190529-g067a4f
@@ -3354,3 +3351,4 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim: set nowrap:
+endif
diff --git a/syntax/coffee.vim b/syntax/coffee.vim
index 39b42058..b61d006e 100644
--- a/syntax/coffee.vim
+++ b/syntax/coffee.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -223,3 +220,4 @@ syn cluster coffeeAll contains=coffeeStatement,coffeeRepeat,coffeeConditional,
 if !exists('b:current_syntax')
   let b:current_syntax = 'coffee'
 endif
+endif
diff --git a/syntax/common.vim b/syntax/common.vim
index b639206b..27e4480d 100644
--- a/syntax/common.vim
+++ b/syntax/common.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 " Define the default highlighting.
 " For version 5.8 and later: only when an item doesn't have highlighting yet
 let did_typescript_hilink = 1
@@ -163,3 +160,4 @@ if exists("did_typescript_hilink")
   delcommand HiLink
   unlet did_typescript_hilink
 endif
+endif
diff --git a/syntax/cpp.vim b/syntax/cpp.vim
index 092c21e2..587eef28 100644
--- a/syntax/cpp.vim
+++ b/syntax/cpp.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c/c++') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c/c++') == -1
 " Vim syntax file
 " Language:	C++
 " Current Maintainer:	vim-jp (https://github.com/vim-jp/vim-cpp)
@@ -78,3 +75,4 @@ hi def link cppNumber		Number
 let b:current_syntax = "cpp"
 
 " vim: ts=8
+endif
diff --git a/syntax/cql.vim b/syntax/cql.vim
index df9a1c35..acdd5030 100644
--- a/syntax/cql.vim
+++ b/syntax/cql.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cql') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cql') == -1
 " Vim syntax file
 " Language:     cql
 " Maintainer:   Eric Lubow <eric@lubow.org
@@ -133,3 +130,4 @@ endif
 
 let b:current_syntax = "cql"
 
+endif
diff --git a/syntax/cryptol.vim b/syntax/cryptol.vim
index 9f3c611e..5739f627 100644
--- a/syntax/cryptol.vim
+++ b/syntax/cryptol.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cryptol') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
 " Vim syntax file
 " Language:	Cryptol
 " Maintainer:	Fergus Henderson
@@ -115,3 +112,4 @@ endif
 let b:current_syntax = "cryptol"
 
 " Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=vim
+endif
diff --git a/syntax/crystal.vim b/syntax/crystal.vim
index ea37ecb9..77fea2ce 100644
--- a/syntax/crystal.vim
+++ b/syntax/crystal.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 " Language: Crystal
 " Based on Ruby syntax highlight
 " which was made by Mirko Nasato and Doug Kearns
@@ -401,3 +398,4 @@ hi def link crystalSpaceError		crystalError
 let b:current_syntax = 'crystal'
 
 " vim: nowrap sw=2 sts=2 ts=8 noet:
+endif
diff --git a/syntax/csv.vim b/syntax/csv.vim
index 848e2218..17ddb1b3 100644
--- a/syntax/csv.vim
+++ b/syntax/csv.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'csv') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csv') == -1
 " A simple syntax highlighting, simply alternate colors between two
 " adjacent columns
 " Init {{{2
@@ -171,3 +168,4 @@ let b:current_syntax="csv"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: set foldmethod=marker et sw=0 sts=-1 ts=4:
+endif
diff --git a/syntax/cucumber.vim b/syntax/cucumber.vim
index 496db9c7..e94e9835 100644
--- a/syntax/cucumber.vim
+++ b/syntax/cucumber.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cucumber') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 " Vim syntax file
 " Language:     Cucumber
 " Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
@@ -144,3 +141,4 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:set sts=2 sw=2:
+endif
diff --git a/syntax/cuesheet.vim b/syntax/cuesheet.vim
index 6c615eb3..8bd089f6 100644
--- a/syntax/cuesheet.vim
+++ b/syntax/cuesheet.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cue') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cue') == -1
 " Language:    Cue sheet
 " Maintainer:  Matěj Grabovský
 " URL:         http://github.com/mgrabovsky
@@ -28,3 +25,4 @@ syn match Number /\<\d\+\%(:\d\{2}\)\{2}\>/
 let b:current_syntax='cuesheet'
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/syntax/d.vim b/syntax/d.vim
index 8550c256..4e14cefa 100644
--- a/syntax/d.vim
+++ b/syntax/d.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dlang') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 " Vim syntax file for the D programming language (version 1.076 and 2.069).
 "
 " Language:     D
@@ -575,3 +572,4 @@ syn keyword dAsmOpCode contained	adc
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/syntax/dart.vim b/syntax/dart.vim
index 49e41193..996659b6 100644
--- a/syntax/dart.vim
+++ b/syntax/dart.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dart') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
 " Vim syntax file " Language: Dart
 " Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 " for details. All rights reserved. Use of this source code is governed by a
@@ -137,3 +134,4 @@ let b:spell_options = "contained"
 if g:main_syntax is# 'dart'
   unlet g:main_syntax
 endif
+endif
diff --git a/syntax/dcov.vim b/syntax/dcov.vim
index e241fb3d..83315eda 100644
--- a/syntax/dcov.vim
+++ b/syntax/dcov.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dlang') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 " Vim syntax file for coverage information for the reference compiler (DMD) of
 " the D programming language.
 "
@@ -53,3 +50,4 @@ hi def link dcovLow                     Operator
 hi def link dcovPartial                 Structure
 
 let b:current_syntax = "dcov"
+endif
diff --git a/syntax/dd.vim b/syntax/dd.vim
index ae682f50..cc943713 100644
--- a/syntax/dd.vim
+++ b/syntax/dd.vim
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dlang') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 runtime! /syntax/ddoc.vim
+endif
diff --git a/syntax/ddoc.vim b/syntax/ddoc.vim
index 3c2860d8..80a2a1cb 100644
--- a/syntax/ddoc.vim
+++ b/syntax/ddoc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dlang') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 if &filetype == "ddoc"
     "ddoc file type
     " Quit when a syntax file was already loaded
@@ -84,3 +81,4 @@ elseif &filetype == "d"
     hi! def link ddocIdentifierNestedDecl  Macro
     hi! def link ddocKeyword               Macro
 endif
+endif
diff --git a/syntax/dhall.vim b/syntax/dhall.vim
index 8c79b9f0..01124586 100644
--- a/syntax/dhall.vim
+++ b/syntax/dhall.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dhall') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dhall') == -1
 scriptencoding utf-8
 
 if exists('b:current_syntax')
@@ -64,3 +61,4 @@ highlight link dhallComment Comment
 highlight link dhallMultilineComment Comment
 
 let b:current_syntax = 'dhall'
+endif
diff --git a/syntax/docker-compose.vim b/syntax/docker-compose.vim
index 0fadc6f1..573d45e6 100644
--- a/syntax/docker-compose.vim
+++ b/syntax/docker-compose.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dockerfile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
 " Vim syntax file
 " Language: Dockerfile
 " Maintainer: Eugene Kalinin
@@ -82,3 +79,4 @@ hi link dockercomposeTodo      Todo
 hi link bashStatement       Function
 
 let b:current_syntax = "dockercompose"
+endif
diff --git a/syntax/dsdl.vim b/syntax/dsdl.vim
index f9ffc877..3300ca70 100644
--- a/syntax/dsdl.vim
+++ b/syntax/dsdl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dlang') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 " Vim syntax file for DUB configurations."
 "
 " Language:     SDLang (dub config)
@@ -92,3 +89,4 @@ hi def link dsdlStatement            Statement
 hi def link dsdlAttribute            Tag
 
 let b:current_syntax = "dsdl"
+endif
diff --git a/syntax/dune.vim b/syntax/dune.vim
index 4e2c2afe..900c08b7 100644
--- a/syntax/dune.vim
+++ b/syntax/dune.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 if exists("b:current_syntax")
     finish
 endif
@@ -38,3 +35,4 @@ syn match duneVar '\${\k\+\(:\k\+\)\?}' containedin=lispSymbol
 hi def link duneVar Identifier
 
 let b:current_syntax = "dune"
+endif
diff --git a/syntax/eelixir.vim b/syntax/eelixir.vim
index 398becc5..0e499af6 100644
--- a/syntax/eelixir.vim
+++ b/syntax/eelixir.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if exists("b:current_syntax")
   finish
 endif
@@ -72,3 +69,4 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index ad245ca6..35490fd9 100644
--- a/syntax/elixir.vim
+++ b/syntax/elixir.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if !exists("main_syntax")
   if exists("b:current_syntax")
     finish
@@ -245,3 +242,4 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/syntax/elm.vim b/syntax/elm.vim
index 3e643065..2f0b2876 100644
--- a/syntax/elm.vim
+++ b/syntax/elm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
 " syntax highlighting for Elm (http://elm-lang.org/)
 
 if exists('b:current_syntax')
@@ -83,3 +80,4 @@ hi def link elmNumberType Identifier
 syn sync minlines=500
 
 let b:current_syntax = 'elm'
+endif
diff --git a/syntax/ember-script.vim b/syntax/ember-script.vim
index 8869d757..eaaf8bc3 100644
--- a/syntax/ember-script.vim
+++ b/syntax/ember-script.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emberscript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
 " Language:    ember-script
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>>
 " URL:         http://github.com/yalesov/vim-ember-script
@@ -33,3 +30,4 @@ syn match emEach /\v\@each/ display
 hi def link emEach Special
 
 let b:current_syntax = 'ember-script'
+endif
diff --git a/syntax/emblem.vim b/syntax/emblem.vim
index 649e0208..980d21d2 100644
--- a/syntax/emblem.vim
+++ b/syntax/emblem.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emblem') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
 " Language:    emblem
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>
 " URL:         http://github.com/yalesov/vim-emblem
@@ -173,3 +170,4 @@ hi def link eblId       Constant
 hi def link eblClass    Identifier
 
 let b:current_syntax = 'emblem'
+endif
diff --git a/syntax/erlang.vim b/syntax/erlang.vim
index 391ad1b3..d3b547c6 100644
--- a/syntax/erlang.vim
+++ b/syntax/erlang.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'erlang') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
 " Vim syntax file
 " Language:     Erlang (http://www.erlang.org)
 " Maintainer:   Csaba Hoch <csaba.hoch@gmail.com>
@@ -263,3 +260,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 et
+endif
diff --git a/syntax/eruby.vim b/syntax/eruby.vim
index 91246d0f..d0627bc6 100644
--- a/syntax/eruby.vim
+++ b/syntax/eruby.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim syntax file
 " Language:		eRuby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -82,3 +79,4 @@ if main_syntax == 'eruby'
 endif
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/syntax/fbs.vim b/syntax/fbs.vim
index 90ee9409..340d3064 100644
--- a/syntax/fbs.vim
+++ b/syntax/fbs.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'flatbuffers') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'flatbuffers') == -1
 if exists("b:current_syntax")
   finish
 endif
@@ -54,3 +51,4 @@ if version >= 508 || !exists("did_proto_syn_inits")
 endif
 
 let b:current_syntax = "fbs"
+endif
diff --git a/syntax/ferm.vim b/syntax/ferm.vim
index ff87082c..f372a1e5 100644
--- a/syntax/ferm.vim
+++ b/syntax/ferm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ferm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ferm') == -1
 "============================================================================
 " ferm syntax highlighter
 "
@@ -205,3 +202,4 @@ endif
 " Autoconfigure vim indentation settings
 " vim:ts=4:sw=4:sts=4:fdm=marker:iskeyword+=-
 
+endif
diff --git a/syntax/fish.vim b/syntax/fish.vim
index 8ba62e14..0fe60454 100644
--- a/syntax/fish.vim
+++ b/syntax/fish.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 if exists('b:current_syntax')
     finish
 endif
@@ -39,3 +36,4 @@ highlight default link fishStatement Statement
 highlight default link fishCommandSub fishStatement
 
 let b:current_syntax = 'fish'
+endif
diff --git a/syntax/fsharp.vim b/syntax/fsharp.vim
index 16802018..999d4fd4 100644
--- a/syntax/fsharp.vim
+++ b/syntax/fsharp.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fsharp') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
 " Vim syntax file
 " Language:     F#
 " Last Change:  Sun 19 Oct 2014 11:11:44 PM CEST
@@ -267,3 +264,4 @@ endif
 let b:current_syntax = 'fsharp'
 
 " vim: sw=4 et sts=4
+endif
diff --git a/syntax/git.vim b/syntax/git.vim
index 686dcf80..768e1ffc 100644
--- a/syntax/git.vim
+++ b/syntax/git.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim syntax file
 " Language:	generic git output
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -82,3 +79,4 @@ hi def link gitDiffAdded         diffAdded
 hi def link gitDiffRemoved       diffRemoved
 
 let b:current_syntax = "git"
+endif
diff --git a/syntax/gitcommit.vim b/syntax/gitcommit.vim
index 10aa7a1f..554bef68 100644
--- a/syntax/gitcommit.vim
+++ b/syntax/gitcommit.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim syntax file
 " Language:	git commit file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -93,3 +90,4 @@ hi def link gitcommitArrow		gitcommitComment
 hi def link gitcommitBlank		Error
 
 let b:current_syntax = "gitcommit"
+endif
diff --git a/syntax/gitconfig.vim b/syntax/gitconfig.vim
index 80ee7971..5c5055e2 100644
--- a/syntax/gitconfig.vim
+++ b/syntax/gitconfig.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim syntax file
 " Language:	git config file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -38,3 +35,4 @@ hi def link gitconfigEscape		Special
 hi def link gitconfigError		Error
 
 let b:current_syntax = "gitconfig"
+endif
diff --git a/syntax/gitrebase.vim b/syntax/gitrebase.vim
index 01b4cc0f..0313e8f3 100644
--- a/syntax/gitrebase.vim
+++ b/syntax/gitrebase.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim syntax file
 " Language:	git rebase --interactive
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -46,3 +43,4 @@ hi def link gitrebaseComment        Comment
 hi def link gitrebaseSquashError    Error
 
 let b:current_syntax = "gitrebase"
+endif
diff --git a/syntax/gitsendemail.vim b/syntax/gitsendemail.vim
index 1d0b4c9b..b491379b 100644
--- a/syntax/gitsendemail.vim
+++ b/syntax/gitsendemail.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim syntax file
 " Language:	git send-email message
 " Maintainer:	Tim Pope
@@ -25,3 +22,4 @@ syn match   gitsendemailComment "^GIT:.*"
 hi def link gitsendemailComment Comment
 
 let b:current_syntax = "gitsendemail"
+endif
diff --git a/syntax/glsl.vim b/syntax/glsl.vim
index 2c9b08c5..7ef4e636 100644
--- a/syntax/glsl.vim
+++ b/syntax/glsl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'glsl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
 " Language: OpenGL Shading Language
 " Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
 
@@ -677,3 +674,4 @@ if !exists("b:current_syntax")
 endif
 
 " vim:set sts=2 sw=2 :
+endif
diff --git a/syntax/gmpl.vim b/syntax/gmpl.vim
index 9eb26f8f..326b62d1 100644
--- a/syntax/gmpl.vim
+++ b/syntax/gmpl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'gmpl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gmpl') == -1
 " Vim syntax file
 " Language: GMPL
 " Maintainer: Mark Mba Wright
@@ -120,3 +117,4 @@ hi def link gmplType Type
 hi def link gmplLabel Keyword
 hi def link gmplString String
 hi def link gmplStringToken Special 
+endif
diff --git a/syntax/gnuplot.vim b/syntax/gnuplot.vim
index 632719fd..fd7b559c 100644
--- a/syntax/gnuplot.vim
+++ b/syntax/gnuplot.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'gnuplot') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gnuplot') == -1
 " Vim syntax file
 " Language:	gnuplot 4.7.0
 " Maintainer:	Andrew Rasmussen andyras@users.sourceforge.net
@@ -556,3 +553,4 @@ endif
 let b:current_syntax = "gnuplot"
 
 " vim: ts=8
+endif
diff --git a/syntax/go.vim b/syntax/go.vim
index 86c09b68..5f098aaa 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 " Copyright 2009 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
 " license that can be found in the LICENSE file.
@@ -414,3 +411,4 @@ syn sync minlines=500
 let b:current_syntax = "go"
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/syntax/godebugoutput.vim b/syntax/godebugoutput.vim
index c7fbd005..3d05e3e2 100644
--- a/syntax/godebugoutput.vim
+++ b/syntax/godebugoutput.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 if exists("b:current_syntax")
   finish
 endif
@@ -15,3 +12,4 @@ hi def link godebugOutputErr Comment
 hi def link godebugOutputOut Normal
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/syntax/godebugstacktrace.vim b/syntax/godebugstacktrace.vim
index dfc741dc..e803fcf3 100644
--- a/syntax/godebugstacktrace.vim
+++ b/syntax/godebugstacktrace.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 if exists("b:current_syntax")
   finish
 endif
@@ -13,3 +10,4 @@ let b:current_syntax = "godebugoutput"
 hi def link godebugStacktrace SpecialKey
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/syntax/godebugvariables.vim b/syntax/godebugvariables.vim
index 853a4917..b057b067 100644
--- a/syntax/godebugvariables.vim
+++ b/syntax/godebugvariables.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 if exists("b:current_syntax")
   finish
 endif
@@ -25,3 +22,4 @@ hi def link goType Type
 hi def link goBoolean Boolean
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/syntax/godefstack.vim b/syntax/godefstack.vim
index 69e10a3e..d9bad004 100644
--- a/syntax/godefstack.vim
+++ b/syntax/godefstack.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 if exists("b:current_syntax")
   finish
 endif
@@ -22,3 +19,4 @@ hi def link godefStackFilename          Directory
 hi def link godefStackEntryLocationNumber LineNr
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/syntax/gohtmltmpl.vim b/syntax/gohtmltmpl.vim
index 565d9e02..95953d61 100644
--- a/syntax/gohtmltmpl.vim
+++ b/syntax/gohtmltmpl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 if exists("b:current_syntax")
   finish
 endif
@@ -19,3 +16,4 @@ syn cluster htmlPreproc add=gotplAction,goTplComment
 let b:current_syntax = "gohtmltmpl"
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/syntax/gomod.vim b/syntax/gomod.vim
index 74b430cc..238d9065 100644
--- a/syntax/gomod.vim
+++ b/syntax/gomod.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 " gomod.vim: Vim syntax file for go.mod file
 "
 " Quit when a (custom) syntax file was already loaded
@@ -87,3 +84,4 @@ syntax match gomodVersion "v[2-9]\{1}\d*\.\d\+\.\d\+\%(+\%([0-9A-Za-z-]\+\)\%(\.
 highlight default link gomodVersion Identifier
 
 let b:current_syntax = "gomod"
+endif
diff --git a/syntax/gotexttmpl.vim b/syntax/gotexttmpl.vim
index 7730af9c..6f5bc7d0 100644
--- a/syntax/gotexttmpl.vim
+++ b/syntax/gotexttmpl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  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
 " license that can be found in the LICENSE file.
@@ -87,3 +84,4 @@ hi def link goTplComment Comment
 let b:current_syntax = "gotexttmpl"
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/syntax/graphql.vim b/syntax/graphql.vim
index 06223576..b30b2228 100644
--- a/syntax/graphql.vim
+++ b/syntax/graphql.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 " Vim syntax file
 " Language: GraphQL
 " Maintainer: Jon Parise <jon@indelible.org>
@@ -66,3 +63,4 @@ hi def link graphqlVariable         Identifier
 syn sync minlines=500
 
 let b:current_syntax = 'graphql'
+endif
diff --git a/syntax/groovy.vim b/syntax/groovy.vim
index 25dcf68a..2182bd3e 100644
--- a/syntax/groovy.vim
+++ b/syntax/groovy.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'groovy') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'groovy') == -1
 " Vim syntax file
 " Language:	Groovy
 " Maintainer:	Alessio Pace <billy.corgan@tiscali.it>
@@ -452,3 +449,4 @@ endif
 let b:spell_options="contained"
 
 " vim: ts=8
+endif
diff --git a/syntax/haml.vim b/syntax/haml.vim
index cd584cf9..880ebbf0 100644
--- a/syntax/haml.vim
+++ b/syntax/haml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 " Vim syntax file
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -111,3 +108,4 @@ if main_syntax == "haml"
 endif
 
 " vim:set sw=2:
+endif
diff --git a/syntax/haproxy.vim b/syntax/haproxy.vim
index 786c2fb8..8352a013 100644
--- a/syntax/haproxy.vim
+++ b/syntax/haproxy.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haproxy') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haproxy') == -1
 " Vim syntax file
 " Language:    HAproxy
 " Maintainer:  Dan Reif
@@ -358,3 +355,4 @@ delcommand HiLink
 
 let b:current_syntax = "haproxy"
 " vim: ts=8
+endif
diff --git a/syntax/haskell.vim b/syntax/haskell.vim
index e86aa7c3..ead2d541 100644
--- a/syntax/haskell.vim
+++ b/syntax/haskell.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 " syntax highlighting for haskell
 "
 " Heavily modified version of the haskell syntax
@@ -210,3 +207,4 @@ if get(g:, 'haskell_backpack', 0)
   highlight def link haskellBackpackDependency Include
 endif
 let b:current_syntax = "haskell"
+endif
diff --git a/syntax/haxe.vim b/syntax/haxe.vim
index b2c1606d..89329caa 100644
--- a/syntax/haxe.vim
+++ b/syntax/haxe.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haxe') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haxe') == -1
 " Vim syntax file
 " Language:     haxe
 " Derived from:
@@ -429,3 +426,4 @@ if main_syntax == 'haxe'
   unlet main_syntax
 endif
 let b:spell_options="contained"
+endif
diff --git a/syntax/hcl.vim b/syntax/hcl.vim
index 30e83544..8937cabe 100644
--- a/syntax/hcl.vim
+++ b/syntax/hcl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'hcl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hcl') == -1
 
 if exists("b:current_syntax")
   finish
@@ -46,3 +43,4 @@ hi def link hclInterpolation            String
 hi def link hclSimpleString             PreProc
 
 let b:current_syntax = "hcl"
+endif
diff --git a/syntax/helm.vim b/syntax/helm.vim
index aa75c006..1a0d5c13 100644
--- a/syntax/helm.vim
+++ b/syntax/helm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'helm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'helm') == -1
 if exists("b:current_syntax")
   finish
 endif
@@ -93,3 +90,4 @@ hi def link goTplComment Comment
 let b:current_syntax = "helm"
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/syntax/hive.vim b/syntax/hive.vim
index e858f9fd..bc0b7fd4 100644
--- a/syntax/hive.vim
+++ b/syntax/hive.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'hive') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hive') == -1
 " Vim syntax file
 " Language: HIVE Query Language
 " Maintainer: German Lashevich <german.lashevich@gmail.com>
@@ -137,3 +134,4 @@ hi link hiveVar Special
 let b:current_syntax = "hive"
 
 " vim: ts=4
+endif
diff --git a/syntax/html.vim b/syntax/html.vim
index a529b56b..61dacaa5 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Vim syntax file
 " Language:     HTML (version 5.1)
 "               SVG (SVG 1.1 Second Edition)
@@ -192,10 +189,8 @@ syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemul
 syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
 syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
 
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jinja') != -1
-  finish
 endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jinja') == -1
 " Vim syntax file
 " Language:	HTML (version 5)
 " Maintainer:	Rodrigo Machado <rcmachado@gmail.com>
@@ -286,3 +281,4 @@ syn match  htmlArg contained "\<aria-\(dropeffect\|grabbed\)\>"
 " Relationship Attributes
 syn match  htmlArg contained "\<aria-\(activedescendant\|controls\|describedby\|flowto\|\)\>"
 syn match  htmlArg contained "\<aria-\(labelledby\|owns\|posinset\|setsize\|\)\>"
+endif
diff --git a/syntax/html/aria.vim b/syntax/html/aria.vim
index 78106c17..a22c013b 100644
--- a/syntax/html/aria.vim
+++ b/syntax/html/aria.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Vim syntax file
 " Language:     WAI-ARIA
 " Maintainer:  	othree <othree@gmail.com>
@@ -77,3 +74,4 @@ syn match    htmlArg contained "\<aria-\%(\|labelledby\|owns\|posinset\|setsize\
 syn match    htmlArg contained "\<aria-\%(\|colcount\|colindex\|colspan\)\>"
 syn match    htmlArg contained "\<aria-\%(\|rowcount\|rowindex\|rowspan\)\>"
 
+endif
diff --git a/syntax/html/electron.vim b/syntax/html/electron.vim
index 64ed9e9b..090c0648 100644
--- a/syntax/html/electron.vim
+++ b/syntax/html/electron.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Vim syntax file
 " Language:     Electron
 " Maintainer:   othree <othree@gmail.com>
@@ -17,3 +14,4 @@ syn keyword htmlArg contained useragent disablewebsecurity partition allowpopups
 syn keyword htmlArg contained webpreferences blinkfeatures disableblinkfeatures
 syn keyword htmlArg contained guestinstance disableguestresize 
 
+endif
diff --git a/syntax/html/rdfa.vim b/syntax/html/rdfa.vim
index 4f32e783..dfe9f9b6 100644
--- a/syntax/html/rdfa.vim
+++ b/syntax/html/rdfa.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Vim syntax file
 " Language:     RDFa
 " Maintainer:   othree <othree@gmail.com>
@@ -13,3 +10,4 @@ endif
 " RDFa
 " http://www.w3.org/TR/rdfa-syntax/#s_syntax
 syn keyword htmlArg contained about content datatype href inlist prefix property rel resource rev src typeof vocab
+endif
diff --git a/syntax/i3config.vim b/syntax/i3config.vim
index 6448379b..0f0a73fb 100644
--- a/syntax/i3config.vim
+++ b/syntax/i3config.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'i3') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'i3') == -1
 " Vim syntax file
 " Language: i3 config file
 " Maintainer: Mohamed Boughaba <mohamed dot bgb at gmail dot com>
@@ -252,3 +249,4 @@ hi! def link i3ConfigVariable                        Statement
 hi! def link i3ConfigArbitraryCommand                Type
 
 let b:current_syntax = "i3config"
+endif
diff --git a/syntax/idris.vim b/syntax/idris.vim
index 6a86f386..05566fa4 100644
--- a/syntax/idris.vim
+++ b/syntax/idris.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'idris') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 " syntax highlighting for idris (idris-lang.org)
 "
 " Heavily modified version of the haskell syntax
@@ -91,3 +88,4 @@ highlight def link idrisChar String
 highlight def link idrisBacktick Operator
 
 let b:current_syntax = "idris"
+endif
diff --git a/syntax/ion.vim b/syntax/ion.vim
index 1a55663a..0e5455fc 100644
--- a/syntax/ion.vim
+++ b/syntax/ion.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ion') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ion') == -1
 if v:version < 600
   syntax clear
 elseif exists('b:current_syntax')
@@ -85,3 +82,4 @@ hi def link ionProcess PreProc
 hi def link ionComment Comment
 hi def link ionOperator Operator
 hi def link ionFlag Boolean
+endif
diff --git a/syntax/jasmine.vim b/syntax/jasmine.vim
index ea9aa976..87b3de15 100644
--- a/syntax/jasmine.vim
+++ b/syntax/jasmine.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jasmine') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jasmine') == -1
 " Syntax highlighting for jasmine specs (used by http://github.com/thomd/vim-jasmine).
 
 " if b:current_syntax is defined, some other syntax files, earlier in 'runtimepath' was already loaded
@@ -86,3 +83,4 @@ hi def link jasmineSpecial Special
 hi def link jasmineSpy Special
 hi def link jasmineSpyMatcher Statement
 hi def link jasmineSuite Statement
+endif
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 0c917b68..a7dbb98e 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 " Vim syntax file
 " Language:     JavaScript
 " Maintainer:   vim-javascript community
@@ -395,3 +392,4 @@ let b:current_syntax = "javascript"
 if main_syntax == 'javascript'
   unlet main_syntax
 endif
+endif
diff --git a/syntax/javascript/html5.vim b/syntax/javascript/html5.vim
index d8fb1ded..1d4abb0c 100644
--- a/syntax/javascript/html5.vim
+++ b/syntax/javascript/html5.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Vim syntax file
 " Language:	    HTML5 New Stuff
 " Maintainer:	othree <othree@gmail.com>
@@ -51,3 +48,4 @@ syn keyword javascriptDomElemAttrs indeterminate
 
 " select https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
 syn keyword javascriptDomElemAttrs onselectstart onselectchange
+endif
diff --git a/syntax/jinja.vim b/syntax/jinja.vim
index 177619c1..439741fa 100644
--- a/syntax/jinja.vim
+++ b/syntax/jinja.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jinja') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jinja') == -1
 " jinja syntax file
 " Language: Jinja HTML template
 " Maintainer: Hsiaoming Yang <lepture@me.com>
@@ -88,3 +85,4 @@ hi def link jinjaComBlock Comment
 hi def link jinjaTodo Todo
 
 let b:current_syntax = "jinja"
+endif
diff --git a/syntax/jinja2.vim b/syntax/jinja2.vim
index bcdeacb1..749ab66f 100644
--- a/syntax/jinja2.vim
+++ b/syntax/jinja2.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 " Vim syntax file
 " Language: Jinja2 - with special modifications for compound-filetype
 " compatibility
@@ -99,3 +96,4 @@ if !exists("did_jinja_syn_inits")
 endif
 
 let b:current_syntax = "jinja2"
+endif
diff --git a/syntax/json.vim b/syntax/json.vim
index 49a8df7b..fb279a3f 100644
--- a/syntax/json.vim
+++ b/syntax/json.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'json') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
 " Vim syntax file
 " Language:	JSON
 " Maintainer:	Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json
@@ -141,3 +138,4 @@ endif
 "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 "THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 "See https://twitter.com/elzr/status/294964017926119424
+endif
diff --git a/syntax/json5.vim b/syntax/json5.vim
index fae65c66..f5383374 100644
--- a/syntax/json5.vim
+++ b/syntax/json5.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'json5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json5') == -1
 " Modified from the original taken from https://github.com/gutenye/json5.vim
 
 " Syntax setup
@@ -69,3 +66,4 @@ if !exists('b:current_syntax')
   let b:current_syntax = 'json5'
 endif
 
+endif
diff --git a/syntax/jst.vim b/syntax/jst.vim
index 0059716a..4174b44c 100644
--- a/syntax/jst.vim
+++ b/syntax/jst.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jst') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jst') == -1
 if exists("b:current_syntax")
   finish
 endif
@@ -89,3 +86,4 @@ if exists("loaded_matchit")
 endif
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 8baed244..cb6c8e80 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 " Vim syntax file
 " Language:	julia
 " Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
@@ -561,3 +558,4 @@ end
 syntax sync fromstart
 
 let b:current_syntax = "julia"
+endif
diff --git a/syntax/juliadoc.vim b/syntax/juliadoc.vim
index 91f930df..871a2ab5 100644
--- a/syntax/juliadoc.vim
+++ b/syntax/juliadoc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 " Vim syntax file for julia document view
 scriptencoding utf-8
 
@@ -67,3 +64,4 @@ highlight default link juliadocAdmonitionsType Todo
 highlight default link juliadocAdmonitionsTitle Title
 
 let b:current_syntax = "juliadoc"
+endif
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index 8febe4d3..04eab3d7 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'kotlin') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
 " Vim syntax file
 " Language: Kotlin
 " Maintainer: Alexander Udalov
@@ -114,3 +111,4 @@ hi def link ktExclExcl Special
 hi def link ktArrow Structure
 
 let b:current_syntax = 'kotlin'
+endif
diff --git a/syntax/latextoc.vim b/syntax/latextoc.vim
index fbcbc01e..c5713eb6 100644
--- a/syntax/latextoc.vim
+++ b/syntax/latextoc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 syntax match helpText /^.*: .*/
 syntax match secNum /^\S\+\(\.\S\+\)\?\s*/ contained conceal
 syntax match secLine /^\S\+\t.\+/ contains=secNum
@@ -11,3 +8,4 @@ highlight link helpText		PreProc
 highlight link secNum		Number
 highlight link mainSecLine	Title
 highlight link ssubSecLine	Comment
+endif
diff --git a/syntax/less.vim b/syntax/less.vim
index b66f6421..74d249a6 100644
--- a/syntax/less.vim
+++ b/syntax/less.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'less') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 if exists("b:current_syntax")
   finish
 endif
@@ -66,3 +63,4 @@ hi def link lessNestedProperty Type
 hi def link lessClass PreProc
 
 let b:current_syntax = "less"
+endif
diff --git a/syntax/lidris.vim b/syntax/lidris.vim
index d4e55efb..883a237d 100644
--- a/syntax/lidris.vim
+++ b/syntax/lidris.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'idris') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 " Vim syntax file
 " Language:    Literate Idris
 " Maintainer:  Idris Hackers (https://github.com/idris-hackers/idris-vim)
@@ -24,3 +21,4 @@ syntax match  lidrisBirdTrack "^>" contained
 hi def link   lidrisBirdTrack Comment
 
 let b:current_syntax = "lidris"
+endif
diff --git a/syntax/lilypond-words.vim b/syntax/lilypond-words.vim
index 6fafeae9..032c4732 100644
--- a/syntax/lilypond-words.vim
+++ b/syntax/lilypond-words.vim
@@ -1,7 +1,5 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'lilypond') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 syn match lilyKeyword "[-_^]\?\\\(xNotesOn\|xNotesOff\|xNote\|wordwrap-string-internal\|wordwrap-string\|wordwrap-lines\|wordwrap-internal\|wordwrap-field\|wordwrap\|withMusicProperty\|with-url\|with-link\|with-dimensions\|with-color\|with\|whiteout\|whiteTriangleMarkup\|walkerHeadsMinor\|walkerHeads\|vspace\|void\|voiceTwoStyle\|voiceTwo\|voiceThreeStyle\|voiceThree\|voiceOneStyle\|voiceOne\|voiceNeutralStyle\|voiceFourStyle\|voiceFour\|vocalName\|virgula\|virga\|verylongfermata\|versus\|version\|verbatim-file\|vcenter\|varcoda\|upright\|upprall\|upmordent\|upbow\|up\|unset\|unit\|unfoldRepeats\|undo\|underline\|unaCorda\|unHideNotes\|typewriter\|type\|tweak\|turn\|tupletUp\|tupletSpan\|tupletNeutral\|tupletDown\|tuplet\|trill\|triangle\|treCorde\|transposition\|transposedCueDuring\|transpose\|transparent\|translate-scaled\|translate\|topLevelAlignment\|tocTitleMarkup\|tocItemWithDotsMarkup\|tocItemMarkup\|tocItem\|tiny\|timing\|times\|timeSignatureSettings\|timeSignatureFraction\|time\|tied-lyric\|tieWaitForNote\|tieUp\|tieSolid\|tieNeutral\|tieHalfSolid\|tieHalfDashed\|tieDown\|tieDotted\|tieDashed\|tieDashPattern\|thumb\|textSpannerUp\|textSpannerNeutral\|textSpannerDown\|textLengthOn\|textLengthOff\|text\|tenuto\|temporary\|tempoWholesPerMinute\|tempo\|teeny\|tag\|table-of-contents\|tablatureFormat\|tabStaffLineLayoutFunction\|tabFullNotation\|systemStartDelimiter\|sustainOn\|sustainOff\|super\|subdivideBeams\|sub\|styledNoteHeads\|strut\|stropha\|strokeFingerOrientations\|stringTunings\|stringOneTopmost\|stringNumberOrientations\|stopped\|stopTrillSpan\|stopTextSpan\|stopStaff\|stopSlashedGraceMusic\|stopMeasureCount\|stopGroup\|stopGraceSlur\|stopGraceMusic\|stopAppoggiaturaMusic\|stopAcciaccaturaMusic\|stop\|stencil\|stemUp\|stemNeutral\|stemDown\|startTrillSpan\|startTextSpan\|startStaff\|startSlashedGraceMusic\|startRepeatType\|startMeasureCount\|startGroup\|startGraceSlur\|startGraceMusic\|startAppoggiaturaMusic\|startAcciaccaturaMusic\|start\|staccato\|staccatissimo\|squashedPosition\|spp\|spacingTweaks\|sp\|southernHarmonyHeadsMinor\|southernHarmonyHeads\|sostenutoOn\|sostenutoOff\|soloText\|soloIIText\|snappizzicato\|smaller\|smallCaps\|small\|slurUp\|slurSolid\|slurNeutral\|slurHalfSolid\|slurHalfDashed\|slurDown\|slurDotted\|slurDashed\|slurDashPattern\|slashedGrace\|slashed-digit\|slashChordSeparator\|skipTypesetting\|skip\|single\|simultaneous\|simple\|signumcongruentiae\|showStaffSwitch\|showSplitTiedTabNotes\|shortfermata\|shortVocalName\|shortInstrumentName\|shiftOnnn\|shiftOnn\|shiftOn\|shiftOff\|shiftDurations\|sharp\|shape\|sfz\|sfp\|sff\|sf\|settingsFrom\|setDefaultDurationToQuarter\|set\|sesquisharp\|sesquiflat\|sequential\|semisharp\|semiflat\|semicirculus\|semiGermanChords\|segno\|searchForVoice\|scriptDefinitions\|score\|scaleDurations\|scale\|sans\|sacredHarpHeadsMinor\|sacredHarpHeads\|rtoe\|rounded-box\|rotate\|roman\|rightHandFinger\|right-column\|right-brace\|right-align\|right\|rheel\|rfz\|revertTimeSignatureSettings\|revert\|reverseturn\|retrograde\|restrainOpenStrings\|rest-by-number\|rest\|responsum\|resetRelativeOctave\|replace\|repeatTie\|repeatCountVisibility\|repeat\|removeWithTag\|remove\|relative\|rehearsalMark\|raise\|quotedEventTypes\|quotedCueEventTypes\|quoteDuring\|quilisma\|put-adjacent\|pushToTag\|pt\|property-recursive\|printPartCombineTexts\|printKeyCancellation\|predefinedFretboardsOn\|predefinedFretboardsOff\|predefinedDiagramTable\|prallup\|prallprall\|prallmordent\|pralldown\|prall\|ppppp\|pppp\|ppp\|pp\|powerChords\|powerChordSymbol\|powerChordExceptions\|postscript\|portato\|pointAndClickTypes\|pointAndClickOn\|pointAndClickOff\|pitchedTrill\|phrygian\|phrasingSlurUp\|phrasingSlurSolid\|phrasingSlurNeutral\|phrasingSlurHalfSolid\|phrasingSlurHalfDashed\|phrasingSlurDown\|phrasingSlurDotted\|phrasingSlurDashed\|phrasingSlurDashPattern\|pes\|pedalUnaCordaStyle\|pedalUnaCordaStrings\|pedalSustainStyle\|pedalSustainStrings\|pedalSostenutoStyle\|pedalSostenutoStrings\|pattern\|path\|partialJazzMusic\|partialJazzExceptions\|partial\|partcombineUp\|partcombineUnisonoOnce\|partcombineUnisono\|partcombineSoloIOnce\|partcombineSoloIIOnce\|partcombineSoloII\|partcombineSoloI\|partcombineForce\|partcombineDown\|partcombineChordsOnce\|partcombineChords\|partcombineAutomaticOnce\|partcombineAutomatic\|partcombineApartOnce\|partcombineApart\|partcombine\|partCombineTextsOnNote\|partCombineListener\|parenthesize\|parallelMusic\|paper\|palmMuteOn\|palmMuteOff\|palmMute\|pageTurn\|pageBreak\|page-ref\|page-link\|pad-x\|pad-to-box\|pad-markup\|pad-around\|p\|overrideTimeSignatureSettings\|overrideProperty\|override-lines\|override\|oval\|ottava\|oriscus\|open\|oneVoice\|once\|on-the-fly\|omit\|offset\|octaveCheck\|numericTimeSignature\|number\|null\|notemode\|noteToFretFunction\|note-by-number\|note\|normalsize\|normal-text\|normal-size-super\|normal-size-sub\|noPageTurn\|noPageBreak\|noChordSymbol\|noBreak\|noBeam\|newSpacingSection\|new\|neumeDemoLayout\|natural\|name\|musicglyph\|musicMap\|mp\|mordent\|modalTranspose\|modalInversion\|mm\|mixolydian\|minorChordModifier\|minor\|midiInstrument\|midiChannelMapping\|midi\|middleCPosition\|middleCClefPosition\|mf\|metronomeMarkFormatter\|mergeDifferentlyHeadedOn\|mergeDifferentlyHeadedOff\|mergeDifferentlyDottedOn\|mergeDifferentlyDottedOff\|melismaEnd\|melismaBusyProperties\|melisma\|medium\|maxima\|markuplist\|markup\|markletter\|markalphabet\|markLengthOn\|markLengthOff\|markFormatter\|mark\|marcato\|map-markup-commands\|makeClusters\|majorSevenSymbol\|major\|maininput\|magnify\|lyricsto\|lyrics\|lyricmode\|lyricMelismaAlignment\|lydian\|ltoe\|lower\|lookup\|longfermata\|longa\|locrian\|localKeySignature\|lineprall\|linea\|line\|ligature\|lheel\|left-column\|left-brace\|left-align\|left\|layout\|larger\|large\|languageSaveAndChange\|languageRestore\|language\|laissezVibrer\|label\|killCues\|kievanOn\|kievanOff\|keyAlterationOrder\|key\|keepWithTag\|keepAliveInterfaces\|justify-string\|justify-field\|justify\|justified-lines\|italic\|italianChords\|ionian\|inversion\|interscoreline\|instrumentTransposition\|instrumentSwitch\|instrumentName\|instrumentEqualizer\|indent\|include\|inclinatum\|inStaffSegno\|in\|improvisationOn\|improvisationOff\|implicitTimeSignatureVisibility\|ij\|iij\|ignoreFiguredBassRest\|ignoreBarChecks\|ignatzekExceptions\|ignatzekExceptionMusic\|ictus\|huge\|hspace\|highStringOne\|hideStaffSwitch\|hideSplitTiedTabNotes\|hideNotes\|hide\|header\|hcenter-in\|hbracket\|harp-pedal\|harmonicsOn\|harmonicsOff\|harmonicNote\|harmonicByRatio\|harmonicByFret\|harmonicAccidentals\|harmonic\|handleNegativeFrets\|halign\|halfopen\|grobdescriptions\|graceSettings\|grace\|glissando\|germanChords\|general-align\|fz\|funkHeadsMinor\|funkHeads\|fullJazzExceptions\|fromproperty\|fret-diagram-verbose\|fret-diagram-terse\|fret-diagram\|frenchChords\|fraction\|fp\|footnote\|fontsize\|fontSize\|fontCaps\|flexa\|flat\|flageolet\|firstClef\|fingeringOrientations\|finger\|finalis\|filled-box\|fill-with-pattern\|fill-line\|figures\|figuremode\|figuredBassFormatter\|fffff\|ffff\|fff\|ff\|fermataMarkup\|fermata\|featherDurations\|f\|eyeglasses\|extraNatural\|explicitKeySignatureVisibility\|explicitCueClefVisibility\|explicitClefVisibility\|expandFullBarRests\|eventChords\|espressivo\|epsfile\|episemInitium\|episemFinis\|endincipit\|enddim\|enddecresc\|enddecr\|endcresc\|endcr\|endSpanners\|endRepeatType\|ellipse\|easyHeadsOn\|easyHeadsOff\|dynamicUp\|dynamicNeutral\|dynamicDown\|dynamicAbsoluteVolumeFunction\|dynamic\|drums\|drummode\|drumStyleTable\|drumPitchTable\|draw-line\|draw-hline\|draw-dotted-line\|draw-dashed-line\|draw-circle\|downprall\|downmordent\|downbow\|down\|doublesharp\|doubleflat\|doubleRepeatType\|dotsUp\|dotsNeutral\|dotsDown\|dorian\|divisioMinima\|divisioMaxima\|divisioMaior\|displayScheme\|displayMusic\|displayLilyMusic\|dir-column\|dimTextDim\|dimTextDecresc\|dimTextDecr\|dimHairpin\|dim\|description\|descendens\|deprecatedenddim\|deprecatedendcresc\|deprecateddim\|deprecatedcresc\|denies\|deminutum\|defineBarLine\|defaultchild\|defaultTimeSignature\|defaultNoteHeads\|defaultBarType\|default\|decrescendoSpanner\|decresc\|decr\|deadNotesOn\|deadNotesOff\|deadNote\|dashUnderscore\|dashPlus\|dashLarger\|dashHat\|dashDot\|dashDash\|dashBang\|cueDuringWithClef\|cueDuring\|cueClefUnset\|cueClefTranspositionFormatter\|cueClef\|crossStaff\|crescendoSpanner\|crescTextCresc\|crescHairpin\|cresc\|createSpacing\|cr\|context\|consists\|concat\|compressFullBarRests\|compoundMeter\|command-name\|combine\|column-lines\|column\|coda\|cm\|clefTranspositionFormatter\|clefTransposition\|clefPosition\|clefGlyph\|clef\|circulus\|circle\|chords\|chordmodifiers\|chordmode\|chordRootNamer\|chordPrefixSpacer\|chordNoteNamer\|chordNameSeparator\|chordNameLowercaseMinor\|chordNameFunction\|chordNameExceptionsPartial\|chordNameExceptionsFull\|chordNameExceptions\|char\|change\|center-column\|center-align\|center\|cavum\|caps\|caesura\|cadenzaOn\|cadenzaOff\|breve\|breathe\|breakDynamicSpan\|break\|bracket\|box\|bookpart\|bookOutputSuffix\|bookOutputName\|book\|bold\|blackTriangleMarkup\|bigger\|bendAfter\|beamHalfMeasure\|beam\|bassStaffProperties\|bassFigureStaffAlignmentUp\|bassFigureStaffAlignmentNeutral\|bassFigureStaffAlignmentDown\|bassFigureExtendersOn\|bassFigureExtendersOff\|barNumberVisibility\|barNumberFormatter\|barNumberCheck\|barCheckSynchronize\|barAlways\|bar\|balloonText\|balloonLengthOn\|balloonLengthOff\|balloonGrobText\|backslashed-digit\|automaticBars\|autochange\|autoCautionaries\|autoBeaming\|autoBeamOn\|autoBeamOff\|autoBeamCheck\|autoAccidentals\|auto-footnote\|augmentum\|auctum\|assertBeamSlope\|assertBeamQuant\|ascendens\|arrow-head\|arpeggioParenthesisDashed\|arpeggioParenthesis\|arpeggioNormal\|arpeggioBracket\|arpeggioArrowUp\|arpeggioArrowDown\|arpeggio\|appoggiatura\|applyOutput\|applyMusic\|applyContext\|appendToTag\|alternative\|alterBroken\|allowVoltaHook\|allowPageTurn\|alias\|aikenHeadsMinor\|aikenHeads\|afterGraceFraction\|afterGrace\|aeolian\|addlyrics\|additionalPitchPrefix\|addQuote\|addInstrumentDefinition\|accidentalStyle\|acciaccatura\|accepts\|accentus\|accent\|absolute\|abs-fontsize\|aDueText\|RemoveEmptyTabStaffContext\|RemoveEmptyStaffContext\|RemoveEmptyRhythmicStaffContext\|RemoveEmptyDrumStaffContext\|IJ\|IIJ\|C\|B\|AncientRemoveEmptyStaffContext\|A\|n\)\(\A\|\n\)"me=e-1
 syn match lilyReservedWord "\(\A\|\n\)\(warnings\|staff\|spacing\|signature\|shift\|routine\|notes\|handler\|corrected\|beams\|arpeggios\|Volta_engraver\|Voice\|Vertical_align_engraver\|Vaticana_ligature_engraver\|VaticanaVoice\|VaticanaStaff\|Tweak_engraver\|Tuplet_engraver\|Trill_spanner_engraver\|Timing_translator\|Time_signature_performer\|Time_signature_engraver\|Tie_performer\|Tie_engraver\|Text_spanner_engraver\|Text_engraver\|Tempo_performer\|Tab_tie_follow_engraver\|Tab_staff_symbol_engraver\|Tab_note_heads_engraver\|TabVoice\|TabStaff\|System_start_delimiter_engraver\|Stem_engraver\|Stanza_number_engraver\|Stanza_number_align_engraver\|Staff_symbol_engraver\|Staff_performer\|Staff_collecting_engraver\|StaffGroup\|Staff\|Spanner_break_forbid_engraver\|Span_bar_stub_engraver\|Span_bar_engraver\|Span_arpeggio_engraver\|Spacing_engraver\|Slur_performer\|Slur_engraver\|Slash_repeat_engraver\|Separating_line_group_engraver\|Script_row_engraver\|Script_engraver\|Script_column_engraver\|Score\|Rhythmic_column_engraver\|RhythmicStaff\|Rest_engraver\|Rest_collision_engraver\|Repeat_tie_engraver\|Repeat_acknowledge_engraver\|Pure_from_neighbor_engraver\|Pitched_trill_engraver\|Pitch_squash_engraver\|Piano_pedal_performer\|Piano_pedal_engraver\|Piano_pedal_align_engraver\|PianoStaff\|Phrasing_slur_engraver\|PetrucciVoice\|PetrucciStaff\|Percent_repeat_engraver\|Part_combine_engraver\|Parenthesis_engraver\|Paper_column_engraver\|Output_property_engraver\|Ottava_spanner_engraver\|NullVoice\|Note_spacing_engraver\|Note_performer\|Note_name_engraver\|Note_heads_engraver\|Note_head_line_engraver\|NoteNames\|New_fingering_engraver\|Multi_measure_rest_engraver\|Midi_control_function_performer\|Metronome_mark_engraver\|Mensural_ligature_engraver\|MensuralVoice\|MensuralStaff\|Mark_engraver\|Lyrics\|Lyric_performer\|Lyric_engraver\|Ligature_bracket_engraver\|Ledger_line_engraver\|Laissez_vibrer_engraver\|Kievan_ligature_engraver\|KievanVoice\|KievanStaff\|Key_performer\|Key_engraver\|Keep_alive_together_engraver\|Instrument_switch_engraver\|Instrument_name_engraver\|Hyphen_engraver\|Grob_pq_engraver\|GregorianTranscriptionVoice\|GregorianTranscriptionStaff\|GrandStaff\|Grace_spacing_engraver\|Grace_engraver\|Grace_beam_engraver\|Grace_auto_beam_engraver\|Global\|Glissando_engraver\|Fretboard_engraver\|FretBoards\|Forbid_line_break_engraver\|Footnote_engraver\|Font_size_engraver\|Fingering_engraver\|Fingering_column_engraver\|Figured_bass_position_engraver\|Figured_bass_engraver\|FiguredBass\|Extender_engraver\|Episema_engraver\|Dynamics\|Dynamic_performer\|Dynamic_engraver\|Dynamic_align_engraver\|Drum_notes_engraver\|Drum_note_performer\|DrumVoice\|DrumStaff\|Double_percent_repeat_engraver\|Dots_engraver\|Dot_column_engraver\|Devnull\|Default_bar_line_engraver\|Custos_engraver\|Cue_clef_engraver\|CueVoice\|Control_track_performer\|Concurrent_hairpin_engraver\|Collision_engraver\|Cluster_spanner_engraver\|Clef_engraver\|Chord_tremolo_engraver\|Chord_name_engraver\|ChordNames\|ChordNameVoice\|ChoirStaff\|Breathing_sign_engraver\|Break_align_engraver\|Bend_engraver\|Beam_performer\|Beam_engraver\|Beam_collision_engraver\|Bar_number_engraver\|Bar_engraver\|Axis_group_engraver\|Auto_beam_engraver\|Arpeggio_engraver\|Accidental_engraver\|Score\)\(\A\|\n\)"ms=s+1,me=e-1
 syn match lilyNote "\<\(\(\(solx\|soltcs\|soltcb\|solstqt\|solss\|solsqt\|solsd\|solsb\|sols\|solkk\|solk\|soldsd\|soldd\|sold\|solcs\|solcb\|solbtqt\|solbsb\|solbqt\|solbb\|solb\|sol\|six\|sitcs\|sitcb\|sistqt\|siss\|sisqt\|sisd\|sisb\|sis\|sikk\|sik\|sidsd\|sidd\|sid\|sics\|sicb\|sibtqt\|sibsb\|sibqt\|sibb\|sib\|si\|rex\|retcs\|retcb\|restqt\|ress\|resqt\|resd\|resb\|res\|rekk\|rek\|redsd\|redd\|red\|recs\|recb\|rebtqt\|rebsb\|rebqt\|rebb\|reb\|re\|mix\|mitcs\|mitcb\|mistqt\|miss\|misqt\|misd\|misb\|mis\|mikk\|mik\|midsd\|midd\|mid\|mics\|micb\|mibtqt\|mibsb\|mibqt\|mibb\|mib\|mi\|lax\|latcs\|latcb\|lastqt\|lass\|lasqt\|lasd\|lasb\|las\|lakk\|lak\|ladsd\|ladd\|lad\|lacs\|lacb\|labtqt\|labsb\|labqt\|labb\|lab\|la\|hississ\|hiss\|hisis\|hisih\|his\|hih\|hessess\|heses\|heseh\|h\|gx\|gtqs\|gtqf\|gss\|gsharpsharp\|gsharp\|gs\|gqs\|gqf\|gississ\|giss\|gisis\|gisih\|gis\|gih\|gflatflat\|gflat\|gff\|gf\|gessess\|gess\|geses\|geseh\|ges\|geh\|g\|fx\|ftqs\|ftqf\|fss\|fsharpsharp\|fsharp\|fs\|fqs\|fqf\|fississ\|fiss\|fisis\|fisih\|fis\|fih\|fflatflat\|fflat\|fff\|ff\|fessess\|fess\|feses\|feseh\|fes\|feh\|fax\|fatcs\|fatcb\|fastqt\|fass\|fasqt\|fasd\|fasb\|fas\|fakk\|fak\|fadsd\|fadd\|fad\|facs\|facb\|fabtqt\|fabsb\|fabqt\|fabb\|fab\|fa\|f\|ex\|etqs\|etqf\|essess\|ess\|esharpsharp\|esharp\|eses\|eseh\|es\|eqs\|eqf\|eississ\|eiss\|eisis\|eisih\|eis\|eih\|eflatflat\|eflat\|eff\|ef\|eessess\|eess\|eeses\|eeseh\|ees\|eeh\|e\|dx\|dtqs\|dtqf\|dss\|dsharpsharp\|dsharp\|ds\|dqs\|dqf\|dox\|dotcs\|dotcb\|dostqt\|doss\|dosqt\|dosd\|dosb\|dos\|dokk\|dok\|dodsd\|dodd\|dod\|docs\|docb\|dobtqt\|dobsb\|dobqt\|dobb\|dob\|do\|dississ\|diss\|disis\|disih\|dis\|dih\|dflatflat\|dflat\|dff\|df\|dessess\|dess\|deses\|deseh\|des\|deh\|d\|cx\|ctqs\|ctqf\|css\|csharpsharp\|csharp\|cs\|cqs\|cqf\|cississ\|ciss\|cisis\|cisih\|cis\|cih\|cflatflat\|cflat\|cff\|cf\|cessess\|cess\|ceses\|ceseh\|ces\|ceh\|c\|bx\|btqs\|btqf\|bss\|bsharpsharp\|bsharp\|bs\|bqs\|bqf\|bisis\|bisih\|bis\|bih\|bflatflat\|bflat\|bff\|bf\|bess\|beses\|beseh\|bes\|beh\|bb\|b\|ax\|atqs\|atqf\|assess\|ass\|asharpsharp\|asharp\|ases\|aseh\|asas\|asah\|as\|aqs\|aqf\|aississ\|aiss\|aisis\|aisih\|ais\|aih\|aflatflat\|aflat\|aff\|af\|aessess\|aess\|aeses\|aeseh\|aes\|aeh\|a\|a\)\([,']\)\{,4}\([?!]\)\?\)\|s\|r\|R\|q\)\(\(128\|64\|32\|16\|8\|4\|2\|1\|\\breve\|\\longa\|\\maxima\)[.]\{,8}\)\?\(\A\|\n\)"me=e-1
+endif
diff --git a/syntax/lilypond.vim b/syntax/lilypond.vim
index 97f78c89..7e0e8fbb 100644
--- a/syntax/lilypond.vim
+++ b/syntax/lilypond.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'lilypond') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 " LilyPond syntax file
 " Language:	LilyPond
 " Maintainer:	Heikki Junes <hjunes@cc.hut.fi>
@@ -89,3 +86,4 @@ if version >= 508 || !exists("did_lily_syn_inits")
 endif
 
 let b:current_syntax = "lilypond"
+endif
diff --git a/syntax/litcoffee.vim b/syntax/litcoffee.vim
index 38867403..3957140b 100644
--- a/syntax/litcoffee.vim
+++ b/syntax/litcoffee.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 " Language:   Literate CoffeeScript
 " Maintainer: Michael Smith <michael@diglumi.com>
 " URL:        https://github.com/mintplant/vim-literate-coffeescript
@@ -25,3 +22,4 @@ syn region inlineCoffee start='^    \|\t' end='$' contains=@coffee
 highlight default link notCoffee Comment
 
 let b:current_syntax = "litcoffee"
+endif
diff --git a/syntax/llvm.vim b/syntax/llvm.vim
index 87202ede..740b2639 100644
--- a/syntax/llvm.vim
+++ b/syntax/llvm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'llvm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 " Vim syntax file
 " Language:   llvm
 " Maintainer: The LLVM team, http://llvm.org/
@@ -235,3 +232,4 @@ if version >= 508 || !exists("did_c_syn_inits")
 endif
 
 let b:current_syntax = "llvm"
+endif
diff --git a/syntax/log.vim b/syntax/log.vim
index a27d10c5..f44ae9ff 100644
--- a/syntax/log.vim
+++ b/syntax/log.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'log') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'log') == -1
 " Vim syntax file
 " Language:         Generic log file
 " Maintainer:       MTDL9 <https://github.com/MTDL9>
@@ -161,3 +158,4 @@ let b:current_syntax = 'log'
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
 
+endif
diff --git a/syntax/ls.vim b/syntax/ls.vim
index 64e7905f..4b5feb82 100644
--- a/syntax/ls.vim
+++ b/syntax/ls.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'livescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 " Language:    LiveScript "
 " Maintainer:  George Zahariev
 " URL:         http://github.com/gkz/vim-ls
@@ -138,3 +135,4 @@ highlight default link lsSpaceError Error
 if !exists('b:current_syntax')
   let b:current_syntax = 'livescript'
 endif
+endif
diff --git a/syntax/lua.vim b/syntax/lua.vim
index 9f026bf3..0daa6477 100644
--- a/syntax/lua.vim
+++ b/syntax/lua.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'lua') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lua') == -1
 " Vim syntax file
 " Language: Lua
 " URL: https://github.com/tbastos/vim-lua
@@ -249,3 +246,4 @@ let b:current_syntax = "lua"
 if main_syntax == 'lua'
   unlet main_syntax
 endif
+endif
diff --git a/syntax/mako.vim b/syntax/mako.vim
index 37b2a274..5fa30c24 100644
--- a/syntax/mako.vim
+++ b/syntax/mako.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mako') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
 " Vim syntax file
 " Language:     Mako
 " Maintainer:   Armin Ronacher <armin.ronacher@active-4.com>
@@ -105,3 +102,4 @@ if version >= 508 || !exists("did_mako_syn_inits")
 endif
 
 let b:current_syntax = b:mako_outer_lang
+endif
diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index d28da0e2..a4207919 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'markdown') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
 " Vim syntax file
 " Language:	Markdown
 " Maintainer:	Ben Williams <benw@plasticboy.com>
@@ -186,3 +183,4 @@ let b:current_syntax = "mkd"
 
 delcommand HtmlHiLink
 " vim: ts=8
+endif
diff --git a/syntax/mason.vim b/syntax/mason.vim
index 45586f31..2915055e 100644
--- a/syntax/mason.vim
+++ b/syntax/mason.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Vim syntax file
 " Language:     Mason (Perl embedded in HTML)
 " Maintainer:   vim-perl <vim-perl@googlegroups.com>
@@ -85,3 +82,4 @@ let b:current_syntax = "mason"
 if main_syntax == 'mason'
 	unlet main_syntax
 endif
+endif
diff --git a/syntax/merlin.vim b/syntax/merlin.vim
index 9c2d2ee4..97f400d1 100644
--- a/syntax/merlin.vim
+++ b/syntax/merlin.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'reason') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reason') == -1
 " Vim syntax file for editing merlin project files
 if exists("b:current_syntax")
   finish
@@ -15,3 +12,4 @@ hi link merlinComment Comment
 
 let b:current_syntax = "merlin"
 
+endif
diff --git a/syntax/meson.vim b/syntax/meson.vim
index 7bd562c0..025a991b 100644
--- a/syntax/meson.vim
+++ b/syntax/meson.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'meson') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'meson') == -1
 " Vim syntax file
 " Language:	Meson
 " Maintainer:	Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
@@ -166,3 +163,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 noet:
+endif
diff --git a/syntax/mma.vim b/syntax/mma.vim
index 1774c3e5..33925394 100644
--- a/syntax/mma.vim
+++ b/syntax/mma.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mathematica') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
 " Vim syntax file
 " Language:     Mathematica
 " Maintainer:   Voldikss <dyzplus@gmail.com>
@@ -1362,3 +1359,4 @@ let b:current_syntax = "mma"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/syntax/moon.vim b/syntax/moon.vim
index 70ebeaf9..cc9f6433 100644
--- a/syntax/moon.vim
+++ b/syntax/moon.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'moonscript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
 " Language:    MoonScript
 " Maintainer:  leafo <leafot@gmail.com>
 " Based On:    CoffeeScript by Mick Koch <kchmck@gmail.com>
@@ -319,3 +316,4 @@ syn cluster moonAll contains=moonStatement,moonRepeat,moonConditional,
 if !exists('b:current_syntax')
   let b:current_syntax = 'moon'
 endif
+endif
diff --git a/syntax/mustache.vim b/syntax/mustache.vim
index 204b4fb9..e37087d6 100644
--- a/syntax/mustache.vim
+++ b/syntax/mustache.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'handlebars') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 " Mustache & Handlebars syntax
 " Language:	Mustache, Handlebars
 " Maintainer:	Juvenn Woo <machese@gmail.com>
@@ -108,3 +105,4 @@ syn region mustacheScriptTemplate start=+<script [^>]*type *=[^>]*text/\(mustach
 
 let b:current_syntax = "mustache"
 delcommand HtmlHiLink
+endif
diff --git a/syntax/nginx.vim b/syntax/nginx.vim
index 1c3e00d8..7b0822a3 100644
--- a/syntax/nginx.vim
+++ b/syntax/nginx.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nginx') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
 " Vim syntax file
 " Language: nginx.conf
 " Maintainer: Chris Aumann <me@chr4.org>
@@ -2307,3 +2304,4 @@ hi link ngxGzipOn Error
 hi link ngxSSLCipherInsecure Error
 
 hi link ngxThirdPartyLuaBlock Function
+endif
diff --git a/syntax/nim.vim b/syntax/nim.vim
index 7dbb18ab..b374bc1d 100644
--- a/syntax/nim.vim
+++ b/syntax/nim.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nim') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 if version < 600
@@ -206,3 +203,4 @@ endif
 
 let b:current_syntax = "nim"
 
+endif
diff --git a/syntax/nix.vim b/syntax/nix.vim
index fae15304..1c50a08c 100644
--- a/syntax/nix.vim
+++ b/syntax/nix.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nix') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 " Vim syntax file
 " Language:    Nix
 " Maintainer:  Daiderd Jordan <daiderd@gmail.com>
@@ -199,3 +196,4 @@ hi def link nixWithExprKeyword           Keyword
 syn sync fromstart
 
 let b:current_syntax = "nix"
+endif
diff --git a/syntax/oasis.vim b/syntax/oasis.vim
index 38059118..95364f2c 100644
--- a/syntax/oasis.vim
+++ b/syntax/oasis.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 if exists("b:current_syntax")
     finish
 endif
@@ -97,3 +94,4 @@ highlight link oasisString String
 highlight link oasisVersion Number
 
 let b:current_syntax = "oasis"
+endif
diff --git a/syntax/ocaml.vim b/syntax/ocaml.vim
index 80f2551f..5e6f9359 100644
--- a/syntax/ocaml.vim
+++ b/syntax/ocaml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Vim syntax file
 " Language:     OCaml
 " Filenames:    *.ml *.mli *.mll *.mly
@@ -393,3 +390,4 @@ endif
 let b:current_syntax = "ocaml"
 
 " vim: ts=8
+endif
diff --git a/syntax/ocamlbuild_tags.vim b/syntax/ocamlbuild_tags.vim
index d6cef447..357ee9c6 100644
--- a/syntax/ocamlbuild_tags.vim
+++ b/syntax/ocamlbuild_tags.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 if exists("b:current_syntax")
   finish
 endif
@@ -42,3 +39,4 @@ hi! link ocamlbuild_tagsComment Comment
 hi link ocamlbuild_tagsFindlibPkg Identifier
 
 let b:current_syntax = "ocamlbuild_tags"
+endif
diff --git a/syntax/octave.vim b/syntax/octave.vim
index 1c63fbec..ceaa795e 100644
--- a/syntax/octave.vim
+++ b/syntax/octave.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'octave') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'octave') == -1
 " Vim syntax file
 " Language:             Octave
 " Maintainer:           Rik <rik@nomad.inbox5.com>
@@ -616,3 +613,4 @@ endif
 let b:current_syntax = "octave"
 
 "EOF	vim: ts=8 noet tw=100 sw=8 sts=0
+endif
diff --git a/syntax/omake.vim b/syntax/omake.vim
index 75f8daf4..63ac9f46 100644
--- a/syntax/omake.vim
+++ b/syntax/omake.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Vim syntax file
 " Language:	OMakefile
 
@@ -130,3 +127,4 @@ hi def link omakeRuleOption Type
 
 let b:current_syntax = "omake"
 " vim: ts=8
+endif
diff --git a/syntax/opam.vim b/syntax/opam.vim
index 80661c88..bc593804 100644
--- a/syntax/opam.vim
+++ b/syntax/opam.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 if exists("b:current_syntax")
   finish
 endif
@@ -33,3 +30,4 @@ hi link opamInterpolate Identifier
 let b:current_syntax = "opam"
 
 " vim: ts=2 sw=2
+endif
diff --git a/syntax/opencl.vim b/syntax/opencl.vim
index 2d8b55a0..12842bad 100644
--- a/syntax/opencl.vim
+++ b/syntax/opencl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'opencl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
 " Vim syntax file
 " Language:	OpenCL (Open Computing Language)
 " Maintainer:	Terence Ou (rivan_@msn.com)
@@ -159,3 +156,4 @@ hi def link clStatement         Statement
 let b:current_syntax = "opencl"
 
 " vim: ts=8
+endif
diff --git a/syntax/perl.vim b/syntax/perl.vim
index bafa04ae..0ffa7565 100644
--- a/syntax/perl.vim
+++ b/syntax/perl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Vim syntax file
 " Language:      Perl 5
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -584,3 +581,4 @@ unlet s:cpo_save
 
 " XXX Change to sts=4:sw=4
 " vim:ts=8:sts=2:sw=2:expandtab:ft=vim
+endif
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index 18c7f9ec..46bb423a 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pgsql') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pgsql') == -1
 " Vim syntax file
 " Language:     SQL (PostgreSQL dialect), PL/pgSQL, PL/…, PostGIS, …
 " Maintainer:   Lifepillar
@@ -1996,3 +1993,4 @@ hi def link sqlCreateTextSearchKeyword sqlKeyword
 
 let b:current_syntax = "sql"
 
+endif
diff --git a/syntax/php.vim b/syntax/php.vim
index fec88265..56f53efa 100644
--- a/syntax/php.vim
+++ b/syntax/php.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'php') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'php') == -1
 " Vim syntax file
 " Language: PHP 5.3 & up
 "
@@ -970,3 +967,4 @@ endif
 " }}}
 
 " vim: ts=8 sts=2 sw=2 fdm=marker expandtab
+endif
diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim
index 0ea30e98..bce66772 100644
--- a/syntax/plantuml.vim
+++ b/syntax/plantuml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'plantuml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
 scriptencoding utf-8
 " Vim syntax file
 " Language:     PlantUML
@@ -398,3 +395,4 @@ highlight default link plantumlStereotype Type
 
 let &cpoptions=s:cpo_orig
 unlet s:cpo_orig
+endif
diff --git a/syntax/pod.vim b/syntax/pod.vim
index c85e5c57..09ec66be 100644
--- a/syntax/pod.vim
+++ b/syntax/pod.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Vim syntax file
 " Language:      Perl POD format
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -177,3 +174,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8
+endif
diff --git a/syntax/pony.vim b/syntax/pony.vim
index 8035ca08..2895057f 100644
--- a/syntax/pony.vim
+++ b/syntax/pony.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pony') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
 " Vim syntax file
 " Language:     Pony
 " Maintainer:   Jak Wings
@@ -229,3 +226,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 let b:current_syntax = 'pony'
+endif
diff --git a/syntax/proto.vim b/syntax/proto.vim
index 70f776f7..bc5a3eef 100644
--- a/syntax/proto.vim
+++ b/syntax/proto.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'protobuf') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protobuf') == -1
 " Protocol Buffers - Google's data interchange format
 " Copyright 2008 Google Inc.  All rights reserved.
 " https://developers.google.com/protocol-buffers/
@@ -109,3 +106,4 @@ if version >= 508 || !exists("did_proto_syn_inits")
 endif
 
 let b:current_syntax = "proto"
+endif
diff --git a/syntax/ps1.vim b/syntax/ps1.vim
index 69819dca..4453200e 100644
--- a/syntax/ps1.vim
+++ b/syntax/ps1.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'powershell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 " Vim syntax file
 " Language:           Windows PowerShell
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -187,3 +184,4 @@ if version >= 508 || !exists("did_ps1_syn_inits")
 endif
 
 let b:current_syntax = "ps1"
+endif
diff --git a/syntax/ps1xml.vim b/syntax/ps1xml.vim
index 10565cde..2703dbf3 100644
--- a/syntax/ps1xml.vim
+++ b/syntax/ps1xml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'powershell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 " Vim syntax file
 " Language:           Windows PowerShell XML
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -58,3 +55,4 @@ let b:current_syntax = "ps1xml"
 let &cpo = s:ps1xml_cpo_save
 unlet s:ps1xml_cpo_save
 
+endif
diff --git a/syntax/pug.vim b/syntax/pug.vim
index 509d62a1..e269ab41 100644
--- a/syntax/pug.vim
+++ b/syntax/pug.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pug') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
 " Vim syntax file
 " Language: Pug
 " Maintainer: Joshua Borton
@@ -115,3 +112,4 @@ let b:current_syntax = "pug"
 if main_syntax == "pug"
   unlet main_syntax
 endif
+endif
diff --git a/syntax/puppet.vim b/syntax/puppet.vim
index 44f2f839..c5082ed2 100644
--- a/syntax/puppet.vim
+++ b/syntax/puppet.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 " puppet syntax file
 " Filename:     puppet.vim
 " Language:     puppet configuration file
@@ -172,3 +169,4 @@ if version >= 508 || !exists("did_puppet_syn_inits")
 endif
 
 let b:current_syntax = "puppet"
+endif
diff --git a/syntax/purescript.vim b/syntax/purescript.vim
index 670d61ef..376f8aee 100644
--- a/syntax/purescript.vim
+++ b/syntax/purescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'purescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
 " syntax highlighting for purescript
 "
 " Heavily modified version of the purescript syntax
@@ -219,3 +216,4 @@ highlight def link purescriptType Type
 highlight def link purescriptComment Comment
 
 let b:current_syntax = "purescript"
+endif
diff --git a/syntax/python.vim b/syntax/python.vim
index 5d14488d..29c4bae1 100644
--- a/syntax/python.vim
+++ b/syntax/python.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python') == -1
 " For version 5.x: Clear all syntax items
 " For versions greater than 6.x: Quit when a syntax file was already loaded
 if v:version < 600
@@ -495,3 +492,4 @@ if v:version >= 508 || !exists('did_python_syn_inits')
 endif
 
 let b:current_syntax = 'python'
+endif
diff --git a/syntax/qmake.vim b/syntax/qmake.vim
index 108fc597..acc09c6b 100644
--- a/syntax/qmake.vim
+++ b/syntax/qmake.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'qmake') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qmake') == -1
 " qmake project syntax file
 " Language:     qmake project
 " Maintainer:   Arto Jonsson <ajonsson@kapsi.fi>
@@ -301,3 +298,4 @@ hi def link qmakeQtConfiguration PreProc
 hi def link qmakeScope Conditional
 
 let b:current_syntax = "qmake"
+endif
diff --git a/syntax/qml.vim b/syntax/qml.vim
index 9ff05e3e..b7d2ba1d 100644
--- a/syntax/qml.vim
+++ b/syntax/qml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'qml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
 " Vim syntax file
 " Language:     QML
 " Maintainer:   Peter Hoeg <peter@hoeg.com>
@@ -137,3 +134,4 @@ let b:current_syntax = "qml"
 if main_syntax == 'qml'
   unlet main_syntax
 endif
+endif
diff --git a/syntax/racket.vim b/syntax/racket.vim
index a84e1545..111531ad 100644
--- a/syntax/racket.vim
+++ b/syntax/racket.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'racket') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
 " Vim syntax file
 " Language:     Racket
 " Maintainer:   Will Langstroth <will@langstroth.com>
@@ -662,3 +659,4 @@ if version >= 508 || !exists("did_racket_syntax_inits")
 endif
 
 let b:current_syntax = "racket"
+endif
diff --git a/syntax/ragel.vim b/syntax/ragel.vim
index 1c7b8612..57e89637 100644
--- a/syntax/ragel.vim
+++ b/syntax/ragel.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ragel') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ragel') == -1
 " Vim syntax file
 "
 " Language: Ragel
@@ -166,3 +163,4 @@ hi link caseLabelKeyword Keyword
 hi link beginRL Type
  
 let b:current_syntax = "ragel"
+endif
diff --git a/syntax/raml.vim b/syntax/raml.vim
index aec1d95a..b52cf23b 100644
--- a/syntax/raml.vim
+++ b/syntax/raml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'raml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raml') == -1
 " Vim syntax file
 " Language:    RAML (RESTful API Modeling Language)
 " Maintainer:  Eric Hopkins <eric.on.tech@gmail.com>
@@ -108,3 +105,4 @@ let b:current_syntax = "raml"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/syntax/reason.vim b/syntax/reason.vim
index 6d47a010..59fdac64 100644
--- a/syntax/reason.vim
+++ b/syntax/reason.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'reason') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reason') == -1
 " Vim syntax file
 " Language:     Reason (Forked from Rust)
 " Maintainer:   (Jordan - for Reason changes) Patrick Walton <pcwalton@mozilla.com>
@@ -252,3 +249,4 @@ syn sync minlines=200
 syn sync maxlines=500
 
 let b:current_syntax = "rust"
+endif
diff --git a/syntax/rhelp.vim b/syntax/rhelp.vim
index 417579d0..43e155a6 100644
--- a/syntax/rhelp.vim
+++ b/syntax/rhelp.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'r-lang') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
 " Vim syntax file
 " Language:    R Help File
 " Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
@@ -157,3 +154,4 @@ endif
 
 let   b:current_syntax = "rhelp"
 " vim: foldmethod=marker:
+endif
diff --git a/syntax/rnoweb.vim b/syntax/rnoweb.vim
index 40a86b50..5b09f3dc 100644
--- a/syntax/rnoweb.vim
+++ b/syntax/rnoweb.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'r-lang') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
 " Vim syntax file
 " Language:    R noweb Files
 " Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
@@ -58,3 +55,4 @@ hi def link rnowebChunkReference Delimiter
 
 let   b:current_syntax = "rnoweb"
 " vim: foldmethod=marker:
+endif
diff --git a/syntax/rst.vim b/syntax/rst.vim
index 43b17aa8..93e2e9e3 100644
--- a/syntax/rst.vim
+++ b/syntax/rst.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rst') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
 " Vim syntax file
 " Language: reStructuredText documentation format
 " Maintainer: Marshall Ward <marshall.ward@gmail.com>
@@ -292,3 +289,4 @@ let b:current_syntax = "rst"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/syntax/ruby.vim b/syntax/ruby.vim
index 6d5a8dbf..c2063459 100644
--- a/syntax/ruby.vim
+++ b/syntax/ruby.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim syntax file
 " Language:		Ruby
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
@@ -597,3 +594,4 @@ unlet! s:cpo_sav
 delc SynFold
 
 " vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
+endif
diff --git a/syntax/rust.vim b/syntax/rust.vim
index 0dae57c6..21063bcd 100644
--- a/syntax/rust.vim
+++ b/syntax/rust.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Vim syntax file
 " Language:     Rust
 " Maintainer:   Patrick Walton <pcwalton@mozilla.com>
@@ -365,3 +362,4 @@ syn sync maxlines=500
 let b:current_syntax = "rust"
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/syntax/sbt.vim b/syntax/sbt.vim
index 5d4cfba1..3d49abd0 100644
--- a/syntax/sbt.vim
+++ b/syntax/sbt.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'sbt') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sbt') == -1
 " Vim syntax file
 " Language:     sbt
 " Maintainer:   Derek Wyatt <derek@{myfirstname}{mylastname}.org>
@@ -35,3 +32,4 @@ hi link sbtSpecial Special
 hi link sbtComment Comment
 hi link sbtLineComment Comment
 hi link sbtDocComment Comment
+endif
diff --git a/syntax/scala.vim b/syntax/scala.vim
index 9555b5f3..c54694b6 100644
--- a/syntax/scala.vim
+++ b/syntax/scala.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 " Vim syntax file
 " Language:             Scala
 " Maintainer:           Derek Wyatt
@@ -233,3 +230,4 @@ if main_syntax ==# 'scala'
 endif
 
 " vim:set sw=2 sts=2 ts=8 et:
+endif
diff --git a/syntax/scss.vim b/syntax/scss.vim
index 69574735..22f5b44b 100644
--- a/syntax/scss.vim
+++ b/syntax/scss.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scss') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
 " Vim syntax file
 " Language:    SCSS (Sassy CSS)
 " Author:      Daniel Hofstetter (daniel.hofstetter@42dh.com)
@@ -225,3 +222,4 @@ let b:current_syntax = "scss"
 if main_syntax == 'scss'
   unlet main_syntax
 endif
+endif
diff --git a/syntax/sexplib.vim b/syntax/sexplib.vim
index 2462d7cd..9700eab8 100644
--- a/syntax/sexplib.vim
+++ b/syntax/sexplib.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Vim syntax file
 " Language:     S-expressions as used in Sexplib
 " Filenames:    *.sexp
@@ -90,3 +87,4 @@ endif
 let b:current_syntax = "sexplib"
 
 " vim: ts=8
+endif
diff --git a/syntax/slim.vim b/syntax/slim.vim
index 20733bad..c7e0cc1f 100644
--- a/syntax/slim.vim
+++ b/syntax/slim.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'slim') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
 " Vim syntax file
 " Language: Slim
 " Maintainer: Andrew Stone <andy@stonean.com>
@@ -111,3 +108,4 @@ hi def link slimInlineTagChar             Delimiter
 hi def link slimFilter                    PreProc
 
 let b:current_syntax = "slim"
+endif
diff --git a/syntax/slime.vim b/syntax/slime.vim
index d984aa49..f9ad0ba7 100644
--- a/syntax/slime.vim
+++ b/syntax/slime.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'slime') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slime') == -1
 " Vim syntax file
 " Language: slime
 " Maintainer: Andrew Stone <andy@stonean.com>
@@ -104,3 +101,4 @@ hi def link slimeWrappedAttrsDelimiter     Delimiter
 hi def link slimeInlineTagChar             Delimiter
 
 let b:current_syntax = "slime"
+endif
diff --git a/syntax/smhl.vim b/syntax/smhl.vim
index eb772699..3b6dc2e9 100644
--- a/syntax/smhl.vim
+++ b/syntax/smhl.vim
@@ -1,6 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax cluster _semantic contains=_semantic1,_semantic2,_semantic3,_semantic4,_semantic5,_semantic6,_semantic7,_semantic8,_semantic9,_semantic10,_semantic11,_semantic12,_semantic13,_semantic14,_semantic15,_semantic16,_semantic17,_semantic18,_semantic19,_semantic20,_semantic21,_semantic22,_semantic23,_semantic24,_semantic25
 
+endif
diff --git a/syntax/smt2.vim b/syntax/smt2.vim
index 09f58c67..92605969 100644
--- a/syntax/smt2.vim
+++ b/syntax/smt2.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'smt2') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smt2') == -1
 " Vim syntax file
 " " Language:     SMT-LIB2 with Z3's extensions
 " " Maintainer:   Dimitri Bohlender <bohlender@embedded.rwth-aachen.de>
@@ -177,3 +174,4 @@ highlight def link smt2Binary      Number
 highlight def link smt2Int         Number
 highlight def link smt2Delimiter   Delimiter
 highlight def link smt2Error       Error
+endif
diff --git a/syntax/solidity.vim b/syntax/solidity.vim
index 3ff61bf0..56dff8d8 100644
--- a/syntax/solidity.vim
+++ b/syntax/solidity.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'solidity') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
 " Vim syntax file
 " Language:     Solidity
 " Maintainer:   Tomlion (qycpublic@gmail.com)
@@ -150,3 +147,4 @@ syn region  solComment           start="/\*"  end="\*/" contains=solCommentTodo,
 hi def link solCommentTodo       Comment
 hi def link solLineComment       Comment
 hi def link solComment           Comment
+endif
diff --git a/syntax/stylus.vim b/syntax/stylus.vim
index bd366007..bbdc2229 100644
--- a/syntax/stylus.vim
+++ b/syntax/stylus.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'stylus') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
 " Vim syntax file
 " Language:	CSS3
 " Maintainer:	Hsiaoming Yang <lepture@me.com>
@@ -378,3 +375,4 @@ hi def link stylusIdChar                Special
 let b:current_syntax = "stylus"
 
 " vim:set sw=2:
+endif
diff --git a/syntax/svelte.vim b/syntax/svelte.vim
index 2149e71a..2cd001d0 100644
--- a/syntax/svelte.vim
+++ b/syntax/svelte.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'svelte') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svelte') == -1
 " Vim syntax file
 " Language:   Svelte 3 (HTML/JavaScript)
 " Author:     Evan Lecklider <evan@lecklider.com>
@@ -62,3 +59,4 @@ highlight def link svelteKeyword Keyword
 highlight def link svelteRepeat Repeat
 
 let b:current_syntax = "svelte"
+endif
diff --git a/syntax/svg.vim b/syntax/svg.vim
index 53215160..e49abbd9 100644
--- a/syntax/svg.vim
+++ b/syntax/svg.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'svg') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svg') == -1
 " Vim syntax file
 " Language:	SVG
 " Filenames:	*.svg
@@ -147,3 +144,4 @@ if main_syntax == 'svg'
 endif
 
 " vim: ts=8
+endif
diff --git a/syntax/swift.vim b/syntax/swift.vim
index f026d076..d7a734dc 100644
--- a/syntax/swift.vim
+++ b/syntax/swift.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'swift') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
 " File: swift.vim
 " Author: Keith Smiley
 " Description: Runtime files for Swift
@@ -306,3 +303,4 @@ highlight default link swiftLineDirective PreProc
 syn sync minlines=100
 
 let b:current_syntax = "swift"
+endif
diff --git a/syntax/sxhkdrc.vim b/syntax/sxhkdrc.vim
index 206497dd..0ed560a6 100644
--- a/syntax/sxhkdrc.vim
+++ b/syntax/sxhkdrc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'sxhkd') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sxhkd') == -1
 if exists("b:current_syntax")
     finish
 endif
@@ -28,3 +25,4 @@ hi def link sxHotkeySep Delimiter
 hi def link sxSequenceSep Delimiter
 
 let b:current_syntax = "sxhkdrc"
+endif
diff --git a/syntax/systemd.vim b/syntax/systemd.vim
index dc9686c4..fafb2ca3 100644
--- a/syntax/systemd.vim
+++ b/syntax/systemd.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'systemd') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemd') == -1
 " Filename:     systemd.vim
 " Purpose:      Vim syntax file
 " Language:     systemd unit files
@@ -328,3 +325,4 @@ hi def link sdCapFlags          Identifier
 
 let b:current_syntax = "systemd"
 " vim: fdm=marker
+endif
diff --git a/syntax/tablegen.vim b/syntax/tablegen.vim
index 8dd1c59f..23c2ed30 100644
--- a/syntax/tablegen.vim
+++ b/syntax/tablegen.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'llvm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 " Vim syntax file
 " Language:   TableGen
 " Maintainer: The LLVM team, http://llvm.org/
@@ -56,3 +53,4 @@ if version >= 508 || !exists("did_c_syn_inits")
 endif
 
 let b:current_syntax = "tablegen"
+endif
diff --git a/syntax/tap.vim b/syntax/tap.vim
index 136ed143..7577df7e 100644
--- a/syntax/tap.vim
+++ b/syntax/tap.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Vim syntax file
 " Language:    Verbose TAP Output
 " Maintainer:  Rufus Cable <rufus@threebytesfull.com>
@@ -99,3 +96,4 @@ if !exists("did_tapverboseoutput_syntax_inits")
 endif
 
 let b:current_syntax="tapVerboseOutput"
+endif
diff --git a/syntax/terraform.vim b/syntax/terraform.vim
index fb202c77..4789c9b2 100644
--- a/syntax/terraform.vim
+++ b/syntax/terraform.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'terraform') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
 " Forked from Larry Gilbert's syntax file
 " github.com/L2G/vim-syntax-terraform
 
@@ -4286,3 +4283,4 @@ hi def link terraCollectionType    Type
 hi def link terraValueNull         Constant
 
 let b:current_syntax = 'terraform'
+endif
diff --git a/syntax/textile.vim b/syntax/textile.vim
index eccd7115..cbadce87 100644
--- a/syntax/textile.vim
+++ b/syntax/textile.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'textile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'textile') == -1
 "
 "   You will have to restart vim for this to take effect.  In any case
 "   it is a good idea to read ":he new-filetype" so that you know what
@@ -93,3 +90,4 @@ if version >= 508 || !exists("did_txt_syn_inits")
 endif
 
 " vim: set ai et sw=4 :
+endif
diff --git a/syntax/thrift.vim b/syntax/thrift.vim
index 4c481332..148391ec 100644
--- a/syntax/thrift.vim
+++ b/syntax/thrift.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'thrift') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'thrift') == -1
 " Vim syntax file
 " Language: Thrift
 " Maintainer: Martin Smith <martin@facebook.com>
@@ -100,3 +97,4 @@ endif
 
 let b:current_syntax = "thrift"
 
+endif
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index 101b1a28..03d0115d 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'tmux') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tmux') == -1
 " Language: tmux(1) configuration file
 " Version: 2.9a (git-0d64531f)
 " URL: https://github.com/ericpruitt/tmux.vim/
@@ -116,3 +113,4 @@ syn keyword tmuxCommands
 
 let &cpo = s:original_cpo
 unlet! s:original_cpo s:bg s:i
+endif
diff --git a/syntax/tomdoc.vim b/syntax/tomdoc.vim
index b6d7ab21..f08b407f 100644
--- a/syntax/tomdoc.vim
+++ b/syntax/tomdoc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'tomdoc') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tomdoc') == -1
 syn keyword tomdocKeywords
       \ Returns Yields Raises Examples Signature
       \ containedin=.*Comment
@@ -20,3 +17,4 @@ syn match tomdocArguments
 hi default link tomdocDescriptions String
 hi default link tomdocKeywords String
 hi default link tomdocArguments HELP
+endif
diff --git a/syntax/toml.vim b/syntax/toml.vim
index 0299d28e..218d4fe6 100644
--- a/syntax/toml.vim
+++ b/syntax/toml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'toml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'toml') == -1
 " Language:   TOML
 " Maintainer: Caleb Spare <cespare@gmail.com>
 " URL:        https://github.com/cespare/vim-toml
@@ -78,3 +75,4 @@ hi def link tomlComment Comment
 syn sync minlines=500
 
 let b:current_syntax = "toml"
+endif
diff --git a/syntax/tptp.vim b/syntax/tptp.vim
index 623ec947..0cd92fb8 100644
--- a/syntax/tptp.vim
+++ b/syntax/tptp.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'tptp') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tptp') == -1
 " Vim syntax file
 " Language:		TPTP
 " Filename extensions:	*.p (collides with Pascal/Progress),
@@ -150,3 +147,4 @@ end
 let b:current_syntax = "tptp"
 
 " vim: ts=8 sw=8
+endif
diff --git a/syntax/tsx.vim b/syntax/tsx.vim
index c73e1bfc..1be42093 100644
--- a/syntax/tsx.vim
+++ b/syntax/tsx.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 if !exists("main_syntax")
   if exists("b:current_syntax") && b:current_syntax != 'typescript'
     finish
@@ -142,3 +139,4 @@ let b:current_syntax = "typescript.tsx"
 if main_syntax == 'typescript.tsx'
   unlet main_syntax
 endif
+endif
diff --git a/syntax/tt2.vim b/syntax/tt2.vim
index ccea0905..31bc61f5 100644
--- a/syntax/tt2.vim
+++ b/syntax/tt2.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Language:      TT2 (Perl Template Toolkit)
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Author:        Moriki, Atsushi <4woods+vim@gmail.com>
@@ -212,3 +209,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:ts=4:sw=4
+endif
diff --git a/syntax/tt2html.vim b/syntax/tt2html.vim
index 0ee06595..b48bed29 100644
--- a/syntax/tt2html.vim
+++ b/syntax/tt2html.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Language:      TT2 embedded with HTML
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Author:        Moriki, Atsushi <4woods+vim@gmail.com>
@@ -22,3 +19,4 @@ unlet b:current_syntax
 syn cluster htmlPreProc add=@tt2_top_cluster
 
 let b:current_syntax = "tt2html"
+endif
diff --git a/syntax/tt2js.vim b/syntax/tt2js.vim
index 35849b62..be93d2c6 100644
--- a/syntax/tt2js.vim
+++ b/syntax/tt2js.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Language:      TT2 embedded with Javascript
 " Maintainer:    Andy Lester <andy@petdance.com>
 " Author:        Yates, Peter <pd.yates@gmail.com>
@@ -22,3 +19,4 @@ unlet b:current_syntax
 syn cluster javascriptPreProc add=@tt2_top_cluster
 
 let b:current_syntax = "tt2js"
+endif
diff --git a/syntax/twig.vim b/syntax/twig.vim
index 5b2fc92b..1cc89f76 100644
--- a/syntax/twig.vim
+++ b/syntax/twig.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'twig') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
 " Vim syntax file
 " Language:	Twig template
 " Maintainer:	Gabriel Gosselin <gabrielNOSPAM@evidens.ca>
@@ -116,3 +113,4 @@ if version >= 508 || !exists("did_twig_syn_inits")
 
   delcommand HiLink
 endif
+endif
diff --git a/syntax/typescript.vim b/syntax/typescript.vim
index 11c6b1ec..048a423a 100644
--- a/syntax/typescript.vim
+++ b/syntax/typescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 " Vim syntax file
 " Language:     TypeScript
 " Maintainer:   Herrington Darkholme
@@ -34,3 +31,4 @@ let b:current_syntax = "typescript"
 if main_syntax == 'typescript'
   unlet main_syntax
 endif
+endif
diff --git a/syntax/vala.vim b/syntax/vala.vim
index f49b32a1..0208d824 100644
--- a/syntax/vala.vim
+++ b/syntax/vala.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
 " Vim syntax file
 " Language:	Vala
 " Maintainers:	Emmanuele Bassi <ebassi@gnome.org>
@@ -228,3 +225,4 @@ let &cpo = s:vala_cpo_save
 unlet s:vala_cpo_save
 
 " vim: ts=8
+endif
diff --git a/syntax/vbnet.vim b/syntax/vbnet.vim
index c9550284..32e20263 100644
--- a/syntax/vbnet.vim
+++ b/syntax/vbnet.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vbnet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vbnet') == -1
 " Vim syntax file
 " Language:     VB.NET
 " Maintainer:   Tim Pope <vim@rebelongto.us>
@@ -433,3 +430,4 @@ endif
 let b:current_syntax = "vbnet"
 
 " vim:set ft=vim sts=4 sw=4:
+endif
diff --git a/syntax/vcl.vim b/syntax/vcl.vim
index 66772576..476e4dda 100644
--- a/syntax/vcl.vim
+++ b/syntax/vcl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vcl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vcl') == -1
 " Vim syntax file
 " Filename:     vcl.vim
 " Language:     Varnish configuation Language, http://www.varnish-cache.org/wiki/VCL
@@ -108,3 +105,4 @@ hi link vclModes            Operator
 hi link vclOption           Identifier
 hi link vclNumber           Number
 hi link vclNumberTime       Number
+endif
diff --git a/syntax/velocity.vim b/syntax/velocity.vim
index 44f78250..0bd11cd9 100644
--- a/syntax/velocity.vim
+++ b/syntax/velocity.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vm') == -1
 " Vim syntax file
 " Language:	Velocity HTML template
 " Maintainer:	Hsiaoming Young <http://lepture.com>
@@ -69,3 +66,4 @@ if version >= 508 || !exists("did_velocity_syn_inits")
 endif
 
 let b:current_syntax = "velocity"
+endif
diff --git a/syntax/vifm.vim b/syntax/vifm.vim
index eb92a074..538d0576 100644
--- a/syntax/vifm.vim
+++ b/syntax/vifm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
 " vifm syntax file
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: July 12, 2019
@@ -483,3 +480,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
+endif
diff --git a/syntax/vimgo.vim b/syntax/vimgo.vim
index 38040319..b1a432fc 100644
--- a/syntax/vimgo.vim
+++ b/syntax/vimgo.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 if exists("b:current_syntax")
   finish
 endif
@@ -15,3 +12,4 @@ hi def link goInterface Type
 hi def link goTitle Label
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/syntax/vue.vim b/syntax/vue.vim
index 5a054132..79b3f792 100644
--- a/syntax/vue.vim
+++ b/syntax/vue.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vue') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
 " Vim syntax file
 " Language: Vue.js
 " Maintainer: Eduardo San Martin Morote
@@ -80,3 +77,4 @@ syn match   htmlArg "[@v:][-:.0-9_a-z]*\>" contained
 syntax sync fromstart
 
 let b:current_syntax = "vue"
+endif
diff --git a/syntax/xdc.vim b/syntax/xdc.vim
index cf31ce5e..6cf07443 100644
--- a/syntax/xdc.vim
+++ b/syntax/xdc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'xdc') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xdc') == -1
 " Vim syntax file
 " Language:     XDC - Xilinx Design Constraints
 " Author:       Amal Khailtash <amal.khailtash@gmail.com>
@@ -195,3 +192,4 @@ highligh default link xdcFlags                                Special
 let b:current_syntax = "xdc"
 
 " vim: fileformat=unix tabstop=2 shiftwidth=2 expandtab
+endif
diff --git a/syntax/xml.vim b/syntax/xml.vim
index 2e5c0926..164b91de 100644
--- a/syntax/xml.vim
+++ b/syntax/xml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'xml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xml') == -1
 " Vim syntax file
 " Language:	XML
 " Maintainer:	Amadeus Demarzi http://github.com/amadeus
@@ -350,3 +347,4 @@ let &cpo = s:xml_cpo_save
 unlet s:xml_cpo_save
 
 " vim: ts=8
+endif
diff --git a/syntax/xs.vim b/syntax/xs.vim
index 1be78c27..1e72eb5b 100644
--- a/syntax/xs.vim
+++ b/syntax/xs.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Vim syntax file
 " Language:    XS (Perl extension interface language)
 " Author:      Autogenerated from perl headers, on an original basis of Michael W. Dodge <sarge@pobox.com>
@@ -3679,3 +3676,4 @@ hi def link xsMacro      Macro
 let b:current_syntax = "xs"
 
 " vim: ts=8
+endif
diff --git a/syntax/xsl.vim b/syntax/xsl.vim
index e40b6811..802abe20 100644
--- a/syntax/xsl.vim
+++ b/syntax/xsl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'xls') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xls') == -1
 " Vim syntax file
 " Language:	XSLT 1.0
 " with HTML, CSS, JavaScript, PerlScript, VBScript and MSXSL extention
@@ -539,3 +536,4 @@ let b:current_syntax = "xsl"
 "unlet s:xml_cpo_save
 
 " vim: ts=4:sw=4
+endif
diff --git a/syntax/yats.vim b/syntax/yats.vim
index 1865eb68..c68daa9f 100644
--- a/syntax/yats.vim
+++ b/syntax/yats.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 runtime syntax/yats/typescript.vim
 runtime syntax/yats/es6-number.vim
 runtime syntax/yats/es6-string.vim
@@ -48,3 +45,4 @@ runtime syntax/yats/css.vim
 let typescript_props = 1
 
 runtime syntax/yats/event.vim
+endif
diff --git a/syntax/yats/css.vim b/syntax/yats/css.vim
index b1df41ef..d25f2a9d 100644
--- a/syntax/yats/css.vim
+++ b/syntax/yats/css.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptDOMStyle contained alignContent alignItems alignSelf animation
 syntax keyword typescriptDOMStyle contained animationDelay animationDirection animationDuration
 syntax keyword typescriptDOMStyle contained animationFillMode animationIterationCount
@@ -73,3 +70,4 @@ syntax keyword typescriptDOMStyle contained whiteSpace width willChange wordBrea
 syntax keyword typescriptDOMStyle contained wordSpacing wordWrap writingMode zIndex
 if exists("did_typescript_hilink") | HiLink typescriptDOMStyle Keyword
 endif
+endif
diff --git a/syntax/yats/dom-document.vim b/syntax/yats/dom-document.vim
index dfe4f5ba..4a893d50 100644
--- a/syntax/yats/dom-document.vim
+++ b/syntax/yats/dom-document.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptDOMDocProp contained activeElement body cookie defaultView
 syntax keyword typescriptDOMDocProp contained designMode dir domain embeds forms head
 syntax keyword typescriptDOMDocProp contained images lastModified links location plugins
@@ -34,3 +31,4 @@ syntax keyword typescriptDOMDocMethod contained querySelectorAll write writeln n
 syntax cluster props add=typescriptDOMDocMethod
 if exists("did_typescript_hilink") | HiLink typescriptDOMDocMethod Keyword
 endif
+endif
diff --git a/syntax/yats/dom-elem.vim b/syntax/yats/dom-elem.vim
index b9629bac..1309cedf 100644
--- a/syntax/yats/dom-elem.vim
+++ b/syntax/yats/dom-elem.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptDOMElemAttrs contained accessKey clientHeight clientLeft
 syntax keyword typescriptDOMElemAttrs contained clientTop clientWidth id innerHTML
 syntax keyword typescriptDOMElemAttrs contained length onafterscriptexecute onbeforescriptexecute
@@ -25,3 +22,4 @@ syntax keyword typescriptDOMElemFuncs contained setAttributeNodeNS setCapture su
 syntax keyword typescriptDOMElemFuncs contained getAttribute
 if exists("did_typescript_hilink") | HiLink typescriptDOMElemFuncs Keyword
 endif
+endif
diff --git a/syntax/yats/dom-event.vim b/syntax/yats/dom-event.vim
index e33547fc..a31be737 100644
--- a/syntax/yats/dom-event.vim
+++ b/syntax/yats/dom-event.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptDOMEventTargetMethod contained addEventListener removeEventListener nextgroup=typescriptEventFuncCallArg
 syntax keyword typescriptDOMEventTargetMethod contained dispatchEvent waitUntil nextgroup=typescriptEventFuncCallArg
 syntax cluster props add=typescriptDOMEventTargetMethod
@@ -65,3 +62,4 @@ syntax keyword typescriptDOMEventMethod contained stopPropagation respondWith de
 syntax cluster props add=typescriptDOMEventMethod
 if exists("did_typescript_hilink") | HiLink typescriptDOMEventMethod Keyword
 endif
+endif
diff --git a/syntax/yats/dom-form.vim b/syntax/yats/dom-form.vim
index d5ca56af..5c800f4a 100644
--- a/syntax/yats/dom-form.vim
+++ b/syntax/yats/dom-form.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptDOMFormProp contained acceptCharset action elements encoding
 syntax keyword typescriptDOMFormProp contained enctype length method name target
 syntax cluster props add=typescriptDOMFormProp
@@ -11,3 +8,4 @@ syntax keyword typescriptDOMFormMethod contained reportValidity reset submit nex
 syntax cluster props add=typescriptDOMFormMethod
 if exists("did_typescript_hilink") | HiLink typescriptDOMFormMethod Keyword
 endif
+endif
diff --git a/syntax/yats/dom-node.vim b/syntax/yats/dom-node.vim
index b9f615c8..87166905 100644
--- a/syntax/yats/dom-node.vim
+++ b/syntax/yats/dom-node.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptDOMNodeProp contained attributes baseURI baseURIObject childNodes
 syntax keyword typescriptDOMNodeProp contained firstChild lastChild localName namespaceURI
 syntax keyword typescriptDOMNodeProp contained nextSibling nodeName nodePrincipal
@@ -27,3 +24,4 @@ syntax keyword typescriptDOMNodeType contained COMMENT_NODE DOCUMENT_NODE DOCUME
 syntax keyword typescriptDOMNodeType contained DOCUMENT_FRAGMENT_NODE NOTATION_NODE
 if exists("did_typescript_hilink") | HiLink typescriptDOMNodeType Keyword
 endif
+endif
diff --git a/syntax/yats/dom-storage.vim b/syntax/yats/dom-storage.vim
index 3664d1cb..45a88bcb 100644
--- a/syntax/yats/dom-storage.vim
+++ b/syntax/yats/dom-storage.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptDOMStorage contained sessionStorage localStorage
 if exists("did_typescript_hilink") | HiLink typescriptDOMStorage Keyword
 endif
@@ -14,3 +11,4 @@ syntax keyword typescriptDOMStorageMethod contained clear nextgroup=typescriptFu
 syntax cluster props add=typescriptDOMStorageMethod
 if exists("did_typescript_hilink") | HiLink typescriptDOMStorageMethod Keyword
 endif
+endif
diff --git a/syntax/yats/ecma-402.vim b/syntax/yats/ecma-402.vim
index ae5a806e..cbfd62b8 100644
--- a/syntax/yats/ecma-402.vim
+++ b/syntax/yats/ecma-402.vim
@@ -1,10 +1,8 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Intl
 syntax keyword typescriptIntlMethod contained Collator DateTimeFormat NumberFormat nextgroup=typescriptFuncCallArg
 syntax keyword typescriptIntlMethod contained PluralRules nextgroup=typescriptFuncCallArg
 syntax cluster props add=typescriptIntlMethod
 if exists("did_typescript_hilink") | HiLink typescriptIntlMethod Keyword
 endif
+endif
diff --git a/syntax/yats/es6-array.vim b/syntax/yats/es6-array.vim
index 36890b13..c246f686 100644
--- a/syntax/yats/es6-array.vim
+++ b/syntax/yats/es6-array.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Array nextgroup=typescriptGlobalArrayDot,typescriptFuncCallArg
 syntax match   typescriptGlobalArrayDot /\./ contained nextgroup=typescriptArrayStaticMethod,typescriptProp
 syntax keyword typescriptArrayStaticMethod contained from isArray of nextgroup=typescriptFuncCallArg
@@ -16,3 +13,4 @@ syntax keyword typescriptArrayMethod contained toSource toString unshift nextgro
 syntax cluster props add=typescriptArrayMethod
 if exists("did_typescript_hilink") | HiLink typescriptArrayMethod Keyword
 endif
+endif
diff --git a/syntax/yats/es6-date.vim b/syntax/yats/es6-date.vim
index 1aa586ff..dc8591c3 100644
--- a/syntax/yats/es6-date.vim
+++ b/syntax/yats/es6-date.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Date nextgroup=typescriptGlobalDateDot,typescriptFuncCallArg
 syntax match   typescriptGlobalDateDot /\./ contained nextgroup=typescriptDateStaticMethod,typescriptProp
 syntax keyword typescriptDateStaticMethod contained UTC now parse nextgroup=typescriptFuncCallArg
@@ -24,3 +21,4 @@ syntax keyword typescriptDateMethod contained valueOf nextgroup=typescriptFuncCa
 syntax cluster props add=typescriptDateMethod
 if exists("did_typescript_hilink") | HiLink typescriptDateMethod Keyword
 endif
+endif
diff --git a/syntax/yats/es6-function.vim b/syntax/yats/es6-function.vim
index 842e8cde..e0768fff 100644
--- a/syntax/yats/es6-function.vim
+++ b/syntax/yats/es6-function.vim
@@ -1,9 +1,7 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Function
 syntax keyword typescriptFunctionMethod contained apply bind call nextgroup=typescriptFuncCallArg
 syntax cluster props add=typescriptFunctionMethod
 if exists("did_typescript_hilink") | HiLink typescriptFunctionMethod Keyword
 endif
+endif
diff --git a/syntax/yats/es6-json.vim b/syntax/yats/es6-json.vim
index 40ddf2d2..0d3bec6a 100644
--- a/syntax/yats/es6-json.vim
+++ b/syntax/yats/es6-json.vim
@@ -1,9 +1,7 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName JSON nextgroup=typescriptGlobalJSONDot,typescriptFuncCallArg
 syntax match   typescriptGlobalJSONDot /\./ contained nextgroup=typescriptJSONStaticMethod,typescriptProp
 syntax keyword typescriptJSONStaticMethod contained parse stringify nextgroup=typescriptFuncCallArg
 if exists("did_typescript_hilink") | HiLink typescriptJSONStaticMethod Keyword
 endif
+endif
diff --git a/syntax/yats/es6-map.vim b/syntax/yats/es6-map.vim
index b9f2d47a..c8d837e3 100644
--- a/syntax/yats/es6-map.vim
+++ b/syntax/yats/es6-map.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Map WeakMap
 syntax keyword typescriptES6MapProp contained size
 syntax cluster props add=typescriptES6MapProp
@@ -12,3 +9,4 @@ syntax keyword typescriptES6MapMethod contained keys set values nextgroup=typesc
 syntax cluster props add=typescriptES6MapMethod
 if exists("did_typescript_hilink") | HiLink typescriptES6MapMethod Keyword
 endif
+endif
diff --git a/syntax/yats/es6-math.vim b/syntax/yats/es6-math.vim
index 20444a5a..e0396df0 100644
--- a/syntax/yats/es6-math.vim
+++ b/syntax/yats/es6-math.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Math nextgroup=typescriptGlobalMathDot,typescriptFuncCallArg
 syntax match   typescriptGlobalMathDot /\./ contained nextgroup=typescriptMathStaticProp,typescriptMathStaticMethod,typescriptProp
 syntax keyword typescriptMathStaticProp contained E LN10 LN2 LOG10E LOG2E PI SQRT1_2
@@ -16,3 +13,4 @@ syntax keyword typescriptMathStaticMethod contained min pow random round sign si
 syntax keyword typescriptMathStaticMethod contained sinh sqrt tan tanh trunc nextgroup=typescriptFuncCallArg
 if exists("did_typescript_hilink") | HiLink typescriptMathStaticMethod Keyword
 endif
+endif
diff --git a/syntax/yats/es6-number.vim b/syntax/yats/es6-number.vim
index 21c94cb8..b1399085 100644
--- a/syntax/yats/es6-number.vim
+++ b/syntax/yats/es6-number.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Number nextgroup=typescriptGlobalNumberDot,typescriptFuncCallArg
 syntax match   typescriptGlobalNumberDot /\./ contained nextgroup=typescriptNumberStaticProp,typescriptNumberStaticMethod,typescriptProp
 syntax keyword typescriptNumberStaticProp contained EPSILON MAX_SAFE_INTEGER MAX_VALUE
@@ -18,3 +15,4 @@ syntax keyword typescriptNumberMethod contained toPrecision toSource toString va
 syntax cluster props add=typescriptNumberMethod
 if exists("did_typescript_hilink") | HiLink typescriptNumberMethod Keyword
 endif
+endif
diff --git a/syntax/yats/es6-object.vim b/syntax/yats/es6-object.vim
index 84d639d8..c70d1a86 100644
--- a/syntax/yats/es6-object.vim
+++ b/syntax/yats/es6-object.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Object nextgroup=typescriptGlobalObjectDot,typescriptFuncCallArg
 syntax match   typescriptGlobalObjectDot /\./ contained nextgroup=typescriptObjectStaticMethod,typescriptProp
 syntax keyword typescriptObjectStaticMethod contained create defineProperties defineProperty nextgroup=typescriptFuncCallArg
@@ -19,3 +16,4 @@ syntax keyword typescriptObjectMethod contained setPrototypeOf nextgroup=typescr
 syntax cluster props add=typescriptObjectMethod
 if exists("did_typescript_hilink") | HiLink typescriptObjectMethod Keyword
 endif
+endif
diff --git a/syntax/yats/es6-promise.vim b/syntax/yats/es6-promise.vim
index 619b538b..8c6f8965 100644
--- a/syntax/yats/es6-promise.vim
+++ b/syntax/yats/es6-promise.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Promise nextgroup=typescriptGlobalPromiseDot,typescriptFuncCallArg
 syntax match   typescriptGlobalPromiseDot /\./ contained nextgroup=typescriptPromiseStaticMethod,typescriptProp
 syntax keyword typescriptPromiseStaticMethod contained resolve reject all race nextgroup=typescriptFuncCallArg
@@ -11,3 +8,4 @@ syntax keyword typescriptPromiseMethod contained then catch finally nextgroup=ty
 syntax cluster props add=typescriptPromiseMethod
 if exists("did_typescript_hilink") | HiLink typescriptPromiseMethod Keyword
 endif
+endif
diff --git a/syntax/yats/es6-proxy.vim b/syntax/yats/es6-proxy.vim
index e8255682..e6f28aa1 100644
--- a/syntax/yats/es6-proxy.vim
+++ b/syntax/yats/es6-proxy.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Proxy
 syntax keyword typescriptProxyAPI contained getOwnPropertyDescriptor getOwnPropertyNames
 syntax keyword typescriptProxyAPI contained defineProperty deleteProperty freeze seal
@@ -9,3 +6,4 @@ syntax keyword typescriptProxyAPI contained preventExtensions has hasOwn get set
 syntax keyword typescriptProxyAPI contained iterate ownKeys apply construct
 if exists("did_typescript_hilink") | HiLink typescriptProxyAPI Keyword
 endif
+endif
diff --git a/syntax/yats/es6-reflect.vim b/syntax/yats/es6-reflect.vim
index d417e895..acf4cef2 100644
--- a/syntax/yats/es6-reflect.vim
+++ b/syntax/yats/es6-reflect.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Reflect
 syntax keyword typescriptReflectMethod contained apply construct defineProperty deleteProperty nextgroup=typescriptFuncCallArg
 syntax keyword typescriptReflectMethod contained enumerate get getOwnPropertyDescriptor nextgroup=typescriptFuncCallArg
@@ -10,3 +7,4 @@ syntax keyword typescriptReflectMethod contained preventExtensions set setProtot
 syntax cluster props add=typescriptReflectMethod
 if exists("did_typescript_hilink") | HiLink typescriptReflectMethod Keyword
 endif
+endif
diff --git a/syntax/yats/es6-regexp.vim b/syntax/yats/es6-regexp.vim
index aa2e960e..7b1a00f8 100644
--- a/syntax/yats/es6-regexp.vim
+++ b/syntax/yats/es6-regexp.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName RegExp nextgroup=typescriptGlobalRegExpDot,typescriptFuncCallArg
 syntax match   typescriptGlobalRegExpDot /\./ contained nextgroup=typescriptRegExpStaticProp,typescriptProp
 syntax keyword typescriptRegExpStaticProp contained lastIndex
@@ -15,3 +12,4 @@ syntax keyword typescriptRegExpMethod contained exec test nextgroup=typescriptFu
 syntax cluster props add=typescriptRegExpMethod
 if exists("did_typescript_hilink") | HiLink typescriptRegExpMethod Keyword
 endif
+endif
diff --git a/syntax/yats/es6-set.vim b/syntax/yats/es6-set.vim
index f77695f5..f4ca3cd5 100644
--- a/syntax/yats/es6-set.vim
+++ b/syntax/yats/es6-set.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Set WeakSet
 syntax keyword typescriptES6SetProp contained size
 syntax cluster props add=typescriptES6SetProp
@@ -12,3 +9,4 @@ syntax keyword typescriptES6SetMethod contained values nextgroup=typescriptFuncC
 syntax cluster props add=typescriptES6SetMethod
 if exists("did_typescript_hilink") | HiLink typescriptES6SetMethod Keyword
 endif
+endif
diff --git a/syntax/yats/es6-string.vim b/syntax/yats/es6-string.vim
index 99749bfd..4e63d164 100644
--- a/syntax/yats/es6-string.vim
+++ b/syntax/yats/es6-string.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName String nextgroup=typescriptGlobalStringDot,typescriptFuncCallArg
 syntax match   typescriptGlobalStringDot /\./ contained nextgroup=typescriptStringStaticMethod,typescriptProp
 syntax keyword typescriptStringStaticMethod contained fromCharCode fromCodePoint raw nextgroup=typescriptFuncCallArg
@@ -18,3 +15,4 @@ syntax keyword typescriptStringMethod contained valueOf nextgroup=typescriptFunc
 syntax cluster props add=typescriptStringMethod
 if exists("did_typescript_hilink") | HiLink typescriptStringMethod Keyword
 endif
+endif
diff --git a/syntax/yats/es6-symbol.vim b/syntax/yats/es6-symbol.vim
index 97fd60fd..17318319 100644
--- a/syntax/yats/es6-symbol.vim
+++ b/syntax/yats/es6-symbol.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Symbol nextgroup=typescriptGlobalSymbolDot,typescriptFuncCallArg
 syntax match   typescriptGlobalSymbolDot /\./ contained nextgroup=typescriptSymbolStaticProp,typescriptSymbolStaticMethod,typescriptProp
 syntax keyword typescriptSymbolStaticProp contained length iterator match replace
@@ -13,3 +10,4 @@ endif
 syntax keyword typescriptSymbolStaticMethod contained for keyFor nextgroup=typescriptFuncCallArg
 if exists("did_typescript_hilink") | HiLink typescriptSymbolStaticMethod Keyword
 endif
+endif
diff --git a/syntax/yats/event.vim b/syntax/yats/event.vim
index f86b4b18..6c196719 100644
--- a/syntax/yats/event.vim
+++ b/syntax/yats/event.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptAnimationEvent contained animationend animationiteration
 syntax keyword typescriptAnimationEvent contained animationstart beginEvent endEvent
 syntax keyword typescriptAnimationEvent contained repeatEvent
@@ -161,3 +158,4 @@ syntax keyword typescriptServiceWorkerEvent contained install activate fetch
 syntax cluster events add=typescriptServiceWorkerEvent
 if exists("did_typescript_hilink") | HiLink typescriptServiceWorkerEvent Title
 endif
+endif
diff --git a/syntax/yats/node.vim b/syntax/yats/node.vim
index 312c5fb8..0b9965f9 100644
--- a/syntax/yats/node.vim
+++ b/syntax/yats/node.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptNodeGlobal containedin=typescriptIdentifierName global process
 syntax keyword typescriptNodeGlobal containedin=typescriptIdentifierName console Buffer
 syntax keyword typescriptNodeGlobal containedin=typescriptIdentifierName module exports
@@ -11,3 +8,4 @@ syntax keyword typescriptNodeGlobal containedin=typescriptIdentifierName setInte
 syntax keyword typescriptNodeGlobal containedin=typescriptIdentifierName clearInterval
 if exists("did_typescript_hilink") | HiLink typescriptNodeGlobal Structure
 endif
+endif
diff --git a/syntax/yats/test.vim b/syntax/yats/test.vim
index 9354645a..7e050a53 100644
--- a/syntax/yats/test.vim
+++ b/syntax/yats/test.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName describe
 syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName it test before
 syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName after beforeEach
@@ -9,3 +6,4 @@ syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName afterEa
 syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName beforeAll
 syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName afterAll
 syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName expect assert
+endif
diff --git a/syntax/yats/typescript.vim b/syntax/yats/typescript.vim
index 3177a1a0..420b1499 100644
--- a/syntax/yats/typescript.vim
+++ b/syntax/yats/typescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Function Boolean
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Error EvalError
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName InternalError
@@ -33,3 +30,4 @@ syntax keyword typescriptGlobalMethod containedin=typescriptIdentifierName encod
 syntax cluster props add=typescriptGlobalMethod
 if exists("did_typescript_hilink") | HiLink typescriptGlobalMethod Structure
 endif
+endif
diff --git a/syntax/yats/web-blob.vim b/syntax/yats/web-blob.vim
index 9b920a05..03b644be 100644
--- a/syntax/yats/web-blob.vim
+++ b/syntax/yats/web-blob.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Blob BlobBuilder
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName File FileReader
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName FileReaderSync
@@ -39,3 +36,4 @@ endif
 syntax keyword typescriptURLStaticMethod contained createObjectURL revokeObjectURL nextgroup=typescriptFuncCallArg
 if exists("did_typescript_hilink") | HiLink typescriptURLStaticMethod Keyword
 endif
+endif
diff --git a/syntax/yats/web-console.vim b/syntax/yats/web-console.vim
index 5b4375c8..b3294058 100644
--- a/syntax/yats/web-console.vim
+++ b/syntax/yats/web-console.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName console
 syntax keyword typescriptConsoleMethod contained count dir error group groupCollapsed nextgroup=typescriptFuncCallArg
 syntax keyword typescriptConsoleMethod contained groupEnd info log time timeEnd trace nextgroup=typescriptFuncCallArg
@@ -9,3 +6,4 @@ syntax keyword typescriptConsoleMethod contained warn nextgroup=typescriptFuncCa
 syntax cluster props add=typescriptConsoleMethod
 if exists("did_typescript_hilink") | HiLink typescriptConsoleMethod Keyword
 endif
+endif
diff --git a/syntax/yats/web-crypto.vim b/syntax/yats/web-crypto.vim
index b410ba56..61d9af30 100644
--- a/syntax/yats/web-crypto.vim
+++ b/syntax/yats/web-crypto.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptCryptoGlobal containedin=typescriptIdentifierName crypto
 if exists("did_typescript_hilink") | HiLink typescriptCryptoGlobal Structure
 endif
@@ -18,3 +15,4 @@ syntax keyword typescriptCryptoMethod contained getRandomValues nextgroup=typesc
 syntax cluster props add=typescriptCryptoMethod
 if exists("did_typescript_hilink") | HiLink typescriptCryptoMethod Keyword
 endif
+endif
diff --git a/syntax/yats/web-encoding.vim b/syntax/yats/web-encoding.vim
index f4d8d310..d7081034 100644
--- a/syntax/yats/web-encoding.vim
+++ b/syntax/yats/web-encoding.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptEncodingGlobal containedin=typescriptIdentifierName TextEncoder
 syntax keyword typescriptEncodingGlobal containedin=typescriptIdentifierName TextDecoder
 if exists("did_typescript_hilink") | HiLink typescriptEncodingGlobal Structure
@@ -14,3 +11,4 @@ syntax keyword typescriptEncodingMethod contained encode decode nextgroup=typesc
 syntax cluster props add=typescriptEncodingMethod
 if exists("did_typescript_hilink") | HiLink typescriptEncodingMethod Keyword
 endif
+endif
diff --git a/syntax/yats/web-fetch.vim b/syntax/yats/web-fetch.vim
index 2330b272..2e5c2370 100644
--- a/syntax/yats/web-fetch.vim
+++ b/syntax/yats/web-fetch.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Headers Request
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Response
 syntax keyword typescriptGlobalMethod containedin=typescriptIdentifierName fetch nextgroup=typescriptFuncCallArg
@@ -30,3 +27,4 @@ syntax keyword typescriptResponseMethod contained clone nextgroup=typescriptFunc
 syntax cluster props add=typescriptResponseMethod
 if exists("did_typescript_hilink") | HiLink typescriptResponseMethod Keyword
 endif
+endif
diff --git a/syntax/yats/web-geo.vim b/syntax/yats/web-geo.vim
index 6dd53a54..da386643 100644
--- a/syntax/yats/web-geo.vim
+++ b/syntax/yats/web-geo.vim
@@ -1,10 +1,8 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Geolocation
 syntax keyword typescriptGeolocationMethod contained getCurrentPosition watchPosition nextgroup=typescriptFuncCallArg
 syntax keyword typescriptGeolocationMethod contained clearWatch nextgroup=typescriptFuncCallArg
 syntax cluster props add=typescriptGeolocationMethod
 if exists("did_typescript_hilink") | HiLink typescriptGeolocationMethod Keyword
 endif
+endif
diff --git a/syntax/yats/web-history.vim b/syntax/yats/web-history.vim
index 80993067..42283af3 100644
--- a/syntax/yats/web-history.vim
+++ b/syntax/yats/web-history.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptBOMHistoryProp contained length current next previous state
 syntax keyword typescriptBOMHistoryProp contained scrollRestoration
 syntax cluster props add=typescriptBOMHistoryProp
@@ -11,3 +8,4 @@ syntax keyword typescriptBOMHistoryMethod contained back forward go pushState re
 syntax cluster props add=typescriptBOMHistoryMethod
 if exists("did_typescript_hilink") | HiLink typescriptBOMHistoryMethod Keyword
 endif
+endif
diff --git a/syntax/yats/web-location.vim b/syntax/yats/web-location.vim
index 3cd08f7f..29efd9cc 100644
--- a/syntax/yats/web-location.vim
+++ b/syntax/yats/web-location.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptBOMLocationProp contained href protocol host hostname port
 syntax keyword typescriptBOMLocationProp contained pathname search hash username password
 syntax keyword typescriptBOMLocationProp contained origin
@@ -12,3 +9,4 @@ syntax keyword typescriptBOMLocationMethod contained assign reload replace toStr
 syntax cluster props add=typescriptBOMLocationMethod
 if exists("did_typescript_hilink") | HiLink typescriptBOMLocationMethod Keyword
 endif
+endif
diff --git a/syntax/yats/web-navigator.vim b/syntax/yats/web-navigator.vim
index cb826d82..db32a416 100644
--- a/syntax/yats/web-navigator.vim
+++ b/syntax/yats/web-navigator.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptBOMNavigatorProp contained battery buildID connection cookieEnabled
 syntax keyword typescriptBOMNavigatorProp contained doNotTrack maxTouchPoints oscpu
 syntax keyword typescriptBOMNavigatorProp contained productSub push serviceWorker
@@ -22,3 +19,4 @@ syntax keyword typescriptServiceWorkerMethod contained register nextgroup=typesc
 syntax cluster props add=typescriptServiceWorkerMethod
 if exists("did_typescript_hilink") | HiLink typescriptServiceWorkerMethod Keyword
 endif
+endif
diff --git a/syntax/yats/web-network.vim b/syntax/yats/web-network.vim
index 497e10d2..f46efd09 100644
--- a/syntax/yats/web-network.vim
+++ b/syntax/yats/web-network.vim
@@ -1,10 +1,8 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName NetworkInformation
 syntax keyword typescriptBOMNetworkProp contained downlink downlinkMax effectiveType
 syntax keyword typescriptBOMNetworkProp contained rtt type
 syntax cluster props add=typescriptBOMNetworkProp
 if exists("did_typescript_hilink") | HiLink typescriptBOMNetworkProp Keyword
 endif
+endif
diff --git a/syntax/yats/web-payment.vim b/syntax/yats/web-payment.vim
index fc0e4557..e0479a53 100644
--- a/syntax/yats/web-payment.vim
+++ b/syntax/yats/web-payment.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName PaymentRequest
 syntax keyword typescriptPaymentMethod contained show abort canMakePayment nextgroup=typescriptFuncCallArg
 syntax cluster props add=typescriptPaymentMethod
@@ -35,3 +32,4 @@ syntax keyword typescriptPaymentShippingOptionProp contained id label amount sel
 syntax cluster props add=typescriptPaymentShippingOptionProp
 if exists("did_typescript_hilink") | HiLink typescriptPaymentShippingOptionProp Keyword
 endif
+endif
diff --git a/syntax/yats/web-service-worker.vim b/syntax/yats/web-service-worker.vim
index 0c9cd543..dde90386 100644
--- a/syntax/yats/web-service-worker.vim
+++ b/syntax/yats/web-service-worker.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptServiceWorkerProp contained controller ready
 syntax cluster props add=typescriptServiceWorkerProp
 if exists("did_typescript_hilink") | HiLink typescriptServiceWorkerProp Keyword
@@ -16,3 +13,4 @@ syntax keyword typescriptCacheMethod contained keys nextgroup=typescriptFuncCall
 syntax cluster props add=typescriptCacheMethod
 if exists("did_typescript_hilink") | HiLink typescriptCacheMethod Keyword
 endif
+endif
diff --git a/syntax/yats/web-window.vim b/syntax/yats/web-window.vim
index 2633ba97..a0109fcb 100644
--- a/syntax/yats/web-window.vim
+++ b/syntax/yats/web-window.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptBOMWindowProp containedin=typescriptIdentifierName applicationCache
 syntax keyword typescriptBOMWindowProp containedin=typescriptIdentifierName closed
 syntax keyword typescriptBOMWindowProp containedin=typescriptIdentifierName Components
@@ -111,3 +108,4 @@ syntax keyword typescriptBOMWindowCons containedin=typescriptIdentifierName Quer
 syntax keyword typescriptBOMWindowCons containedin=typescriptIdentifierName XMLSerializer
 if exists("did_typescript_hilink") | HiLink typescriptBOMWindowCons Structure
 endif
+endif
diff --git a/syntax/yats/web-xhr.vim b/syntax/yats/web-xhr.vim
index 60769f21..6a6379f7 100644
--- a/syntax/yats/web-xhr.vim
+++ b/syntax/yats/web-xhr.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptXHRGlobal containedin=typescriptIdentifierName XMLHttpRequest
 if exists("did_typescript_hilink") | HiLink typescriptXHRGlobal Structure
 endif
@@ -16,3 +13,4 @@ syntax keyword typescriptXHRMethod contained open overrideMimeType send setReque
 syntax cluster props add=typescriptXHRMethod
 if exists("did_typescript_hilink") | HiLink typescriptXHRMethod Keyword
 endif
+endif
diff --git a/syntax/yats/web.vim b/syntax/yats/web.vim
index 33d4e066..ffef459d 100644
--- a/syntax/yats/web.vim
+++ b/syntax/yats/web.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 syntax keyword typescriptBOM containedin=typescriptIdentifierName AbortController
 syntax keyword typescriptBOM containedin=typescriptIdentifierName AbstractWorker AnalyserNode
 syntax keyword typescriptBOM containedin=typescriptIdentifierName App Apps ArrayBuffer
@@ -251,3 +248,4 @@ syntax keyword typescriptBOM containedin=typescriptIdentifierName XDomainRequest
 syntax keyword typescriptBOM containedin=typescriptIdentifierName XMLHttpRequestEventTarget
 if exists("did_typescript_hilink") | HiLink typescriptBOM Structure
 endif
+endif
diff --git a/syntax/zephir.vim b/syntax/zephir.vim
index bfd3ef09..053c9354 100644
--- a/syntax/zephir.vim
+++ b/syntax/zephir.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'zephir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zephir') == -1
 " Copyright 2009 The Go Authors. All rights reserved.
 if exists("b:current_syntax")
   finish
@@ -135,3 +132,4 @@ syn sync minlines=500
 
 let b:current_syntax = "zephir"
 syn match       zepTypeHits          "<\w+>" contained display
+endif
diff --git a/syntax/zig.vim b/syntax/zig.vim
index 825d5e7f..e482b2e4 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'zig') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 " Vim syntax file
 " Language: Zig
 " Maintainer: Andrew Kelley
@@ -105,3 +102,4 @@ hi def link zigStructure Structure
 hi def link zigStatement Statement
 hi def link zigConditional Conditional
 hi def link zigRepeat Repeat
+endif
author	Adam Stankiewicz <sheerun@sher.pl>	2019-09-06 15:54:31 +0200
committer	Adam Stankiewicz <sheerun@sher.pl>	2019-09-06 15:54:31 +0200
commit	48e07bc5014fecfdff24f75124a65634c216c9e2 (patch)
tree	2e16f9a515364e27ac451acbc313b1d7ca518790
parent	c8897c9c18ee79d3780dd352aee34bf6498c625d (diff)
download	vim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.tar.gz vim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.zip