Add remaining work from the roads refactoring.