Switch from underscore to lodash, #659