Refactoring of actions which dispatch searches.

Previously action composition was been (ab)used in a way that hurt
readability. Although the number of different search-related objects
is still confusing, the way searches were dispatched is now easier on
the eye and brain.
Merge branch 'master' into merge_guides