Move signal matching machinery into superclasses