Be more careful in ty_co_match

I have Thought Hard, and made a few tweaks to ty_co_match. If this passes CI, merge.

It turns out that the comments were right, but the implementation was slightly wrong.