More massaging for the --diff option