Additional search.cpp cleanup