Switch to SimpleSignal++.