Followup r65114 (per CR cabal), remove SpecialSearchGomatch, replace with SpecialSear...