BUG: Allow empty else- and else_if-blocks

This fix allows empty else and else-if blocks to be processed, fixes #1660