Re #9958. Fix compiler warnings.