Some cleanup regarding SettableFutures