Minor simplification of the routing code