Made the <ifname>[.<router>] handling consistent - had mixed i%ifnum and <ifname>.