Cleanup related to the HighlightRegex() functions.