Adjust for newer redirect formats, getting results faster & easier.

Change-Id: Ib626ce29f6338de2bfffd12e8a1c1c811b337f46