Structural change to match up with syscall state changes.

More scut work for #293.