r2066 + employ origin highlighting more widely: