This fixes #8326.  All of the style errors are fixed now.