I agree with both points. The original purpose of nation states wasn't geared in practice to serving the whole population, but catered instead to the citizens in some elitist sense, such as men and the slaveholders. And liberalism may indeed be on the way out, as some all-encompassing version of capitalism triumphs.
But I don't think either point addresses my argument here. Regardless of what was intended, the question remains whether it's wise to think a government could be run like a corporation. Just because liberalism may be on the way out, doesn't mean anarcho-capitalism is sustainable.