After the preceding cleanups, it turns out that a couple of states are
not necessary and can just be removed. Also, they can be given more
descriptive names now.