Cosmetics + now use executable-make-buffer-file-executable-if-script-p.