Cleaning up stuff that came up when I created a local copy.

Some errors and clashes that seem to be due to hard links and a few
other miscellaneous things. None of it seems to be of import.