Fixed #7470.
Style fix for bug #7393.
Style fixes for bug #7468.
Work on bug #7470.