Remove futures - leave that up to the user.

Also, a couple of handy helpers.