Improve handling of SIGINT so that it disables option -k.