This intention of this change is to make the normal flow of execution
easier to read, and to prevent mistakes in deeply nested if-else trees.