Rename identifiers that still use 'alt' to use 'match'

This'll be less confusing for anyone who works on match in future.

(One slightly annoying thing, though, is that I had to use "_match" in a couple of places where "match" couldn't appear because it's a keyword.)