Expanding the Life-Cycle Model: Precautionary Saving and Public Policy