The other component is decoupling health care and dental insurance from employment. Because that's a far bigger problem than retirement. A lot of people lost their jobs last year and suddenly had to pay full price on their insurance to keep going to their doctor.
The whole insurance system in the US is best described as a real-life re-enactment of The Trial by Franz Kafka.