Improved handling of probes which have analogs in charm gen ff.