Further cleanup using the new DFAState interface