`Router, Locator`: Clean up returns; conditionals.