Fixes to data dependency computation.