Fix out-of-order statements and remove redundant scheduler state.
Merge pull request #249 from cgjones/sched-tweak

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