Re #8909. Fixed compiler warnings.