Update to rust master.

More work on routing system.