more improvements to dfa construction

Signed-off-by: Tim Henderson <tim.tadh@gmail.com>
only 1 match in dfa

Signed-off-by: Tim Henderson <tim.tadh@gmail.com>