Fix haskell-mode problem, again
Improve delete-buffer-and-file