Round one of style cleanup.