Merged SwitchableRouter into RouterImpl, cleaned up router exceptions