Misc untangling of search code.
Genericise call list.