Cosmetic changes

  found by coccinelle.