Migrate to underscore-plus and array-series