v3.0.x: minor router refactor