Fix a regression with defer unroll declared in else clauses