Re #10123. Fix compiler warnings.