This fixes #7680.  The style errors are fixed.