Keep new event search-related stuff where it belongs.