Clean up some clang-tidy warnings in the router