Issue #144: using less cluttered highlighting