Completely remove old dependence graph construction procedure and replace with simpler version using bidirectional maps.