cleanup: Reduce nesting of else clauses after return.

cleanup: Reduce nesting of else clauses after return. #2093