Simplified DFA conversion.

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

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