Future transformation improvements

Transformed futures now respect more of the rules of the underlying
future.