Minor cleanup of route introspect code

Change-Id: I6d522bf31b9971794bcb0d787af4a3e77bc82292