Some stylistic consistency patches from Dridi Boukelmoune
who made them with Coccinelle.

Thanks!