Improve management of elif and else nodes. Fix issue #129