Cleaning up some module id usage in the router.