Wait until last moment to alter StateMachine's internal state
Remove event handlers from dead signaller
Refactor to new interface
Remove junk comment