Code cleanups, mainly. With another attempt to have the SearchView retain focus.