Fix arg length
match.c: comment out unused dump_match
d2.c: minor edits to placate compiler