Corrected bug on data dependencies detection.

It is still as brittle as before, but now there are comments.