Re #7452 Cleanup warnings.