Improved support for future<R&>