Second set of house keeping changes: focus on search, but also including concrete and graph

This is a second set of house keeping changes that should be relatively uncontroversial.