fix vertical whitespace before else/elseif, and add some tests for this