bug#17604: bug#17605: [PATCH] dfa: simplify building intial state

[Paul Eggert]

Thanks, I've pushed those changes, along with the changes for Bug#17604.