A style fix for bug #7668.
More style fixes for bug #7668.