Minor cleanup of route introspect code

Change-Id: I34b2418279df4ee3a11ef28f4d54cb73047cd65e