I've always figured the long term govt plan was to get everyone to save up a lot of 401k money in accounts. Then put a new "gotcha" surtax on withdrawals by "the rich" as baby boomers start to retire.
I hadn't thought of that, but I believe you are right.