(grep-compute-defaults): Don't set grep-command/grep-find-command when it is already non-nil. (grep-command): Make it a user option. (grep-find-command): Likewise.