Re #6484. gcc compiler warnings.