Reduce lines of code a little
Fix highlight of second targets with matchaddpos()
Merge branch 'fix-matchaddpos'