Some signal matching cleanup.
Merge branch 'master' of https://github.com/Mw1993/HisAndHers551