(server-sentinel): Kill buffers if applicable. (server-temp-file-p): Make arg optional. (server-done): Use it to simplify. (server-switch-buffer): If server-window is a function, use it.