Address a warning
Make delete-file-and-buffer vc aware
Minor changes
Code style
Pull in upstream changes