Avoid use of hard-coded signal type id

Completes transition started by #114.