Conform with project style.
Merge pull request #1541 from braddunbar/else-if-style

Conform with project style.