Style fixes for bug #7306