Yet more re-factoring in the routing area.