Support empty elsif in MultilineIfThen

And simplify a lot. Closes #1433.