Clean up multi-pub searching.
OK, I did introduce a bug with that earlier change.
Centralize common pattern of locate-pub-or-die.