Aren't the last two lines replaceable with a single `whenComplete()`?