Updated to match changes to FindCbfs module.