Some minor improvements for highlighting.