This should not be any functional change. The only difference are the
variable scopes, and early return versus nested ifs.