Fix multi-line if-else in single-line expression.

* When searching for the closing token of a single-line expression, ignore TERMINATORS that will subsequently be removed.
* Add a test.
Merge `removeMidExpressionNewlines` into `addImplicitIndentation`

and rename it to `normalizeLines`