Another round of Style Cop fixes