SERVER-75. Restructure for Super.apply. Waterfall. Cleanup