Change the class_specifier rules to better match standard.

This should not create any functional changes, it is primarily for
readability.