Replace all unless/else logic with if/else by reversing the order of the blocks.
Merge pull request #2675 from awagener/remove_unless_else

Remove all unless/else logic.