Cleaning up static initializers in Signals.inc