A bit more of Styles cleanup.