Finish underscore/lodash swapout