Fix argument propagation in _signal and weave/unweave