Clean up some search related helper classes.