More highlight tidying.

This *seems* to fix #66 entirely for me.