Teach simplifycfg to recompute branch weights when merging some branches, and