Bug 1021533 - (bug 1018836 follow up) css class cleanup.

yeah I made sure the two are visually close together so it doesn't go unnoticed.