vii/unsp cleanups for cowering (nw)