Update typehinting code to use primitives and collections types as main types over typing variants

Update typehinting code to use primitives and collections types as main types over typing variants #22781