Before employment, there was only social roles. In other words, they should absolutely be conflated. It is absurd and foolhardy to attempt separating them.
Plenty of social roles are still not determined by market whims. Such as friendship and family relations.