nearly final, pre-CSS cleanup.