Update hl and _hl_complete to work with current ‘highlight’ versions