feat: don't use type vars where not necessary

François Ferry requested to merge topic/default/typing-fixes into branch/default

TypeVars should be referenced at least twice otherwise they have no effect.

Merge request reports