More work on ICFG-creation.