Improved handling of Futures and in-place rewrites.