More highlighting refactoring.