3.0: fix merge error leaving references to whistle_stats functions