Phase out all entitlements. There is no such thing as an entitlement.
I still like the idea of the Chilean system with personally directed mandated retirement accounts. I do think they should be able to be borrowed from and repaid for housing, medical and education expenses (life has a pattern and there are periods that money flows out instead of into savings).