Managing demographic risk in enhanced pensions