Do not unhighlight word when not at new word

This modifies the behaviour of the word highlighting so that the
currently highlighted word is only unhighlighted once the point reaches
a new word.