mostly reformats, but also add a small fix to aggregator to pull off the last ref in the path and use that for the next round of discovery, rather than querying the db again. Also, add logic to ResolveOps NOT to directly resolve relationships for roots if we're just about to do graph discovery...let the aggregator handle it.