Avoid duplicate test

No need for the if statement, since the test is already done with the
when statement.
Merge pull request #143 from vuntz/minor-cleanup

Avoid duplicate test