Update renumbering utility to include updating the id that is stored for a map entry. Also updates struct info positions to include the possibility that the key is not in the map (which this test example illuminated). - #2196