Yet another fixup for search paths.