Better dependency tracking when unfolding ASG into AST.
Merge branch 'better-dependency-tracking'