Switch more use of CheckedFuture to ListenableFuture