[WIP] Scheduler refactor redux

Follow-up from #27.