Add rewrite_sigspecs2, Improve remove() wires