Revise proposed SettableFuture implementation

Issue: SPR-11614