I agree, although I doubt we will be able to get rid of entitlements completely, since let us face it, most people are dumb and shortsighted and we will never get rid of state-backed and taste provided pensions, but IMHO those should be linked to not just years of work but also social...