Marc Petit-Huguenin's nits

- More nits.
Merge pull request #227 from petithug/mph-nits

Marc Petit-Huguenin's nits