Fix cp /dev/null filename, and a few in-passing cleanups.
2 files changed