More routing performance improvements.