I disagree with the post itself. Since in Civ7 there's no gameplay association between civ and leaders, we should be talking about historical connection, not gameplay. And thus, 2 personas should count as one. So, France has 2 leaders, one of which is a bonus, not coming in vanilla game without additional effort.
Similarly, America really has 2 vanilla leaders, but this makes sense, since it's the biggest market. Associating Lafayette with America is just wrong - even though he's known in America for his actions in American Revolution, he was French and did a lot of other things.