Besides, with GNU diff one can use the DIFF_OPTIONS envvar.
Update code to use `trap' and more up to date infrastructure.