Cleanup of router conversion.

Prepping for the real work...