Remove some <SPAN> elements that were used only to carry a CLASS

attribute; stick the CLASS on an existing element.