Re #9221. Fix the compiler warnings.