From Rob Sullivan: Fix a segfault with searching, plus some cleanups.
1 file changed