Fix to magit's highlighting issues.