Style fixes for bug #7909.
Style fixes for bug #7906.