NFA to DFA improvements