Removing underscore as a dependency.  No longer hacking objects, just indexes.