"classical liberalism", which encompasses positions ranging from most forms of social-democracy (roughly corresponding to mainstream US liberals, if I understand US politics correctly) to most forms of neoliberalism (Thatcherism-Reaganism) and libertarianism.

I think you're treating it much too widely. I don't consider the European social democrats or the US progressives to fall under "classical liberalism".