Minor API improvements in router.