Updated for underscore > 1.3.3