second round of svi318.c cleanup (with some tagmap reduction too). nw.