Minor cleanup.
Incorporated the auto-generated highlighting as a repository element.