code-highlight directive improvements