More build script repo search order tweaking.