Better tracking for state of tasks inside the Scheduler

[niloc132]

Among other things, this hopefully solves the issue where a task finishing after it was canceled used to fail to signal that all work was finished.

Fixes #161