Better use of highlighting directives