[C++] Result<detail::Empty> is annoying

When I add a callback (using AddCallback or Then) to a Future<T>, I would like the callback to take a Status rather than a Result<detail::Empty>.

I managed to get this done for AddCallback, but Then is another pile of complication due to template hackery.