Update depres to better handle uptree changes

When A -> B -> A(+flag), we need to be carefull
on how we handle this.  More info in comments