Yeah, the paper Yvain linked, seems to be providing evidence that a hyperbolic discount function may be the first-order heuristic for handling such issues, with patches applied where appropriate.