Style fixes for bug #7494.