Minor cleanup of route introspect code

Change-Id: I67fb46d91dba0e828e4b244d336f276aba80436e