Fix match highlighting

Not all Unicode codepoints are one column in width.