SERVER-75. Restructure for async waterfall