Fix issue #214

Revert "The else of an if has a scope."

This reverts commit 4efc2b5933e803738ed003625784067dca474460.