Add skipped blocks back into debug info.
Fix dependency edges in the scheduler now that species trees are induced