Further routing simplifications.