Work on bug #8326. Most of the style errors have been removed.