Structural change to match up with syscall state changes.