Fix up some highlighting errors.