Cleanup bits in new redirect code

This is a follow-up to not block the original patch with nitpicks.

Yes, this includes an unrelated file from Lib which I found when
doing a regex search. I can move this to an other patch if you
insist. Please tell me.

Change-Id: I1bd2919e833f9a98c9ed4995c713eaffbb6a60ec
Merge "Cleanup bits in new redirect code"