More highlight tidying.
Merge pull request #78 from csmith/master

More highlight tidying.