This series fixes the first two problems described by Jameson in id:87r4gk8qa5.fsf at servo.finestructure.net that caused errors to be reported when the search buffer was killed by the user while the search was still running.