Re #10545. Fix compiler warnings.