Get rid of if/else

Per request: http://issue.cc/r3/2077
Merge pull request #185 from BrianHawley/wish-2077-no-if-else

Get rid of if/else refinement and related warnings.