Updated to use match.c's new "want_i" variable.