Agree, minimizing diffs (even indentation!) is a necessary evil.

Nowadays I will use lambdas that return early in preference to goto. Not from fastidiousness so much as to avoid confusing the optimizer.

Poster child for reprehensible use of goto is procmail.