Work towards bluebird + generator refactor.