Properly degrade redirection confidence

This involved a little refactoring, which actually made things easier to
read.