More cleanup before moving the router installation to the head of the bootstrap order.