Some internal router cleanup.