Fix whitespace highlighting match clashes