Ahem. Global replace of `cfg' with `inst->cfg' is all very well, but