Minor cleanup of route introspect code

Change-Id: I7076244b7d4da98b860c57d1d1a69e3d8348842b