compare.pas: Mostly a revert to the older version