Beta-Delta or Delta-Tau? A Reformulation of Quasi-Hyperbolic Discounting