Marc Petit-Huguenin's nits

- More nits.