Fix style errors for bug #7950.
More work on bug #7906.
Style fix for bug #7941
Style fix for bug #7938
Style fix for bug #7950
Style fix for bug #7948
Style fix for bug #7950
Style fix for bug #7892.