Remove unnecessary if-else statement.
Merge pull request #1211 from yvoyer/cleanup-unnecessary-if-else

Code cleanup: Remove unnecessary if-else statement.