An alternative solution to the diff / line-reordering issues is to let newlines function as commas, as SE-257: Eliding commas from multiline expression lists proposed. That solves that problem and reduces unnecessary visual noise from superfluous punctuation.
Alas, it was rejected - although, without prejudice, so it could be re-pitched. Though, it's not clear to me from reading the [long] review thread what exactly the review committee felt needed addressing.