Another round of style cleanup.