Collective Choice and Social Welfare: An Expanded Edition