Clean up match.c a bit.