Minor refactoring.
Divide mapAsync into mapToCompletionStage and await.