More refractoring, prevent bogus finds.