Scoped kind variables (#16635)