Fixed a problem with multiple parents, which in turn forced a few
resolutions around commit/dao identity