This is from a few days go, a lifetime in blog years, but I neglected to link to it. I think even relatively sensible liberals get stuck in the "means testing" trap occasionally. But the thing about Social Security is that there isn't any money in means testing unless you take it away from people who aren't making much money at all.
Think rich people have too good a deal? Just increase their damn tax rates.