Still unsatisfied, but these are better than before.
Use spectral analysis tool to find spurious edges in the code DAG, refactoring to prune.