Removing explicit cancel search code and rolling it into the stop
search code.  Also some minor code cleanup.  Still need to look at
making fetch_full_context not block...