More improvements in future<R&> support