Minor improvements to routes-router

cc @Matt-Esch @sh1mmer