Minor cleanup of route introspect code

Change-Id: Ia80e96cc0acb9ba44c768858221a74a53b4b48c1