limited improvement to my bundled underscore stuff