Fix out-of-order statements and remove redundant scheduler state.

Followup to #248.