Fix highlighter so it highlights words with apostrophes. (#534)