Gao's SignalConstructor Changes (not others).  Minor refactoring