Used enumerators to improve routing performance.
More dykstra improvements.