diff --git a/runtime/syntax/perl6.vim b/runtime/syntax/perl6.vim
index f40a040..3bcd9ff 100644
--- a/runtime/syntax/perl6.vim
+++ b/runtime/syntax/perl6.vim
@@ -2061,167 +2061,165 @@
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink p6EscOctOld       p6Error
-HiLink p6PackageTwigil   p6Twigil
-HiLink p6StringAngle     p6String
-HiLink p6StringFrench    p6String
-HiLink p6StringAngles    p6String
-HiLink p6StringSQ        p6String
-HiLink p6StringDQ        p6String
-HiLink p6StringQ         p6String
-HiLink p6RxStringSQ      p6String
-HiLink p6RxStringDQ      p6String
-HiLink p6Substitution    p6String
-HiLink p6Transliteration p6String
-HiLink p6StringAuto      p6String
-HiLink p6StringP5Auto    p6String
-HiLink p6Key             p6String
-HiLink p6Match           p6String
-HiLink p6RegexBlock      p6String
-HiLink p6RxP5CharClass   p6String
-HiLink p6RxP5QuoteMeta   p6String
-HiLink p6RxCharClass     p6String
-HiLink p6RxQuoteWords    p6String
-HiLink p6ReduceOp        p6Operator
-HiLink p6ReverseCrossOp  p6Operator
-HiLink p6HyperOp         p6Operator
-HiLink p6QuoteQ          p6Operator
-HiLink p6RxRange         p6StringSpecial
-HiLink p6RxAnchor        p6StringSpecial
-HiLink p6RxP5Anchor      p6StringSpecial
-HiLink p6CodePoint       p6StringSpecial
-HiLink p6RxMeta          p6StringSpecial
-HiLink p6RxP5Range       p6StringSpecial
-HiLink p6RxP5CPId        p6StringSpecial
-HiLink p6RxP5Posix       p6StringSpecial
-HiLink p6RxP5Mod         p6StringSpecial
-HiLink p6RxP5HexSeq      p6StringSpecial
-HiLink p6RxP5OctSeq      p6StringSpecial
-HiLink p6RxP5WriteRefId  p6StringSpecial
-HiLink p6HexSequence     p6StringSpecial
-HiLink p6OctSequence     p6StringSpecial
-HiLink p6RxP5Named       p6StringSpecial
-HiLink p6RxP5PropId      p6StringSpecial
-HiLink p6RxP5Quantifier  p6StringSpecial
-HiLink p6RxP5CountId     p6StringSpecial
-HiLink p6RxP5Verb        p6StringSpecial
-HiLink p6Escape          p6StringSpecial2
-HiLink p6EscNull         p6StringSpecial2
-HiLink p6EscHash         p6StringSpecial2
-HiLink p6EscQQ           p6StringSpecial2
-HiLink p6EscQuote        p6StringSpecial2
-HiLink p6EscDoubleQuote  p6StringSpecial2
-HiLink p6EscBackTick     p6StringSpecial2
-HiLink p6EscForwardSlash p6StringSpecial2
-HiLink p6EscVerticalBar  p6StringSpecial2
-HiLink p6EscExclamation  p6StringSpecial2
-HiLink p6EscDollar       p6StringSpecial2
-HiLink p6EscOpenCurly    p6StringSpecial2
-HiLink p6EscCloseCurly   p6StringSpecial2
-HiLink p6EscCloseBracket p6StringSpecial2
-HiLink p6EscCloseAngle   p6StringSpecial2
-HiLink p6EscCloseFrench  p6StringSpecial2
-HiLink p6EscBackSlash    p6StringSpecial2
-HiLink p6RxEscape        p6StringSpecial2
-HiLink p6RxCapture       p6StringSpecial2
-HiLink p6RxAlternation   p6StringSpecial2
-HiLink p6RxP5            p6StringSpecial2
-HiLink p6RxP5ReadRef     p6StringSpecial2
-HiLink p6RxP5Oct         p6StringSpecial2
-HiLink p6RxP5Hex         p6StringSpecial2
-HiLink p6RxP5EscMeta     p6StringSpecial2
-HiLink p6RxP5Meta        p6StringSpecial2
-HiLink p6RxP5Escape      p6StringSpecial2
-HiLink p6RxP5CodePoint   p6StringSpecial2
-HiLink p6RxP5WriteRef    p6StringSpecial2
-HiLink p6RxP5Prop        p6StringSpecial2
+hi def link p6EscOctOld       p6Error
+hi def link p6PackageTwigil   p6Twigil
+hi def link p6StringAngle     p6String
+hi def link p6StringFrench    p6String
+hi def link p6StringAngles    p6String
+hi def link p6StringSQ        p6String
+hi def link p6StringDQ        p6String
+hi def link p6StringQ         p6String
+hi def link p6RxStringSQ      p6String
+hi def link p6RxStringDQ      p6String
+hi def link p6Substitution    p6String
+hi def link p6Transliteration p6String
+hi def link p6StringAuto      p6String
+hi def link p6StringP5Auto    p6String
+hi def link p6Key             p6String
+hi def link p6Match           p6String
+hi def link p6RegexBlock      p6String
+hi def link p6RxP5CharClass   p6String
+hi def link p6RxP5QuoteMeta   p6String
+hi def link p6RxCharClass     p6String
+hi def link p6RxQuoteWords    p6String
+hi def link p6ReduceOp        p6Operator
+hi def link p6ReverseCrossOp  p6Operator
+hi def link p6HyperOp         p6Operator
+hi def link p6QuoteQ          p6Operator
+hi def link p6RxRange         p6StringSpecial
+hi def link p6RxAnchor        p6StringSpecial
+hi def link p6RxP5Anchor      p6StringSpecial
+hi def link p6CodePoint       p6StringSpecial
+hi def link p6RxMeta          p6StringSpecial
+hi def link p6RxP5Range       p6StringSpecial
+hi def link p6RxP5CPId        p6StringSpecial
+hi def link p6RxP5Posix       p6StringSpecial
+hi def link p6RxP5Mod         p6StringSpecial
+hi def link p6RxP5HexSeq      p6StringSpecial
+hi def link p6RxP5OctSeq      p6StringSpecial
+hi def link p6RxP5WriteRefId  p6StringSpecial
+hi def link p6HexSequence     p6StringSpecial
+hi def link p6OctSequence     p6StringSpecial
+hi def link p6RxP5Named       p6StringSpecial
+hi def link p6RxP5PropId      p6StringSpecial
+hi def link p6RxP5Quantifier  p6StringSpecial
+hi def link p6RxP5CountId     p6StringSpecial
+hi def link p6RxP5Verb        p6StringSpecial
+hi def link p6Escape          p6StringSpecial2
+hi def link p6EscNull         p6StringSpecial2
+hi def link p6EscHash         p6StringSpecial2
+hi def link p6EscQQ           p6StringSpecial2
+hi def link p6EscQuote        p6StringSpecial2
+hi def link p6EscDoubleQuote  p6StringSpecial2
+hi def link p6EscBackTick     p6StringSpecial2
+hi def link p6EscForwardSlash p6StringSpecial2
+hi def link p6EscVerticalBar  p6StringSpecial2
+hi def link p6EscExclamation  p6StringSpecial2
+hi def link p6EscDollar       p6StringSpecial2
+hi def link p6EscOpenCurly    p6StringSpecial2
+hi def link p6EscCloseCurly   p6StringSpecial2
+hi def link p6EscCloseBracket p6StringSpecial2
+hi def link p6EscCloseAngle   p6StringSpecial2
+hi def link p6EscCloseFrench  p6StringSpecial2
+hi def link p6EscBackSlash    p6StringSpecial2
+hi def link p6RxEscape        p6StringSpecial2
+hi def link p6RxCapture       p6StringSpecial2
+hi def link p6RxAlternation   p6StringSpecial2
+hi def link p6RxP5            p6StringSpecial2
+hi def link p6RxP5ReadRef     p6StringSpecial2
+hi def link p6RxP5Oct         p6StringSpecial2
+hi def link p6RxP5Hex         p6StringSpecial2
+hi def link p6RxP5EscMeta     p6StringSpecial2
+hi def link p6RxP5Meta        p6StringSpecial2
+hi def link p6RxP5Escape      p6StringSpecial2
+hi def link p6RxP5CodePoint   p6StringSpecial2
+hi def link p6RxP5WriteRef    p6StringSpecial2
+hi def link p6RxP5Prop        p6StringSpecial2
 
-HiLink p6Property       Tag
-HiLink p6Attention      Todo
-HiLink p6Type           Type
-HiLink p6Error          Error
-HiLink p6BlockLabel     Label
-HiLink p6Float          Float
-HiLink p6Normal         Normal
-HiLink p6Package        Normal
-HiLink p6PackageScope   Normal
-HiLink p6Number         Number
-HiLink p6VersionNum     Number
-HiLink p6String         String
-HiLink p6Repeat         Repeat
-HiLink p6Keyword        Keyword
-HiLink p6Pragma         Keyword
-HiLink p6Module         Keyword
-HiLink p6DeclareRoutine Keyword
-HiLink p6VarStorage     Special
-HiLink p6FlowControl    Special
-HiLink p6NumberBase     Special
-HiLink p6Twigil         Special
-HiLink p6StringSpecial2 Special
-HiLink p6VersionDot     Special
-HiLink p6Comment        Comment
-HiLink p6Include        Include
-HiLink p6Shebang        PreProc
-HiLink p6ClosureTrait   PreProc
-HiLink p6Routine        Function
-HiLink p6Operator       Operator
-HiLink p6Version        Operator
-HiLink p6Context        Operator
-HiLink p6Quote          Delimiter
-HiLink p6TypeConstraint PreCondit
-HiLink p6Exception      Exception
-HiLink p6Placeholder    Identifier
-HiLink p6Variable       Identifier
-HiLink p6VarSlash       Identifier
-HiLink p6VarNum         Identifier
-HiLink p6VarExclam      Identifier
-HiLink p6VarMatch       Identifier
-HiLink p6VarName        Identifier
-HiLink p6MatchVar       Identifier
-HiLink p6RxP5ReadRefId  Identifier
-HiLink p6RxP5ModDef     Identifier
-HiLink p6RxP5ModName    Identifier
-HiLink p6Conditional    Conditional
-HiLink p6StringSpecial  SpecialChar
+hi def link p6Property       Tag
+hi def link p6Attention      Todo
+hi def link p6Type           Type
+hi def link p6Error          Error
+hi def link p6BlockLabel     Label
+hi def link p6Float          Float
+hi def link p6Normal         Normal
+hi def link p6Package        Normal
+hi def link p6PackageScope   Normal
+hi def link p6Number         Number
+hi def link p6VersionNum     Number
+hi def link p6String         String
+hi def link p6Repeat         Repeat
+hi def link p6Keyword        Keyword
+hi def link p6Pragma         Keyword
+hi def link p6Module         Keyword
+hi def link p6DeclareRoutine Keyword
+hi def link p6VarStorage     Special
+hi def link p6FlowControl    Special
+hi def link p6NumberBase     Special
+hi def link p6Twigil         Special
+hi def link p6StringSpecial2 Special
+hi def link p6VersionDot     Special
+hi def link p6Comment        Comment
+hi def link p6Include        Include
+hi def link p6Shebang        PreProc
+hi def link p6ClosureTrait   PreProc
+hi def link p6Routine        Function
+hi def link p6Operator       Operator
+hi def link p6Version        Operator
+hi def link p6Context        Operator
+hi def link p6Quote          Delimiter
+hi def link p6TypeConstraint PreCondit
+hi def link p6Exception      Exception
+hi def link p6Placeholder    Identifier
+hi def link p6Variable       Identifier
+hi def link p6VarSlash       Identifier
+hi def link p6VarNum         Identifier
+hi def link p6VarExclam      Identifier
+hi def link p6VarMatch       Identifier
+hi def link p6VarName        Identifier
+hi def link p6MatchVar       Identifier
+hi def link p6RxP5ReadRefId  Identifier
+hi def link p6RxP5ModDef     Identifier
+hi def link p6RxP5ModName    Identifier
+hi def link p6Conditional    Conditional
+hi def link p6StringSpecial  SpecialChar
 
-HiLink p6PodAbbr         p6Pod
-HiLink p6PodAbbrEOF      p6Pod
-HiLink p6PodAbbrNoCode   p6Pod
-HiLink p6PodAbbrCode     p6PodCode
-HiLink p6PodPara         p6Pod
-HiLink p6PodParaEOF      p6Pod
-HiLink p6PodParaNoCode   p6Pod
-HiLink p6PodParaCode     p6PodCode
-HiLink p6PodDelim        p6Pod
-HiLink p6PodDelimEOF     p6Pod
-HiLink p6PodDelimNoCode  p6Pod
-HiLink p6PodDelimCode    p6PodCode
-HiLink p6PodImplicitCode p6PodCode
-HiLink p6PodExtraConfig  p6PodPrefix
-HiLink p6PodVerticalBar  p6PodFormatCode
-HiLink p6PodColon        p6PodFormatCode
-HiLink p6PodSemicolon    p6PodFormatCode
-HiLink p6PodComma        p6PodFormatCode
-HiLink p6PodFormatOne    p6PodFormat
-HiLink p6PodFormatTwo    p6PodFormat
-HiLink p6PodFormatThree  p6PodFormat
-HiLink p6PodFormatFrench p6PodFormat
+hi def link p6PodAbbr         p6Pod
+hi def link p6PodAbbrEOF      p6Pod
+hi def link p6PodAbbrNoCode   p6Pod
+hi def link p6PodAbbrCode     p6PodCode
+hi def link p6PodPara         p6Pod
+hi def link p6PodParaEOF      p6Pod
+hi def link p6PodParaNoCode   p6Pod
+hi def link p6PodParaCode     p6PodCode
+hi def link p6PodDelim        p6Pod
+hi def link p6PodDelimEOF     p6Pod
+hi def link p6PodDelimNoCode  p6Pod
+hi def link p6PodDelimCode    p6PodCode
+hi def link p6PodImplicitCode p6PodCode
+hi def link p6PodExtraConfig  p6PodPrefix
+hi def link p6PodVerticalBar  p6PodFormatCode
+hi def link p6PodColon        p6PodFormatCode
+hi def link p6PodSemicolon    p6PodFormatCode
+hi def link p6PodComma        p6PodFormatCode
+hi def link p6PodFormatOne    p6PodFormat
+hi def link p6PodFormatTwo    p6PodFormat
+hi def link p6PodFormatThree  p6PodFormat
+hi def link p6PodFormatFrench p6PodFormat
 
-HiLink p6PodType           Type
-HiLink p6PodConfigOption   String
-HiLink p6PodCode           PreProc
-HiLink p6Pod               Comment
-HiLink p6PodComment        Comment
-HiLink p6PodAutoQuote      Operator
-HiLink p6PodConfigOperator Operator
-HiLink p6PodPrefix         Statement
-HiLink p6PodName           Identifier
-HiLink p6PodFormatCode     SpecialChar
-HiLink p6PodFormat         SpecialComment
+hi def link p6PodType           Type
+hi def link p6PodConfigOption   String
+hi def link p6PodCode           PreProc
+hi def link p6Pod               Comment
+hi def link p6PodComment        Comment
+hi def link p6PodAutoQuote      Operator
+hi def link p6PodConfigOperator Operator
+hi def link p6PodPrefix         Statement
+hi def link p6PodName           Identifier
+hi def link p6PodFormatCode     SpecialChar
+hi def link p6PodFormat         SpecialComment
 
-delcommand HiLink
 
 " Syncing to speed up processing
 "syn sync match p6SyncPod groupthere p6PodAbbrRegion     "^=\K\k*\>"