I'm wondering that it might be cleaner to have a dedicated highlighter type?