More routing refactoring.