[grr. diff -u vs diff -uN].  Attached are the new files.