Instead of matching -t & -s names exactly, do substring search.

This is less cumbersome with long "foo_should_blah_when_blah"-style names.