Tax Amendments to Improve Long-Term Savings