Moar fixes of building extended CFG.
much bggy, very dummy, so code.