Another small improvement in highlighting