HighlightUsageTagger and RenameCommandFilter refactoring