Investors no longer face a blunt choice between annuities and drawdown