Adapt to bfgedition changes.