Switch from underscore to lodash: part 2

Missed a few references to underscore.