Fix another mixup in swapping router improvements.